From a4aba5ab301a79ebd3239610d205188581bbcd0d Mon Sep 17 00:00:00 2001 From: Olivier Fourdan Date: Wed, 27 Apr 2022 14:07:49 +0200 Subject: [PATCH] xwayland: catch SetWindowPixmap() even when rootful Xwayland's own SetWindowPixmap() handler would be ignored when running rootful. This is fine as long as we do not plan to resize the root window, however this is becoming problematic if we plan to resize the root window dynamically when running rootful. Just add the xwl_window_set_window_pixmap() handler regardless of rootful/rootless mode. Signed-off-by: Olivier Fourdan Reviewed-by: Adam Jackson --- hw/xwayland/xwayland-screen.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/xwayland/xwayland-screen.c b/hw/xwayland/xwayland-screen.c index d6e19282c..dd520819b 100644 --- a/hw/xwayland/xwayland-screen.c +++ b/hw/xwayland/xwayland-screen.c @@ -777,10 +777,8 @@ xwl_screen_init(ScreenPtr pScreen, int argc, char **argv) xwl_screen->MoveWindow = pScreen->MoveWindow; pScreen->MoveWindow = xwl_move_window; - if (xwl_screen->rootless) { - xwl_screen->SetWindowPixmap = pScreen->SetWindowPixmap; - pScreen->SetWindowPixmap = xwl_window_set_window_pixmap; - } + xwl_screen->SetWindowPixmap = pScreen->SetWindowPixmap; + pScreen->SetWindowPixmap = xwl_window_set_window_pixmap; pScreen->CursorWarpedTo = xwl_cursor_warped_to; pScreen->CursorConfinedTo = xwl_cursor_confined_to;