`0c71d2c`

Clear root window on window close to fix visual artifacts

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

SHA: 0c71d2c44a352c24881246fa92f3e1effea17cd8
Parents: 80bba0d
Tree: e660517

2 changed files

Status	File	+	-
M	`gar/src/x11/connection.rs`	29	6
M	`gar/src/x11/events.rs`	11	0

gar/src/x11/connection.rsmodified

+     }
      pub fn become_wm(&self) -> Result<(), Error> {
 -        let change = ChangeWindowAttributesAux::new().event_mask(
 -            EventMask::SUBSTRUCTURE_REDIRECT
 -                | EventMask::SUBSTRUCTURE_NOTIFY
 -                | EventMask::STRUCTURE_NOTIFY
 -                | EventMask::PROPERTY_CHANGE,
 -        );
 +        // Set root window background to black and subscribe to events
 +        // The background ensures old window pixels are cleared when windows close
 +        let change = ChangeWindowAttributesAux::new()
 +            .event_mask(
 +                EventMask::SUBSTRUCTURE_REDIRECT
 +                    | EventMask::SUBSTRUCTURE_NOTIFY
 +                    | EventMask::STRUCTURE_NOTIFY
 +                    | EventMask::PROPERTY_CHANGE,
 +            )
 +            .background_pixel(self.screen().black_pixel);
          let result = self
              .conn
              .change_window_attributes(self.root, &change)?
              .check();
 +        // Clear the root window to apply the background
 +        if result.is_ok() {
 +            self.conn.clear_area(
 +                false,
 +                self.root,
 +                0,
 +                0,
 +                self.screen_width,
 +                self.screen_height,
 +            )?;
 +            self.conn.flush()?;
 +        }
++
          match result {
              Ok(_) => {
                  tracing::info!("Successfully became window manager");
          Ok(())
+     }
 +    /// Clear an area of the root window (fills with background color).
 +    pub fn clear_root_area(&self, x: i16, y: i16, width: u16, height: u16) -> Result<(), Error> {
 +        self.conn.clear_area(false, self.root, x, y, width, height)?;
 +        Ok(())
 +    }
++
      /// Configure a window's geometry.
      pub fn configure_window(
          &self,

gar/src/x11/events.rsmodified

          // are unmapped intentionally by us during workspace switching
          if is_visible {
              self.unmanage_window(window);
++
 +            // Clear the entire root window to remove any leftover pixels
 +            self.conn.clear_root_area(0, 0, self.conn.screen_width, self.conn.screen_height)?;
++
              self.apply_layout()?;
              // Focus next window or warp to monitor if none left
                  // No windows left, warp to current monitor center
                  self.warp_to_monitor(self.focused_monitor)?;
+             }
++
 +            self.conn.flush()?;
+         }
          Ok(())
          // Remove from management
          self.unmanage_window(event.window);
 +        // Clear the entire root window to remove any leftover pixels
 +        // This is needed because X11 without a compositor doesn't automatically repaint
 +        self.conn.clear_root_area(0, 0, self.conn.screen_width, self.conn.screen_height)?;
++
          // Re-apply layout
          self.apply_layout()?;
              self.warp_to_monitor(self.focused_monitor)?;
+         }
 +        self.conn.flush()?;
          Ok(())
+     }