hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-10-15 00:13:28 +00:00
Code Issues Projects Releases Wiki Activity

Add "Extensions" section support to configuration parser

Browse source
This commit is contained in:
Kevin E Martin 2004-07-31 09:14:06 +00:00
commit 383b6b5986
9 changed files with 211 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
mi/miinitext.c
View file

@ -1,4 +1,4 @@
/* $XdotOrg: xc/programs/Xserver/mi/miinitext.c,v 1.7 2004/07/31 04:23:21 kem Exp $ */
/* $XdotOrg: xc/programs/Xserver/mi/miinitext.c,v 1.8 2004/07/31 08:24:14 anholt Exp $ */
/* $XFree86: xc/programs/Xserver/mi/miinitext.c,v 3.67 2003/01/12 02:44:27 dawes Exp $ */
/***********************************************************
@ -101,6 +101,9 @@ extern Bool noRenderExtension;
#ifdef XEVIE
extern Bool noXevieExtension;
#endif
#ifdef COMPOSITE
extern Bool noCompositeExtension;
#endif
#ifndef XFree86LOADER
#define INITARGS void
@ -308,6 +311,9 @@ static ExtensionToggle ExtensionToggleList[] =
#endif
#ifdef XEVIE
{ "XEVIE", &noXevieExtension },
#endif
#ifdef COMPOSITE
{ "COMPOSITE", &noCompositeExtension },
#endif
{ NULL, NULL }
};
@ -323,13 +329,18 @@ Bool EnableDisableExtension(char *name, Bool enable)
}
}
return FALSE;
}
void EnableDisableExtensionError(char *name, Bool enable)
{
ExtensionToggle *ext = &ExtensionToggleList[0];
ErrorF("Extension \"%s\" is not recognized\n", name);
ErrorF("Only the following extensions can be run-time %s:\n",
enable ? "enabled" : "disabled");
for (ext = &ExtensionToggleList[0]; ext->name != NULL; ext++)
ErrorF(" %s\n", ext->name);
return FALSE;
}
#ifndef XFree86LOADER
@ -482,7 +493,7 @@ InitExtensions(argc, argv)
DamageExtensionInit();
#endif
#ifdef COMPOSITE
CompositeExtensionInit ();
if (!noCompositeExtension) CompositeExtensionInit();
#endif
}
@ -614,7 +625,7 @@ static ExtensionModule staticExtensions[] = {
{ DamageExtensionInit, "DAMAGE", NULL, NULL },
#endif
#ifdef COMPOSITE
{ CompositeExtensionInit, "COMPOSITE", NULL, NULL },
{ CompositeExtensionInit, "COMPOSITE", &noCompositeExtension, NULL },
#endif
#ifdef XEVIE
{ XevieExtensionInit, "XEVIE", &noXevieExtension, NULL },