monolith

public

Star0

Fork 0

Watch0

295 commits 1 branch 0 tags 0 releases1.5 MiB

Commit `c92022840707`

tarball

atagen <boss@atagen.co>2026-10-19 10:50 UTC

4 files changed+31-37

windows: share one fullscreen toggle between xdg, X11 and taskbars

The three copies had drifted. Only the taskbar path skipped focus_if_covering, and only the xdg path could move the window to a requested output.

Modified file: crates/monolith/src/toplevels.rs+1 additions−8 deletions@@ -50,14 +50,7 @@ impl ForeignToplevelHandler for State {
             }
             Action::Fullscreen(k, on) => {
                 let Some(id) = id_of(k) else { return };
-                if self
-                    .wm
-                    .layout
-                    .window(id)
-                    .is_some_and(|w| w.fullscreen != on)
-                {
-                    self.wm.layout.toggle_fullscreen(id);
-                }
+                self.set_window_fullscreen(id, on, None);
                 if on && self.wm.layout.visible(id) {
                     self.wm.layout.focus(id);
                 }

Modified file: crates/monolith/src/windows.rs+27 additions@@ -128,6 +128,33 @@ impl State {
         self.window_id(&parent)
     }
 
+    /// Makes a window fullscreen or not, on `output` when it names one, for
+    /// every route a client or taskbar has to ask. Returns whether anything
+    /// changed, for the caller to lay out again.
+    pub(crate) fn set_window_fullscreen(
+        &mut self,
+        id: WindowId,
+        on: bool,
+        output: Option<OutputId>,
+    ) -> bool {
+        let layout = &mut self.wm.layout;
+        let Some(win) = layout.window(id) else {
+            return false;
+        };
+        let (toggled, moved) = (
+            win.fullscreen != on,
+            output.filter(|&o| win.output != Some(o)),
+        );
+        if let Some(o) = moved {
+            layout.send_to_output(id, o);
+        }
+        if toggled {
+            layout.toggle_fullscreen(id);
+            layout.focus_if_covering(id);
+        }
+        toggled || moved.is_some()
+    }
+
     /// Feeds the window's modal state to the layout and lets focus follow.
     pub(crate) fn sync_modal(&mut self, id: WindowId) {
         let modal = self.wm.window(id).is_some_and(is_modal);

Modified file: crates/monolith/src/xdg.rs+2 additions−22 deletions@@ -233,28 +233,8 @@ impl State {
             });
             return;
         };
-        let target = output
-            .as_ref()
-            .and_then(|o| self.layout_output(o))
-            .filter(|&o| {
-                self.wm
-                    .layout
-                    .window(id)
-                    .is_some_and(|w| w.output != Some(o))
-            });
-        if let Some(o) = target {
-            self.wm.layout.send_to_output(id, o);
-        }
-        let toggled = self
-            .wm
-            .layout
-            .window(id)
-            .is_some_and(|w| w.fullscreen != on);
-        if toggled {
-            self.wm.layout.toggle_fullscreen(id);
-            self.wm.layout.focus_if_covering(id);
-        }
-        if target.is_some() || toggled {
+        let target = output.as_ref().and_then(|o| self.layout_output(o));
+        if self.set_window_fullscreen(id, on, target) {
             self.apply_layout();
         }
     }

Modified file: crates/monolith/src/xwayland.rs+1 additions−7 deletions@@ -564,14 +564,8 @@ impl State {
 
     fn x11_fullscreen(&mut self, window: &X11Surface, on: bool) {
         if let Some(id) = self.x11_window_id(window)
-            && self
-                .wm
-                .layout
-                .window(id)
-                .is_some_and(|w| w.fullscreen != on)
+            && self.set_window_fullscreen(id, on, None)
         {
-            self.wm.layout.toggle_fullscreen(id);
-            self.wm.layout.focus_if_covering(id);
             self.apply_layout();
         }
     }

monolith

Commit c92022840707

Commit `c92022840707`