andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

XkbCopyKeymap: inputInfo.keyboard is not a special case

Browse Source 
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:
Daniel Stone 2008-11-27 13:35:42 +11:00
parent 07c3bb922b
commit 2762cafc32
1 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
xkb/xkbUtils.c
View File

@ -2148,26 +2148,19 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
if (!_XkbCopyGeom(src, dst)) if (!_XkbCopyGeom(src, dst))
return FALSE; return FALSE;
if (inputInfo.keyboard->key->xkbInfo && for (tmpDev = inputInfo.devices; tmpDev && !pDev; tmpDev = tmpDev->next) {
inputInfo.keyboard->key->xkbInfo->desc == dst) { if (tmpDev->key && tmpDev->key->xkbInfo &&
pDev = inputInfo.keyboard; tmpDev->key->xkbInfo->desc == dst) {
} pDev = tmpDev;
else { break;
for (tmpDev = inputInfo.devices; tmpDev && !pDev;
tmpDev = tmpDev->next) {
if (tmpDev->key && tmpDev->key->xkbInfo &&
tmpDev->key->xkbInfo->desc == dst) {
pDev = tmpDev;
break;
}
} }
for (tmpDev = inputInfo.off_devices; tmpDev && !pDev; }
tmpDev = tmpDev->next) { for (tmpDev = inputInfo.off_devices; tmpDev && !pDev;
if (tmpDev->key && tmpDev->key->xkbInfo && tmpDev = tmpDev->next) {
tmpDev->key->xkbInfo->desc == dst) { if (tmpDev->key && tmpDev->key->xkbInfo &&
pDev = tmpDev; tmpDev->key->xkbInfo->desc == dst) {
break; pDev = tmpDev;
} break;
} }
} }