monolith

public

Star0

Fork 0

Watch0

83 commits 1 branch 0 tags 0 releases1.5 MiB

Commit `92d5331c9dd9`

tarball

atagen <boss@atagen.co>2026-10-17 03:59 UTC

4 files changed+3-24

monolith: keep client snapshots current before anyone binds

Publishing skipped building the workspace and toplevel snapshots while no client was bound. With publishing gated on the dirty flag, a client binding into a quiet desktop got the empty snapshot and was never sent the windows, so wlrctl saw nothing to act on. Snapshots are now rebuilt whenever they are dirty, which the gate already keeps cheap.

Modified file: crates/monolith/src/state.rs+1 additions−6 deletions@@ -553,9 +553,6 @@ impl State {
     }
 
     fn publish_workspaces(&mut self) {
-        if !self.protocols.workspaces.has_clients() {
-            return;
-        }
         let l = &self.wm.layout;
         let occupied: HashSet<(OutputId, monolith_layout::TagId)> = l
             .windows()
@@ -630,9 +627,7 @@ impl State {
         }
         let fullscreen = self.wm.layout.outputs().any(|(o, out)| {
             let a = out.area;
-            (a.x..a.right()).contains(&pos.x)
-                && (a.y..a.bottom()).contains(&pos.y)
-                && self.wm.layout.arrange(o).fullscreen.is_some()
+            a.contains(pos.x, pos.y) && self.wm.layout.arrange(o).fullscreen.is_some()
         });
         let above: &[Layer] = if fullscreen {
             &[Layer::Overlay]

Modified file: crates/monolith/src/toplevels.rs+2 additions−10 deletions@@ -2,7 +2,6 @@
 //! and wlr-foreign-toplevel-management for taskbars that also act on them.
 
 use crate::state::State;
-use monolith_layout::WindowId;
 use monolith_protocols::toplevel::{
     Action, ForeignToplevelHandler, ForeignToplevelState, Snapshot, Toplevel,
 };
@@ -10,10 +9,6 @@ use smithay::wayland::foreign_toplevel_list::{
     ForeignToplevelListHandler, ForeignToplevelListState,
 };
 
-pub fn key(id: WindowId) -> u64 {
-    slotmap::Key::data(&id).as_ffi()
-}
-
 impl ForeignToplevelListHandler for State {
     fn foreign_toplevel_list_state(&mut self) -> &mut ForeignToplevelListState {
         &mut self.protocols.toplevel_list
@@ -26,7 +21,7 @@ impl ForeignToplevelHandler for State {
     }
 
     fn foreign_toplevel_action(&mut self, action: Action) {
-        let id_of = |k: u64| self.wm.iter().map(|(id, _)| id).find(|&id| key(id) == k);
+        let id_of = |k: u64| self.wm.by_key(k);
         match action {
             Action::Activate(k) => {
                 let Some(id) = id_of(k) else { return };
@@ -90,9 +85,6 @@ impl State {
         }
         list.cleanup_closed_handles();
 
-        if !self.protocols.foreign_toplevels.has_clients() {
-            return;
-        }
         let focused = self.wm.layout.focused();
         let toplevels = self
             .wm
@@ -101,7 +93,7 @@ impl State {
                 let (app_id, title) = (w.app_id.clone(), w.title.clone());
                 let w = self.wm.layout.window(id);
                 Toplevel {
-                    key: key(id),
+                    key: crate::wm::key(id),
                     title,
                     app_id,
                     outputs: w

Modified file: crates/protocols/src/toplevel.rs−4 deletions@@ -85,10 +85,6 @@ impl ForeignToplevelState {
         self.global.clone()
     }
 
-    pub fn has_clients(&self) -> bool {
-        !self.managers.is_empty()
-    }
-
     pub fn update<D>(&mut self, dh: &DisplayHandle, snapshot: Snapshot)
     where
         D: Dispatch<ZwlrForeignToplevelHandleV1, HandleData> + 'static,

Modified file: crates/protocols/src/workspace.rs−4 deletions@@ -109,10 +109,6 @@ impl WorkspaceState {
         self.global.clone()
     }
 
-    pub fn has_clients(&self) -> bool {
-        !self.managers.is_empty()
-    }
-
     /// Publishes a snapshot. Clients only hear about differences, including
     /// wl_outputs they bound after the manager.
     pub fn update<D>(&mut self, dh: &DisplayHandle, snapshot: Snapshot)

monolith

Commit 92d5331c9dd9

Commit `92d5331c9dd9`