From 2ccea152c091e25474a83588e18475567471e7c8 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Sun, 28 May 2017 15:56:19 +0200 Subject: xwayland: Update root window size when desktop size changes This fixes grabs on InputOnly windows whose parent is the root window failing with GrabNotViewable. This is due to window->borderSize/windowSize being computed as clipped by its parent, resulting in a null region. Setting up the right size on the root window makes the InputOnly size correct too, so the GrabNotViewable paths aren't hit anymore. Signed-off-by: Carlos Garnacho Acked-by: Peter Hutterer Signed-off-by: Peter Hutterer (cherry picked from commit 513e3bd3870fdb8a8e0e2e52c0fa93872300bc8b) --- hw/xwayland/xwayland-output.c | 3 +++ hw/xwayland/xwayland.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'hw') diff --git a/hw/xwayland/xwayland-output.c b/hw/xwayland/xwayland-output.c index a4bc185da..5a0f739f3 100644 --- a/hw/xwayland/xwayland-output.c +++ b/hw/xwayland/xwayland-output.c @@ -187,8 +187,11 @@ update_screen_size(struct xwl_output *xwl_output, int width, int height) SetRootClip(xwl_screen->screen, xwl_screen->root_clip_mode); if (xwl_screen->screen->root) { + BoxRec box = { 0, 0, width, height }; + xwl_screen->screen->root->drawable.width = width; xwl_screen->screen->root->drawable.height = height; + RegionReset(&xwl_screen->screen->root->winSize, &box); RRScreenSizeNotify(xwl_screen->screen); } diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c index 4ccea1a1f..939f3392c 100644 --- a/hw/xwayland/xwayland.c +++ b/hw/xwayland/xwayland.c @@ -334,9 +334,11 @@ xwl_realize_window(WindowPtr window) screen->RealizeWindow = xwl_realize_window; if (xwl_screen->rootless && !window->parent) { + BoxRec box = { 0, 0, xwl_screen->width, xwl_screen->height }; + + RegionReset(&window->winSize, &box); RegionNull(&window->clipList); RegionNull(&window->borderClip); - RegionNull(&window->winSize); } if (xwl_screen->rootless) { -- cgit v1.2.3