diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2008-07-24 17:38:16 +0930 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2008-07-28 09:05:12 +0930 |
| commit | 70bd8261223366dae9dfdbb999691328d85f093c (patch) | |
| tree | 9f7a684c335128c6b0c718977d090771a9c8f001 | |
| parent | 47160edec7f0d9129576d83f1593a5549879a893 (diff) | |
xkb: use PickPointer/PickKeyboard in _XkbLookupAnyDevice.
| -rw-r--r-- | xkb/xkbUtils.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c index 0727ad83a..0ed7e689a 100644 --- a/xkb/xkbUtils.c +++ b/xkb/xkbUtils.c @@ -56,16 +56,10 @@ _XkbLookupAnyDevice(DeviceIntPtr *pDev, int id, ClientPtr client, int rc = XkbKeyboardErrorCode; if (id == XkbUseCoreKbd) { - if (inputInfo.keyboard) - id = inputInfo.keyboard->id; - else - goto out; + id = PickKeyboard(client)->id; } if (id == XkbUseCorePtr) { - if (inputInfo.pointer) - id = inputInfo.pointer->id; - else - goto out; + id = PickPointer(client)->id; } rc = dixLookupDevice(pDev, id, client, access_mode); out: |