[PATCH 3/3] xwayland: call through to miPointerWarpCursor on warp_cursor
Peter Hutterer
peter.hutterer at who-t.net
Thu Aug 27 21:28:11 PDT 2015
This is (eventually) called during
InitializeSprite() → *pScreen->SetCursorPosition → miPointerSetCursorPosition
when a device is set to floating. We don't do anything special outselves, but
we need to pass on to the next layer to make sure the device is initialized
properly. Otherwise, pScreen stays NULL and eventually crashes the server when
we try to clean up behind us.
Test case: grab a device → floats it, ungrab again → crash
Reported-by: Jason Gerecke <killertofu at gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
hw/xwayland/xwayland-cursor.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/hw/xwayland/xwayland-cursor.c b/hw/xwayland/xwayland-cursor.c
index c137e1e..76729db 100644
--- a/hw/xwayland/xwayland-cursor.c
+++ b/hw/xwayland/xwayland-cursor.c
@@ -199,6 +199,7 @@ xwl_cross_screen(ScreenPtr pScreen, Bool entering)
static void
xwl_pointer_warp_cursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
{
+ miPointerWarpCursor(pDev, pScreen, x, y);
}
static miPointerScreenFuncRec xwl_pointer_screen_funcs = {
--
2.4.3
More information about the xorg-devel
mailing list