diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-03-19 09:33:02 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-03-20 15:17:57 +1000 |
| commit | 111ef10375204a6981a5be5c045860854c4da4e6 (patch) | |
| tree | 32bd8092f2abae9488e1f6ee8c747119e13c47ff /Xi/grabdev.c | |
| parent | dc153271b6458cacd63a4bc0208594011c6460b0 (diff) | |
dix: move ProcGrabPointer guts into GrabDevice.
Yes, this means we have even more arguments to GrabDevice. But it beats having
a copy of most but not all of GrabDevice in ProcGrabPointer.
Also, reshuffle the order of parameters, the CARD* status is a return value
and should be last.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'Xi/grabdev.c')
| -rw-r--r-- | Xi/grabdev.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Xi/grabdev.c b/Xi/grabdev.c index f032b4a42..65997acaf 100644 --- a/Xi/grabdev.c +++ b/Xi/grabdev.c @@ -126,10 +126,11 @@ ProcXGrabDevice(ClientPtr client) X_GrabDevice)) != Success) return rc; - rc = GrabDevice(client, dev, stuff->this_device_mode, - stuff->other_devices_mode, stuff->grabWindow, + rc = GrabDevice(client, dev, stuff->other_devices_mode, + stuff->this_device_mode, stuff->grabWindow, stuff->ownerEvents, stuff->time, - tmp[stuff->deviceid].mask, &rep.status, FALSE); + tmp[stuff->deviceid].mask, FALSE, None, None, + &rep.status); if (rc != Success) return rc; |