monolith

public

Star0

Fork 0

Watch0

277 commits 1 branch 0 tags 0 releases1.5 MiB

Commit `03f06fcf10d6`

tarball

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

3 files changed+30-32

frame: compute the shown windows once per frame

shown_windows ran again for frame callbacks and for presentation feedback, and render_surface arranged a third time for the VRR decision. A single Shown now carries the windows, the fullscreen window and the covered flag to all three.

Modified file: crates/monolith/src/drm.rs+5 additions−7 deletions@@ -1014,7 +1014,8 @@ fn render_surface(state: &mut State, crtc: crtc::Handle, target: u64) -> bool {
         return false;
     }
     surface.cursor_redraw = false;
-    let fullscreen = wm.layout.arrange(surface.id).fullscreen;
+    let shown = crate::frame::shown_windows(wm, surface.id, &surface.output, target);
+    let fullscreen = shown.fullscreen;
     let forced = fullscreen.and_then(|w| wm.get(w)?.rule.vrr);
     let want_vrr = surface.vrr_capable
         && forced.unwrap_or(match settings.config.output.vrr {
@@ -1070,9 +1071,8 @@ fn render_surface(state: &mut State, crtc: crtc::Handle, target: u64) -> bool {
                 wm,
                 lock,
                 xwayland.as_ref().map_or(&[], |x| &x.unmanaged),
-                surface.id,
+                &shown,
                 &surface.output,
-                now,
                 &result.states,
             );
             if direct {
@@ -1110,9 +1110,8 @@ fn render_surface(state: &mut State, crtc: crtc::Handle, target: u64) -> bool {
                 wm,
                 lock,
                 xwayland.as_ref().map_or(&[], |x| &x.unmanaged),
-                surface.id,
+                &shown,
                 &surface.output,
-                now,
                 &result.states,
             ));
             lock.shown(&surface.output);
@@ -1153,9 +1152,8 @@ fn render_surface(state: &mut State, crtc: crtc::Handle, target: u64) -> bool {
         wm,
         lock,
         xwayland.as_ref().map_or(&[], |x| &x.unmanaged),
-        surface.id,
+        &shown,
         &surface.output,
-        now,
         elapsed,
         input.dnd_icon.as_ref(),
     );

Modified file: crates/monolith/src/frame.rs+22 additions−21 deletions@@ -7,7 +7,7 @@ use crate::scene::Draw;
 use crate::state::Input;
 use crate::wm::Wm;
 use monolith_config::Decoration;
-use monolith_layout::OutputId;
+use monolith_layout::{OutputId, WindowId};
 use monolith_render_vk::VulkanRenderer;
 use smithay::backend::renderer::element::RenderElementStates;
 use smithay::desktop::Window;
@@ -84,14 +84,12 @@ pub fn compose(
 /// window at rest only it and the overlay layer are shown, and anything
 /// else that kept drawing would hold the output, or a VRR panel, at full
 /// refresh for frames nobody sees.
-#[expect(clippy::too_many_arguments)]
 pub fn send_frame_callbacks(
     wm: &Wm,
     lock: &Lock,
     unmanaged: &[X11Surface],
-    o: OutputId,
+    shown: &Shown,
     output: &Output,
-    now: u64,
     elapsed: Duration,
     dnd_icon: Option<&DndIcon>,
 ) {
@@ -108,8 +106,7 @@ pub fn send_frame_callbacks(
         crate::lock::send_frames(lock, output, elapsed);
         return;
     }
-    let (windows, covered) = shown_windows(wm, o, output, now);
-    for window in windows {
+    for window in &shown.windows {
         window.send_frame(
             output,
             elapsed,
@@ -117,7 +114,7 @@ pub fn send_frame_callbacks(
             crate::fifo::scanout(output),
         );
     }
-    crate::layers::send_frames(output, elapsed, covered);
+    crate::layers::send_frames(output, elapsed, shown.covered);
     if let Some(geo) = wm.space.output_geometry(output) {
         for surface in unmanaged
             .iter()
@@ -131,14 +128,15 @@ pub fn send_frame_callbacks(
     }
 }
 
-/// The windows `output` shows at `now`, and whether a fullscreen window at
-/// rest hides everything below the overlay layer.
-fn shown_windows<'a>(
-    wm: &'a Wm,
-    o: OutputId,
-    output: &'a Output,
-    now: u64,
-) -> (Vec<&'a Window>, bool) {
+/// What `output` shows at one instant, worked out once per frame.
+pub struct Shown {
+    pub windows: Vec<Window>,
+    pub fullscreen: Option<WindowId>,
+    /// A fullscreen window at rest hides everything below the overlay layer.
+    pub covered: bool,
+}
+
+pub fn shown_windows(wm: &Wm, o: OutputId, output: &Output, now: u64) -> Shown {
     let arr = wm.layout.arrange(o);
     let covering = arr
         .fullscreen
@@ -149,8 +147,13 @@ fn shown_windows<'a>(
         .space
         .elements_for_output(output)
         .filter(|&w| covering.is_none_or(|c| c == w || over.contains(&w)))
+        .cloned()
         .collect();
-    (windows, covering.is_some())
+    Shown {
+        windows,
+        fullscreen: arr.fullscreen,
+        covered: covering.is_some(),
+    }
 }
 
 /// Takes the presentation feedback of everything `output` shows at `now`,
@@ -160,9 +163,8 @@ pub fn take_presentation_feedback(
     wm: &Wm,
     lock: &Lock,
     unmanaged: &[X11Surface],
-    o: OutputId,
+    shown: &Shown,
     output: &Output,
-    now: u64,
     states: &RenderElementStates,
 ) -> OutputPresentationFeedback {
     let mut feedback = OutputPresentationFeedback::new(output);
@@ -174,11 +176,10 @@ pub fn take_presentation_feedback(
         crate::lock::take_presentation_feedback(lock, output, &mut feedback, primary, flags);
         return feedback;
     }
-    let (windows, covered) = shown_windows(wm, o, output, now);
-    for window in windows {
+    for window in &shown.windows {
         window.take_presentation_feedback(&mut feedback, primary, flags);
     }
-    crate::layers::take_presentation_feedback(output, covered, &mut feedback, primary, flags);
+    crate::layers::take_presentation_feedback(output, shown.covered, &mut feedback, primary, flags);
     if let Some(geo) = wm.space.output_geometry(output) {
         for surface in unmanaged
             .iter()

Modified file: crates/monolith/src/nested/mod.rs+3 additions−4 deletions@@ -277,6 +277,7 @@ pub fn render(state: &mut State) {
         }
     };
     let mut dmabuf = (*slot).clone();
+    let shown = crate::frame::shown_windows(wm, host.output_id, &host.output, now);
     let (damage, feedback) = {
         let mut fb = match renderer.bind(&mut dmabuf) {
             Ok(fb) => fb,
@@ -307,9 +308,8 @@ pub fn render(state: &mut State) {
                     wm,
                     lock,
                     xwayland.as_ref().map_or(&[], |x| &x.unmanaged),
-                    o,
+                    &shown,
                     &host.output,
-                    now,
                     &result.states,
                 );
                 (result.damage.cloned(), feedback)
@@ -327,9 +327,8 @@ pub fn render(state: &mut State) {
         wm,
         lock,
         xwayland.as_ref().map_or(&[], |x| &x.unmanaged),
-        host.output_id,
+        &shown,
         &host.output,
-        now,
         elapsed,
         input.dnd_icon.as_ref(),
     );

monolith

Commit 03f06fcf10d6

Commit `03f06fcf10d6`