diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2006-05-29 11:14:03 +0000 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2006-05-29 11:14:03 +0000 |
| commit | fd8bde8bb0f9d796b3464973b53285c0a6d22a31 (patch) | |
| tree | 3ca147e3cb1bad4dfe698e2a129cf731f8c27b8e /hw/xwin | |
| parent | db0680cf70b8367e1f8a7fff9c0f6ec414db0542 (diff) | |
Remove -xkbmap argument.
Diffstat (limited to 'hw/xwin')
| -rw-r--r-- | hw/xwin/winconfig.c | 10 | ||||
| -rw-r--r-- | hw/xwin/winkeybd.c | 24 |
2 files changed, 6 insertions, 28 deletions
diff --git a/hw/xwin/winconfig.c b/hw/xwin/winconfig.c index 917ce08c0..514dfdc84 100644 --- a/hw/xwin/winconfig.c +++ b/hw/xwin/winconfig.c @@ -542,16 +542,6 @@ winConfigKeyboard (DeviceIntPtr pDevice) #ifdef XWIN_XF86CONFIG from = X_CMDLINE; - if (!XkbInitialMap) - { - s = - winSetStrOption (kbd->inp_option_lst, "XkbInitialMap", NULL); - if (s) - { - XkbInitialMap = NULL_IF_EMPTY (s); - from = X_CONFIG; - } - } if ((s = winSetStrOption (kbd->inp_option_lst, "XkbKeymap", NULL))) { diff --git a/hw/xwin/winkeybd.c b/hw/xwin/winkeybd.c index 3756a4432..3161e1f82 100644 --- a/hw/xwin/winkeybd.c +++ b/hw/xwin/winkeybd.c @@ -259,24 +259,12 @@ winKeybdProc (DeviceIntPtr pDeviceInt, int iState) else { - if (XkbInitialMap) - { - names.keymap = XkbInitialMap; - names.keycodes = NULL; - names.types = NULL; - names.compat = NULL; - names.symbols = NULL; - names.geometry = NULL; - } - else - { - names.keymap = g_winInfo.xkb.keymap; - names.keycodes = g_winInfo.xkb.keycodes; - names.types = g_winInfo.xkb.types; - names.compat = g_winInfo.xkb.compat; - names.symbols = g_winInfo.xkb.symbols; - names.geometry = g_winInfo.xkb.geometry; - } + names.keymap = g_winInfo.xkb.keymap; + names.keycodes = g_winInfo.xkb.keycodes; + names.types = g_winInfo.xkb.types; + names.compat = g_winInfo.xkb.compat; + names.symbols = g_winInfo.xkb.symbols; + names.geometry = g_winInfo.xkb.geometry; winErrorFVerb(2, "Rules = \"%s\" Model = \"%s\" Layout = \"%s\"" " Variant = \"%s\" Options = \"%s\"\n", |