summaryrefslogtreecommitdiff
path: root/Xi
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2011-10-27 11:03:39 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2011-11-09 13:26:41 +1000
commit22715e465b415b3351b83b8279a4f44157f63199 (patch)
tree6a491101d4ef837316b631c0d9d32cf369433946 /Xi
parentc643c2b7bf480f5c27ff8606bda087f8bff3b154 (diff)
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>
Diffstat (limited to 'Xi')
-rw-r--r--Xi/exevents.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Xi/exevents.c b/Xi/exevents.c
index 053c76f22..edf2c393f 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -1495,7 +1495,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)
{