diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-04-12 17:38:28 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-04-19 22:28:11 +1000 |
| commit | c94ea5bc055e4efc323e84b7a8266e8b8a4af48e (patch) | |
| tree | 250806d53d035ae79260bd4e2a0a2a018654f74b /dix/events.c | |
| parent | 6bb4b5b93701535402f65ea828348ed7747c7dbf (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 'dix/events.c')
| -rw-r--r-- | dix/events.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/dix/events.c b/dix/events.c index dfbc49643..96f357911 100644 --- a/dix/events.c +++ b/dix/events.c @@ -4395,6 +4395,7 @@ ProcGrabPointer(ClientPtr client) xGrabPointerReply rep; DeviceIntPtr device = PickPointer(client); GrabPtr grab; + GrabMask mask; WindowPtr confineTo; CursorPtr oldCursor; REQUEST(xGrabPointerReq); @@ -4431,9 +4432,11 @@ ProcGrabPointer(ClientPtr client) oldCursor = grab->cursor; } + mask.core = stuff->eventMask; + rc = GrabDevice(client, device, stuff->pointerMode, stuff->keyboardMode, stuff->grabWindow, stuff->ownerEvents, stuff->time, - stuff->eventMask, GRABTYPE_CORE, stuff->cursor, + &mask, GRABTYPE_CORE, stuff->cursor, stuff->confineTo, &rep.status); if (rc != Success) return rc; @@ -4551,7 +4554,7 @@ ProcUngrabPointer(ClientPtr client) int GrabDevice(ClientPtr client, DeviceIntPtr dev, unsigned pointer_mode, unsigned keyboard_mode, Window grabWindow, - unsigned ownerEvents, Time ctime, Mask mask, + unsigned ownerEvents, Time ctime, GrabMask *mask, int grabtype, Cursor curs, Window confineToWin, CARD8 *status) { WindowPtr pWin, confineTo; @@ -4643,7 +4646,12 @@ GrabDevice(ClientPtr client, DeviceIntPtr dev, tempGrab.ownerEvents = ownerEvents; tempGrab.keyboardMode = keyboard_mode; tempGrab.pointerMode = pointer_mode; - tempGrab.eventMask = mask; + if (grabtype == GRABTYPE_CORE) + tempGrab.eventMask = mask->core; + else if (grabtype == GRABTYPE_XI) + tempGrab.eventMask = mask->xi; + else + memcpy(tempGrab.xi2mask, mask->xi2mask, sizeof(tempGrab.xi2mask)); tempGrab.device = dev; tempGrab.cursor = cursor; tempGrab.confineTo = confineTo; @@ -4666,13 +4674,16 @@ ProcGrabKeyboard(ClientPtr client) REQUEST(xGrabKeyboardReq); int result; DeviceIntPtr keyboard = PickKeyboard(client); + GrabMask mask; REQUEST_SIZE_MATCH(xGrabKeyboardReq); memset(&rep, 0, sizeof(xGrabKeyboardReply)); + mask.core = KeyPressMask | KeyReleaseMask; + result = GrabDevice(client, keyboard, stuff->pointerMode, stuff->keyboardMode, stuff->grabWindow, stuff->ownerEvents, - stuff->time, KeyPressMask | KeyReleaseMask, GRABTYPE_CORE, None, None, + stuff->time, &mask, GRABTYPE_CORE, None, None, &rep.status); if (result != Success) |