monolith

public

Star0

Fork 0

Watch0

175 commits 1 branch 0 tags 0 releases1.5 MiB

Commit `3c7b8405eb7d`

tarball

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

1 file changed+22-1

layers: skip focus sync unless a layer's focus claim changed

Every surface commit searched all layer maps, and reserve_layers ended in sync_focus even when nothing changed, so a 60 Hz bar reran focus sync at 60 Hz. Now only layer surfaces take the path, and focus syncs only when the layer keyboard target differs from the seat's focus.

Modified file: crates/monolith/src/layers.rs+22 additions−1 deletions@@ -1,5 +1,6 @@
 //! wlr-layer-shell, for bars, launchers, wallpapers and notifications.
 
+use crate::focus::Focus;
 use crate::scene::Draw;
 use crate::state::State;
 use monolith_layout::{Insets, OutputId};
@@ -13,6 +14,7 @@ use smithay::reexports::wayland_server::protocol::wl_output::WlOutput;
 use smithay::reexports::wayland_server::protocol::wl_surface::WlSurface;
 use smithay::utils::{Logical, Point, Scale};
 use smithay::wayland::compositor::with_states;
+use smithay::wayland::seat::WaylandFocus;
 use smithay::wayland::shell::wlr_layer::{
     KeyboardInteractivity, Layer, LayerSurface as WlrLayerSurface, LayerSurfaceData,
     WlrLayerShellHandler, WlrLayerShellState,
@@ -82,6 +84,9 @@ impl State {
     /// anchors and size, and picks up exclusive zone changes after that.
     /// Returns false for surfaces that are not layer surfaces.
     pub fn layer_commit(&mut self, surface: &WlSurface) -> bool {
+        if with_states(surface, |s| s.data_map.get::<LayerSurfaceData>().is_none()) {
+            return false;
+        }
         let Some(output) = self
             .wm
             .space
@@ -160,11 +165,27 @@ impl State {
         }
         if changed {
             self.apply_layout();
-        } else {
+        } else if self.layer_focus_stale() {
             self.sync_focus();
         }
     }
 
+    fn layer_focus_stale(&self) -> bool {
+        if self.services.lock.active() {
+            return false;
+        }
+        let Some(keyboard) = self.input.seat.get_keyboard() else {
+            return false;
+        };
+        let current = keyboard.current_focus();
+        match self.layer_keyboard_focus() {
+            Some(wanted) => current != Some(Focus::from(wanted)),
+            None => current
+                .and_then(|f| f.wl_surface().map(|s| s.into_owned()))
+                .is_some_and(|s| self.layer_maps_contain(&s)),
+        }
+    }
+
     /// The layer surface that should hold the keyboard, if any. One asking
     /// for exclusive focus above the windows wins over everything.
     pub fn layer_keyboard_focus(&self) -> Option<WlSurface> {

monolith

Commit 3c7b8405eb7d

Commit `3c7b8405eb7d`