From bc1f90a615018c05994fae3e678dd2341256cd82 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 26 Nov 2012 12:23:54 +1000 Subject: [PATCH] dix: only reject active grabs on ungrab and do it before actually ungrabbing An active grab ungrabbing is the same as rejecting the grab, since the client is no longer interested in those events. So reject any touch grab, but do so before actually deactivating since we're interested in the TouchEnd for the current grabbing client. A passive grab otoh is _not_ like rejecting a grab, since it deactivates automatically when the touch ends. Signed-off-by: Peter Hutterer --- dix/events.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dix/events.c b/dix/events.c index 3282ef818..03ed106ed 100644 --- a/dix/events.c +++ b/dix/events.c @@ -1503,11 +1503,20 @@ DeactivatePointerGrab(DeviceIntPtr mouse) { GrabPtr grab = mouse->deviceGrab.grab; DeviceIntPtr dev; + Bool wasPassive = mouse->deviceGrab.fromPassiveGrab; Bool wasImplicit = (mouse->deviceGrab.fromPassiveGrab && mouse->deviceGrab.implicitGrab); XID grab_resource = grab->resource; int i; + /* If an explicit grab was deactivated, we must remove it from the head of + * all the touches' listener lists. */ + for (i = 0; !wasPassive && mouse->touch && i < mouse->touch->num_touches; i++) { + TouchPointInfoPtr ti = mouse->touch->touches + i; + if (ti->active && TouchResourceIsOwner(ti, grab_resource)) + TouchListenerAcceptReject(mouse, ti, 0, XIRejectTouch); + } + TouchRemovePointerGrab(mouse); mouse->valuator->motionHintWindow = NullWindow;