summaryrefslogtreecommitdiff
path: root/extra/xorg-server/Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch
diff options
context:
space:
mode:
Diffstat (limited to 'extra/xorg-server/Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch')
-rw-r--r--extra/xorg-server/Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/extra/xorg-server/Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch b/extra/xorg-server/Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch
new file mode 100644
index 000000000..8bddb2945
--- /dev/null
+++ b/extra/xorg-server/Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch
@@ -0,0 +1,31 @@
+From 97f2af5876dab0dfab06be735416f3fc950ed39e 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>
+---
+ Xi/exevents.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Xi/exevents.c b/Xi/exevents.c
+index 053c76f..edf2c39 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)
+ {
+--
+1.7.7
+