XKB: Simplify a loop in ProcXkbGetKbdByName
Replace: for (stuff; things; etc) { if (misc || other) { [...] } } with: for (stuff; things; etc) { if (!misc && !other) continue; [...] } Signed-off-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
parent
72b6639c83
commit
b8540d18c7
27
xkb/xkb.c
27
xkb/xkb.c
|
@ -5870,21 +5870,22 @@ ProcXkbGetKbdByName(ClientPtr client)
|
|||
xkb->ctrls->num_groups= nTG;
|
||||
|
||||
for (tmpd = inputInfo.devices; tmpd; tmpd = tmpd->next) {
|
||||
if ((tmpd == dev) || (!IsMaster(tmpd) && GetMaster(tmpd, MASTER_KEYBOARD) == dev)) {
|
||||
if (tmpd != dev)
|
||||
XkbCopyDeviceKeymap(tmpd, dev);
|
||||
if (tmpd != dev && GetMaster(tmpd, MASTER_KEYBOARD) != dev)
|
||||
continue;
|
||||
|
||||
if (tmpd->kbdfeed && tmpd->kbdfeed->xkb_sli) {
|
||||
old_sli = tmpd->kbdfeed->xkb_sli;
|
||||
tmpd->kbdfeed->xkb_sli = NULL;
|
||||
sli = XkbAllocSrvLedInfo(tmpd, tmpd->kbdfeed, NULL, 0);
|
||||
if (sli) {
|
||||
sli->explicitState = old_sli->explicitState;
|
||||
sli->effectiveState = old_sli->effectiveState;
|
||||
}
|
||||
tmpd->kbdfeed->xkb_sli = sli;
|
||||
XkbFreeSrvLedInfo(old_sli);
|
||||
if (tmpd != dev)
|
||||
XkbCopyDeviceKeymap(tmpd, dev);
|
||||
|
||||
if (tmpd->kbdfeed && tmpd->kbdfeed->xkb_sli) {
|
||||
old_sli = tmpd->kbdfeed->xkb_sli;
|
||||
tmpd->kbdfeed->xkb_sli = NULL;
|
||||
sli = XkbAllocSrvLedInfo(tmpd, tmpd->kbdfeed, NULL, 0);
|
||||
if (sli) {
|
||||
sli->explicitState = old_sli->explicitState;
|
||||
sli->effectiveState = old_sli->effectiveState;
|
||||
}
|
||||
tmpd->kbdfeed->xkb_sli = sli;
|
||||
XkbFreeSrvLedInfo(old_sli);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user