andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Obsolete InputDevices keyword in xorg.conf Files section

Browse Source 
Was only used to provide a list of input devices that XF86-Misc could use,
now that XF86-Misc is gone, was parsed and logged, then completely ignored.

(Depends on previous patch that introduces OBSOLETE_TOKEN in parser to
 make obsolete keywords like InputDevices & RgbPath be non-fatal errors.)

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Acked-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Alan Coopersmith 2009-02-17 19:37:22 -08:00
parent d2cf562bba
commit e0a451eb7c
6 changed files with 1 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/xfree86/common/xf86Config.c
View File

@ -644,14 +644,6 @@ configFiles(XF86ConfFilesPtr fileconf)
strcpy(temp_path, start);
xf86Msg(pathFrom, "FontPath set to:\n%s\n", log_buf);
xfree(log_buf);
if (fileconf && fileconf->file_inputdevs) {
xf86InputDeviceList = fileconf->file_inputdevs;
xf86Msg(X_CONFIG, "Input device list set to \"%s\"\n",
xf86InputDeviceList);
}
/* ModulePath */

1
hw/xfree86/common/xf86Globals.c
View File

@ -139,7 +139,6 @@ xf86InfoRec xf86Info = {
#endif
};
const char *xf86ConfigFile = NULL;
const char *xf86InputDeviceList = NULL;
const char *xf86ModulePath = DEFAULT_MODULE_PATH;
MessageType xf86ModPathFrom = X_DEFAULT;
const char *xf86LogFile = DEFAULT_LOGPREFIX;

1
hw/xfree86/common/xf86Priv.h
View File

@ -76,7 +76,6 @@ extern _X_EXPORT struct pci_slot_match xf86IsolateDevice;
/* Other parameters */
extern _X_EXPORT xf86InfoRec xf86Info;
extern _X_EXPORT const char *xf86InputDeviceList;
extern _X_EXPORT const char *xf86ModulePath;
extern _X_EXPORT MessageType xf86ModPathFrom;
extern _X_EXPORT const char *xf86LogFile;

45
hw/xfree86/parser/Files.c
View File

@ -70,11 +70,11 @@ static xf86ConfigSymTabRec FilesTab[] =
{ENDSECTION, "endsection"},
{FONTPATH, "fontpath"},
{MODULEPATH, "modulepath"},
{INPUTDEVICES, "inputdevices"},
{LOGFILEPATH, "logfile"},
{XKBDIR, "xkbdir"},
/* Obsolete keywords that aren't used but shouldn't cause errors: */
{OBSOLETE_TOKEN, "rgbpath"},
{OBSOLETE_TOKEN, "inputdevices"},
{-1, ""},
};
@ -151,33 +151,6 @@ xf86parseFilesSection (void)
strcat (ptr->file_modulepath, str);
xf86conffree (val.str);
break;
case INPUTDEVICES:
if (xf86getSubToken (&(ptr->file_comment)) != STRING)
Error (QUOTE_MSG, "InputDevices");
l = FALSE;
str = val.str;
if (ptr->file_inputdevs == NULL)
{
ptr->file_inputdevs = xf86confmalloc (1);
ptr->file_inputdevs[0] = '\0';
k = strlen (str) + 1;
}
else
{
k = strlen (ptr->file_inputdevs) + strlen (str) + 1;
if (ptr->file_inputdevs[strlen (ptr->file_inputdevs) - 1] != ',')
{
k++;
l = TRUE;
}
}
ptr->file_inputdevs = xf86confrealloc (ptr->file_inputdevs, k);
if (l)
strcat (ptr->file_inputdevs, ",");
strcat (ptr->file_inputdevs, str);
xf86conffree (val.str);
break;
case LOGFILEPATH:
if (xf86getSubToken (&(ptr->file_comment)) != STRING)
Error (QUOTE_MSG, "LogFile");
@ -237,21 +210,6 @@ xf86printFileSection (FILE * cf, XF86ConfFilesPtr ptr)
}
fprintf (cf, "\tModulePath \"%s\"\n", s);
}
if (ptr->file_inputdevs)
{
s = ptr->file_inputdevs;
p = index (s, ',');
while (p)
{
*p = '\000';
fprintf (cf, "\tInputDevices \"%s\"\n", s);
*p = ',';
s = p;
s++;
p = index (s, ',');
}
fprintf (cf, "\tInputDevices \"%s\"\n", s);
}
if (ptr->file_fontpath)
{
s = ptr->file_fontpath;
@ -279,7 +237,6 @@ xf86freeFiles (XF86ConfFilesPtr p)
TestFree (p->file_logfile);
TestFree (p->file_modulepath);
TestFree (p->file_inputdevs);
TestFree (p->file_fontpath);
TestFree (p->file_comment);
TestFree (p->file_xkbdir);

1
hw/xfree86/parser/xf86Parser.h
View File

@ -72,7 +72,6 @@ typedef struct
{
char *file_logfile;
char *file_modulepath;
char *file_inputdevs;
char *file_fontpath;
char *file_comment;
char *file_xkbdir;

1
hw/xfree86/parser/xf86tokens.h
View File

@ -99,7 +99,6 @@ typedef enum {
/* File tokens */
FONTPATH,
MODULEPATH,
INPUTDEVICES,
LOGFILEPATH,
XKBDIR,