XkbCopyKeymap: inputInfo.keyboard is not a special case
The device-walking code is still depressing, though. Signed-off-by: Daniel Stone <daniel@fooishbar.org> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
parent
07c3bb922b
commit
2762cafc32
|
@ -2148,13 +2148,7 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
|
|||
if (!_XkbCopyGeom(src, dst))
|
||||
return FALSE;
|
||||
|
||||
if (inputInfo.keyboard->key->xkbInfo &&
|
||||
inputInfo.keyboard->key->xkbInfo->desc == dst) {
|
||||
pDev = inputInfo.keyboard;
|
||||
}
|
||||
else {
|
||||
for (tmpDev = inputInfo.devices; tmpDev && !pDev;
|
||||
tmpDev = tmpDev->next) {
|
||||
for (tmpDev = inputInfo.devices; tmpDev && !pDev; tmpDev = tmpDev->next) {
|
||||
if (tmpDev->key && tmpDev->key->xkbInfo &&
|
||||
tmpDev->key->xkbInfo->desc == dst) {
|
||||
pDev = tmpDev;
|
||||
|
@ -2169,7 +2163,6 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
|
|||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (sendNotifies) {
|
||||
if (!pDev) {
|
||||
|
|
Loading…
Reference in New Issue
Block a user