`8a1594a`

fix: use work_area for tiled edge detection

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

SHA: 8a1594abaa30ca68f7a42933fb1b142dd890db64
Parents: 35a4759
Tree: 42eab95

3 changed files

Status	File	+	-
M	`Cargo.lock`	2	2
M	`gar/src/core/mod.rs`	40	0
M	`gar/src/x11/events.rs`	2	2

Cargo.lockmodified

  [[package]]
  name = "gar"
 -version = "0.1.0"
 +version = "0.2.0"
  dependencies = [
   "dirs",
   "libc",
  [[package]]
  name = "garctl"
 -version = "0.1.0"
 +version = "0.2.0"
  dependencies = [
   "clap",
   "serde",

gar/src/core/mod.rsmodified

          self.monitors[self.focused_monitor].geometry
+     }
 +    /// Get the work area for the focused monitor (accounting for struts and outer gaps).
 +    pub fn work_area(&self) -> Rect {
 +        let screen = self.screen_rect();
 +        let gap_outer = self.config.gap_outer as i16;
++
 +        // Calculate struts for focused monitor
 +        let (strut_left, strut_right, strut_top, strut_bottom) =
 +            self.calculate_struts(self.focused_monitor);
++
 +        Rect::new(
 +            screen.x + gap_outer + strut_left as i16,
 +            screen.y + gap_outer + strut_top as i16,
 +            screen.width
 +                .saturating_sub(2 * gap_outer as u16 + strut_left as u16 + strut_right as u16),
 +            screen.height
 +                .saturating_sub(2 * gap_outer as u16 + strut_top as u16 + strut_bottom as u16),
 +        )
 +    }
++
      /// Get the rectangle for a specific workspace's monitor.
      pub fn workspace_rect(&self, workspace_idx: usize) -> Rect {
          self.monitor_for_workspace(workspace_idx)
          self.monitors.iter().position(|m| m.active_workspace == workspace_idx)
+     }
 +    /// Calculate struts (reserved space for panels/docks) for a monitor.
 +    fn calculate_struts(&self, _monitor_idx: usize) -> (u32, u32, u32, u32) {
 +        if self.config.bar_height > 0 {
 +            // Manual bar height overrides struts (assumes bar at top)
 +            (0, 0, self.config.bar_height, 0)
 +        } else {
 +            // Accumulate struts from dock windows
 +            let mut left: u32 = 0;
 +            let mut right: u32 = 0;
 +            let mut top: u32 = 0;
 +            let mut bottom: u32 = 0;
 +            for strut in self.dock_struts.values() {
 +                left = left.max(strut.left);
 +                right = right.max(strut.right);
 +                top = top.max(strut.top);
 +                bottom = bottom.max(strut.bottom);
 +            }
 +            (left, right, top, bottom)
 +        }
 +    }
++
      /// Refresh monitors (called on RandR screen change).
      pub fn refresh_monitors(&mut self) -> Result<()> {
          tracing::info!("Refreshing monitor configuration");

gar/src/x11/events.rsmodified

          // Check for edge resize on TILED windows (click on gap between windows, no mod key)
          if !has_mod && event.detail == 1 {
 -            let screen = self.screen_rect();
 -            let geometries = self.current_workspace().tree.calculate_geometries(screen);
 +            let work_area = self.work_area();
 +            let geometries = self.current_workspace().tree.calculate_geometries(work_area);
              if let Some((window, direction, container_size)) =
                  self.find_tiled_edge(event.root_x, event.root_y, &geometries)