`9c44705`

fix: refresh DISPLAY from systemd env on X11 reconnect

When the X session restarts, DISPLAY can change (e.g. :0 -> :1).
The daemon kept the stale value, preventing X11 reconnection.

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

SHA: 9c4470527c5fb7faafaa1cfd9ee99f4906c6e510
Parents: f89cf77
Tree: 8b54751

1 changed file

Status	File	+	-
M	`garbg/src/daemon/state.rs`	41	0

garbg/src/daemon/state.rsmodified

+     }
      /// Attempt to establish/re-establish X11 connection
 +    ///
 +    /// On reconnection, refreshes `DISPLAY` from the systemd user environment
 +    /// since the X display number may change across session restarts (e.g. `:0` -> `:1`).
      fn try_connect_x11(&mut self) -> bool {
 +        Self::refresh_display_env();
++
          match Connection::new() {
              Ok(conn) => {
                  let (width, height) = conn.screen_dimensions();
+         }
+     }
 +    /// Refresh DISPLAY (and XAUTHORITY) from the systemd user manager environment.
 +    ///
 +    /// When the X session restarts, the display number can change (e.g. `:0` -> `:1`).
 +    /// systemd's user manager gets updated via `systemctl --user import-environment`,
 +    /// but a long-running daemon keeps the stale value in its own process environment.
 +    fn refresh_display_env() {
 +        let output = match std::process::Command::new("systemctl")
 +            .args(["--user", "show-environment"])
 +            .output()
 +        {
 +            Ok(o) if o.status.success() => o,
 +            _ => return,
 +        };
++
 +        let env_str = match std::str::from_utf8(&output.stdout) {
 +            Ok(s) => s,
 +            Err(_) => return,
 +        };
++
 +        for line in env_str.lines() {
 +            if let Some(val) = line.strip_prefix("DISPLAY=") {
 +                let current = std::env::var("DISPLAY").unwrap_or_default();
 +                if current != val {
 +                    tracing::info!("DISPLAY changed: {} -> {}", current, val);
 +                    std::env::set_var("DISPLAY", val);
 +                }
 +            } else if let Some(val) = line.strip_prefix("XAUTHORITY=") {
 +                let current = std::env::var("XAUTHORITY").unwrap_or_default();
 +                if current != val {
 +                    tracing::info!("XAUTHORITY changed: {} -> {}", current, val);
 +                    std::env::set_var("XAUTHORITY", val);
 +                }
 +            }
 +        }
 +    }
++
      /// Check if X11 connection is alive
      fn x11_is_alive(&self) -> bool {
          self.conn.as_ref().map(|c| c.is_alive()).unwrap_or(false)