`5624ed9`

Pass session_type from greeter to daemon

Add session_type parameter to handle_login function and include
it in the StartSession IPC request. Get session type from the
session selector for both button click and Enter key handlers.

Authored by mfwolffe <wolffemf@dukes.jmu.edu> 3 months ago

SHA: 5624ed9208bb15ca36ce939edce76eac5d1a8541
Parents: e7cad66
Tree: 1d5cfb2

1 changed file

Status	File	+	-
M	`gardm-greeter/src/main.rs`	15	3

gardm-greeter/src/main.rsmodified

+                     }
                      // Check login button click
                      else if form.button_contains(click_x, click_y) && form.can_submit() {
 -                        // Get selected session exec command
 +                        // Get selected session exec command and type
                          let session_exec = session_selector
                              .selected_exec()
                              .unwrap_or("gar-session.sh")
                              .to_string();
 +                        let session_type = session_selector
 +                            .selected_type()
 +                            .unwrap_or("x11")
 +                            .to_string();
                          // Attempt login
                          if let Some(fade) = handle_login(
                              &mut client,
                              &mut form,
                              &session_exec,
 +                            &session_type,
                              config.effective_fade_duration(),
+                         )
                          .await?
                          keycodes::RETURN => {
                              if form.focused_field == FocusedField::Password && form.can_submit() {
 -                                // Get selected session exec command
 +                                // Get selected session exec command and type
                                  let session_exec = session_selector
                                      .selected_exec()
                                      .unwrap_or("gar-session.sh")
                                      .to_string();
 +                                let session_type = session_selector
 +                                    .selected_type()
 +                                    .unwrap_or("x11")
 +                                    .to_string();
                                  // Attempt login
                                  if let Some(fade) = handle_login(
                                      &mut client,
                                      &mut form,
                                      &session_exec,
 +                                    &session_type,
                                      config.effective_fade_duration(),
+                                 )
                                  .await?
      client: &mut Client,
      form: &mut LoginForm,
      session_exec: &str,
 +    session_type: &str,
      fade_duration_ms: u64,
  ) -> Result<Option<FadeOutTransition>> {
      form.is_loading = true;
              // Start session with selected session command
              let session_cmd = vec![session_exec.to_string()];
 -            tracing::info!(?session_cmd, "Starting session");
 +            tracing::info!(?session_cmd, %session_type, "Starting session");
              let response = client
                  .request(&Request::StartSession {
                      cmd: session_cmd,
 +                    session_type: session_type.to_string(),
                      env: vec![],
                  })
                  .await?;