dix: Don't interfere grabs the interfering device is of different type.

A pointer device should be able to send events while the client has a core
grab on a keyboard device, and likewise.

1 files changed, 3 insertions, 1 deletions

diff --git a/dix/events.c b/dix/events.c
index 7a21af1d1..2032b42ca 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -6206,7 +6206,9 @@ IsInterferingGrab(ClientPtr client, DeviceIntPtr dev, xEvent* event)
             if (it->deviceGrab.grab && SameClient(it->deviceGrab.grab, client)
                         && !it->deviceGrab.fromPassiveGrab)
             {
-                return TRUE;
+                if ((IsPointerDevice(it) && IsPointerDevice(dev)) ||
+                        (IsKeyboardDevice(it) && IsKeyboardDevice(dev)))
+                    return TRUE;
             }
         }
         it = it->next;