diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2011-07-28 15:43:10 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-08-22 15:56:50 +1000 |
| commit | 80c37048539daa1d257d127d66502bde45c97c85 (patch) | |
| tree | a086e7ffbf81187de9de6a1310aab11597414ce3 | |
| parent | 20a61845d3c93c337bf3331a6bac30cf66c2a293 (diff) | |
dix: avoid using the VCP as modifier device
Core grabs may change device when they're activated to reflect the master
they apply to. If the device is a keyboard, modifierDevice is erroneously
set to the Virtual Core Pointer.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
| -rw-r--r-- | dix/events.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dix/events.c b/dix/events.c index 8a4c6b9ac..25ff8997f 100644 --- a/dix/events.c +++ b/dix/events.c @@ -3678,7 +3678,7 @@ CheckPassiveGrabsOnWindow( if (tempGrab.type < GenericEvent) { grab->device = device; - grab->modifierDevice = GetPairedDevice(device); + grab->modifierDevice = GetMaster(device, MASTER_KEYBOARD); } for (other = inputInfo.devices; other; other = other->next) |