From 420f77a1ba8bfbbf8c06f6dd57e9ee36124b7360 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Sun, 28 May 2017 15:56:17 +0200 Subject: [PATCH] xwayland: Allow pointer warp on root/None window Of sorts, as we can't honor pointer warping across the whole root window coordinates, peek the pointer focus in these cases. Signed-off-by: Carlos Garnacho Reviewed-by: Peter Hutterer Signed-off-by: Peter Hutterer (cherry picked from commit c217fcb4c4640ffd2fefee63c6fcd7ea5e64b942) --- hw/xwayland/xwayland.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c index 97b5b58d7..33c784fd6 100644 --- a/hw/xwayland/xwayland.c +++ b/hw/xwayland/xwayland.c @@ -175,11 +175,31 @@ xwl_cursor_warped_to(DeviceIntPtr device, struct xwl_screen *xwl_screen = xwl_screen_get(screen); struct xwl_seat *xwl_seat = device->public.devicePrivate; struct xwl_window *xwl_window; + WindowPtr focus; if (!xwl_seat) xwl_seat = xwl_screen_get_default_seat(xwl_screen); xwl_window = xwl_window_from_window(window); + if (!xwl_window && xwl_seat->focus_window) { + focus = xwl_seat->focus_window->window; + + /* Warps on non wl_surface backed Windows are only allowed + * as long as the pointer stays within the focus window. + */ + if (x >= focus->drawable.x && + y >= focus->drawable.y && + x < focus->drawable.x + focus->drawable.width && + y < focus->drawable.y + focus->drawable.height) { + if (!window) { + DebugF("Warp relative to pointer, assuming pointer focus\n"); + xwl_window = xwl_seat->focus_window; + } else if (window == screen->root) { + DebugF("Warp on root window, assuming pointer focus\n"); + xwl_window = xwl_seat->focus_window; + } + } + } if (!xwl_window) return;