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:
parent
29b9a10dad
commit
9caba3e2ab
|
@ -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) {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user