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

xkb: Daniel's patch to stop evdev keyboard segfaults.

Browse Source 
mi:	Remove quickfix from ba547d4f6a
This commit is contained in:
Peter Hutterer 2007-02-05 11:38:44 +10:30 committed by Peter Hutterer
parent 4aaaa70d1b
commit a309c936bb
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mi/mieq.c
View File

@ -244,14 +244,6 @@ mieqProcessInputEvents()
dev = e->pDev;
}
/* FIXME: Keyboard extension devices do not have devPrivates
* initialized, resulting in a segfault in XkbHandleActions. */
if (e->event[0].u.u.type == DeviceKeyPress ||
e->event[0].u.u.type == DeviceKeyRelease ||
e->event[0].u.u.type == KeyPress ||
e->event[0].u.u.type == KeyRelease)
e->pDev = dev = inputInfo.keyboard;
/* MPX devices send both core and Xi events.
* Use dev to get the correct processing function but supply
* e->pDev to pass the correct device

3
xkb/xkbUtils.c
View File

@ -1220,7 +1220,8 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
tmp = xalloc(src->max_key_code + 1);
if (!tmp)
return FALSE;
dst->map->syms = tmp;
/*dst->map->syms = tmp;*/
dst->map->modmap = tmp;
}
memcpy(dst->map->modmap, src->map->modmap, src->max_key_code + 1);
}