From 32e16082c5297776a56e9fade91f72e603adda89 Mon Sep 17 00:00:00 2001 From: Olivier Fourdan Date: Tue, 4 Jun 2024 17:26:29 +0200 Subject: [PATCH] xwayland: Stop on first unmapped child MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If a child window of the same size is unmapped, we should stop walking the tree looking for the surface window to use. Whatever lies beneath is not visible anyway. This also fixes an issue with the Damage list becoming corrupted when destroying a window, because the first thing that DeleteWindow() does is to unmap the window and crush the window tree underneath it. Signed-off-by: Olivier Fourdan Reviewed-by: Michel Dänzer Fixes: 3a0fc268 - xwayland: Add xwl_window::surface_window Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1680 Part-of: --- hw/xwayland/xwayland-window.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/xwayland/xwayland-window.c b/hw/xwayland/xwayland-window.c index 84291c622..c2bd792e4 100644 --- a/hw/xwayland/xwayland-window.c +++ b/hw/xwayland/xwayland-window.c @@ -1351,6 +1351,9 @@ xwl_window_update_surface_window(struct xwl_window *xwl_window) if (!RegionEqual(&window->winSize, &surface_window->winSize)) break; + if (!window->mapped) + break; + /* The surface window must be top-level for its window pixmap */ window_pixmap = screen->GetWindowPixmap(window); if (window_pixmap == surface_pixmap)