monolith

public

Star0

Fork 0

Watch0

328 commits 1 branch 0 tags 0 releases1.5 MiB

Commit `692a9dda8779`

tarball

atagen <boss@atagen.co>2026-10-20 11:57 UTC

2 files changed+26-7

layout: keep windows an extended window covers out of focus

A window with no room on screen could still take focus from focus_dir, the focus history after a close, or a taskbar, leaving keybinds acting on something invisible. Layout::focus refuses it, focused_on skips it, and covered counts it hidden so a request for attention marks it urgent instead.

Modified file: crates/layout/src/lib.rs+25 additions−5 deletions@@ -466,6 +466,9 @@ impl Layout {
     /// focused on its own brings its parent up beneath it, so closing the
     /// dialog hands focus back to its parent.
     pub fn focus(&mut self, mut w: WindowId) -> Option<WindowId> {
+        if self.eclipsed(w) {
+            return None;
+        }
         loop {
             let win = self.windows.get(w)?;
             self.active = win.output.or(self.active);
@@ -547,7 +550,7 @@ impl Layout {
             .iter()
             .rev()
             .copied()
-            .find(|&w| self.windows[w].output == Some(o) && self.visible(w))
+            .find(|&w| self.windows[w].output == Some(o) && self.visible(w) && !self.eclipsed(w))
             .map(|w| self.modal_leaf(w))
     }
 
@@ -566,7 +569,7 @@ impl Layout {
             let candidates = arr
                 .tiled
                 .iter()
-                .filter(|p| p.visible)
+                .filter(|p| p.visible && !self.eclipsed(p.window))
                 .map(|p| (p.window, p.rect))
                 .chain(arr.floating.iter().copied())
                 .filter(|&(w, _)| Some(self.modal_leaf(w)) != current && reachable(w));
@@ -644,6 +647,20 @@ impl Layout {
         merged
     }
 
+    /// Whether another window is extended over the tiled window `w`, which
+    /// leaves it no room and takes it out of reach of focus.
+    pub fn eclipsed(&self, w: WindowId) -> bool {
+        let Some(o) = self
+            .windows
+            .get(w)
+            .filter(|w| !w.fullscreen)
+            .and_then(|w| w.output)
+        else {
+            return false;
+        };
+        self.outputs[o].tree.eclipsed(w, self.vis_on(o))
+    }
+
     /// Whether a tiled window fills its output through expansion.
     pub fn maximized(&self, w: WindowId) -> bool {
         let Some(o) = self.windows.get(w).and_then(|w| w.output) else {
@@ -963,10 +980,13 @@ impl Layout {
         false
     }
 
-    /// Whether a fullscreen window on `w`'s output hides it. The fullscreen
-    /// window's transients and shown scratchpads are not hidden, and a window
-    /// that is itself fullscreen takes over.
+    /// Whether a fullscreen or extended window on `w`'s output hides it. The
+    /// fullscreen window's transients and shown scratchpads are not hidden,
+    /// and a window that is itself fullscreen takes over.
     pub fn covered(&self, w: WindowId) -> bool {
+        if self.eclipsed(w) {
+            return true;
+        }
         let Some(win) = self.windows.get(w) else {
             return false;
         };

Modified file: crates/monolith/src/toplevels.rs+1 additions−2 deletions@@ -43,8 +43,7 @@ impl ForeignToplevelHandler for State {
             }
             Action::Maximize(k, on) => {
                 let Some(id) = id_of(k) else { return };
-                if self.wm.layout.maximized(id) != on {
-                    self.wm.layout.focus(id);
+                if self.wm.layout.maximized(id) != on && self.wm.layout.focus(id).is_some() {
                     self.wm.layout.expand(monolith_layout::ExpandScope::All);
                 }
             }

monolith

Commit 692a9dda8779

Commit `692a9dda8779`