diff options
author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-03-06 23:22:00 +1000 |
---|---|---|
committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-03-20 15:17:55 +1000 |
commit | 97e89a59572a4be6757510a317c142ec1d82e8f8 (patch) | |
tree | 7f7288542cba555dd39a93f6911833275286aaf0 /Xi/xiselectev.c | |
parent | 808a158182b0a3b985385899252c190947b4dbbd (diff) |
Allow XI2 event selection for AllDevices and AllMasterDevices.
Diffstat (limited to 'Xi/xiselectev.c')
-rw-r--r-- | Xi/xiselectev.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Xi/xiselectev.c b/Xi/xiselectev.c index 87811dc2d..cdb9c6ff0 100644 --- a/Xi/xiselectev.c +++ b/Xi/xiselectev.c @@ -67,6 +67,7 @@ ProcXISelectEvent(ClientPtr client) int rc, num_masks, i; WindowPtr win; DeviceIntPtr dev; + DeviceIntRec dummy; xXIDeviceEventMask *evmask; int *types = NULL; @@ -109,7 +110,13 @@ ProcXISelectEvent(ClientPtr client) num_masks = stuff->num_masks; while(num_masks--) { - dixLookupDevice(&dev, evmask->deviceid, client, DixReadAccess); + if (evmask->deviceid == AllDevices || + evmask->deviceid == AllMasterDevices) + { + dummy.id = evmask->deviceid; + dev = &dummy; + } else + dixLookupDevice(&dev, evmask->deviceid, client, DixReadAccess); XISetEventMask(dev, win, client, evmask->mask_len * 4, (unsigned char*)&evmask[1]); evmask = (xXIDeviceEventMask*)(((unsigned char*)evmask) + evmask->mask_len * 4); } |