diff options
| author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-06-21 13:19:32 +0000 |
|---|---|---|
| committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-06-21 13:19:32 +0000 |
| commit | d6e8b1affec7351549c0006cc63b6923091cdd68 (patch) | |
| tree | 6e5e9dd1c1ec6e141349337df844b649bbf4277d /hw/xwin/winconfig.h | |
| parent | dfdbb60bf5f613b3554d5435f08f16bde72aa353 (diff) | |
Bug 777: Merge from CYGWIN branch
Diffstat (limited to 'hw/xwin/winconfig.h')
| -rw-r--r-- | hw/xwin/winconfig.h | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/hw/xwin/winconfig.h b/hw/xwin/winconfig.h index 6f07ea9bc..8b7702501 100644 --- a/hw/xwin/winconfig.h +++ b/hw/xwin/winconfig.h @@ -1,3 +1,5 @@ +#ifndef __WIN_CONFIG_H__ +#define __WIN_CONFIG_H__ /* *Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved. * @@ -27,11 +29,12 @@ * * Authors: Alexander Gottwald */ -#ifndef __WIN_CONFIG_H__ -#define __WIN_CONFIG_H__ +/* $Id$ */ #include "win.h" +#ifdef XWIN_XF86CONFIG #include "../xfree86/parser/xf86Parser.h" +#endif /* These are taken from hw/xfree86/common/xf86str.h */ @@ -184,14 +187,23 @@ serverLayoutRec, *serverLayoutPtr; typedef struct { /* Files */ +#ifdef XWIN_XF86CONFIG char *configFile; +#endif char *fontPath; char *rgbPath; /* input devices - keyboard */ +#ifdef XWIN_XF86CONFIG char *keyboard; +#endif #ifdef XKB Bool noXkbExtension; char *xkbMap; + char *xkbRules; + char *xkbModel; + char *xkbLayout; + char *xkbVariant; + char *xkbOptions; #endif /* layout */ char *screenname; @@ -204,8 +216,9 @@ WinCmdlineRec, *WinCmdlinePtr; extern WinCmdlineRec g_cmdline; - +#ifdef XWIN_XF86CONFIG extern XF86ConfigPtr g_xf86configptr; +#endif extern serverLayoutRec g_winConfigLayout; @@ -281,9 +294,10 @@ char *winSetStrOption (pointer optlist, const char *name, char *deflt); int winSetBoolOption (pointer optlist, const char *name, int deflt); int winSetIntOption (pointer optlist, const char *name, int deflt); double winSetRealOption (pointer optlist, const char *name, double deflt); - +#ifdef XWIN_XF86CONFIG XF86OptionPtr winFindOption (XF86OptionPtr list, const char *name); char *winFindOptionValue (XF86OptionPtr list, const char *name); +#endif int winNameCompare (const char *s1, const char *s2); char *winNormalizeName (const char *s); |