`ae7eded`

track monitor focus on mouse enter to empty workspaces

Authored by

espadonne 2 months ago

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

gar/src/x11/connection.rsmodified

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

gar/src/x11/events.rsmodified

              return Ok(());
+         }
--        // Only focus windows we manage
++        // For unmanaged windows (root window / empty desktop areas),
++        // check if the pointer crossed to a different monitor and update
++        // focused workspace accordingly so garbar underline tracks correctly.
          if !self.windows.contains_key(&window) {
++            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(());
+         }