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

dmx: XkbComponentNamesRec doesn't have a keymap field anymore. 

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2009-08-04 15:04:45 +10:00
parent a6f3f6a63a
commit 29b9a10dad
2 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/dmx/input/dmxcommon.c
View File

@ -264,7 +264,6 @@ void dmxCommonKbdGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info)
dmxCommonSaveState(priv); dmxCommonSaveState(priv);
if (priv->xkb) { if (priv->xkb) {
info->names.keymap = NULL;
#define NAME(x) \ #define NAME(x) \
priv->xkb->names->x ? XGetAtomName(priv->display,priv->xkb->names->x) : NULL priv->xkb->names->x ? XGetAtomName(priv->display,priv->xkb->names->x) : NULL
info->names.keycodes = NAME(keycodes); info->names.keycodes = NAME(keycodes);

1
hw/dmx/input/dmxinputinit.c
View File

@ -362,7 +362,6 @@ void dmxKeyboardBellProc(int percent, DeviceIntPtr pDevice,
static void dmxKeyboardFreeNames(XkbComponentNamesPtr names) static void dmxKeyboardFreeNames(XkbComponentNamesPtr names)
{ {
if (names->keymap) XFree(names->keymap);
if (names->keycodes) XFree(names->keycodes); if (names->keycodes) XFree(names->keycodes);
if (names->types) XFree(names->types); if (names->types) XFree(names->types);
if (names->compat) XFree(names->compat); if (names->compat) XFree(names->compat);