diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2007-10-09 23:07:51 +0930 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2007-10-09 23:07:51 +0930 |
| commit | 042e16458b751ad0fcfa1ebbdd74d7d48036b22a (patch) | |
| tree | 477901d89fe6328692fffc1dfb9d76860ec201dd | |
| parent | d42909b23a9be64a26aa349c1d6dcd8b228bffa7 (diff) | |
dix: change a few inputInfo.keyboard over to PickKeyboard()
| -rw-r--r-- | dix/devices.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/dix/devices.c b/dix/devices.c index 59404e9cf..37a98a090 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -1514,7 +1514,7 @@ int ProcGetModifierMapping(ClientPtr client) { xGetModifierMappingReply rep; - KeyClassPtr keyc = inputInfo.keyboard->key; + KeyClassPtr keyc = PickKeyboard(client)->key; REQUEST_SIZE_MATCH(xReq); rep.type = X_Reply; @@ -1537,7 +1537,7 @@ ProcChangeKeyboardMapping(ClientPtr client) REQUEST(xChangeKeyboardMappingReq); unsigned len; KeySymsRec keysyms; - KeySymsPtr curKeySyms = &inputInfo.keyboard->key->curKeySyms; + KeySymsPtr curKeySyms = &PickKeyboard(client)->key->curKeySyms; DeviceIntPtr pDev = NULL; REQUEST_AT_LEAST_SIZE(xChangeKeyboardMappingReq); @@ -1940,7 +1940,7 @@ int ProcGetKeyboardControl (ClientPtr client) { int i; - KeybdCtrl *ctrl = &inputInfo.keyboard->kbdfeed->ctrl; + KeybdCtrl *ctrl = &PickKeyboard(client)->kbdfeed->ctrl; xGetKeyboardControlReply rep; REQUEST_SIZE_MATCH(xReq); @@ -1962,7 +1962,7 @@ ProcGetKeyboardControl (ClientPtr client) int ProcBell(ClientPtr client) { - DeviceIntPtr keybd = inputInfo.keyboard; + DeviceIntPtr keybd = PickKeyboard(client); int base = keybd->kbdfeed->ctrl.bell; int newpercent; REQUEST(xBellReq); @@ -2174,7 +2174,7 @@ ProcQueryKeymap(ClientPtr client) { xQueryKeymapReply rep; int i; - CARD8 *down = inputInfo.keyboard->key->down; + CARD8 *down = PickKeyboard(client)->key->down; REQUEST_SIZE_MATCH(xReq); rep.type = X_Reply; |