diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-08-04 15:12:25 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-09-13 10:30:15 +1000 |
| commit | 9caba3e2abceda0a1ff4ad4bf05708f0166c2218 (patch) | |
| tree | 76263bbe45fb870fa28400e75223ec2eb7145fd5 /hw/dmx | |
| parent | 29b9a10dad1ca780dc90f4f1f63fd11fd7d1221b (diff) | |
dmx: fix two calls to InitKeyboardDeviceStruct.
Takes RMLVO now instead of the keysyms directly.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'hw/dmx')
| -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) { |