`fd1f785`

add startup retry for root pixmap loading

Authored by

espadonne 3 months ago

SHA: fd1f785b6d1f984c09e0c90ce41dd299b13c3049
Parents: b3f2049
Tree: f4db49f

2 changed files

Status	File	+	-
M	`garchomp/src/compositor/mod.rs`	27	1
M	`garchomp/src/main.rs`	3	0

garchomp/src/compositor/mod.rsmodified

      root_pixmap: Option<u32>,
      /// Monitor configuration from RandR.
      pub monitors: Vec<MonitorInfo>,
 +    /// Startup retry counter for root pixmap loading.
 +    root_pixmap_retry_count: u32,
+ }
  impl Compositor {
              lua_config,
              root_pixmap,
              monitors,
 +            root_pixmap_retry_count: if root_pixmap.is_none() { 10 } else { 0 },
          };
          // Get initial active window
              && (event.atom == self.conn.atoms._XROOTPMAP_ID
                  || event.atom == self.conn.atoms.ESETROOT_PMAP_ID)
+         {
 +            tracing::debug!("Received PropertyNotify for root pixmap");
              let new_pixmap = self.conn.get_root_pixmap();
              if new_pixmap != self.root_pixmap {
                  tracing::info!("Root pixmap changed: {:?} -> {:?}", self.root_pixmap, new_pixmap);
                  self.root_pixmap = new_pixmap;
 +                self.root_pixmap_retry_count = 0; // Stop startup retries
                  // Tell renderer about new background
                  self.renderer.set_root_pixmap(new_pixmap);
                  self.needs_redraw = true;
      /// Check if a redraw is needed.
      pub fn needs_redraw(&self) -> bool {
 -        self.needs_redraw
 +        self.needs_redraw || self.root_pixmap_retry_count > 0
 +    }
++
 +    /// Try to load the root pixmap if we haven't found one yet.
 +    /// Called during startup to handle race condition with garbg.
 +    pub fn try_load_root_pixmap(&mut self) {
 +        if self.root_pixmap_retry_count > 0 {
 +            self.root_pixmap_retry_count -= 1;
 +            let new_pixmap = self.conn.get_root_pixmap();
 +            if new_pixmap.is_some() && new_pixmap != self.root_pixmap {
 +                tracing::info!(
 +                    "Root pixmap found on startup retry: {:?} (retries left: {})",
 +                    new_pixmap, self.root_pixmap_retry_count
 +                );
 +                self.root_pixmap = new_pixmap;
 +                self.renderer.set_root_pixmap(new_pixmap);
 +                self.root_pixmap_retry_count = 0; // Success, stop retrying
 +                self.needs_redraw = true;
 +            } else if self.root_pixmap_retry_count == 0 {
 +                tracing::debug!("Root pixmap startup retry exhausted, pixmap={:?}", self.root_pixmap);
 +            }
 +        }
+     }
      /// Resize the renderer surface.

garchomp/src/main.rsmodified


             }
         }
 
+        // Try to load root pixmap on startup if not found initially
+        compositor.try_load_root_pixmap();
+
         // Render if needed
         if compositor.needs_redraw() {
             if let Err(e) = compositor.render() {

`@@ -143,6 +143,9 @@` async fn main() -> Result<()> {
143	143	}
144	144	}
145	145
	146	+ // Try to load root pixmap on startup if not found initially
	147	+ compositor.try_load_root_pixmap();
	148	+
146	149	// Render if needed
147	150	if compositor.needs_redraw() {
148	151	if let Err(e) = compositor.render() {