add option not to move cursor

Author: prog-r-amer

niri-config/src/lib.rs

@@ -1434,7 +1434,10 @@ pub enum Action {
     #[knuffel(skip)]
     FullscreenWindowById(u64),
     #[knuffel(skip)]
-    FocusWindow(u64),
+    FocusWindow {
+        id: u64,
+        no_mouse_warp: bool,
+    },
     FocusWindowInColumn(#[knuffel(argument)] u8),
     FocusWindowPrevious,
     FocusColumnLeft,
@@ -1485,9 +1488,19 @@ pub enum Action {
     CenterWindow,
     #[knuffel(skip)]
     CenterWindowById(u64),
-    FocusWorkspaceDown,
-    FocusWorkspaceUp,
-    FocusWorkspace(#[knuffel(argument)] WorkspaceReference),
+    #[knuffel(skip)]
+    FocusWorkspaceDown {
+        no_mouse_warp: bool,
+    },
+    #[knuffel(skip)]
+    FocusWorkspaceUp {
+        no_mouse_warp: bool,
+    },
+    FocusWorkspace(
+        //fix this
+        #[knuffel(argument)] WorkspaceReference,
+        bool,
+    ),
     FocusWorkspacePrevious,
     MoveWindowToWorkspaceDown,
     MoveWindowToWorkspaceUp,
@@ -1620,7 +1633,9 @@ impl From<niri_ipc::Action> for Action {
             niri_ipc::Action::CloseWindow { id: Some(id) } => Self::CloseWindowById(id),
             niri_ipc::Action::FullscreenWindow { id: None } => Self::FullscreenWindow,
             niri_ipc::Action::FullscreenWindow { id: Some(id) } => Self::FullscreenWindowById(id),
-            niri_ipc::Action::FocusWindow { id } => Self::FocusWindow(id),
+            niri_ipc::Action::FocusWindow { id, no_mouse_warp } => {
+                Self::FocusWindow { id, no_mouse_warp }
+            }
             niri_ipc::Action::FocusWindowInColumn { index } => Self::FocusWindowInColumn(index),
             niri_ipc::Action::FocusWindowPrevious {} => Self::FocusWindowPrevious,
             niri_ipc::Action::FocusColumnLeft {} => Self::FocusColumnLeft,
@@ -1682,11 +1697,16 @@ impl From<niri_ipc::Action> for Action {
             niri_ipc::Action::CenterColumn {} => Self::CenterColumn,
             niri_ipc::Action::CenterWindow { id: None } => Self::CenterWindow,
             niri_ipc::Action::CenterWindow { id: Some(id) } => Self::CenterWindowById(id),
-            niri_ipc::Action::FocusWorkspaceDown {} => Self::FocusWorkspaceDown,
-            niri_ipc::Action::FocusWorkspaceUp {} => Self::FocusWorkspaceUp,
-            niri_ipc::Action::FocusWorkspace { reference } => {
-                Self::FocusWorkspace(WorkspaceReference::from(reference))
+            niri_ipc::Action::FocusWorkspaceDown { no_mouse_warp } => {
+                Self::FocusWorkspaceDown { no_mouse_warp }
             }
+            niri_ipc::Action::FocusWorkspaceUp { no_mouse_warp } => {
+                Self::FocusWorkspaceUp { no_mouse_warp }
+            }
+            niri_ipc::Action::FocusWorkspace {
+                reference,
+                no_mouse_warp,
+            } => Self::FocusWorkspace(WorkspaceReference::from(reference), no_mouse_warp),
             niri_ipc::Action::FocusWorkspacePrevious {} => Self::FocusWorkspacePrevious,
             niri_ipc::Action::MoveWindowToWorkspaceDown {} => Self::MoveWindowToWorkspaceDown,
             niri_ipc::Action::MoveWindowToWorkspaceUp {} => Self::MoveWindowToWorkspaceUp,
@@ -4149,7 +4169,7 @@ mod tests {
                             trigger: Trigger::Keysym(Keysym::_1),
                             modifiers: Modifiers::COMPOSITOR,
                         },
-                        action: Action::FocusWorkspace(WorkspaceReference::Index(1)),
+                        action: Action::FocusWorkspace( WorkspaceReference::Index(1), false),
                         repeat: true,
                         cooldown: None,
                         allow_when_locked: false,
@@ -4163,7 +4183,7 @@ mod tests {
                         },
                         action: Action::FocusWorkspace(WorkspaceReference::Name(
                             "workspace-1".to_string(),
-                        )),
+                        ), false),
                         repeat: true,
                         cooldown: None,
                         allow_when_locked: false,
@@ -4187,7 +4207,7 @@ mod tests {
                             trigger: Trigger::WheelScrollDown,
                             modifiers: Modifiers::COMPOSITOR,
                         },
-                        action: Action::FocusWorkspaceDown,
+                        action: Action::FocusWorkspaceDown{no_mouse_warp: false},
                         repeat: true,
                         cooldown: Some(Duration::from_millis(150)),
                         allow_when_locked: false,

niri-ipc/src/lib.rs

@@ -214,6 +214,9 @@ pub enum Action {
         /// Id of the window to focus.
         #[cfg_attr(feature = "clap", arg(long))]
         id: u64,
+        /// Dont move the cursor when focussing the window.
+        #[cfg_attr(feature = "clap", arg(long = "no_mouse_warp", action = clap::ArgAction::SetTrue))]
+        no_mouse_warp: bool,
     },
     /// Focus a window in the focused column by index.
     FocusWindowInColumn {
@@ -344,14 +347,25 @@ pub enum Action {
         id: Option<u64>,
     },
     /// Focus the workspace below.
-    FocusWorkspaceDown {},
+    FocusWorkspaceDown {
+        /// Dont move the cursor when focussing the window.
+        #[cfg_attr(feature = "clap", arg(long = "no_mouse_warp", action = clap::ArgAction::SetTrue))]
+        no_mouse_warp: bool,
+    },
     /// Focus the workspace above.
-    FocusWorkspaceUp {},
+    FocusWorkspaceUp {
+        /// Dont move the cursor when focussing the window.
+        #[cfg_attr(feature = "clap", arg(long = "no_mouse_warp", action = clap::ArgAction::SetTrue))]
+        no_mouse_warp: bool,
+    },
     /// Focus a workspace by reference (index or name).
     FocusWorkspace {
         /// Reference (index or name) of the workspace to focus.
         #[cfg_attr(feature = "clap", arg())]
         reference: WorkspaceReferenceArg,
+        /// Dont move the cursor when focussing the window.
+        #[cfg_attr(feature = "clap", arg(long = "no_mouse_warp", action = clap::ArgAction::SetTrue))]
+        no_mouse_warp: bool,
     },
     /// Focus the previous workspace.
     FocusWorkspacePrevious {},

src/input/mod.rs

@@ -679,11 +679,15 @@ impl State {
                     self.niri.queue_redraw_all();
                 }
             }
-            Action::FocusWindow(id) => {
+            Action::FocusWindow { id, no_mouse_warp } => {
                 let window = self.niri.layout.windows().find(|(_, m)| m.id().get() == id);
                 let window = window.map(|(_, m)| m.window.clone());
                 if let Some(window) = window {
-                    self.focus_window(&window);
+                    if !no_mouse_warp {
+                        self.focus_window(&window);
+                        return;
+                    }
+                    self.focus_window_without_moving_cursor(&window);
                 }
             }
             Action::FocusWindowInColumn(index) => {
@@ -1149,21 +1153,25 @@ impl State {
                     self.niri.queue_redraw_all();
                 }
             }
-            Action::FocusWorkspaceDown => {
+            Action::FocusWorkspaceDown { no_mouse_warp } => {
                 self.niri.layout.switch_workspace_down();
-                self.maybe_warp_cursor_to_focus();
+                if !no_mouse_warp {
+                    self.maybe_warp_cursor_to_focus();
+                }
                 self.niri.layer_shell_on_demand_focus = None;
                 // FIXME: granular
                 self.niri.queue_redraw_all();
             }
-            Action::FocusWorkspaceUp => {
+            Action::FocusWorkspaceUp { no_mouse_warp } => {
                 self.niri.layout.switch_workspace_up();
-                self.maybe_warp_cursor_to_focus();
+                if !no_mouse_warp {
+                    self.maybe_warp_cursor_to_focus();
+                }
                 self.niri.layer_shell_on_demand_focus = None;
                 // FIXME: granular
                 self.niri.queue_redraw_all();
             }
-            Action::FocusWorkspace(reference) => {
+            Action::FocusWorkspace(reference, no_mouse_warp) => {
                 if let Some((mut output, index)) =
                     self.niri.find_output_and_workspace_index(reference)
                 {
@@ -1176,7 +1184,7 @@ impl State {
                     if let Some(output) = output {
                         self.niri.layout.focus_output(&output);
                         self.niri.layout.switch_workspace(index);
-                        if !self.maybe_warp_cursor_to_focus_centered() {
+                        if !no_mouse_warp && !self.maybe_warp_cursor_to_focus_centered() {
                             self.move_cursor_to_output(&output);
                         }
                     } else {
@@ -1186,7 +1194,9 @@ impl State {
                         } else {
                             self.niri.layout.switch_workspace(index);
                         }
-                        self.maybe_warp_cursor_to_focus();
+                        if !no_mouse_warp {
+                            self.maybe_warp_cursor_to_focus();
+                        }
                     }
                     self.niri.layer_shell_on_demand_focus = None;
 

src/niri.rs

@@ -775,6 +775,13 @@ impl State {
         self.niri.queue_redraw_all();
     }
 
+    /// Focus a specific window without moving the cursor.
+    pub fn focus_window_without_moving_cursor(&mut self, window: &Window) {
+        self.niri.layout.activate_window(window);
+        // FIXME: granular
+        self.niri.queue_redraw_all();
+    }
+
     pub fn maybe_warp_cursor_to_focus(&mut self) -> bool {
         if !self.niri.config.borrow().input.warp_mouse_to_focus {
             return false;

src/ui/hotkey_overlay.rs

@@ -210,8 +210,12 @@ fn render(
         &Action::FocusColumnRight,
         &Action::MoveColumnLeft,
         &Action::MoveColumnRight,
-        &Action::FocusWorkspaceDown,
-        &Action::FocusWorkspaceUp,
+        &Action::FocusWorkspaceDown {
+            no_mouse_warp: false,
+        },
+        &Action::FocusWorkspaceUp {
+            no_mouse_warp: false,
+        },
     ]);
 
     // Prefer move-column-to-workspace-down, but fall back to move-window-to-workspace-down.
@@ -422,8 +426,8 @@ fn action_name(action: &Action) -> String {
         Action::FocusColumnRight => String::from("Focus Column to the Right"),
         Action::MoveColumnLeft => String::from("Move Column Left"),
         Action::MoveColumnRight => String::from("Move Column Right"),
-        Action::FocusWorkspaceDown => String::from("Switch Workspace Down"),
-        Action::FocusWorkspaceUp => String::from("Switch Workspace Up"),
+        Action::FocusWorkspaceDown { no_mouse_warp: _ } => String::from("Switch Workspace Down"),
+        Action::FocusWorkspaceUp { no_mouse_warp: _ } => String::from("Switch Workspace Up"),
         Action::MoveColumnToWorkspaceDown => String::from("Move Column to Workspace Down"),
         Action::MoveColumnToWorkspaceUp => String::from("Move Column to Workspace Up"),
         Action::MoveWindowToWorkspaceDown => String::from("Move Window to Workspace Down"),