monolith

public

Star0

Fork 0

Watch0

321 commits 1 branch 0 tags 0 releases1.5 MiB

Commit `bb1e0d9edf31`

tarball

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

4 files changed+54-1

cursor: preload the common shapes for each output's scale

Keeping only the chosen image per shape meant the first draw of a shape read the theme file inside a frame. Outputs appearing or changing scale now prepare the common shapes for every connected scale, and scales no output uses are dropped.

Modified file: crates/monolith/src/cursor.rs+38 additions−1 deletions@@ -27,6 +27,31 @@ struct Prepared {
     hotspot: Point<i32, Physical>,
 }
 
+const PRELOADED: [CursorIcon; 18] = [
+    CursorIcon::Default,
+    CursorIcon::Text,
+    CursorIcon::Pointer,
+    CursorIcon::Grab,
+    CursorIcon::Grabbing,
+    CursorIcon::NotAllowed,
+    CursorIcon::Wait,
+    CursorIcon::Progress,
+    CursorIcon::EwResize,
+    CursorIcon::NsResize,
+    CursorIcon::NResize,
+    CursorIcon::SResize,
+    CursorIcon::EResize,
+    CursorIcon::WResize,
+    CursorIcon::NwResize,
+    CursorIcon::NeResize,
+    CursorIcon::SwResize,
+    CursorIcon::SeResize,
+];
+
+fn scale_step(scale: f64) -> u32 {
+    (scale * 120.0).round() as u32
+}
+
 pub struct Cursor {
     theme: xcursor::CursorTheme,
     size: u32,
@@ -63,6 +88,18 @@ impl Cursor {
             .find_map(|n| load_file(&self.theme, n))
     }
 
+    /// Reads the shapes clients ask for most at each of `scales`, so none is
+    /// read from the theme inside a frame, and forgets other scales.
+    pub fn preload(&mut self, renderer: &mut VulkanRenderer, scales: &[f64]) {
+        let steps: Vec<u32> = scales.iter().map(|s| scale_step(*s)).collect();
+        self.sized.retain(|(_, step), _| steps.contains(step));
+        for &scale in scales {
+            for icon in PRELOADED {
+                self.sized(renderer, icon, scale);
+            }
+        }
+    }
+
     /// The theme's image nearest the cursor size times `scale`, stretched to
     /// exactly that size so it covers whole pixels. Only that image is kept,
     /// and an upload that fails is retried on the next call.
@@ -72,7 +109,7 @@ impl Cursor {
         icon: CursorIcon,
         scale: f64,
     ) -> Option<&Prepared> {
-        let key = (icon, (scale * 120.0).round() as u32);
+        let key = (icon, scale_step(scale));
         if !self.sized.contains_key(&key) && !self.absent.contains(&icon) {
             let Some(images) = self.read(icon) else {
                 self.absent.insert(icon);

Modified file: crates/monolith/src/drm/outputs.rs+2 additions@@ -222,6 +222,7 @@ pub(super) fn connect(state: &mut State, connector: connector::Info, crtc: crtc:
             refresh_ns: 1_000_000_000_000 / u64::from(wl_mode.refresh.max(1) as u32),
         },
     );
+    state.preload_cursors();
 }
 
 pub(super) fn connector_name(connector: &connector::Info) -> String {
@@ -428,6 +429,7 @@ pub fn reconfigure_outputs(state: &mut State) {
         );
     }
     if changed {
+        state.preload_cursors();
         state.reserve_layers();
         state.reconfigure_lock();
         state.apply_layout();

Modified file: crates/monolith/src/nested/mod.rs+2 additions@@ -181,6 +181,7 @@ pub fn init(
         next_feedback: 0,
         awaiting_frame: Vec::new(),
     }));
+    state.preload_cursors();
     queue.roundtrip(state)?;
     queue.roundtrip(state)?;
     WaylandSource::new(conn, queue).insert(event_loop.handle())?;
@@ -217,6 +218,7 @@ pub fn reconfigure(state: &mut State) {
     );
     state.wm.layout.set_output_area(o, area);
     tracing::info!(scale, "output reconfigured");
+    state.preload_cursors();
     state.dirty.redraw = true;
     state.reserve_layers();
     state.reconfigure_lock();

Modified file: crates/monolith/src/scale.rs+12 additions@@ -116,6 +116,18 @@ impl State {
         }
     }
 
+    /// Readies the cursor shapes for every output's scale, for when an output
+    /// appears or changes scale.
+    pub fn preload_cursors(&mut self) {
+        let scales: Vec<f64> = self
+            .wm
+            .space
+            .outputs()
+            .map(|o| o.current_scale().fractional_scale())
+            .collect();
+        self.input.cursor.preload(&mut self.renderer, &scales);
+    }
+
     /// Retells the cursor and drag icon when the pointer crosses to an output.
     pub fn follow_pointer_scale(&mut self) {
         let under = self.pointer_output_ref();

monolith

Commit bb1e0d9edf31

Commit `bb1e0d9edf31`