monolith

public

Star0

Fork 0

Watch0

261 commits 1 branch 0 tags 0 releases1.5 MiB

Commit `e27a31fac80d`

tarball

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

4 files changed+34-13

scale: tell popups and send the scale before the initial configure

send_scales skipped popups, which kept a stale scale until their next commit. The scale also went out after the initial configure of toplevels, popups and layers, so a first buffer could be drawn at scale 1 and redrawn. A surface with no output found was marked told and then waited for an unrelated layout pass, and follow_pointer_scale allocated the output name on every motion event.

Modified file: crates/monolith/src/commit.rs+2 additions@@ -93,6 +93,7 @@ impl CompositorHandler for State {
             let toplevel = window.toplevel().cloned();
             self.map_window(window, None);
             if let Some(t) = toplevel {
+                self.send_scale_once(surface);
                 t.send_configure();
             }
         }
@@ -101,6 +102,7 @@ impl CompositorHandler for State {
         if let Some(PopupKind::Xdg(popup)) = self.wm.popups.find_popup(surface)
             && !popup.is_initial_configure_sent()
         {
+            self.send_scale_once(surface);
             let _ = popup.send_configure();
         }
         self.layer_commit(surface);

Modified file: crates/monolith/src/layers.rs+3 additions@@ -112,6 +112,9 @@ impl State {
                 .and_then(|d| d.lock().ok())
                 .is_some_and(|d| d.initial_configure_sent)
         });
+        if !configured {
+            self.send_scale_once(surface);
+        }
         {
             let mut map = layer_map_for_output(&output);
             map.arrange();

Modified file: crates/monolith/src/scale.rs+28 additions−12 deletions@@ -4,7 +4,9 @@
 
 use crate::state::State;
 use smithay::desktop::utils::with_surfaces_surface_tree;
-use smithay::desktop::{WindowSurfaceType, find_popup_root_surface, layer_map_for_output};
+use smithay::desktop::{
+    PopupManager, WindowSurfaceType, find_popup_root_surface, layer_map_for_output,
+};
 use smithay::output::{Output, Scale};
 use smithay::reexports::wayland_server::Resource;
 use smithay::reexports::wayland_server::protocol::wl_surface::WlSurface;
@@ -28,6 +30,14 @@ fn apply(surface: &WlSurface, states: &SurfaceData, scale: Scale) {
     states.data_map.insert_if_missing(|| Told);
 }
 
+fn apply_popups(root: &WlSurface, scale: Scale) {
+    for (popup, _) in PopupManager::popups_for_surface(root) {
+        with_surfaces_surface_tree(popup.wl_surface(), |surface, states| {
+            apply(surface, states, scale);
+        });
+    }
+}
+
 impl State {
     /// Tells a surface that has not heard yet, which every commit asks of
     /// the surfaces it may have just created.
@@ -42,14 +52,13 @@ impl State {
             c.get_data::<smithay::xwayland::XWaylandClientData>()
                 .is_some()
         });
-        match self.scale_output(surface).filter(|_| !xwayland) {
-            Some(output) => {
-                let scale = output.current_scale();
-                with_states(surface, |states| apply(surface, states, scale));
-            }
-            None => with_states(surface, |states| {
+        if xwayland {
+            with_states(surface, |states| {
                 states.data_map.insert_if_missing(|| Told);
-            }),
+            });
+        } else if let Some(output) = self.scale_output(surface) {
+            let scale = output.current_scale();
+            with_states(surface, |states| apply(surface, states, scale));
         }
     }
 
@@ -71,12 +80,16 @@ impl State {
                 state
                     .window
                     .with_surfaces(|surface, states| apply(surface, states, scale));
+                if let Some(root) = state.window.toplevel() {
+                    apply_popups(root.wl_surface(), scale);
+                }
             }
         }
         for output in self.wm.space.outputs() {
             let scale = output.current_scale();
             for l in layer_map_for_output(output).layers() {
                 l.with_surfaces(|surface, states| apply(surface, states, scale));
+                apply_popups(l.wl_surface(), scale);
             }
         }
         for (output, surface) in self.services.lock.surfaces() {
@@ -105,20 +118,23 @@ impl State {
 
     /// Retells the cursor and drag icon when the pointer crosses to an output.
     pub fn follow_pointer_scale(&mut self) {
-        let name = self.pointer_output().map(|o| o.name());
-        if self.input.pointer_output != name {
-            self.input.pointer_output = name;
+        let under = self.pointer_output_ref();
+        if self.input.pointer_output.as_ref() != under {
+            self.input.pointer_output = under.cloned();
             self.send_pointer_scales();
         }
     }
 
     pub fn pointer_output(&self) -> Option<Output> {
+        self.pointer_output_ref().cloned()
+    }
+
+    fn pointer_output_ref(&self) -> Option<&Output> {
         self.wm
             .space
             .output_under(self.input.pointer_pos)
             .next()
             .or_else(|| self.wm.space.outputs().next())
-            .cloned()
     }
 
     /// The output a surface is mainly shown on.

Modified file: crates/monolith/src/state.rs+1−1

@@ -64,7 +64,7 @@ pub struct Input {

6464 /// The edges of the window border under the pointer, for the resize cursor.

6565 pub hover: Option<crate::input::Edges>,

6666 /// The output the pointer was last on, whose scale cursor and drag icon surfaces follow.

67- pub pointer_output: Option<String>,

67+ pub pointer_output: Option<smithay::output::Output>,

6868 /// Where the last absolute device event put the pointer, so the next

6969 /// one yields a relative delta even while the pointer is held in place.

7070 pub absolute: Option<Point<f64, Logical>>,

monolith

Commit e27a31fac80d

Commit `e27a31fac80d`