frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add xorg.conf IgnoreABI option which does the same thing as -ignoreABI

This commit is contained in:
David Nusinow 2006-08-23 22:39:42 +00:00
parent b983773d44
commit 733c4beb16
4 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -761,7 +761,8 @@ typedef enum {
FLAG_RENDER_COLORMAP_MODE, FLAG_RENDER_COLORMAP_MODE,
FLAG_HANDLE_SPECIAL_KEYS, FLAG_HANDLE_SPECIAL_KEYS,
FLAG_RANDR, FLAG_RANDR,
FLAG_AIGLX FLAG_AIGLX,
FLAG_IGNORE_ABI
} FlagValues; } FlagValues;
static OptionInfoRec FlagOptions[] = { static OptionInfoRec FlagOptions[] = {
@ -833,6 +834,8 @@ static OptionInfoRec FlagOptions[] = {
{0}, FALSE }, {0}, FALSE },
{ FLAG_AIGLX, "AIGLX", OPTV_BOOLEAN, { FLAG_AIGLX, "AIGLX", OPTV_BOOLEAN,
{0}, FALSE }, {0}, FALSE },
{ FLAG_IGNORE_ABI, "IgnoreABI", OPTV_BOOLEAN,
{0}, FALSE },
{ -1, NULL, OPTV_NONE, { -1, NULL, OPTV_NONE,
{0}, FALSE }, {0}, FALSE },
}; };
@ -891,6 +894,10 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
&(xf86Info.grabInfo.allowDeactivate)); &(xf86Info.grabInfo.allowDeactivate));
xf86GetOptValBool(FlagOptions, FLAG_ALLOW_CLOSEDOWN_GRABS, xf86GetOptValBool(FlagOptions, FLAG_ALLOW_CLOSEDOWN_GRABS,
&(xf86Info.grabInfo.allowClosedown)); &(xf86Info.grabInfo.allowClosedown));
xf86GetOptValBool(FlagOptions, FLAG_IGNORE_ABI, &xf86Info.ignoreABI);
if (&xf86Info.ignoreABI) {
xf86Msg(X_CONFIG, "Ignoring ABI Version\n");
}
/* /*
* Set things up based on the config file information. Some of these * Set things up based on the config file information. Some of these

4
hw/xfree86/common/xf86Init.c
View File

@ -331,6 +331,10 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
/* Tell the loader the default module search path */ /* Tell the loader the default module search path */
LoaderSetPath(xf86ModulePath); LoaderSetPath(xf86ModulePath);
if (xf86Info.ignoreABI) {
LoaderSetOptions(LDR_OPT_ABI_MISMATCH_NONFATAL);
}
#ifdef TESTING #ifdef TESTING
{ {
char **list, **l; char **list, **l;

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

@ -166,6 +166,7 @@ typedef struct {
MessageType randRFrom; MessageType randRFrom;
Bool aiglx; Bool aiglx;
MessageType aiglxFrom; MessageType aiglxFrom;
Bool ignoreABI;
struct { struct {
Bool disabled; /* enable/disable deactivating Bool disabled; /* enable/disable deactivating
* grabs or closing the * grabs or closing the

4
hw/xfree86/doc/man/xorg.conf.man.pre
View File

@ -605,6 +605,10 @@ the builtin handler will be used.
.TP 7 .TP 7
.BI "Option \*qAIGLX\*q \*q" boolean \*q .BI "Option \*qAIGLX\*q \*q" boolean \*q
enable or disable AIGLX. AIGLX is enabled by default. enable or disable AIGLX. AIGLX is enabled by default.
.TP 7
.BI "Option \*qIgnoreABI\*q \*q" boolean \*q
Allow modules built for a different, potentially incompatible version of
the X server to load. Disabled by default.
.SH MODULE SECTION .SH MODULE SECTION
The The
.B Module .B Module