diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2013-03-09 16:54:56 +0000 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2013-03-09 16:54:56 +0000 |
| commit | f93c38fd889ba3a345daf41a5c8b472433e007b9 (patch) | |
| tree | 33d4f04e0d4192cddf638923f907b1d3031d48a6 /dix/grabs.c | |
| parent | 5df71d7065365c8314a3f45741ebbb4bbf9811dc (diff) | |
| parent | eec5eb2f09682718e69f42491181ade0b093f52d (diff) | |
Merge tag 'xorg-server-1.13.3' into cygwin-release-1.13xserver-cygwin-1.13.3-1
xorg-server-1.13.3
Diffstat (limited to 'dix/grabs.c')
| -rw-r--r-- | dix/grabs.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/dix/grabs.c b/dix/grabs.c index 55bf64f2c..d55a69cf0 100644 --- a/dix/grabs.c +++ b/dix/grabs.c @@ -219,7 +219,10 @@ CreateGrab(int client, DeviceIntPtr device, DeviceIntPtr modDevice, grab->resource = FakeClientID(client); grab->device = device; grab->window = window; - grab->eventMask = mask->core; /* same for XI */ + if (grabtype == CORE || grabtype == XI) + grab->eventMask = mask->core; /* same for XI */ + else + grab->eventMask = 0; grab->deviceMask = 0; grab->ownerEvents = param->ownerEvents; grab->keyboardMode = param->this_device_mode; |