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/xwin | |
| 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/xwin')
| -rw-r--r-- | hw/xwin/winkeybd.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/hw/xwin/winkeybd.c b/hw/xwin/winkeybd.c index f270431e6..41168f3bd 100644 --- a/hw/xwin/winkeybd.c +++ b/hw/xwin/winkeybd.c @@ -217,7 +217,6 @@ int winKeybdProc (DeviceIntPtr pDeviceInt, int iState) { KeySymsRec keySyms; - CARD8 modMap[MAP_LENGTH]; DevicePtr pDevice = (DevicePtr) pDeviceInt; XkbComponentNamesRec names; XkbSrvInfoPtr xkbi; @@ -228,8 +227,6 @@ winKeybdProc (DeviceIntPtr pDeviceInt, int iState) case DEVICE_INIT: winConfigKeyboard (pDeviceInt); - winGetKeyMappings (&keySyms, modMap); - /* FIXME: Maybe we should use winGetKbdLeds () here? */ defaultKeyboardControl.leds = g_winInfo.keyboard.leds; @@ -237,7 +234,6 @@ winKeybdProc (DeviceIntPtr pDeviceInt, int iState) { InitKeyboardDeviceStruct (pDevice, &keySyms, - modMap, winKeybdBell, winKeybdCtrl); } @@ -263,7 +259,7 @@ winKeybdProc (DeviceIntPtr pDeviceInt, int iState) g_winInfo.xkb.layout, g_winInfo.xkb.variant, g_winInfo.xkb.options); XkbInitKeyboardDeviceStruct (pDeviceInt, &names, &keySyms, - modMap, winKeybdBell, winKeybdCtrl); + winKeybdBell, winKeybdCtrl); } if (!g_winInfo.xkb.disable) |