diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2009-01-26 13:15:07 +0000 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2009-02-02 17:51:50 +0000 |
| commit | 4475ae036c3d5a06a6ce88a359ce2a9a8ae9b4f1 (patch) | |
| tree | 99ec788e564bb0af5670c225270eb509b77f3f8b /hw/xwin/winconfig.c | |
| parent | e2b4d3d4a1994347979508fbb483cd55c2232502 (diff) | |
Cygwin/X: Fix compilation for mandatory XKB
Fix a stray '}'
Update to use RMLVO interface
Remove g_winInfo.xkb.disable, can never be set since noXkbExtension has been removed
Change to retrieve modifier key state using XkbStateFieldFromRec() from Colin Harrison
Update to use XKB defaults from xkb-config.h
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Diffstat (limited to 'hw/xwin/winconfig.c')
| -rw-r--r-- | hw/xwin/winconfig.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/hw/xwin/winconfig.c b/hw/xwin/winconfig.c index 5f5b4825a..13b8b3adf 100644 --- a/hw/xwin/winconfig.c +++ b/hw/xwin/winconfig.c @@ -81,7 +81,6 @@ winInfoRec g_winInfo = { } , { /* xkb */ - FALSE, /* disable */ NULL, /* rules */ NULL, /* model */ NULL, /* layout */ @@ -222,25 +221,10 @@ winConfigKeyboard (DeviceIntPtr pDevice) char *s = NULL; /* Setup defaults */ - g_winInfo.xkb.disable = FALSE; -# ifdef PC98 /* japanese */ /* not implemented */ - g_winInfo.xkb.rules = "xfree98"; - g_winInfo.xkb.model = "pc98"; - g_winInfo.xkb.layout = "nex/jp"; - g_winInfo.xkb.variant = NULL; - g_winInfo.xkb.options = NULL; -# else - g_winInfo.xkb.rules = "xorg"; - g_winInfo.xkb.model = "pc101"; - g_winInfo.xkb.layout = "us"; - g_winInfo.xkb.variant = NULL; - g_winInfo.xkb.options = NULL; -# endif /* PC98 */ + XkbGetRulesDflts(&g_winInfo.xkb); /* * Query the windows autorepeat settings and change the xserver defaults. - * If XKB is disabled then windows handles the autorepeat and the special - * treatment is not needed */ { int kbd_delay; @@ -483,7 +467,6 @@ winConfigKeyboard (DeviceIntPtr pDevice) winMsg (from, "XKB: options: \"%s\"\n", s); } - } #ifdef XWIN_XF86CONFIG } #endif |