layout/monitor: Add focus/move to previous monitor

niri-config/src/lib.rs

@@ -1225,16 +1225,19 @@ pub enum Action {
     FocusMonitorRight,
     FocusMonitorDown,
     FocusMonitorUp,
+    FocusMonitorPrevious,
     FocusMonitorNext,
     MoveWindowToMonitorLeft,
     MoveWindowToMonitorRight,
     MoveWindowToMonitorDown,
     MoveWindowToMonitorUp,
+    MoveWindowToMonitorPrevious,
     MoveWindowToMonitorNext,
     MoveColumnToMonitorLeft,
     MoveColumnToMonitorRight,
     MoveColumnToMonitorDown,
     MoveColumnToMonitorUp,
+    MoveColumnToMonitorPrevious,
     MoveColumnToMonitorNext,
     SetWindowHeight(#[knuffel(argument, str)] SizeChange),
     #[knuffel(skip)]
@@ -1257,6 +1260,7 @@ pub enum Action {
     MoveWorkspaceToMonitorRight,
     MoveWorkspaceToMonitorDown,
     MoveWorkspaceToMonitorUp,
+    MoveWorkspaceToMonitorPrevious,
     MoveWorkspaceToMonitorNext,
 }
 
@@ -1357,16 +1361,19 @@ impl From<niri_ipc::Action> for Action {
             niri_ipc::Action::FocusMonitorRight {} => Self::FocusMonitorRight,
             niri_ipc::Action::FocusMonitorDown {} => Self::FocusMonitorDown,
             niri_ipc::Action::FocusMonitorUp {} => Self::FocusMonitorUp,
+            niri_ipc::Action::FocusMonitorPrevious {} => Self::FocusMonitorPrevious,
             niri_ipc::Action::FocusMonitorNext {} => Self::FocusMonitorNext,
             niri_ipc::Action::MoveWindowToMonitorLeft {} => Self::MoveWindowToMonitorLeft,
             niri_ipc::Action::MoveWindowToMonitorRight {} => Self::MoveWindowToMonitorRight,
             niri_ipc::Action::MoveWindowToMonitorDown {} => Self::MoveWindowToMonitorDown,
             niri_ipc::Action::MoveWindowToMonitorUp {} => Self::MoveWindowToMonitorUp,
+            niri_ipc::Action::MoveWindowToMonitorPrevious {} => Self::MoveWindowToMonitorPrevious,
             niri_ipc::Action::MoveWindowToMonitorNext {} => Self::MoveWindowToMonitorNext,
             niri_ipc::Action::MoveColumnToMonitorLeft {} => Self::MoveColumnToMonitorLeft,
             niri_ipc::Action::MoveColumnToMonitorRight {} => Self::MoveColumnToMonitorRight,
             niri_ipc::Action::MoveColumnToMonitorDown {} => Self::MoveColumnToMonitorDown,
             niri_ipc::Action::MoveColumnToMonitorUp {} => Self::MoveColumnToMonitorUp,
+            niri_ipc::Action::MoveColumnToMonitorPrevious {} => Self::MoveColumnToMonitorPrevious,
             niri_ipc::Action::MoveColumnToMonitorNext {} => Self::MoveColumnToMonitorNext,
             niri_ipc::Action::SetWindowHeight { id: None, change } => Self::SetWindowHeight(change),
             niri_ipc::Action::SetWindowHeight {
@@ -1390,6 +1397,9 @@ impl From<niri_ipc::Action> for Action {
             niri_ipc::Action::MoveWorkspaceToMonitorRight {} => Self::MoveWorkspaceToMonitorRight,
             niri_ipc::Action::MoveWorkspaceToMonitorDown {} => Self::MoveWorkspaceToMonitorDown,
             niri_ipc::Action::MoveWorkspaceToMonitorUp {} => Self::MoveWorkspaceToMonitorUp,
+            niri_ipc::Action::MoveWorkspaceToMonitorPrevious {} => {
+                Self::MoveWorkspaceToMonitorPrevious
+            }
             niri_ipc::Action::MoveWorkspaceToMonitorNext {} => Self::MoveWorkspaceToMonitorNext,
             niri_ipc::Action::ToggleDebugTint {} => Self::ToggleDebugTint,
             niri_ipc::Action::DebugToggleOpaqueRegions {} => Self::DebugToggleOpaqueRegions,

niri-ipc/src/lib.rs

@@ -346,6 +346,8 @@ pub enum Action {
     FocusMonitorDown {},
     /// Focus the monitor above.
     FocusMonitorUp {},
+    /// Focus the previous monitor.
+    FocusMonitorPrevious {},
     /// Focus the next monitor.
     FocusMonitorNext {},
     /// Move the focused window to the monitor to the left.
@@ -356,6 +358,8 @@ pub enum Action {
     MoveWindowToMonitorDown {},
     /// Move the focused window to the monitor above.
     MoveWindowToMonitorUp {},
+    /// Move the focused window to the previous monitor.
+    MoveWindowToMonitorPrevious {},
     /// Move the focused window to the next monitor.
     MoveWindowToMonitorNext {},
     /// Move the focused column to the monitor to the left.
@@ -366,6 +370,8 @@ pub enum Action {
     MoveColumnToMonitorDown {},
     /// Move the focused column to the monitor above.
     MoveColumnToMonitorUp {},
+    /// Move the focused column to the previous monitor.
+    MoveColumnToMonitorPrevious {},
     /// Move the focused column to the next monitor.
     MoveColumnToMonitorNext {},
     /// Change the height of a window.
@@ -430,6 +436,8 @@ pub enum Action {
     MoveWorkspaceToMonitorDown {},
     /// Move the focused workspace to the monitor above.
     MoveWorkspaceToMonitorUp {},
+    /// Move the focused workspace to the previous monitor.
+    MoveWorkspaceToMonitorPrevious {},
     /// Move the focused workspace to the next monitor.
     MoveWorkspaceToMonitorNext {},
     /// Toggle a debug tint on windows.

src/input/mod.rs

@@ -1162,6 +1162,14 @@ impl State {
                     }
                 }
             }
+            Action::FocusMonitorPrevious => {
+                if let Some(output) = self.niri.output_previous() {
+                    self.niri.layout.focus_output(&output);
+                    if !self.maybe_warp_cursor_to_focus_centered() {
+                        self.move_cursor_to_output(&output);
+                    }
+                }
+            }
             Action::FocusMonitorNext => {
                 if let Some(output) = self.niri.output_next() {
                     self.niri.layout.focus_output(&output);
@@ -1206,6 +1214,15 @@ impl State {
                     }
                 }
             }
+            Action::MoveWindowToMonitorPrevious => {
+                if let Some(output) = self.niri.output_previous() {
+                    self.niri.layout.move_to_output(None, &output, None);
+                    self.niri.layout.focus_output(&output);
+                    if !self.maybe_warp_cursor_to_focus_centered() {
+                        self.move_cursor_to_output(&output);
+                    }
+                }
+            }
             Action::MoveWindowToMonitorNext => {
                 if let Some(output) = self.niri.output_next() {
                     self.niri.layout.move_to_output(None, &output, None);
@@ -1251,6 +1268,15 @@ impl State {
                     }
                 }
             }
+            Action::MoveColumnToMonitorPrevious => {
+                if let Some(output) = self.niri.output_previous() {
+                    self.niri.layout.move_column_to_output(&output);
+                    self.niri.layout.focus_output(&output);
+                    if !self.maybe_warp_cursor_to_focus_centered() {
+                        self.move_cursor_to_output(&output);
+                    }
+                }
+            }
             Action::MoveColumnToMonitorNext => {
                 if let Some(output) = self.niri.output_next() {
                     self.niri.layout.move_column_to_output(&output);
@@ -1320,6 +1346,14 @@ impl State {
                     }
                 }
             }
+            Action::MoveWorkspaceToMonitorPrevious => {
+                if let Some(output) = self.niri.output_previous() {
+                    self.niri.layout.move_workspace_to_output(&output);
+                    if !self.maybe_warp_cursor_to_focus_centered() {
+                        self.move_cursor_to_output(&output);
+                    }
+                }
+            }
             Action::MoveWorkspaceToMonitorNext => {
                 if let Some(output) = self.niri.output_next() {
                     self.niri.layout.move_workspace_to_output(&output);

src/niri.rs

@@ -2610,6 +2610,18 @@ impl Niri {
             .cloned()
     }
 
+    pub fn output_previous(&self) -> Option<Output> {
+        let active = self.layout.active_output()?;
+
+        self.sorted_outputs
+            .iter()
+            .rev()
+            .skip_while(|&output| output != active)
+            .nth(1)
+            .or(self.sorted_outputs.last())
+            .cloned()
+    }
+
     pub fn output_next(&self) -> Option<Output> {
         let active = self.layout.active_output()?;