3 files changed, 44 insertions, 0 deletions
diff --git a/src/input/mod.rs b/src/input/mod.rs
index c510a958..d874ee34 100644
--- a/src/input/mod.rs
+++ b/src/input/mod.rs
@@ -1346,6 +1346,16 @@ impl State {
                     self.niri.queue_redraw_all();
                 }
             }
+            Action::FocusFloating => {
+                self.niri.layout.focus_floating();
+                // FIXME: granular
+                self.niri.queue_redraw_all();
+            }
+            Action::FocusTiling => {
+                self.niri.layout.focus_tiling();
+                // FIXME: granular
+                self.niri.queue_redraw_all();
+            }
             Action::SwitchFocusBetweenFloatingAndTiling => {
                 self.niri.layout.switch_focus_floating_tiling();
                 // FIXME: granular
diff --git a/src/layout/mod.rs b/src/layout/mod.rs
index 53c9ce6b..c11eb6ab 100644
--- a/src/layout/mod.rs
+++ b/src/layout/mod.rs
@@ -2729,6 +2729,20 @@ impl<W: LayoutElement> Layout<W> {
         workspace.set_window_floating(window, floating);
     }
 
+    pub fn focus_floating(&mut self) {
+        let Some(workspace) = self.active_workspace_mut() else {
+            return;
+        };
+        workspace.focus_floating();
+    }
+
+    pub fn focus_tiling(&mut self) {
+        let Some(workspace) = self.active_workspace_mut() else {
+            return;
+        };
+        workspace.focus_tiling();
+    }
+
     pub fn switch_focus_floating_tiling(&mut self) {
         let Some(workspace) = self.active_workspace_mut() else {
             return;
@@ -4393,6 +4407,8 @@ mod tests {
             id: Option<usize>,
             floating: bool,
         },
+        FocusFloating,
+        FocusTiling,
         SwitchFocusFloatingTiling,
         SetParent {
             #[proptest(strategy = "1..=5usize")]
@@ -4909,6 +4925,12 @@ mod tests {
                     let id = id.filter(|id| layout.has_window(id));
                     layout.set_window_floating(id.as_ref(), floating);
                 }
+                Op::FocusFloating => {
+                    layout.focus_floating();
+                }
+                Op::FocusTiling => {
+                    layout.focus_tiling();
+                }
                 Op::SwitchFocusFloatingTiling => {
                     layout.switch_focus_floating_tiling();
                 }
diff --git a/src/layout/workspace.rs b/src/layout/workspace.rs
index 099b449c..06900afc 100644
--- a/src/layout/workspace.rs
+++ b/src/layout/workspace.rs
@@ -1157,6 +1157,18 @@ impl<W: LayoutElement> Workspace<W> {
         self.toggle_window_floating(id);
     }
 
+    pub fn focus_floating(&mut self) {
+        if !self.floating_is_active.get() {
+            self.switch_focus_floating_tiling();
+        }
+    }
+
+    pub fn focus_tiling(&mut self) {
+        if self.floating_is_active.get() {
+            self.switch_focus_floating_tiling();
+        }
+    }
+
     pub fn switch_focus_floating_tiling(&mut self) {
         if self.floating.is_empty() {
             // If floating is empty, keep focus on scrolling.