diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-25 19:39:46 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-25 19:39:46 +0000 |
| commit | 4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05 (patch) | |
| tree | c1e02b9d3509aa97703aa4b540d4cd22ec4600ed /xorg-server/hw/xfree86/parser/Files.c | |
| parent | dc3c299dd0995549e2a6973ca0f25b254afd38a5 (diff) | |
| download | vcxsrv-4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05.tar.gz vcxsrv-4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05.tar.bz2 vcxsrv-4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05.zip | |
Added xorg-server-1.6.2.tar.gz
Diffstat (limited to 'xorg-server/hw/xfree86/parser/Files.c')
| -rw-r--r-- | xorg-server/hw/xfree86/parser/Files.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/xorg-server/hw/xfree86/parser/Files.c b/xorg-server/hw/xfree86/parser/Files.c index 3777432b1..c3523024d 100644 --- a/xorg-server/hw/xfree86/parser/Files.c +++ b/xorg-server/hw/xfree86/parser/Files.c @@ -72,6 +72,9 @@ static xf86ConfigSymTabRec FilesTab[] = {MODULEPATH, "modulepath"}, {INPUTDEVICES, "inputdevices"}, {LOGFILEPATH, "logfile"}, + {XKBDIR, "xkbdir"}, + /* Obsolete keywords that aren't used but shouldn't cause errors: */ + {OBSOLETE_TOKEN, "rgbpath"}, {-1, ""}, }; @@ -180,9 +183,18 @@ xf86parseFilesSection (void) Error (QUOTE_MSG, "LogFile"); ptr->file_logfile = val.str; break; + case XKBDIR: + if (xf86getSubToken (&(ptr->file_xkbdir)) != STRING) + Error (QUOTE_MSG, "XkbDir"); + ptr->file_xkbdir = val.str; + break; case EOF_TOKEN: Error (UNEXPECTED_EOF_MSG, NULL); break; + case OBSOLETE_TOKEN: + xf86parseError (OBSOLETE_MSG, xf86tokenString ()); + xf86getSubToken (&(ptr->file_comment)); + break; default: Error (INVALID_KEYWORD_MSG, xf86tokenString ()); break; @@ -255,6 +267,8 @@ xf86printFileSection (FILE * cf, XF86ConfFilesPtr ptr) } fprintf (cf, "\tFontPath \"%s\"\n", s); } + if (ptr->file_xkbdir) + fprintf (cf, "\tXkbDir \"%s\"\n", ptr->file_xkbdir); } void @@ -268,6 +282,7 @@ xf86freeFiles (XF86ConfFilesPtr p) TestFree (p->file_inputdevs); TestFree (p->file_fontpath); TestFree (p->file_comment); + TestFree (p->file_xkbdir); xf86conffree (p); } |