`321cba3`

daemon: Make X11 connection optional

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

Status	File	+	-
M	`garbg/src/daemon/state.rs`	13	3

garbg/src/daemon/state.rsmodified

  /// Main daemon struct
  pub struct Daemon {
--    /// X11 connection
++    /// X11 connection (None if disconnected, will attempt reconnect)
--    conn: Connection,
++    conn: Option<Connection>,
      /// Daemon state
      state: DaemonState,
          let state = DaemonState::new(config);
          Ok(Self {
--            conn,
++            conn: Some(conn),
              state,
              animation: None,
              cache,
          })
+     }
++    /// Get a reference to the X11 connection, or error if disconnected
++    fn conn(&self) -> Result<&Connection> {
++        self.conn.as_ref().ok_or_else(|| anyhow::anyhow!("X11 connection not available"))
++    }
++
++    /// Get a mutable reference to the X11 connection, or error if disconnected
++    fn conn_mut(&mut self) -> Result<&mut Connection> {
++        self.conn.as_mut().ok_or_else(|| anyhow::anyhow!("X11 connection not available"))
++    }
++
      /// Run the daemon event loop
      pub async fn run(&mut self) -> Result<()> {
          // Check for stale PID file and clean up