frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dix: change a few inputInfo.keyboard over to PickKeyboard()

This commit is contained in:
Peter Hutterer 2007-10-09 23:07:51 +09:30
parent d42909b23a
commit 042e16458b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dix/devices.c
View File

@ -1514,7 +1514,7 @@ int
ProcGetModifierMapping(ClientPtr client) ProcGetModifierMapping(ClientPtr client)
{ {
xGetModifierMappingReply rep; xGetModifierMappingReply rep;
KeyClassPtr keyc = inputInfo.keyboard->key; KeyClassPtr keyc = PickKeyboard(client)->key;
REQUEST_SIZE_MATCH(xReq); REQUEST_SIZE_MATCH(xReq);
rep.type = X_Reply; rep.type = X_Reply;
@ -1537,7 +1537,7 @@ ProcChangeKeyboardMapping(ClientPtr client)
REQUEST(xChangeKeyboardMappingReq); REQUEST(xChangeKeyboardMappingReq);
unsigned len; unsigned len;
KeySymsRec keysyms; KeySymsRec keysyms;
KeySymsPtr curKeySyms = &inputInfo.keyboard->key->curKeySyms; KeySymsPtr curKeySyms = &PickKeyboard(client)->key->curKeySyms;
DeviceIntPtr pDev = NULL; DeviceIntPtr pDev = NULL;
REQUEST_AT_LEAST_SIZE(xChangeKeyboardMappingReq); REQUEST_AT_LEAST_SIZE(xChangeKeyboardMappingReq);
@ -1940,7 +1940,7 @@ int
ProcGetKeyboardControl (ClientPtr client) ProcGetKeyboardControl (ClientPtr client)
{ {
int i; int i;
KeybdCtrl *ctrl = &inputInfo.keyboard->kbdfeed->ctrl; KeybdCtrl *ctrl = &PickKeyboard(client)->kbdfeed->ctrl;
xGetKeyboardControlReply rep; xGetKeyboardControlReply rep;
REQUEST_SIZE_MATCH(xReq); REQUEST_SIZE_MATCH(xReq);
@ -1962,7 +1962,7 @@ ProcGetKeyboardControl (ClientPtr client)
int int
ProcBell(ClientPtr client) ProcBell(ClientPtr client)
{ {
DeviceIntPtr keybd = inputInfo.keyboard; DeviceIntPtr keybd = PickKeyboard(client);
int base = keybd->kbdfeed->ctrl.bell; int base = keybd->kbdfeed->ctrl.bell;
int newpercent; int newpercent;
REQUEST(xBellReq); REQUEST(xBellReq);
@ -2174,7 +2174,7 @@ ProcQueryKeymap(ClientPtr client)
{ {
xQueryKeymapReply rep; xQueryKeymapReply rep;
int i; int i;
CARD8 *down = inputInfo.keyboard->key->down; CARD8 *down = PickKeyboard(client)->key->down;
REQUEST_SIZE_MATCH(xReq); REQUEST_SIZE_MATCH(xReq);
rep.type = X_Reply; rep.type = X_Reply;