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

dmx: fix two calls to InitKeyboardDeviceStruct. 

Takes RMLVO now instead of the keysyms directly.

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

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

@ -418,9 +418,7 @@ static int dmxKeyboardOn(DeviceIntPtr pDevice, DMXLocalInitInfo *info)
dmxConfigGetXkbOptions() dmxConfigGetXkbOptions()
? dmxConfigGetXkbOptions() : ""); ? dmxConfigGetXkbOptions() : "");
} }
XkbInitKeyboardDeviceStruct(pDevice, InitKeyboardDeviceStruct(pDevice, &rmlvo,
&info->names,
&info->keySyms,
dmxKeyboardBellProc, dmxKeyboardBellProc,
dmxKeyboardKbdCtrlProc); dmxKeyboardKbdCtrlProc);
@ -453,9 +451,16 @@ static int dmxDeviceOnOff(DeviceIntPtr pDevice, int what)
break; break;
} }
if (info.keyClass) { if (info.keyClass) {
DevicePtr pDev = (DevicePtr) pDevice; XkbRMLVOSet rmlvo;
InitKeyboardDeviceStruct(pDev,
&info.keySyms, rmlvo.rules = dmxConfigGetXkbRules();
rmlvo.model = dmxConfigGetXkbModel();
rmlvo.layout = dmxConfigGetXkbLayout();
rmlvo.variant = dmxConfigGetXkbVariant();
rmlvo.options = dmxConfigGetXkbOptions();
InitKeyboardDeviceStruct(pDevice,
&rmlvo,
dmxBell, dmxKbdCtrl); dmxBell, dmxKbdCtrl);
} }
if (info.buttonClass) { if (info.buttonClass) {