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

Fix kdrive XKB.

This commit is contained in:
Tiago Vignatti 2007-06-27 03:04:55 -03:00
parent 9725516b42
commit 1340f34ec9
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/kdrive/src/kinput.c
View File

@ -740,6 +740,9 @@ KdKeyboardProc(DeviceIntPtr pDevice, int onoff)
DevicePtr pDev = (DevicePtr)pDevice; DevicePtr pDev = (DevicePtr)pDevice;
KdKeyboardInfo *ki; KdKeyboardInfo *ki;
Atom xiclass; Atom xiclass;
#ifdef XKB
XkbComponentNamesRec names;
#endif
if (!pDev) if (!pDev)
return BadImplementation; return BadImplementation;
@ -788,11 +791,9 @@ KdKeyboardProc(DeviceIntPtr pDevice, int onoff)
KdInitModMap(ki); KdInitModMap(ki);
KdInitAutoRepeats(ki); KdInitAutoRepeats(ki);
#ifndef XKB #ifdef XKB
if (!noXkbExtension) { if (!noXkbExtension) {
memset(&names, 0, sizeof(XkbComponentNamesRec)); memset(&names, 0, sizeof(XkbComponentNamesRec));
if (XkbInitialMap)
names.keymap = XkbInitialMap;
XkbSetRulesDflts ("base", "pc105", "us", NULL, NULL); XkbSetRulesDflts ("base", "pc105", "us", NULL, NULL);
ret = XkbInitKeyboardDeviceStruct (pDevice, ret = XkbInitKeyboardDeviceStruct (pDevice,