monolith

public

Star0

Fork 0

Watch0

288 commits 1 branch 0 tags 0 releases1.5 MiB

Commit `cadf3a07a5dc`

tarball

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

9 files changed+102-17

windows: keep a toplevel hidden to a tray in the layout

Hiding went through remove_window, which lost the floating, sticky, scratchpad and tag state, the float rect, the children's parent links and the foreign-toplevel handle, and left no close ghost. The layout entry is now marked hidden and restored on the next commit. The last frame is taken in the pre-commit hook because smithay clears the textures on a null-buffer commit before on_buffer runs.

Modified file: crates/layout/src/lib.rs+3 additions−4 deletions@@ -294,10 +294,9 @@ impl Layout {
         if win.scratchpad.is_some() || self.is_viewed(o, tag) {
             return;
         }
-        let alone = !self
-            .windows
-            .iter()
-            .any(|(x, v)| x != w && v.output == Some(o) && v.tag == tag && v.scratchpad.is_none());
+        let alone = !self.windows.iter().any(|(x, v)| {
+            x != w && v.output == Some(o) && v.tag == tag && v.scratchpad.is_none() && !v.hidden
+        });
         if alone {
             self.toggle_view(o, tag);
         }

Modified file: crates/layout/src/scratchpad.rs+5 additions−1 deletions@@ -40,7 +40,11 @@ impl Layout {
         let o = self.active?;
         let sp = &mut self.scratchpads[s];
         let mut next = sp.shown.map_or(0, |i| i + 1);
-        while sp.windows.get(next).is_some_and(|&w| self.windows[w].hidden) {
+        while sp
+            .windows
+            .get(next)
+            .is_some_and(|&w| self.windows[w].hidden)
+        {
             next += 1;
         }
         if next >= sp.windows.len() {

Modified file: crates/monolith/src/anim.rs+1

@@ -89,6 +89,7 @@ impl Animator {

8989 .ghosts

9090 .iter()

9191 .filter(|g| g.output == o && g.fixed.is_none())

92+ .filter(|g| !targets.iter().any(|t| t.0 == g.id))

9293 .map(|g| (g.id, g.seed));

9394 let targets: Vec<(WindowId, Rect)> = ghosts.chain(targets.iter().copied()).collect();

9495 let ids: Vec<WindowId> = targets.iter().map(|(id, _)| *id).collect();

Modified file: crates/monolith/src/commit.rs+10 additions@@ -27,6 +27,7 @@ impl CompositorHandler for State {
     fn new_surface(&mut self, surface: &WlSurface) {
         add_pre_commit_hook::<Self, _>(surface, |state, _dh, surface| {
             crate::timing::watch(state, surface);
+            state.keep_frame_for_hide(surface);
             hold_until_readable(state, surface);
         });
     }
@@ -97,6 +98,15 @@ impl CompositorHandler for State {
                 t.send_configure();
             }
         }
+        if let Some(id) = self
+            .window_id(surface)
+            .filter(|&id| self.wm.layout.window(id).is_some_and(|w| w.hidden))
+        {
+            self.show_window(id);
+            if let Some(t) = self.wm.window(id).and_then(|w| w.toplevel()) {
+                t.send_configure();
+            }
+        }
         self.on_buffer(surface);
         self.wm.popups.commit(surface);
         if let Some(PopupKind::Xdg(popup)) = self.wm.popups.find_popup(surface)

Modified file: crates/monolith/src/ipc.rs+1

@@ -177,6 +177,7 @@ fn snapshot(state: &State) -> monolith_ipc::State {

177177 .collect();

178178 let mut windows: Vec<monolith_ipc::Window> = l

179179 .windows()

180+ .filter(|(_, w)| !w.hidden)

180181 .map(|(id, w)| {

181182 let (app_id, title) = state

182183 .wm

Modified file: crates/monolith/src/toplevels.rs+6 additions−1 deletions@@ -70,8 +70,12 @@ impl ForeignToplevelHandler for State {
 impl State {
     /// Brings both window lists in line with the windows.
     pub fn publish_toplevels(&mut self) {
+        let hidden: Vec<_> = (self.wm.layout.windows())
+            .filter(|(_, w)| w.hidden)
+            .map(|(id, _)| id)
+            .collect();
         let list = &mut self.protocols.toplevel_list;
-        for (_, w) in self.wm.iter_mut() {
+        for (_, w) in self.wm.iter_mut().filter(|(id, _)| !hidden.contains(id)) {
             match &w.list_handle {
                 Some(h) => {
                     if h.title() != w.title || h.app_id() != w.app_id {
@@ -92,6 +96,7 @@ impl State {
         let toplevels = self
             .wm
             .iter()
+            .filter(|(id, _)| !hidden.contains(id))
             .map(|(id, w)| {
                 let (app_id, title) = (w.app_id.clone(), w.title.clone());
                 let w = self.wm.layout.window(id);

Modified file: crates/monolith/src/windows.rs+71 additions−10 deletions@@ -12,7 +12,7 @@ use smithay::reexports::wayland_protocols::xdg::shell::server::xdg_toplevel::Sta
 use smithay::reexports::wayland_server::protocol::wl_output::WlOutput;
 use smithay::reexports::wayland_server::protocol::wl_surface::WlSurface;
 use smithay::utils::{Logical, Point, Rectangle, Serial};
-use smithay::wayland::compositor::with_states;
+use smithay::wayland::compositor::{BufferAssignment, SurfaceAttributes, with_states};
 use smithay::wayland::shell::xdg::XdgToplevelSurfaceData;
 use std::time::Duration;
 
@@ -157,12 +157,67 @@ impl State {
         }
     }
 
-    /// Takes a toplevel that dropped its buffer, as clients do to hide to a
-    /// tray, out of the layout. Smithay has reset its role, so its next commit
-    /// maps it afresh with a new initial configure.
+    /// Hides a toplevel that dropped its buffer, as clients do to hide to a
+    /// tray. The layout keeps its entry, so its next commit, which smithay
+    /// treats as a fresh map with a new initial configure, restores it.
     fn hide_window(&mut self, id: WindowId) {
-        if let Some(window) = self.remove_window(id) {
-            self.wm.unmapped.push(window);
+        let Some(s) = self.wm.get_mut(id) else {
+            return;
+        };
+        let window = s.window.clone();
+        let saved = s.hide_frame.take();
+        let opacity = s.rule.opacity.unwrap_or(1.0);
+        if let Some(h) = s.list_handle.take() {
+            h.send_closed();
+        }
+        self.leave_ghost(id, &window, saved, opacity);
+        self.wm.layout.set_hidden(id, true);
+        self.wm.anim.forget(id);
+        self.apply_layout();
+    }
+
+    /// Brings back a hidden toplevel on its first commit since, where it was
+    /// and as it was, to be held on its seed until its buffer lands.
+    pub(crate) fn show_window(&mut self, id: WindowId) {
+        let Some(s) = self.wm.get_mut(id) else {
+            return;
+        };
+        s.awaiting_buffer = true;
+        s.drawn = false;
+        s.hide_frame = None;
+        let window = s.window.clone();
+        let focus = s.rule.focus != Some(false);
+        let parent = self.parent_of(&window);
+        self.wm.layout.set_hidden(id, false);
+        self.wm.layout.set_parent(id, parent);
+        self.wm.layout.set_modal(id, is_modal(&window));
+        self.refresh_identity(id);
+        self.view_if_first(id);
+        self.await_first_buffer(id);
+        if focus {
+            self.wm.layout.focus_unless_covered(id);
+        }
+        self.apply_layout();
+    }
+
+    /// Called before a commit applies. A null-buffer commit makes smithay
+    /// drop the surface's textures before `on_buffer` runs, so the frame a
+    /// hiding window leaves behind has to be taken here.
+    pub fn keep_frame_for_hide(&mut self, surface: &WlSurface) {
+        let Some(id) = self.window_id(surface) else {
+            return;
+        };
+        let removes = with_states(surface, |s| {
+            let mut attrs = s.cached_state.get::<SurfaceAttributes>();
+            matches!(attrs.pending().buffer, Some(BufferAssignment::Removed))
+        });
+        let Some(s) = self.wm.get(id).filter(|s| removes && s.drawn) else {
+            return;
+        };
+        let window = s.window.clone();
+        let frame = self.last_frame(&window);
+        if let Some(s) = self.wm.get_mut(id) {
+            s.hide_frame = frame;
         }
     }
 
@@ -247,7 +302,7 @@ impl State {
             .wm
             .layout
             .windows()
-            .filter(|(_, w)| w.floating && w.float_default && w.scratchpad.is_none())
+            .filter(|(_, w)| w.floating && w.float_default && w.scratchpad.is_none() && !w.hidden)
             .map(|(id, _)| id)
             .collect();
         for id in defaults {
@@ -435,7 +490,7 @@ impl State {
         if let Some(state) = &state {
             self.wm.space.unmap_elem(&state.window);
             let opacity = state.rule.opacity.unwrap_or(1.0);
-            self.leave_ghost(id, &state.window, opacity);
+            self.leave_ghost(id, &state.window, None, opacity);
         }
         self.wm.layout.remove_window(id);
         self.apply_layout();
@@ -444,7 +499,13 @@ impl State {
 
     /// Keeps a visible tiled window's last frame shrinking to its seed while
     /// its neighbours close over it.
-    fn leave_ghost(&mut self, id: WindowId, window: &Window, opacity: f32) {
+    fn leave_ghost(
+        &mut self,
+        id: WindowId,
+        window: &Window,
+        saved: Option<LastFrame>,
+        opacity: f32,
+    ) {
         let Some(o) = self.wm.layout.window(id).and_then(|w| w.output) else {
             return;
         };
@@ -466,7 +527,7 @@ impl State {
         else {
             return;
         };
-        if let Some(frame) = self.last_frame(window) {
+        if let Some(frame) = saved.or_else(|| self.last_frame(window)) {
             self.wm.last_frames.insert(id, frame);
             self.wm.anim.add_ghost(Ghost {
                 id,

Modified file: crates/monolith/src/wm.rs+4 additions@@ -81,6 +81,9 @@ pub struct WindowState {
     pub awaiting_buffer: bool,
     /// Has shown a buffer, so one committed without is an unmap.
     pub drawn: bool,
+    /// What it showed when its client committed a null buffer, taken before
+    /// smithay drops the textures so hiding can leave a ghost.
+    pub hide_frame: Option<LastFrame>,
     /// Configured without a size until its first buffer shows the one it
     /// picked.
     pub natural_size: bool,
@@ -159,6 +162,7 @@ impl Wm {
                 placed: None,
                 awaiting_buffer: true,
                 drawn: false,
+                hide_frame: None,
                 natural_size: false,
                 natural_after: None,
                 reclassify: false,

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

@@ -56,7 +56,7 @@ impl State {

5656 let l = &self.wm.layout;

5757 let occupied: HashSet<(OutputId, monolith_layout::TagId)> = l

5858 .windows()

59- .filter(|(_, w)| w.scratchpad.is_none())

59+ .filter(|(_, w)| w.scratchpad.is_none() && !w.hidden)

6060 .filter_map(|(_, w)| Some((w.output?, w.tag)))

6161 .collect();

6262 let groups = l

monolith

Commit cadf3a07a5dc

Commit `cadf3a07a5dc`