`46030f0`

Disable mouse warp on enter/click, add mouse_follows_focus config

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

SHA: 46030f0ef739e4b32d7edf6b9c60e49cc7e2b647
Parents: 10ca6a2
Tree: 17c4a93

3 changed files

Status	File	+	-
M	`gar/src/config/lua.rs`	5	0
M	`gar/src/config/mod.rs`	3	0
M	`gar/src/x11/events.rs`	19	19

gar/src/config/lua.rsmodified


                         state.config.follow_window_on_move = v;
                     }
                 }
+                "mouse_follows_focus" => {
+                    if let Value::Boolean(v) = value {
+                        state.config.mouse_follows_focus = v;
+                    }
+                }
                 _ => {
                     tracing::warn!("Unknown config key: {}", key);
                 }

gar/src/config/mod.rsmodified


     pub titlebar_text_color: u32,
     // Behavior settings
     pub follow_window_on_move: bool,
+    pub mouse_follows_focus: bool,
 }
 
 impl Default for Config {

             titlebar_text_color: 0xffffff,
             // Behavior: follow window when moving to another workspace
             follow_window_on_move: false,
+            // Behavior: warp mouse pointer to center of focused window
+            mouse_follows_focus: false,
         }
     }
 }

gar/src/x11/events.rsmodified

              self.apply_layout()?;
              // Focus the first window
              if let Some(window) = self.focused_window {
 -                self.set_focus(window)?;
 +                self.set_focus(window, true)?;
                  self.conn.ungrab_button(window)?;
+             }
              tracing::info!("Adopted {} existing windows", adopted);
          // Focus the new window (only if on current workspace)
          if target_idx == self.focused_workspace {
 -            self.set_focus(window)?;
 +            self.set_focus(window, true)?;
+         }
          Ok(())
              // Focus next window or warp to monitor if none left
              if let Some(win) = self.focused_window {
 -                self.set_focus(win)?;
 +                self.set_focus(win, true)?;
              } else {
                  // No windows left, warp to current monitor center
                  self.warp_to_monitor(self.focused_monitor)?;
          // Focus next window or warp to monitor if none left
          if let Some(window) = self.focused_window {
 -            self.set_focus(window)?;
 +            self.set_focus(window, true)?;
          } else {
              // No windows left, warp to current monitor center
              self.warp_to_monitor(self.focused_monitor)?;
                  self.conn.grab_button(old)?;
+             }
 -            // Set focus and ungrab button on new focused window
 -            self.set_focus(window)?;
 +            // Set focus and ungrab button on new focused window (no warp - mouse click)
 +            self.set_focus(window, false)?;
              self.conn.ungrab_button(window)?;
              // Raise floating windows on focus
              self.conn.grab_button(old)?;
+         }
 -        // Focus the new window (this will warp pointer back, but we'll suppress the resulting EnterNotify)
 -        self.set_focus(window)?;
 +        // Focus the new window (no warp - mouse enter)
 +        self.set_focus(window, false)?;
          self.conn.ungrab_button(window)?;
          // Raise floating windows on focus
                          self.switch_workspace(ws_idx)?;
+                     }
+                 }
 -                // Focus the window
 +                // Focus the window (external activation, warp pointer)
                  if let Some(old) = self.focused_window {
                      self.conn.grab_button(old)?;
+                 }
 -                self.set_focus(window)?;
 +                self.set_focus(window, true)?;
                  self.conn.ungrab_button(window)?;
                  if self.is_floating(window) {
                      self.raise_window(window)?;
              // Regrab button on old window
              self.conn.grab_button(focused)?;
 -            // Focus new window
 -            self.set_focus(target)?;
 +            // Focus new window (keyboard navigation, warp pointer)
 +            self.set_focus(target, true)?;
              self.conn.ungrab_button(target)?;
              self.conn.flush()?;
              if let Some(old) = self.focused_window {
                  self.conn.grab_button(old)?;
+             }
 -            self.set_focus(window)?;
 +            self.set_focus(window, true)?;
              self.conn.ungrab_button(window)?;
          } else {
              // No windows on target monitor - clear focus and warp to monitor center
                  .or_else(|| self.workspaces[idx].floating.last().copied())
                  .or_else(|| self.workspaces[idx].tree.first_window())
+             {
 -                self.set_focus(window)?;
 +                self.set_focus(window, true)?;
              } else {
                  self.focused_window = None;
                  self.conn.set_active_window(None)?;
                  .or_else(|| self.workspaces[idx].floating.last().copied())
                  .or_else(|| self.workspaces[idx].tree.first_window())
+             {
 -                self.set_focus(window)?;
 +                self.set_focus(window, true)?;
              } else {
                  // No windows - warp to center of monitor
                  self.focused_window = None;
              if current_ws == self.focused_workspace {
                  self.focused_window = new_focus_on_current;
                  if let Some(new_focus) = self.focused_window {
 -                    self.set_focus(new_focus)?;
 +                    self.set_focus(new_focus, true)?;
                  } else {
                      self.conn.set_active_window(None)?;
+                 }
              if let Some(old) = self.focused_window {
                  self.conn.grab_button(old)?;
+             }
 -            self.set_focus(window)?;
 +            self.set_focus(window, true)?;
              self.conn.ungrab_button(window)?;
          } else {
              // No windows - warp to monitor center
              self.conn.grab_button(old)?;
+         }
 -        // Focus and raise the next floating window
 -        self.set_focus(next_window)?;
 +        // Focus and raise the next floating window (keyboard action, warp pointer)
 +        self.set_focus(next_window, true)?;
          self.conn.ungrab_button(next_window)?;
          self.raise_window(next_window)?;

`@@ -282,6 +282,11 @@` impl LuaConfig {
282	282	state.config.follow_window_on_move = v;
283	283	}
284	284	}
	285	+ "mouse_follows_focus" => {
	286	+ if let Value::Boolean(v) = value {
	287	+ state.config.mouse_follows_focus = v;
	288	+ }
	289	+ }
285	290	_ => {
286	291	tracing::warn!("Unknown config key: {}", key);
287	292	}

`@@ -18,6 +18,7 @@` pub struct Config {
18	18	pub titlebar_text_color: u32,
19	19	// Behavior settings
20	20	pub follow_window_on_move: bool,
	21	+ pub mouse_follows_focus: bool,
21	22	}
22	23
23	24	impl Default for Config {
`@@ -37,6 +38,8 @@` impl Default for Config {
37	38	titlebar_text_color: 0xffffff,
38	39	// Behavior: follow window when moving to another workspace
39	40	follow_window_on_move: false,
	41	+ // Behavior: warp mouse pointer to center of focused window
	42	+ mouse_follows_focus: false,
40	43	}
41	44	}
42	45	}