`f9341b4`

Enable Wayland session discovery

Enumerate sessions from /usr/share/wayland-sessions/ in addition
to X11 sessions. Each session is tagged with its type (x11/wayland)
for the daemon to handle appropriately.

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

SHA: f9341b4c1080b9928703e472b7dc02a28e05581d
Parents: 0c6065d
Tree: bd6903e

1 changed file

Status	File	+	-
M	`gardmd/src/sessions.rs`	14	3

gardmd/src/sessions.rsmodified

  const MAX_UID: u32 = 60000;
  /// Enumerate available sessions from .desktop files
 -/// Note: Only X11 sessions are listed since gardm runs an X server.
 -/// Wayland compositors need to be started differently and can't run on X11.
 +/// Returns both X11 and Wayland sessions. The daemon handles launching
 +/// each session type appropriately (X11 on existing server, Wayland directly on VT).
  pub fn list_sessions() -> Vec<SessionInfo> {
      let mut sessions = Vec::new();
 -    // X11 sessions only (Wayland sessions can't run on our X server)
 +    // X11 sessions
      for dir in XSESSION_DIRS {
          if let Ok(entries) = fs::read_dir(dir) {
              for entry in entries.flatten() {
+         }
+     }
 +    // Wayland sessions
 +    for dir in WAYLAND_SESSION_DIRS {
 +        if let Ok(entries) = fs::read_dir(dir) {
 +            for entry in entries.flatten() {
 +                if let Some(session) = parse_desktop_file(&entry.path(), "wayland") {
 +                    sessions.push(session);
 +                }
 +            }
 +        }
 +    }
++
      // Sort by name for consistent ordering
      sessions.sort_by(|a, b| a.name.cmp(&b.name));