From 6ded98becb1f1192062d4cb0f8cdf4ef0159a78b Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 27 Oct 2011 11:03:39 +1000
Subject: [PATCH] Xi: allow passive keygrabs on the XIAll(Master)Devices fake
 devices

They don't have a KeyClassRec, but we must still allow passive grabs on
them.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: Bastien Nocera <hadess@hadess.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
(cherry picked from commit 22715e465b415b3351b83b8279a4f44157f63199)
(cherry picked from commit 2f2d871ccdfb256831ae487c5916054a3d29d126)
---
 Xi/exevents.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Xi/exevents.c b/Xi/exevents.c
index 9bd9d6078..d21490714 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -1483,7 +1483,7 @@ GrabKey(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr modifier_device,
     rc = CheckGrabValues(client, param);
     if (rc != Success)
         return rc;
-    if (k == NULL)
+    if ((dev->id != XIAllDevices && dev->id != XIAllMasterDevices) && k == NULL)
 	return BadMatch;
     if (grabtype == GRABTYPE_XI)
     {