Xi: Include gestures among events that may freeze device

1 files changed, 6 insertions, 1 deletions

diff --git a/Xi/exevents.c b/Xi/exevents.c
index f878dd212..9d4886212 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -1766,6 +1766,7 @@ ProcessGestureEvent(InternalEvent *ev, DeviceIntPtr dev)
     GestureInfoPtr gi;
     DeviceIntPtr kbd;
     Bool deactivateGestureGrab = FALSE;
+    Bool delivered = FALSE;
 
     if (!dev->gesture)
         return;
@@ -1795,7 +1796,11 @@ ProcessGestureEvent(InternalEvent *ev, DeviceIntPtr dev)
             GrabIsGestureGrab(dev->deviceGrab.grab))
         deactivateGestureGrab = TRUE;
 
-    DeliverGestureEventToOwner(dev, gi, ev);
+    delivered = DeliverGestureEventToOwner(dev, gi, ev);
+
+    if (delivered && !deactivateGestureGrab &&
+            (IsGestureBeginEvent(ev) || IsGestureEndEvent(ev)))
+        FreezeThisEventIfNeededForSyncGrab(dev, ev);
 
     if (IsGestureEndEvent(ev))
         GestureEndGesture(gi);