diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2008-04-17 12:42:01 -0700 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2009-01-22 15:08:55 +1100 |
| commit | 32db27a7f867b503c2840ca7b815e96d10be9210 (patch) | |
| tree | e92648cdf253abecbd8dd5491fc1678c5464d8c9 /hw/dmx | |
| parent | f062e90a95f9b7ae5458ef2100615e8ace9b66a7 (diff) | |
Input: Remove modifierMap from core
We already have modmap (in the exact same format!) in XKB, so just use
that all the time, instead of duplicating the information.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'hw/dmx')
| -rw-r--r-- | hw/dmx/input/dmxinputinit.c | 2 | ||||
| -rw-r--r-- | hw/dmx/input/lnx-keyboard.c | 2 | ||||
| -rw-r--r-- | hw/dmx/input/usb-keyboard.c | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/hw/dmx/input/dmxinputinit.c b/hw/dmx/input/dmxinputinit.c index bce886fd3..9a14044db 100644 --- a/hw/dmx/input/dmxinputinit.c +++ b/hw/dmx/input/dmxinputinit.c @@ -427,7 +427,6 @@ static int dmxKeyboardOn(DeviceIntPtr pDevice, DMXLocalInitInfo *info) XkbInitKeyboardDeviceStruct(pDevice, &info->names, &info->keySyms, - info->modMap, dmxKeyboardBellProc, dmxKeyboardKbdCtrlProc); @@ -461,7 +460,6 @@ static int dmxDeviceOnOff(DeviceIntPtr pDevice, int what) DevicePtr pDev = (DevicePtr) pDevice; InitKeyboardDeviceStruct(pDev, &info.keySyms, - info.modMap, dmxBell, dmxKbdCtrl); } if (info.buttonClass) { diff --git a/hw/dmx/input/lnx-keyboard.c b/hw/dmx/input/lnx-keyboard.c index 55ff9f859..744b6ace5 100644 --- a/hw/dmx/input/lnx-keyboard.c +++ b/hw/dmx/input/lnx-keyboard.c @@ -697,7 +697,7 @@ static void kbdLinuxConvert(DevicePtr pDev, /* No auto-repeat? */ if ((feed && !feed->ctrl.autoRepeat) - || priv->pKeyboard->key->modifierMap[keyCode] + || priv->pKeyboard->key->xkbInfo->desc->map->modmap[keyCode] || (feed && !(feed->ctrl.autoRepeats[keyCode >> 3] & (1 << (keyCode & 7))))) return; /* Ignore */ diff --git a/hw/dmx/input/usb-keyboard.c b/hw/dmx/input/usb-keyboard.c index 455513d06..12ca8ab96 100644 --- a/hw/dmx/input/usb-keyboard.c +++ b/hw/dmx/input/usb-keyboard.c @@ -331,7 +331,7 @@ static void kbdUSBConvert(DevicePtr pDev, /* No auto-repeat? */ if ((feed && !feed->ctrl.autoRepeat) - || priv->pDevice->key->modifierMap[keyCode] + || priv->pDevice->key->xkbInfo->desc->map->modmap[keyCode] || (feed && !(feed->ctrl.autoRepeats[keyCode >> 3] & (1 << (keyCode & 7))))) return; /* Ignore */ |