diff options
| -rw-r--r-- | hw/dmx/input/dmxinputinit.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/hw/dmx/input/dmxinputinit.c b/hw/dmx/input/dmxinputinit.c index 5f3579b58..f92c88845 100644 --- a/hw/dmx/input/dmxinputinit.c +++ b/hw/dmx/input/dmxinputinit.c @@ -418,9 +418,7 @@ static int dmxKeyboardOn(DeviceIntPtr pDevice, DMXLocalInitInfo *info) dmxConfigGetXkbOptions() ? dmxConfigGetXkbOptions() : ""); } - XkbInitKeyboardDeviceStruct(pDevice, - &info->names, - &info->keySyms, + InitKeyboardDeviceStruct(pDevice, &rmlvo, dmxKeyboardBellProc, dmxKeyboardKbdCtrlProc); @@ -453,9 +451,16 @@ static int dmxDeviceOnOff(DeviceIntPtr pDevice, int what) break; } if (info.keyClass) { - DevicePtr pDev = (DevicePtr) pDevice; - InitKeyboardDeviceStruct(pDev, - &info.keySyms, + XkbRMLVOSet rmlvo; + + rmlvo.rules = dmxConfigGetXkbRules(); + rmlvo.model = dmxConfigGetXkbModel(); + rmlvo.layout = dmxConfigGetXkbLayout(); + rmlvo.variant = dmxConfigGetXkbVariant(); + rmlvo.options = dmxConfigGetXkbOptions(); + + InitKeyboardDeviceStruct(pDevice, + &rmlvo, dmxBell, dmxKbdCtrl); } if (info.buttonClass) { |