hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-10-04 22:36:10 +00:00
Code Issues Projects Releases Wiki Activity

Remove -xkbmap argument.

Browse source
This commit is contained in:
Daniel Stone 2006-05-29 11:14:03 +00:00
commit fd8bde8bb0
13 changed files with 59 additions and 178 deletions
Download patch file Download diff file Expand all files Collapse all files

10
hw/xwin/winconfig.c
View file

@ -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)))
{

24
hw/xwin/winkeybd.c
View file

@ -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",