diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-06-17 08:37:44 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-06-18 14:40:54 +1000 |
| commit | 17f9723f488d0470e3879c6b0dfdba61544cdd7b (patch) | |
| tree | 53007679cb8989c8232189c83256c593111f4610 /Xi/xipassivegrab.c | |
| parent | cbeb73e2055f6c013c8fe6325851f2631170137d (diff) | |
input: bump to ints for deviceids - XI2 requires 16-bit deviceids.
Note: ABI break, but ABI_XINPUT_VERSION has NOT been bumped. Recompile input
drivers.
Revert "Xi: return BadImplementation for deviceids 256 and above"
This reverts commit 2b459f44f3edaea137df9a28bc7adfeb1b9f1df7.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'Xi/xipassivegrab.c')
| -rw-r--r-- | Xi/xipassivegrab.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/Xi/xipassivegrab.c b/Xi/xipassivegrab.c index a5a957038..df0f5bedd 100644 --- a/Xi/xipassivegrab.c +++ b/Xi/xipassivegrab.c @@ -90,9 +90,6 @@ ProcXIPassiveGrabDevice(ClientPtr client) REQUEST(xXIPassiveGrabDeviceReq); REQUEST_AT_LEAST_SIZE(xXIPassiveGrabDeviceReq); - if (stuff->deviceid > 0xFF) /* FIXME */ - return BadImplementation; - if (stuff->deviceid == XIAllDevices) dev = inputInfo.all_devices; else if (stuff->deviceid == XIAllMasterDevices) @@ -263,12 +260,6 @@ ProcXIPassiveUngrabDevice(ClientPtr client) REQUEST(xXIPassiveUngrabDeviceReq); REQUEST_AT_LEAST_SIZE(xXIPassiveUngrabDeviceReq); - if (stuff->deviceid > 0xFF) /* FIXME */ - { - client->errorValue = stuff->deviceid; - return BadImplementation; - } - rc = dixLookupDevice(&dev, stuff->deviceid, client, DixGrabAccess); if (rc != Success) return rc; |