e91b9ddc7a
Provide default modules that may be overrided easily. Previously the server would load a set of default modules, but only if none were specified in the xorg.conf, or if you didn't have a xorg.conf at all. This patch provides a default set and you can add only the "Load" instructions to xorg.conf that you want without losing the defaults. Similarly, if you don't want to load a module that's loaded by default, you can add "Disable modulename" to your xorg.conf (see man xorg.conf in this release for details). This allows for a minimal "Modules" section, where the user only need specify what they want to be different. See bug #10541 for more. The list of default modules is taken from the set loaded by default when there was a xorg.conf containing no "Modules" section. A potential problem for some users is that some users disable a module, most notably DRI, by commenting out the "Load" line in their xorg.conf. This needs to be changed to an uncommented "Disable" line, as DRI is loaded by default.
81 lines
2.7 KiB
C
81 lines
2.7 KiB
C
|
|
/*
|
|
* Copyright (c) 1997-2000 by The XFree86 Project, Inc.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
|
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
|
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
* OTHER DEALINGS IN THE SOFTWARE.
|
|
*
|
|
* Except as contained in this notice, the name of the copyright holder(s)
|
|
* and author(s) shall not be used in advertising or otherwise to promote
|
|
* the sale, use or other dealings in this Software without prior written
|
|
* authorization from the copyright holder(s) and author(s).
|
|
*/
|
|
|
|
#ifdef HAVE_XORG_CONFIG_H
|
|
#include <xorg-config.h>
|
|
#endif
|
|
|
|
#ifndef _xf86_config_h
|
|
#define _xf86_config_h
|
|
|
|
#include "xf86Optrec.h"
|
|
|
|
#ifdef HAVE_PARSER_DECLS
|
|
/*
|
|
* global structure that holds the result of parsing the config file
|
|
*/
|
|
extern XF86ConfigPtr xf86configptr;
|
|
#endif
|
|
|
|
typedef enum _ConfigStatus {
|
|
CONFIG_OK = 0,
|
|
CONFIG_PARSE_ERROR,
|
|
CONFIG_NOFILE
|
|
} ConfigStatus;
|
|
|
|
typedef struct _ModuleDefault {
|
|
char *name;
|
|
Bool toLoad;
|
|
XF86OptionPtr load_opt;
|
|
} ModuleDefault;
|
|
|
|
static ModuleDefault ModuleDefaults[] = {
|
|
{.name = "extmod", .toLoad = TRUE, .load_opt=NULL},
|
|
{.name = "dbe", .toLoad = TRUE, .load_opt=NULL},
|
|
{.name = "glx", .toLoad = TRUE, .load_opt=NULL},
|
|
{.name = "freetype", .toLoad = TRUE, .load_opt=NULL},
|
|
{.name = "type1", .toLoad = TRUE, .load_opt=NULL},
|
|
{.name = "record", .toLoad = TRUE, .load_opt=NULL},
|
|
{.name = "dri", .toLoad = TRUE, .load_opt=NULL},
|
|
{.name = NULL, .toLoad = FALSE, .load_opt=NULL}
|
|
};
|
|
|
|
/*
|
|
* prototypes
|
|
*/
|
|
char ** xf86ModulelistFromConfig(pointer **);
|
|
char ** xf86DriverlistFromConfig(void);
|
|
char ** xf86DriverlistFromCompile(void);
|
|
char ** xf86InputDriverlistFromConfig(void);
|
|
Bool xf86BuiltinInputDriver(const char *);
|
|
ConfigStatus xf86HandleConfigFile(Bool);
|
|
|
|
Bool xf86AutoConfig(void);
|
|
|
|
#endif /* _xf86_config_h */
|