Index: xc/ChangeLog =================================================================== RCS file: /cvs/xorg/xc/ChangeLog,v retrieving revision 1.365 diff -u -2 -0 -r1.365 ChangeLog --- xc/ChangeLog 8 Sep 2004 01:54:28 -0000 1.365 +++ xc/ChangeLog 14 Sep 2004 00:46:25 -0000 @@ -1,20 +1,29 @@ +2004-09-14 Roland Mainz + * xc/programs/Xserver/hw/xfree86/loader/dixsym.c + * xc/programs/Xserver/include/globals.h + * xc/programs/Xserver/mi/miinitext.c + * xc/programs/Xserver/os/utils.c + Bugzilla #1361: Allow turning on/off most of the Xserver extensions + (=all except server-specific extensions (e.g. DMX, XpExtension, + etc.) via +extension/-extension + 2004-09-07 Kevin E. Martin * BUILD: * programs/Xserver/hw/xfree86/doc/BUILD: * programs/Xserver/hw/xfree86/doc/sgml/BUILD.sgml: * programs/Xserver/hw/xfree86/doc/sgml/index.pre: Fix dates for release. 2004-09-03 Kevin E. Martin * RELNOTES: * programs/Xserver/hw/xfree86/doc/RELNOTES: * programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml: Update docs for Mac OS changes (Torrey T. Lyons). 2004-09-03 Kevin E. Martin * BUILD: * README: * RELNOTES: Index: xc/programs/Xserver/hw/xfree86/loader/dixsym.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/loader/dixsym.c,v retrieving revision 1.5 diff -u -2 -0 -r1.5 dixsym.c --- xc/programs/Xserver/hw/xfree86/loader/dixsym.c 19 Aug 2004 04:08:40 -0000 1.5 +++ xc/programs/Xserver/hw/xfree86/loader/dixsym.c 14 Sep 2004 00:46:34 -0000 @@ -308,49 +308,156 @@ SYMFUNC(SetBorderSize) SYMFUNC(TraverseTree) SYMFUNC(UnmapWindow) SYMFUNC(WalkTree) SYMFUNC(WindowsRestructured) SYMVAR(deltaSaveUndersViewable) SYMVAR(numSaveUndersViewable) SYMVAR(savedScreenInfo) SYMVAR(screenIsSaved) /*os/ */ /* access.c */ SYMFUNC(LocalClient) /* utils.c */ SYMFUNC(Xstrdup) SYMFUNC(XNFstrdup) SYMVAR(Must_have_memory) SYMFUNC(AdjustWaitForDelay) SYMVAR(noTestExtensions) SYMFUNC(GiveUp) + +#ifdef BEZIER + SYMVAR(noBezierExtension) +#endif +#ifdef BIGREQS + SYMVAR(noBigReqExtension) +#endif #ifdef COMPOSITE SYMVAR(noCompositeExtension) #endif +#ifdef DAMAGE + SYMVAR(noDamageExtension) +#endif +#ifdef DBE + SYMVAR(noDbeExtension) +#endif +#ifdef DPSEXT + SYMVAR(noDPSExtension) +#endif +#ifdef DPMSExtension + SYMVAR(noDPMSExtension) +#endif +#ifdef EVI + SYMVAR(noEVIExtension) +#endif +#ifdef FONTCACHE + SYMVAR(noFontCacheExtension) +#endif +#ifdef GLXEXT + SYMVAR(noGlxExtension) +#endif +#ifdef LBX + SYMVAR(noLbxExtension) +#endif +#ifdef SCREENSAVER + SYMVAR(noScreenSaverExtension) +#endif +#ifdef MITSHM + SYMVAR(noMITShmExtension) +#endif +#ifdef MITMISC + SYMVAR(noMITMiscExtension) +#endif +#ifdef MULTIBUFFER + SYMVAR(noMultibufferExtension) +#endif +#ifdef RANDR + SYMVAR(noRRExtension) +#endif #ifdef RENDER SYMVAR(noRenderExtension) #endif +#ifdef SHAPE + SYMVAR(noShapeExtension) +#endif +#ifdef XCSECURITY + SYMVAR(noSecurityExtension) +#endif +#ifdef XSYNC + SYMVAR(noSyncExtension) +#endif +#ifdef TOGCUP + SYMVAR(noXcupExtension) +#endif +#ifdef PEXEXT + SYMVAR(noPexExtension) +#endif +#ifdef RES + SYMVAR(noResExtension) +#endif +#ifdef XAPPGROUP + SYMVAR(noXagExtension) +#endif +#ifdef XCMISC + SYMVAR(noXCMiscExtension) +#endif #ifdef XEVIE SYMVAR(noXevieExtension) #endif +#ifdef XIE + SYMVAR(noXie) +#endif +#ifdef XF86BIGFONT + SYMVAR(noXFree86BigfontExtension) +#endif +#ifdef XFreeXDGA + SYMVAR(noXFree86DGAExtension) +#endif +#ifdef XF86DRI + SYMVAR(noXFree86DRIExtension) +#endif +#ifdef XF86MISC + SYMVAR(noXFree86MiscExtension) +#endif +#ifdef XF86VIDMODE + SYMVAR(noXFree86VidModeExtension) +#endif +#ifdef XFIXES + SYMVAR(noXFixesExtension) +#endif +#ifdef XKB +/* |noXkbExtension| is defined in xc/programs/Xserver/xkb/xkbInit.c */ + SYMVAR(noXkbExtension) +#endif +#ifdef PANORAMIX + SYMVAR(noPanoramiXExtension) +#endif +#ifdef XINPUT + SYMVAR(noXInputExtension) +#endif +#ifdef XIDLE + SYMVAR(noXIdleExtension) +#endif +#ifdef XV + SYMVAR(noXvExtension) +#endif /* log.c */ SYMFUNC(LogVWrite) SYMFUNC(LogWrite) SYMFUNC(LogVMessageVerb) SYMFUNC(LogMessageVerb) SYMFUNC(LogMessage) SYMFUNC(FatalError) SYMFUNC(VErrorF) SYMFUNC(ErrorF) SYMFUNC(Error) /* xalloc.c */ SYMFUNC(XNFalloc) SYMFUNC(XNFcalloc) SYMFUNC(XNFrealloc) SYMFUNC(Xalloc) SYMFUNC(Xcalloc) SYMFUNC(Xfree) SYMFUNC(Xrealloc) /* WaitFor.c */ Index: xc/programs/Xserver/include/globals.h =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/include/globals.h,v retrieving revision 1.4 diff -u -2 -0 -r1.4 globals.h --- xc/programs/Xserver/include/globals.h 31 Jul 2004 09:14:06 -0000 1.4 +++ xc/programs/Xserver/include/globals.h 14 Sep 2004 00:46:46 -0000 @@ -25,40 +25,180 @@ extern Bool noTestExtensions; extern DDXPointRec dixScreenOrigins[MAXSCREENS]; #ifdef DPMSExtension extern CARD32 defaultDPMSStandbyTime; extern CARD32 defaultDPMSSuspendTime; extern CARD32 defaultDPMSOffTime; extern CARD32 DPMSStandbyTime; extern CARD32 DPMSSuspendTime; extern CARD32 DPMSOffTime; extern CARD16 DPMSPowerLevel; extern Bool defaultDPMSEnabled; extern Bool DPMSEnabled; extern Bool DPMSEnabledSwitch; extern Bool DPMSDisabledSwitch; extern Bool DPMSCapableFlag; #endif #ifdef PANORAMIX -extern Bool noPanoramiXExtension; extern Bool PanoramiXMapped; extern Bool PanoramiXVisibilityNotifySent; extern Bool PanoramiXWindowExposureSent; extern Bool PanoramiXOneExposeRequest; #endif +#ifdef BEZIER +extern Bool noBezierExtension; +#endif + +#ifdef BIGREQS +extern Bool noBigReqExtension; +#endif + +#ifdef COMPOSITE +extern Bool noCompositeExtension; +#endif + +#ifdef DAMAGE +extern Bool noDamageExtension; +#endif + +#ifdef DBE +extern Bool noDbeExtension; +#endif + +#ifdef DPSEXT +extern Bool noDPSExtension; +#endif + +#ifdef DPMSExtension +extern Bool noDPMSExtension; +#endif + +#ifdef EVI +extern Bool noEVIExtension; +#endif + +#ifdef FONTCACHE +extern Bool noFontCacheExtension; +#endif + +#ifdef GLXEXT +extern Bool noGlxExtension; +#endif + +#ifdef LBX +extern Bool noLbxExtension; +#endif + +#ifdef SCREENSAVER +extern Bool noScreenSaverExtension; +#endif + +#ifdef MITSHM +extern Bool noMITShmExtension; +#endif + +#ifdef MITMISC +extern Bool noMITMiscExtension; +#endif + +#ifdef MULTIBUFFER +extern Bool noMultibufferExtension; +#endif + +#ifdef RANDR +extern Bool noRRExtension; +#endif + #ifdef RENDER extern Bool noRenderExtension; #endif +#ifdef SHAPE +extern Bool noShapeExtension; +#endif + +#ifdef XCSECURITY +extern Bool noSecurityExtension; +#endif + +#ifdef XSYNC +extern Bool noSyncExtension; +#endif + +#ifdef TOGCUP +extern Bool noXcupExtension; +#endif + +#ifdef PEXEXT +extern Bool noPexExtension; +#endif + +#ifdef RES +extern Bool noResExtension; +#endif + +#ifdef XAPPGROUP +extern Bool noXagExtension; +#endif + +#ifdef XCMISC +extern Bool noXCMiscExtension; +#endif + #ifdef XEVIE extern Bool noXevieExtension; #endif -#ifdef COMPOSITE -extern Bool noCompositeExtension; +#ifdef XIE +extern Bool noXie; +#endif + +#ifdef XF86BIGFONT +extern Bool noXFree86BigfontExtension; +#endif + +#ifdef XFreeXDGA +extern Bool noXFree86DGAExtension; +#endif + +#ifdef XF86DRI +extern Bool noXFree86DRIExtension; +#endif + +#ifdef XF86MISC +extern Bool noXFree86MiscExtension; +#endif + +#ifdef XF86VIDMODE +extern Bool noXFree86VidModeExtension; +#endif + +#ifdef XFIXES +extern Bool noXFixesExtension; +#endif + +#ifdef XKB +/* |noXkbExtension| is defined in xc/programs/Xserver/xkb/xkbInit.c */ +extern Bool noXkbExtension; +#endif + +#ifdef PANORAMIX +extern Bool noPanoramiXExtension; +#endif + +#ifdef XINPUT +extern Bool noXInputExtension; +#endif + +#ifdef XIDLE +extern Bool noXIdleExtension; +#endif + +#ifdef XV +extern Bool noXvExtension; #endif -#endif /* _XSERV_GLOBAL_H_ */ +#endif /* !_XSERV_GLOBAL_H_ */ Index: xc/programs/Xserver/mi/miinitext.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/mi/miinitext.c,v retrieving revision 1.12 diff -u -2 -0 -r1.12 miinitext.c --- xc/programs/Xserver/mi/miinitext.c 12 Aug 2004 08:45:33 -0000 1.12 +++ xc/programs/Xserver/mi/miinitext.c 14 Sep 2004 00:46:46 -0000 @@ -71,55 +71,157 @@ #undef XIE #undef XINPUT #undef XV #undef SCREENSAVER #undef XIDLE #undef XRECORD #undef DBE #undef XF86VIDMODE #undef XF86MISC #undef XFreeXDGA #undef XF86DRI #undef DPMSExtension #undef DPSEXT #undef FONTCACHE #undef RENDER /* not yet */ #undef DAMAGE #undef XFIXES #undef XEVIE #endif /* PRINT_ONLY_SERVER */ -#ifdef PANORAMIX -extern Bool noPanoramiXExtension; -#endif + extern Bool noTestExtensions; -#ifdef XKB -extern Bool noXkbExtension; + +#ifdef BEZIER +extern Bool noBezierExtension; +#endif +#ifdef BIGREQS +extern Bool noBigReqExtension; +#endif +#ifdef COMPOSITE +extern Bool noCompositeExtension; +#endif +#ifdef DAMAGE +extern Bool noDamageExtension; +#endif +#ifdef DBE +extern Bool noDbeExtension; +#endif +#ifdef DPSEXT +extern Bool noDPSExtension; +#endif +#ifdef DPMSExtension +extern Bool noDPMSExtension; +#endif +#ifdef EVI +extern Bool noEVIExtension; +#endif +#ifdef FONTCACHE +extern Bool noFontCacheExtension; +#endif +#ifdef GLXEXT +extern Bool noGlxExtension; +#endif +#ifdef LBX +extern Bool noLbxExtension; +#endif +#ifdef SCREENSAVER +extern Bool noScreenSaverExtension; +#endif +#ifdef MITSHM +extern Bool noMITShmExtension; +#endif +#ifdef MITMISC +extern Bool noMITMiscExtension; +#endif +#ifdef MULTIBUFFER +extern Bool noMultibufferExtension; +#endif +#ifdef RANDR +extern Bool noRRExtension; #endif #ifdef RENDER extern Bool noRenderExtension; #endif +#ifdef SHAPE +extern Bool noShapeExtension; +#endif +#ifdef XCSECURITY +extern Bool noSecurityExtension; +#endif +#ifdef XSYNC +extern Bool noSyncExtension; +#endif +#ifdef TOGCUP +extern Bool noXcupExtension; +#endif +#ifdef PEXEXT +extern Bool noPexExtension; +#endif +#ifdef RES +extern Bool noResExtension; +#endif +#ifdef XAPPGROUP +extern Bool noXagExtension; +#endif +#ifdef XCMISC +extern Bool noXCMiscExtension; +#endif #ifdef XEVIE extern Bool noXevieExtension; #endif -#ifdef COMPOSITE -extern Bool noCompositeExtension; +#ifdef XIE +extern Bool noXie; +#endif +#ifdef XF86BIGFONT +extern Bool noXFree86BigfontExtension; +#endif +#ifdef XFreeXDGA +extern Bool noXFree86DGAExtension; +#endif +#ifdef XF86DRI +extern Bool noXFree86DRIExtension; +#endif +#ifdef XF86MISC +extern Bool noXFree86MiscExtension; +#endif +#ifdef XF86VIDMODE +extern Bool noXFree86VidModeExtension; +#endif +#ifdef XFIXES +extern Bool noXFixesExtension; +#endif +#ifdef XKB +/* |noXkbExtension| is defined in xc/programs/Xserver/xkb/xkbInit.c */ +extern Bool noXkbExtension; +#endif +#ifdef PANORAMIX +extern Bool noPanoramiXExtension; +#endif +#ifdef XINPUT +extern Bool noXInputExtension; +#endif +#ifdef XIDLE +extern Bool noXIdleExtension; +#endif +#ifdef XV +extern Bool noXvExtension; #endif #ifndef XFree86LOADER #define INITARGS void typedef void (*InitExtension)(INITARGS); #else /* XFree86Loader */ #include "loaderProcs.h" #endif #ifdef MITSHM #define _XSHM_SERVER_ #include "shmstr.h" #endif #ifdef XTEST #define _XTEST_SERVER_ #include "XTest.h" #endif #ifdef XKB #include "XKB.h" #endif @@ -282,55 +384,152 @@ #ifdef XFIXES extern void XFixesExtensionInit(INITARGS); #endif #ifdef DAMAGE extern void DamageExtensionInit(INITARGS); #endif #ifdef COMPOSITE extern void CompositeExtensionInit(INITARGS); #endif /* The following is only a small first step towards run-time * configurable extensions. */ typedef struct { char *name; Bool *disablePtr; } ExtensionToggle; static ExtensionToggle ExtensionToggleList[] = { - { "XTEST", &noTestExtensions }, -#ifdef PANORAMIX - { "XINERAMA", &noPanoramiXExtension }, + /* sort order is extension name string as shown in xdpyinfo */ +#ifdef BEZIER + { "BEZIER", &noBezierExtension }, +#endif +#ifdef BIGREQS + { "BIG-REQUESTS", &noBigReqExtension }, +#endif +#ifdef COMPOSITE + { "Composite", &noCompositeExtension }, +#endif +#ifdef DAMAGE + { "DAMAGE", &noDamageExtension }, +#endif +#ifdef DBE + { "DOUBLE-BUFFER", &noDbeExtension }, +#endif +#ifdef DPSEXT + { "DPSExtension", &noDPSExtension }, +#endif +#ifdef DPMSExtension + { "DPMS", &noDPMSExtension }, +#endif +#ifdef EVI + { "Extended-Visual-Information", &noEVIExtension }, +#endif +#ifdef FONTCACHE + { "FontCache", &noFontCacheExtension }, +#endif +#ifdef GLXEXT + { "GLX", &noGlxExtension }, +#endif +#ifdef LBX + { "LBX", &noLbxExtension }, +#endif +#ifdef SCREENSAVER + { "MIT-SCREEN-SAVER", &noScreenSaverExtension }, +#endif +#ifdef MITSHM + { "MIT-SHM", &noMITShmExtension }, +#endif +#ifdef MITMISC + { "MIT-SUNDRY-NONSTANDARD", &noMITMiscExtension }, +#endif +#ifdef MULTIBUFFER + { "Multi-Buffering", &noMultibufferExtension }, +#endif +#ifdef RANDR + { "RANDR", &noRRExtension }, #endif #ifdef RENDER { "RENDER", &noRenderExtension }, #endif -#ifdef XKB - { "XKEYBOARD", &noXkbExtension }, +#ifdef SHAPE + { "SHAPE", &noShapeExtension }, +#endif +#ifdef XCSECURITY + { "SECURITY", &noSecurityExtension }, +#endif +#ifdef XSYNC + { "SYNC", &noSyncExtension }, +#endif +#ifdef TOGCUP + { "TOG-CUP", &noXcupExtension }, +#endif +#ifdef PEXEXT + { "X3D-PEX", &noPexExtension }, +#endif +#ifdef RES + { "X-Resource", &noResExtension }, +#endif +#ifdef XAPPGROUP + { "XC-APPGROUP", &noXagExtension }, +#endif +#ifdef XCMISC + { "XC-MISC", &noXCMiscExtension }, #endif #ifdef XEVIE { "XEVIE", &noXevieExtension }, #endif -#ifdef COMPOSITE - { "Composite", &noCompositeExtension }, +#ifdef XF86BIGFONT + { "XFree86-Bigfont", &noXFree86BigfontExtension }, +#endif +#ifdef XFreeXDGA + { "XFree86-DGA", &noXFree86DGAExtension }, +#endif +#ifdef XF86DRI + { "XFree86-DRI", &noXFree86DRIExtension }, +#endif +#ifdef XF86MISC + { "XFree86-Misc", &noXFree86MiscExtension }, +#endif +#ifdef XF86VIDMODE + { "XFree86-VidModeExtension", &noXFree86VidModeExtension }, +#endif +#ifdef XFIXES + { "XFIXES", &noXFixesExtension }, +#endif +#ifdef XIE + { "XIE", &noXie }, +#endif +#ifdef PANORAMIX + { "XINERAMA", &noPanoramiXExtension }, +#endif +#ifdef XINPUT + { "XInputExtension", &noXInputExtension }, +#endif +#ifdef XKB + { "XKEYBOARD", &noXkbExtension }, +#endif + { "XTEST", &noTestExtensions }, +#ifdef XV + { "XVideo", &noXvExtension }, #endif { NULL, NULL } }; Bool EnableDisableExtension(char *name, Bool enable) { ExtensionToggle *ext = &ExtensionToggleList[0]; for (ext = &ExtensionToggleList[0]; ext->name != NULL; ext++) { if (strcmp(name, ext->name) == 0) { *ext->disablePtr = !enable; return TRUE; } } return FALSE; } void EnableDisableExtensionError(char *name, Bool enable) { @@ -340,177 +539,179 @@ 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); } #ifndef XFree86LOADER /*ARGSUSED*/ void InitExtensions(argc, argv) int argc; char *argv[]; { #ifdef PANORAMIX # if !defined(PRINT_ONLY_SERVER) && !defined(NO_PANORAMIX) if (!noPanoramiXExtension) PanoramiXExtensionInit(); # endif #endif #ifdef BEZIER - BezierExtensionInit(); + if (!noBezierExtension) BezierExtensionInit(); #endif #ifdef XTESTEXT1 if (!noTestExtensions) XTestExtension1Init(); #endif #ifdef SHAPE ShapeExtensionInit(); #endif #ifdef MITSHM - ShmExtensionInit(); + if (!noMITShmExtension) ShmExtensionInit(); #endif #ifdef EVI - EVIExtensionInit(); + if (!noEVIExtension) EVIExtensionInit(); #endif #ifdef PEXEXT - PexExtensionInit(); + if (!noPexExtension) PexExtensionInit(); #endif #ifdef MULTIBUFFER - MultibufferExtensionInit(); + if (!noMultibufferExtension) MultibufferExtensionInit(); #endif #if defined(XINPUT) && !defined(NO_HW_ONLY_EXTS) - XInputExtensionInit(); + if (!noXInputExtension) XInputExtensionInit(); #endif #ifdef XTEST if (!noTestExtensions) XTestExtensionInit(); #endif #ifdef BIGREQS - BigReqExtensionInit(); + if (!noBigReqExtension) BigReqExtensionInit(); #endif #ifdef MITMISC - MITMiscExtensionInit(); + if (!noMITMiscExtension) MITMiscExtensionInit(); #endif #ifdef XIDLE - XIdleExtensionInit(); + if (!noXIdleExtension) XIdleExtensionInit(); #endif #ifdef XTRAP if (!noTestExtensions) DEC_XTRAPInit(); #endif #if defined(SCREENSAVER) && !defined(PRINT_ONLY_SERVER) - ScreenSaverExtensionInit (); + if (!noScreenSaverExtension) ScreenSaverExtensionInit (); #endif #ifdef XV - XvExtensionInit(); - XvMCExtensionInit(); + if (!noXvExtension) { + XvExtensionInit(); + XvMCExtensionInit(); + } #endif #ifdef XIE - XieInit(); + if (!noXie) XieInit(); #endif #ifdef XSYNC - SyncExtensionInit(); + if (!noSyncExtension) SyncExtensionInit(); #endif #if defined(XKB) && !defined(PRINT_ONLY_SERVER) && !defined(NO_HW_ONLY_EXTS) if (!noXkbExtension) XkbExtensionInit(); #endif #ifdef XCMISC - XCMiscExtensionInit(); + if (!noXCMiscExtension) XCMiscExtensionInit(); #endif #ifdef XRECORD if (!noTestExtensions) RecordExtensionInit(); #endif #ifdef LBX - LbxExtensionInit(); + if (!noLbxExtension) LbxExtensionInit(); #endif #ifdef DBE - DbeExtensionInit(); + if (!noDbeExtension) DbeExtensionInit(); #endif #ifdef XAPPGROUP - XagExtensionInit(); + if (!noXagExtension) XagExtensionInit(); #endif #ifdef XCSECURITY - SecurityExtensionInit(); + if (!noSecurityExtension) SecurityExtensionInit(); #endif #ifdef XPRINT - XpExtensionInit(); + XpExtensionInit(); /* server-specific extension, cannot be disabled */ #endif #ifdef TOGCUP - XcupExtensionInit(); + if (!noXcupExtension) XcupExtensionInit(); #endif #if defined(DPMSExtension) && !defined(NO_HW_ONLY_EXTS) - DPMSExtensionInit(); + if (!noDPMSExtension) DPMSExtensionInit(); #endif #ifdef FONTCACHE - FontCacheExtensionInit(); + if (!noFontCacheExtension) FontCacheExtensionInit(); #endif #ifdef XF86BIGFONT - XFree86BigfontExtensionInit(); + if (!noXFree86BigfontExtension) XFree86BigfontExtensionInit(); #endif #if !defined(PRINT_ONLY_SERVER) && !defined(NO_HW_ONLY_EXTS) #if defined(XF86VIDMODE) - XFree86VidModeExtensionInit(); + if (!noXFree86VidModeExtension) XFree86VidModeExtensionInit(); #endif #if defined(XF86MISC) - XFree86MiscExtensionInit(); + if (!noXFree86MiscExtension) XFree86MiscExtensionInit(); #endif #if defined(XFreeXDGA) - XFree86DGAExtensionInit(); + if (!noXFree86DGAExtension) XFree86DGAExtensionInit(); #endif #ifdef XF86DRI - XFree86DRIExtensionInit(); + if (!noXFree86DRIExtension) XFree86DRIExtensionInit(); #endif #endif #ifdef GLXEXT #ifndef __DARWIN__ - GlxExtensionInit(); + if (!noGlxExtension) GlxExtensionInit(); #else - DarwinGlxExtensionInit(); + if (!noGlxExtension) DarwinGlxExtensionInit(); #endif #endif #ifdef DPSEXT #ifndef XPRINT - DPSExtensionInit(); + if (!noDPSExtension) DPSExtensionInit(); #endif #endif #ifdef XFIXES /* must be before Render to layer DisplayCursor correctly */ - XFixesExtensionInit(); + if (!noXFixesExtension) XFixesExtensionInit(); #endif #ifdef RENDER if (!noRenderExtension) RenderExtensionInit(); #endif #ifdef RANDR - RRExtensionInit(); + if (!noRRExtension) RRExtensionInit(); #endif #ifdef RES - ResExtensionInit(); + if (!noResExtension) ResExtensionInit(); #endif #ifdef DMXEXT - DMXExtensionInit(); + DMXExtensionInit(); /* server-specific extension, cannot be disabled */ #endif #ifdef XEVIE if (!noXevieExtension) XevieExtensionInit(); #endif #ifdef COMPOSITE if (!noCompositeExtension) CompositeExtensionInit(); #endif #ifdef DAMAGE - DamageExtensionInit(); + if (!noDamageExtension) DamageExtensionInit(); #endif } void InitVisualWrap() { miResetInitVisuals(); #ifdef GLXEXT #ifndef __DARWIN__ GlxWrapInitVisuals(&miInitVisualsProc); #else DarwinGlxWrapInitVisuals(&miInitVisualsProc); #endif #endif } #else /* XFree86LOADER */ #if 0 /* FIXME:The names here must come from the headers. those with ?? are not included in X11R6.3 sample implementation, so there's a problem... */ Index: xc/programs/Xserver/os/utils.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/os/utils.c,v retrieving revision 1.6 diff -u -2 -0 -r1.6 utils.c --- xc/programs/Xserver/os/utils.c 11 Aug 2004 22:27:50 -0000 1.6 +++ xc/programs/Xserver/os/utils.c 14 Sep 2004 00:46:46 -0000 @@ -102,67 +102,175 @@ # include # endif #endif #include "opaque.h" #ifdef SMART_SCHEDULE #include "dixstruct.h" #endif #ifdef XKB #include "XKBsrv.h" #endif #ifdef XCSECURITY #define _SECURITY_SERVER #include "security.h" #endif #ifdef RENDER #include "picture.h" +#endif + +Bool noTestExtensions; +#ifdef BEZIER +Bool noBezierExtension = FALSE; +#endif +#ifdef BIGREQS +Bool noBigReqExtension = FALSE; +#endif +#ifdef COMPOSITE +/* COMPOSITE is disabled by default for now until the + * interface is stable */ +Bool noCompositeExtension = TRUE; +#endif +#ifdef DAMAGE +Bool noDamageExtension = FALSE; +#endif +#ifdef DBE +Bool noDbeExtension = FALSE; +#endif +#ifdef DPSEXT +Bool noDPSExtension = FALSE; +#endif +#ifdef DPMSExtension +Bool noDPMSExtension = FALSE; +#endif +#ifdef EVI +Bool noEVIExtension = FALSE; +#endif +#ifdef FONTCACHE +Bool noFontCacheExtension = FALSE; +#endif +#ifdef GLXEXT +Bool noGlxExtension = FALSE; +#endif +#ifdef LBX +Bool noLbxExtension = FALSE; +#endif +#ifdef SCREENSAVER +Bool noScreenSaverExtension = FALSE; +#endif +#ifdef MITSHM +Bool noMITShmExtension = FALSE; +#endif +#ifdef MITMISC +Bool noMITMiscExtension = FALSE; +#endif +#ifdef MULTIBUFFER +Bool noMultibufferExtension = FALSE; +#endif +#ifdef RANDR +Bool noRRExtension = FALSE; +#endif +#ifdef RENDER Bool noRenderExtension = FALSE; #endif +#ifdef SHAPE +Bool noShapeExtension = FALSE; +#endif +#ifdef XCSECURITY +Bool noSecurityExtension = FALSE; +#endif +#ifdef XSYNC +Bool noSyncExtension = FALSE; +#endif +#ifdef TOGCUP +Bool noXcupExtension = FALSE; +#endif +#ifdef PEXEXT +Bool noPexExtension = FALSE; +#endif +#ifdef RES +Bool noResExtension = FALSE; +#endif +#ifdef XAPPGROUP +Bool noXagExtension = FALSE; +#endif +#ifdef XCMISC +Bool noXCMiscExtension = FALSE; +#endif +#ifdef XEVIE +/* Xevie is disabled by default for now until the + * interface is stable */ +Bool noXevieExtension = TRUE; +#endif +#ifdef XIE +Bool noXie = FALSE; +#endif +#ifdef XF86BIGFONT +Bool noXFree86BigfontExtension = FALSE; +#endif +#ifdef XFreeXDGA +Bool noXFree86DGAExtension = FALSE; +#endif +#ifdef XF86DRI +Bool noXFree86DRIExtension = FALSE; +#endif +#ifdef XF86MISC +Bool noXFree86MiscExtension = FALSE; +#endif +#ifdef XF86VIDMODE +Bool noXFree86VidModeExtension = FALSE; +#endif +#ifdef XFIXES +Bool noXFixesExtension = FALSE; +#endif +/* |noXkbExtension| is defined in xc/programs/Xserver/xkb/xkbInit.c */ +#ifdef PANORAMIX +/* Xinerama is disabled by default unless enabled via +xinerama */ +Bool noPanoramiXExtension = TRUE; +#endif +#ifdef XINPUT +Bool noXInputExtension = FALSE; +#endif +#ifdef XIDLE +Bool noXIdleExtension = FALSE; +#endif +#ifdef XV +Bool noXvExtension = FALSE; +#endif #define X_INCLUDE_NETDB_H #include #include Bool CoreDump; -Bool noTestExtensions; #ifdef PANORAMIX -Bool noPanoramiXExtension = TRUE; Bool PanoramiXVisibilityNotifySent = FALSE; Bool PanoramiXMapped = FALSE; Bool PanoramiXWindowExposureSent = FALSE; Bool PanoramiXOneExposeRequest = FALSE; #endif -#ifdef XEVIE -Bool noXevieExtension = TRUE; -#endif - -#ifdef COMPOSITE -Bool noCompositeExtension = TRUE; -#endif - int auditTrailLevel = 1; Bool Must_have_memory = FALSE; #ifdef AIXV3 int SyncOn = 0; extern int SelectWaitTime; #endif #ifdef DEBUG #ifndef SPECIAL_MALLOC #define MEMBUG #endif #endif #if defined(SVR4) || defined(__linux__) || defined(CSRG_BASED) #define HAS_SAVED_IDS_AND_SETEUID #endif #ifdef MEMBUG