monolith

public

Star0

Fork 0

Watch0

77 commits 1 branch 0 tags 0 releases1.5 MiB

Commit `272bdf93aead`

tarball

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

6 files changed+71-21

monolith: publish client snapshots only when something changed

IPC, ext-workspace and wlr-foreign-toplevel each rebuilt their view after every batch of events, reading every window's title under its lock, even at 165 commits a second from a single game. They now run only when a layout pass, a title or app id change, or a newly bound wl_output marks the snapshot dirty. Titles and app ids are cached per window and refreshed on that window's commits and X11 property changes.

Modified file: crates/monolith/src/handlers.rs+13 additions−5 deletions@@ -23,6 +23,7 @@ use smithay::wayland::drm_syncobj::{DrmSyncobjCachedState, DrmSyncobjHandler, Dr
 use smithay::wayland::dmabuf::{
     DmabufGlobal, DmabufHandler, DmabufState, ImportNotifier, get_dmabuf,
 };
+use smithay::output::Output;
 use smithay::wayland::output::OutputHandler;
 use smithay::wayland::seat::WaylandFocus;
 use smithay::wayland::selection::SelectionHandler;
@@ -82,10 +83,11 @@ impl CompositorHandler for State {
             if let Some(window) = window {
                 window.on_commit();
             }
-            if self.services.captures.wants_damage()
-                && let Some(id) = self.window_id(&root)
-            {
-                self.services.captures.window_damaged(id);
+            if let Some(id) = self.window_id(&root) {
+                self.refresh_identity(id);
+                if self.services.captures.wants_damage() {
+                    self.services.captures.window_damaged(id);
+                }
             }
         }
         if let Some(i) = self
@@ -254,7 +256,13 @@ impl WaylandDndGrabHandler for State {
     }
 }
 
-impl OutputHandler for State {}
+impl OutputHandler for State {
+    /// Workspace and toplevel lists name outputs by the client's wl_output,
+    /// so a newly bound one needs announcing.
+    fn output_bound(&mut self, _output: Output, _wl_output: WlOutput) {
+        self.dirty.snapshot = true;
+    }
+}
 
 impl smithay::wayland::pointer_constraints::PointerConstraintsHandler for State {
     fn new_constraint(

Modified file: crates/monolith/src/ipc.rs+5 additions−2 deletions@@ -2,7 +2,6 @@
 //! subcommands that talk to it.
 
 use crate::state::State;
-use crate::wm::identity;
 use monolith_ipc::{Answer, Envelope, Query, Reply, Request, VERSION};
 use smithay::reexports::calloop::generic::Generic;
 use smithay::reexports::calloop::{EventLoop, Interest, LoopHandle, Mode, PostAction};
@@ -174,7 +173,11 @@ fn snapshot(state: &State) -> monolith_ipc::State {
     let mut windows: Vec<monolith_ipc::Window> = l
         .windows()
         .map(|(id, w)| {
-            let (app_id, title) = state.wm.window(id).map(identity).unwrap_or_default();
+            let (app_id, title) = state
+                .wm
+                .get(id)
+                .map(|w| (w.app_id.clone(), w.title.clone()))
+                .unwrap_or_default();
             monolith_ipc::Window {
                 id: slotmap::Key::data(&id).as_ffi(),
                 app_id,

Modified file: crates/monolith/src/state.rs+24 additions−5 deletions@@ -63,6 +63,8 @@ pub struct Dirty {
     pub redraw: bool,
     /// The pointer moved, which on its own only redraws the cursor.
     pub cursor: bool,
+    /// Something clients outside see changed: windows, titles, tags, focus.
+    pub snapshot: bool,
 }
 
 /// The event loop and Wayland display, which everything uses and nothing owns.
@@ -171,6 +173,7 @@ impl State {
             dirty: Dirty {
                 redraw: true,
                 cursor: false,
+                snapshot: true,
             },
             services: Services {
                 lock: Default::default(),
@@ -196,9 +199,11 @@ impl State {
         self.wm.anim.prune(now_ns());
         self.confirm_lock();
         self.complete_captures();
-        crate::ipc::broadcast(self);
-        self.publish_workspaces();
-        self.publish_toplevels();
+        if std::mem::take(&mut self.dirty.snapshot) {
+            crate::ipc::broadcast(self);
+            self.publish_workspaces();
+            self.publish_toplevels();
+        }
         let _ = self.core.display.flush_clients();
     }
 
@@ -266,8 +271,8 @@ impl State {
         if let Some(name) = &rule.scratchpad {
             self.wm.layout.scratchpad_add(id, name);
         }
-        self.wm
-            .insert(id, window, rule.tag.is_some() || rule.output.is_some());
+        let by_rule = rule.tag.is_some() || rule.output.is_some();
+        self.wm.insert(id, window, by_rule, app_id, title);
         self.await_first_buffer(id);
         if self.wm.layout.visible(id) {
             self.wm.layout.focus(id);
@@ -376,6 +381,19 @@ impl State {
         }
     }
 
+    /// Picks up a changed title or app id, which clients send at any time.
+    pub fn refresh_identity(&mut self, id: WindowId) {
+        let Some(w) = self.wm.get_mut(id) else {
+            return;
+        };
+        let (app_id, title) = identity(&w.window);
+        if w.app_id != app_id || w.title != title {
+            w.app_id = app_id;
+            w.title = title;
+            self.dirty.snapshot = true;
+        }
+    }
+
     pub fn window_id(&self, surface: &WlSurface) -> Option<WindowId> {
         self.wm.id_of(surface)
     }
@@ -500,6 +518,7 @@ impl State {
         self.sync_focus();
         self.update_inhibit();
         self.dirty.redraw = true;
+        self.dirty.snapshot = true;
     }
 
     pub fn sync_focus(&mut self) {

Modified file: crates/monolith/src/toplevels.rs+8 additions−7 deletions@@ -2,7 +2,6 @@
 //! and wlr-foreign-toplevel-management for taskbars that also act on them.
 
 use crate::state::State;
-use crate::wm::identity;
 use monolith_layout::WindowId;
 use monolith_protocols::toplevel::{
     Action, ForeignToplevelHandler, ForeignToplevelState, Snapshot, Toplevel,
@@ -75,16 +74,18 @@ impl State {
     pub fn publish_toplevels(&mut self) {
         let list = &mut self.protocols.toplevel_list;
         for (_, w) in self.wm.iter_mut() {
-            let (app_id, title) = identity(&w.window);
             match &w.list_handle {
                 Some(h) => {
-                    if h.title() != title || h.app_id() != app_id {
-                        h.send_title(&title);
-                        h.send_app_id(&app_id);
+                    if h.title() != w.title || h.app_id() != w.app_id {
+                        h.send_title(&w.title);
+                        h.send_app_id(&w.app_id);
                         h.send_done();
                     }
                 }
-                None => w.list_handle = Some(list.new_toplevel::<State>(title, app_id)),
+                None => {
+                    let h = list.new_toplevel::<State>(w.title.clone(), w.app_id.clone());
+                    w.list_handle = Some(h);
+                }
             }
         }
         list.cleanup_closed_handles();
@@ -97,7 +98,7 @@ impl State {
             .wm
             .iter()
             .map(|(id, w)| {
-                let (app_id, title) = identity(&w.window);
+                let (app_id, title) = (w.app_id.clone(), w.title.clone());
                 let w = self.wm.layout.window(id);
                 Toplevel {
                     key: key(id),

Modified file: crates/monolith/src/wm.rs+12 additions−1 deletions@@ -41,6 +41,8 @@ pub struct WindowState {
     pub placed_by_rule: bool,
     pub list_handle: Option<ForeignToplevelHandle>,
     pub borders: Option<[SolidColorBuffer; 4]>,
+    pub app_id: String,
+    pub title: String,
 }
 
 /// Asks a window to close, through xdg-shell or X11.
@@ -70,7 +72,14 @@ impl Wm {
         }
     }
 
-    pub fn insert(&mut self, id: WindowId, window: Window, placed_by_rule: bool) {
+    pub fn insert(
+        &mut self,
+        id: WindowId,
+        window: Window,
+        placed_by_rule: bool,
+        app_id: String,
+        title: String,
+    ) {
         self.windows.insert(
             id,
             WindowState {
@@ -80,6 +89,8 @@ impl Wm {
                 placed_by_rule,
                 list_handle: None,
                 borders: None,
+                app_id,
+                title,
             },
         );
         self.index(id);

Modified file: crates/monolith/src/xwayland.rs+9 additions−1 deletions@@ -11,7 +11,7 @@ use smithay::reexports::rustix::io::{FdFlags, fcntl_getfd, fcntl_setfd};
 use smithay::reexports::wayland_server::protocol::wl_surface::WlSurface;
 use smithay::utils::{Logical, Rectangle};
 use smithay::wayland::xwayland_shell::{XWaylandShellHandler, XWaylandShellState};
-use smithay::xwayland::xwm::{Reorder, ResizeEdge, WmWindowType, XwmId};
+use smithay::xwayland::xwm::{Reorder, ResizeEdge, WmWindowProperty, WmWindowType, XwmId};
 use smithay::xwayland::{X11Surface, X11Wm, XWayland, XWaylandEvent, XwmHandler};
 use std::os::fd::AsFd;
 use std::os::linux::net::SocketAddrExt;
@@ -320,6 +320,14 @@ impl XwmHandler for State {
         self.x11_fullscreen(&window, false);
     }
 
+    fn property_notify(&mut self, _xwm: XwmId, window: X11Surface, property: WmWindowProperty) {
+        if matches!(property, WmWindowProperty::Title | WmWindowProperty::Class)
+            && let Some(id) = self.x11_window_id(&window)
+        {
+            self.refresh_identity(id);
+        }
+    }
+
     fn disconnected(&mut self, _xwm: XwmId) {
         tracing::info!("Xwayland exited");
         let gone: Vec<_> = self

monolith

Commit 272bdf93aead

Commit `272bdf93aead`