diff options
| author | srdusr <[email protected]> | 2026-07-27 01:25:00 +0200 |
|---|---|---|
| committer | srdusr <[email protected]> | 2026-07-27 01:25:00 +0200 |
| commit | e20d49b0ee3dbd83499445d61eb2d65904d74311 (patch) | |
| tree | bec0d976da83c17fef7a68033e4d2b66394421c1 /crates/wayland/src/state/lifecycle.rs | |
| parent | 48ccac7ecaeff0aaa503804bdf8e033e273b9862 (diff) | |
| download | srdwm-e20d49b0ee3dbd83499445d61eb2d65904d74311.tar.gz srdwm-e20d49b0ee3dbd83499445d61eb2d65904d74311.zip | |
Hide a window only when srdwm knows it has not drawn, not when a lookup says so
Regression I introduced two commits ago, reported live: "I can click close
where the button would normally be and it does close, but it is still
invisible."
The gate that stops an empty frame being drawn before a client paints asked
the renderer, from inside the render loop, whether a window's surface had a
buffer attached right now - and treated "no" as "do not draw". That
question is only meaningful for a native xdg-shell toplevel. An XWayland
window's surface state does not describe it the same way, so the answer came
back no on every frame and the window was never drawn again, while srdwm's
own hit-testing carried on working perfectly: an invisible window that still
takes clicks, which is a worse failure than the empty frame it was meant to
prevent.
Inverted to the fail-safe direction. `new_managed_window` - the one path
that creates a native toplevel - puts the window into
`awaiting_first_buffer`, and `commit` takes it out on the first commit that
carries a buffer. The render and capture paths test that set and nothing
else. A window is now hidden only when srdwm itself put it there, so no
window whose plumbing works differently can be hidden by a lookup that did
not apply to it: the XWayland map path never touches the set, and neither
can anything else.
The buffer question still gets asked, but only in `commit`, about a surface
it was just handed, where it is the right question.
Verified both halves: an ordinary spawn still shows no frame before content
(26 captured frames with content, 0 without), and the only way into the set
is one line in one function.
Diffstat (limited to 'crates/wayland/src/state/lifecycle.rs')
| -rw-r--r-- | crates/wayland/src/state/lifecycle.rs | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/crates/wayland/src/state/lifecycle.rs b/crates/wayland/src/state/lifecycle.rs index b6c7f09..f2cddd9 100644 --- a/crates/wayland/src/state/lifecycle.rs +++ b/crates/wayland/src/state/lifecycle.rs @@ -19,13 +19,15 @@ impl CompState { if wm.window(id).is_some_and(|w| w.size_is_provisional) { self.provisional_size.insert(id); } - // The open-slide tween is NOT started here, deliberately. - // A toplevel role exists well before its client paints - // anything, so starting it here ran the animation against an - // empty frame and left the window simply appearing, already at - // rest. `CompositorHandler::commit` starts it at the first - // commit that carries a buffer instead - see - // `windows_shown_once`. + // Nothing is drawn for this window until its client paints, + // and the open-slide tween starts then rather than here - a + // toplevel role exists well before a client's first buffer, so + // starting the animation here ran it against an empty frame and + // left the window simply appearing, already at rest. + // `CompositorHandler::commit` does both. This is the only place + // anything is ever put into `awaiting_first_buffer`; see that + // field for why that matters. + self.awaiting_first_buffer.insert(id); id }; @@ -378,7 +380,7 @@ impl CompState { self.shadow_buffers.remove(&id); self.border_side_buffers.remove(&id); self.decoration_signatures.remove(&id); - self.windows_shown_once.remove(&id); + self.awaiting_first_buffer.remove(&id); self.last_synced_size.remove(&id); self.content_epoch.remove(&id); self.rounded_content_buffers.remove(&id); |