diff options
| author | Tiago Vignatti <vignatti@c3sl.ufpr.br> | 2007-06-27 03:04:55 -0300 |
|---|---|---|
| committer | Tiago Vignatti <vignatti@c3sl.ufpr.br> | 2007-06-27 03:04:55 -0300 |
| commit | 1340f34ec98c41781164018d43bd7bb858d8132b (patch) | |
| tree | f346944e6622cf293daec3f4f15291e6762833b4 | |
| parent | 9725516b4274ceaf9d6caf372c5439b4c9db2316 (diff) | |
Fix kdrive XKB.
| -rw-r--r-- | hw/kdrive/src/kinput.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c index 7edcc5106..7b22d170a 100644 --- a/hw/kdrive/src/kinput.c +++ b/hw/kdrive/src/kinput.c @@ -740,6 +740,9 @@ KdKeyboardProc(DeviceIntPtr pDevice, int onoff) DevicePtr pDev = (DevicePtr)pDevice; KdKeyboardInfo *ki; Atom xiclass; +#ifdef XKB + XkbComponentNamesRec names; +#endif if (!pDev) return BadImplementation; @@ -788,11 +791,9 @@ KdKeyboardProc(DeviceIntPtr pDevice, int onoff) KdInitModMap(ki); KdInitAutoRepeats(ki); -#ifndef XKB +#ifdef XKB if (!noXkbExtension) { memset(&names, 0, sizeof(XkbComponentNamesRec)); - if (XkbInitialMap) - names.keymap = XkbInitialMap; XkbSetRulesDflts ("base", "pc105", "us", NULL, NULL); ret = XkbInitKeyboardDeviceStruct (pDevice, |