`3ab345f`

detect cross-monitor mouse movement on empty desktops via root MotionNotify

Authored by

espadonne 2 months ago

SHA: 3ab345f1d045827dc745b7934f617cb444cc124f
Parents: ae7eded
Tree: 38d8769

2 changed files

Status	File	+	-
M	`gar/src/x11/connection.rs`	2	1
M	`gar/src/x11/events.rs`	24	7

gar/src/x11/connection.rsmodified

                      | EventMask::SUBSTRUCTURE_NOTIFY
                      | EventMask::STRUCTURE_NOTIFY
                      | EventMask::PROPERTY_CHANGE
 -                    | EventMask::ENTER_WINDOW,
 +                    | EventMask::ENTER_WINDOW
 +                    | EventMask::POINTER_MOTION,
+             )
              .background_pixel(self.screen().black_pixel)
              .cursor(self.cursor_normal);

gar/src/x11/events.rsmodified

                      // Check for tiled edge hover (for cursor feedback)
                      self.update_tiled_edge_cursor(window, event.root_x, event.root_y)?;
+                 }
 -            } else if self.tiled_edge_cursor.is_some() {
 -                // Moving to unmanaged window or root - clear tiled edge cursor
 -                let (old_w1, old_w2, _) = self.tiled_edge_cursor.unwrap();
 -                self.conn.clear_window_cursor(old_w1)?;
 -                self.conn.clear_window_cursor(old_w2)?;
 -                self.conn.flush()?;
 -                self.tiled_edge_cursor = None;
 +            } else {
 +                if self.tiled_edge_cursor.is_some() {
 +                    // Moving to unmanaged window or root - clear tiled edge cursor
 +                    let (old_w1, old_w2, _) = self.tiled_edge_cursor.unwrap();
 +                    self.conn.clear_window_cursor(old_w1)?;
 +                    self.conn.clear_window_cursor(old_w2)?;
 +                    self.conn.flush()?;
 +                    self.tiled_edge_cursor = None;
 +                }
 +                // Pointer is on root/empty desktop — check for cross-monitor movement
 +                let monitor_idx = self.monitor_idx_at_point(event.root_x, event.root_y);
 +                if monitor_idx != self.focused_monitor {
 +                    let old_workspace_idx = self.focused_workspace;
 +                    self.focused_monitor = monitor_idx;
 +                    let workspace_idx = self.monitors[monitor_idx].active_workspace;
 +                    self.focused_workspace = workspace_idx;
 +                    self.focused_window = None;
 +                    self.conn.set_active_window(None)?;
 +                    self.conn.set_current_desktop(workspace_idx as u32)?;
 +                    if workspace_idx != old_workspace_idx {
 +                        self.broadcast_i3_workspace_event("focus", workspace_idx, Some(old_workspace_idx));
 +                    }
 +                    self.conn.flush()?;
 +                }
+             }
              return Ok(());
+         }