diff options
| author | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2011-11-15 00:09:31 +0000 |
|---|---|---|
| committer | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2011-11-15 00:09:31 +0000 |
| commit | 94d97c4f735232b43d7c8cb8fb1b1262e25850a0 (patch) | |
| tree | dd54342c224a2ce2abf905c11db8280118befcc8 /xserver/Xi | |
| parent | 61661ad6aba72ce83b4a563a877d5207c4c59f66 (diff) | |
Merge patch from http://patchwork.freedesktop.org/patch/7707/,
Xi: allow passive keygrabs on the XIAll(Master)Devices fake deviceslogin.
Amongst other things, this fixes a regression that can be seen in media
keys handling under gnome-settings-daemon.
ok matthieu@
Diffstat (limited to 'xserver/Xi')
| -rw-r--r-- | xserver/Xi/exevents.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xserver/Xi/exevents.c b/xserver/Xi/exevents.c index 3e3c67b63..dcb496fd4 100644 --- a/xserver/Xi/exevents.c +++ b/xserver/Xi/exevents.c @@ -1441,7 +1441,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) { |