summaryrefslogtreecommitdiff
path: root/Xi/grabdev.c
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-04-12 17:38:28 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-04-19 22:28:11 +1000
commitc94ea5bc055e4efc323e84b7a8266e8b8a4af48e (patch)
tree250806d53d035ae79260bd4e2a0a2a018654f74b /Xi/grabdev.c
parent6bb4b5b93701535402f65ea828348ed7747c7dbf (diff)
input: use a GrabMask union in GrabDevice to allow for XI2 masks.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'Xi/grabdev.c')
-rw-r--r--Xi/grabdev.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/Xi/grabdev.c b/Xi/grabdev.c
index 65997acaf..6827fd1b1 100644
--- a/Xi/grabdev.c
+++ b/Xi/grabdev.c
@@ -104,6 +104,7 @@ ProcXGrabDevice(ClientPtr client)
int rc;
xGrabDeviceReply rep;
DeviceIntPtr dev;
+ GrabMask mask;
struct tmask tmp[EMASKSIZE];
REQUEST(xGrabDeviceReq);
@@ -126,10 +127,12 @@ ProcXGrabDevice(ClientPtr client)
X_GrabDevice)) != Success)
return rc;
+ mask.xi = tmp[stuff->deviceid].mask;
+
rc = GrabDevice(client, dev, stuff->other_devices_mode,
stuff->this_device_mode, stuff->grabWindow,
stuff->ownerEvents, stuff->time,
- tmp[stuff->deviceid].mask, FALSE, None, None,
+ &mask, FALSE, None, None,
&rep.status);
if (rc != Success)