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

xkb: simplify core device loop in GetKeyboardByName

This commit is contained in:
Daniel Stone 2006-10-06 16:12:36 +03:00 committed by Daniel Stone
parent 4b6e2f12f7
commit ab56f0c5b5
1 changed files with 19 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
xkb/xkb.c
View File

@ -570,7 +570,7 @@ ProcXkbLatchLockState(ClientPtr client)
status = XkbLatchModifiers(tmpd, stuff->affectModLatches,
stuff->modLatches);
if (status == Success && stuff->latchGroup)
status = XkbLatchGroup(tmp, stuff->groupLatch);
status = XkbLatchGroup(tmpd, stuff->groupLatch);
if (status != Success)
return status;
@ -5111,6 +5111,8 @@ ProcXkbGetKbdByName(ClientPtr client)
unsigned fwant,fneed,reported;
int status;
Bool geom_changed;
XkbSrvLedInfoPtr old_sli;
XkbSrvLedInfoPtr sli;
REQUEST(xkbGetKbdByNameReq);
REQUEST_AT_LEAST_SIZE(xkbGetKbdByNameReq);
@ -5379,35 +5381,18 @@ ProcXkbGetKbdByName(ClientPtr client)
}
xkb->ctrls->num_groups= nTG;
memcpy(dev->key->modifierMap,xkb->map->modmap,xkb->max_key_code+1);
XkbUpdateCoreDescription(dev,True);
if (dev->kbdfeed && dev->kbdfeed->xkb_sli) {
XkbSrvLedInfoPtr old_sli;
XkbSrvLedInfoPtr sli;
old_sli = dev->kbdfeed->xkb_sli;
dev->kbdfeed->xkb_sli = NULL;
sli = XkbAllocSrvLedInfo(dev,dev->kbdfeed,NULL,0);
if (sli) {
sli->explicitState = old_sli->explicitState;
sli->effectiveState = old_sli->effectiveState;
}
dev->kbdfeed->xkb_sli = sli;
XkbFreeSrvLedInfo(old_sli);
}
if (dev == inputInfo.keyboard) {
for (tmpd = inputInfo.devices; tmpd; tmpd = tmpd->next) {
if (tmpd->key && tmpd->coreEvents) {
if ((dev == inputInfo.keyboard && tmpd->key && tmpd->coreEvents) ||
tmpd == inputInfo.keyboard) {
memcpy(tmpd->key->modifierMap, xkb->map->modmap,
xkb->max_key_code + 1);
if (dev != inputInfo.keyboard)
XkbCopyKeymap(dev->key->xkbInfo->desc,
tmpd->key->xkbInfo->desc, True);
XkbUpdateCoreDescription(tmpd, True);
if (tmpd->kbdfeed && tmpd->kbdfeed->xkb_sli) {
XkbSrvLedInfoPtr old_sli;
XkbSrvLedInfoPtr sli;
old_sli = tmpd->kbdfeed->xkb_sli;
tmpd->kbdfeed->xkb_sli = NULL;
sli = XkbAllocSrvLedInfo(tmpd, tmpd->kbdfeed, NULL, 0);
@ -5420,7 +5405,6 @@ ProcXkbGetKbdByName(ClientPtr client)
}
}
}
}
/* this should be either a MN or an NKN, depending on whether or not
* the keycode range changed? */