xkb: use PickPointer/PickKeyboard in _XkbLookupAnyDevice.
This commit is contained in:
parent
47160edec7
commit
70bd826122
|
@ -56,16 +56,10 @@ _XkbLookupAnyDevice(DeviceIntPtr *pDev, int id, ClientPtr client,
|
||||||
int rc = XkbKeyboardErrorCode;
|
int rc = XkbKeyboardErrorCode;
|
||||||
|
|
||||||
if (id == XkbUseCoreKbd) {
|
if (id == XkbUseCoreKbd) {
|
||||||
if (inputInfo.keyboard)
|
id = PickKeyboard(client)->id;
|
||||||
id = inputInfo.keyboard->id;
|
|
||||||
else
|
|
||||||
goto out;
|
|
||||||
}
|
}
|
||||||
if (id == XkbUseCorePtr) {
|
if (id == XkbUseCorePtr) {
|
||||||
if (inputInfo.pointer)
|
id = PickPointer(client)->id;
|
||||||
id = inputInfo.pointer->id;
|
|
||||||
else
|
|
||||||
goto out;
|
|
||||||
}
|
}
|
||||||
rc = dixLookupDevice(pDev, id, client, access_mode);
|
rc = dixLookupDevice(pDev, id, client, access_mode);
|
||||||
out:
|
out:
|
||||||
|
|
Loading…
Reference in New Issue