Fix for http://freedesktop.org/bugzilla/show_bug.cgi?id=1361 - RFE: Allow
enabling/disabling of more extensions
This commit is contained in:
Roland Mainz
parent
80dc84d067
commit
d9df39ee2b
|
|
@ -1,4 +1,4 @@
|
||||||
/* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/dixsym.c,v 1.4 2004/08/09 03:40:50 krh Exp $ */
|
/* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/dixsym.c,v 1.5 2004/08/19 04:08:40 kem Exp $ */
|
||||||
/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/dixsym.c,v 1.63 2003/12/03
|
/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/dixsym.c,v 1.63 2003/12/03
|
||||||
* 17:11:29 tsi Exp $ */
|
* 17:11:29 tsi Exp $ */
|
||||||
|
|
||||||
|
|
@ -325,15 +325,122 @@ LOOKUP dixLookupTab[] = {
|
||||||
SYMFUNC(AdjustWaitForDelay)
|
SYMFUNC(AdjustWaitForDelay)
|
||||||
SYMVAR(noTestExtensions)
|
SYMVAR(noTestExtensions)
|
||||||
SYMFUNC(GiveUp)
|
SYMFUNC(GiveUp)
|
||||||
|
|
||||||
|
#ifdef BEZIER
|
||||||
|
SYMVAR(noBezierExtension)
|
||||||
|
#endif
|
||||||
|
#ifdef BIGREQS
|
||||||
|
SYMVAR(noBigReqExtension)
|
||||||
|
#endif
|
||||||
#ifdef COMPOSITE
|
#ifdef COMPOSITE
|
||||||
SYMVAR(noCompositeExtension)
|
SYMVAR(noCompositeExtension)
|
||||||
#endif
|
#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
|
#ifdef RENDER
|
||||||
SYMVAR(noRenderExtension)
|
SYMVAR(noRenderExtension)
|
||||||
#endif
|
#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
|
#ifdef XEVIE
|
||||||
SYMVAR(noXevieExtension)
|
SYMVAR(noXevieExtension)
|
||||||
#endif
|
#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 */
|
/* log.c */
|
||||||
SYMFUNC(LogVWrite)
|
SYMFUNC(LogVWrite)
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* $XdotOrg: xc/programs/Xserver/include/globals.h,v 1.3 2004/07/31 04:23:21 kem Exp $ */
|
/* $XdotOrg: xc/programs/Xserver/include/globals.h,v 1.4 2004/07/31 09:14:06 kem Exp $ */
|
||||||
/* $XFree86: xc/programs/Xserver/include/globals.h,v 1.3 1999/09/25 14:38:21 dawes Exp $ */
|
/* $XFree86: xc/programs/Xserver/include/globals.h,v 1.3 1999/09/25 14:38:21 dawes Exp $ */
|
||||||
|
|
||||||
#ifndef _XSERV_GLOBAL_H_
|
#ifndef _XSERV_GLOBAL_H_
|
||||||
|
|
@ -42,23 +42,163 @@ extern Bool DPMSCapableFlag;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef PANORAMIX
|
#ifdef PANORAMIX
|
||||||
extern Bool noPanoramiXExtension;
|
|
||||||
extern Bool PanoramiXMapped;
|
extern Bool PanoramiXMapped;
|
||||||
extern Bool PanoramiXVisibilityNotifySent;
|
extern Bool PanoramiXVisibilityNotifySent;
|
||||||
extern Bool PanoramiXWindowExposureSent;
|
extern Bool PanoramiXWindowExposureSent;
|
||||||
extern Bool PanoramiXOneExposeRequest;
|
extern Bool PanoramiXOneExposeRequest;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef RENDER
|
#ifdef BEZIER
|
||||||
extern Bool noRenderExtension;
|
extern Bool noBezierExtension;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef XEVIE
|
#ifdef BIGREQS
|
||||||
extern Bool noXevieExtension;
|
extern Bool noBigReqExtension;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef COMPOSITE
|
#ifdef COMPOSITE
|
||||||
extern Bool noCompositeExtension;
|
extern Bool noCompositeExtension;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif /* _XSERV_GLOBAL_H_ */
|
#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 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_ */
|
||||||
|
|
|
||||||
303
mi/miinitext.c
303
mi/miinitext.c
|
|
@ -1,4 +1,4 @@
|
||||||
/* $XdotOrg: xc/programs/Xserver/mi/miinitext.c,v 1.11 2004/08/03 05:39:19 anholt Exp $ */
|
/* $XdotOrg: xc/programs/Xserver/mi/miinitext.c,v 1.12 2004/08/12 08:45:33 anholt Exp $ */
|
||||||
/* $XFree86: xc/programs/Xserver/mi/miinitext.c,v 3.67 2003/01/12 02:44:27 dawes Exp $ */
|
/* $XFree86: xc/programs/Xserver/mi/miinitext.c,v 3.67 2003/01/12 02:44:27 dawes Exp $ */
|
||||||
/***********************************************************
|
/***********************************************************
|
||||||
|
|
||||||
|
|
@ -88,21 +88,123 @@ SOFTWARE.
|
||||||
#undef XEVIE
|
#undef XEVIE
|
||||||
#endif /* PRINT_ONLY_SERVER */
|
#endif /* PRINT_ONLY_SERVER */
|
||||||
|
|
||||||
#ifdef PANORAMIX
|
|
||||||
extern Bool noPanoramiXExtension;
|
|
||||||
#endif
|
|
||||||
extern Bool noTestExtensions;
|
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
|
#endif
|
||||||
#ifdef RENDER
|
#ifdef RENDER
|
||||||
extern Bool noRenderExtension;
|
extern Bool noRenderExtension;
|
||||||
#endif
|
#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
|
#ifdef XEVIE
|
||||||
extern Bool noXevieExtension;
|
extern Bool noXevieExtension;
|
||||||
#endif
|
#endif
|
||||||
#ifdef COMPOSITE
|
#ifdef XIE
|
||||||
extern Bool noCompositeExtension;
|
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
|
||||||
|
|
||||||
#ifndef XFree86LOADER
|
#ifndef XFree86LOADER
|
||||||
|
|
@ -299,21 +401,118 @@ typedef struct {
|
||||||
|
|
||||||
static ExtensionToggle ExtensionToggleList[] =
|
static ExtensionToggle ExtensionToggleList[] =
|
||||||
{
|
{
|
||||||
{ "XTEST", &noTestExtensions },
|
/* sort order is extension name string as shown in xdpyinfo */
|
||||||
#ifdef PANORAMIX
|
#ifdef BEZIER
|
||||||
{ "XINERAMA", &noPanoramiXExtension },
|
{ "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
|
#endif
|
||||||
#ifdef RENDER
|
#ifdef RENDER
|
||||||
{ "RENDER", &noRenderExtension },
|
{ "RENDER", &noRenderExtension },
|
||||||
#endif
|
#endif
|
||||||
#ifdef XKB
|
#ifdef SHAPE
|
||||||
{ "XKEYBOARD", &noXkbExtension },
|
{ "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
|
#endif
|
||||||
#ifdef XEVIE
|
#ifdef XEVIE
|
||||||
{ "XEVIE", &noXevieExtension },
|
{ "XEVIE", &noXevieExtension },
|
||||||
#endif
|
#endif
|
||||||
#ifdef COMPOSITE
|
#ifdef XF86BIGFONT
|
||||||
{ "Composite", &noCompositeExtension },
|
{ "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
|
#endif
|
||||||
{ NULL, NULL }
|
{ NULL, NULL }
|
||||||
};
|
};
|
||||||
|
|
@ -357,7 +556,7 @@ InitExtensions(argc, argv)
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
#ifdef BEZIER
|
#ifdef BEZIER
|
||||||
BezierExtensionInit();
|
if (!noBezierExtension) BezierExtensionInit();
|
||||||
#endif
|
#endif
|
||||||
#ifdef XTESTEXT1
|
#ifdef XTESTEXT1
|
||||||
if (!noTestExtensions) XTestExtension1Init();
|
if (!noTestExtensions) XTestExtension1Init();
|
||||||
|
|
@ -366,125 +565,127 @@ InitExtensions(argc, argv)
|
||||||
ShapeExtensionInit();
|
ShapeExtensionInit();
|
||||||
#endif
|
#endif
|
||||||
#ifdef MITSHM
|
#ifdef MITSHM
|
||||||
ShmExtensionInit();
|
if (!noMITShmExtension) ShmExtensionInit();
|
||||||
#endif
|
#endif
|
||||||
#ifdef EVI
|
#ifdef EVI
|
||||||
EVIExtensionInit();
|
if (!noEVIExtension) EVIExtensionInit();
|
||||||
#endif
|
#endif
|
||||||
#ifdef PEXEXT
|
#ifdef PEXEXT
|
||||||
PexExtensionInit();
|
if (!noPexExtension) PexExtensionInit();
|
||||||
#endif
|
#endif
|
||||||
#ifdef MULTIBUFFER
|
#ifdef MULTIBUFFER
|
||||||
MultibufferExtensionInit();
|
if (!noMultibufferExtension) MultibufferExtensionInit();
|
||||||
#endif
|
#endif
|
||||||
#if defined(XINPUT) && !defined(NO_HW_ONLY_EXTS)
|
#if defined(XINPUT) && !defined(NO_HW_ONLY_EXTS)
|
||||||
XInputExtensionInit();
|
if (!noXInputExtension) XInputExtensionInit();
|
||||||
#endif
|
#endif
|
||||||
#ifdef XTEST
|
#ifdef XTEST
|
||||||
if (!noTestExtensions) XTestExtensionInit();
|
if (!noTestExtensions) XTestExtensionInit();
|
||||||
#endif
|
#endif
|
||||||
#ifdef BIGREQS
|
#ifdef BIGREQS
|
||||||
BigReqExtensionInit();
|
if (!noBigReqExtension) BigReqExtensionInit();
|
||||||
#endif
|
#endif
|
||||||
#ifdef MITMISC
|
#ifdef MITMISC
|
||||||
MITMiscExtensionInit();
|
if (!noMITMiscExtension) MITMiscExtensionInit();
|
||||||
#endif
|
#endif
|
||||||
#ifdef XIDLE
|
#ifdef XIDLE
|
||||||
XIdleExtensionInit();
|
if (!noXIdleExtension) XIdleExtensionInit();
|
||||||
#endif
|
#endif
|
||||||
#ifdef XTRAP
|
#ifdef XTRAP
|
||||||
if (!noTestExtensions) DEC_XTRAPInit();
|
if (!noTestExtensions) DEC_XTRAPInit();
|
||||||
#endif
|
#endif
|
||||||
#if defined(SCREENSAVER) && !defined(PRINT_ONLY_SERVER)
|
#if defined(SCREENSAVER) && !defined(PRINT_ONLY_SERVER)
|
||||||
ScreenSaverExtensionInit ();
|
if (!noScreenSaverExtension) ScreenSaverExtensionInit ();
|
||||||
#endif
|
#endif
|
||||||
#ifdef XV
|
#ifdef XV
|
||||||
XvExtensionInit();
|
if (!noXvExtension) {
|
||||||
XvMCExtensionInit();
|
XvExtensionInit();
|
||||||
|
XvMCExtensionInit();
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
#ifdef XIE
|
#ifdef XIE
|
||||||
XieInit();
|
if (!noXie) XieInit();
|
||||||
#endif
|
#endif
|
||||||
#ifdef XSYNC
|
#ifdef XSYNC
|
||||||
SyncExtensionInit();
|
if (!noSyncExtension) SyncExtensionInit();
|
||||||
#endif
|
#endif
|
||||||
#if defined(XKB) && !defined(PRINT_ONLY_SERVER) && !defined(NO_HW_ONLY_EXTS)
|
#if defined(XKB) && !defined(PRINT_ONLY_SERVER) && !defined(NO_HW_ONLY_EXTS)
|
||||||
if (!noXkbExtension) XkbExtensionInit();
|
if (!noXkbExtension) XkbExtensionInit();
|
||||||
#endif
|
#endif
|
||||||
#ifdef XCMISC
|
#ifdef XCMISC
|
||||||
XCMiscExtensionInit();
|
if (!noXCMiscExtension) XCMiscExtensionInit();
|
||||||
#endif
|
#endif
|
||||||
#ifdef XRECORD
|
#ifdef XRECORD
|
||||||
if (!noTestExtensions) RecordExtensionInit();
|
if (!noTestExtensions) RecordExtensionInit();
|
||||||
#endif
|
#endif
|
||||||
#ifdef LBX
|
#ifdef LBX
|
||||||
LbxExtensionInit();
|
if (!noLbxExtension) LbxExtensionInit();
|
||||||
#endif
|
#endif
|
||||||
#ifdef DBE
|
#ifdef DBE
|
||||||
DbeExtensionInit();
|
if (!noDbeExtension) DbeExtensionInit();
|
||||||
#endif
|
#endif
|
||||||
#ifdef XAPPGROUP
|
#ifdef XAPPGROUP
|
||||||
XagExtensionInit();
|
if (!noXagExtension) XagExtensionInit();
|
||||||
#endif
|
#endif
|
||||||
#ifdef XCSECURITY
|
#ifdef XCSECURITY
|
||||||
SecurityExtensionInit();
|
if (!noSecurityExtension) SecurityExtensionInit();
|
||||||
#endif
|
#endif
|
||||||
#ifdef XPRINT
|
#ifdef XPRINT
|
||||||
XpExtensionInit();
|
XpExtensionInit(); /* server-specific extension, cannot be disabled */
|
||||||
#endif
|
#endif
|
||||||
#ifdef TOGCUP
|
#ifdef TOGCUP
|
||||||
XcupExtensionInit();
|
if (!noXcupExtension) XcupExtensionInit();
|
||||||
#endif
|
#endif
|
||||||
#if defined(DPMSExtension) && !defined(NO_HW_ONLY_EXTS)
|
#if defined(DPMSExtension) && !defined(NO_HW_ONLY_EXTS)
|
||||||
DPMSExtensionInit();
|
if (!noDPMSExtension) DPMSExtensionInit();
|
||||||
#endif
|
#endif
|
||||||
#ifdef FONTCACHE
|
#ifdef FONTCACHE
|
||||||
FontCacheExtensionInit();
|
if (!noFontCacheExtension) FontCacheExtensionInit();
|
||||||
#endif
|
#endif
|
||||||
#ifdef XF86BIGFONT
|
#ifdef XF86BIGFONT
|
||||||
XFree86BigfontExtensionInit();
|
if (!noXFree86BigfontExtension) XFree86BigfontExtensionInit();
|
||||||
#endif
|
#endif
|
||||||
#if !defined(PRINT_ONLY_SERVER) && !defined(NO_HW_ONLY_EXTS)
|
#if !defined(PRINT_ONLY_SERVER) && !defined(NO_HW_ONLY_EXTS)
|
||||||
#if defined(XF86VIDMODE)
|
#if defined(XF86VIDMODE)
|
||||||
XFree86VidModeExtensionInit();
|
if (!noXFree86VidModeExtension) XFree86VidModeExtensionInit();
|
||||||
#endif
|
#endif
|
||||||
#if defined(XF86MISC)
|
#if defined(XF86MISC)
|
||||||
XFree86MiscExtensionInit();
|
if (!noXFree86MiscExtension) XFree86MiscExtensionInit();
|
||||||
#endif
|
#endif
|
||||||
#if defined(XFreeXDGA)
|
#if defined(XFreeXDGA)
|
||||||
XFree86DGAExtensionInit();
|
if (!noXFree86DGAExtension) XFree86DGAExtensionInit();
|
||||||
#endif
|
#endif
|
||||||
#ifdef XF86DRI
|
#ifdef XF86DRI
|
||||||
XFree86DRIExtensionInit();
|
if (!noXFree86DRIExtension) XFree86DRIExtensionInit();
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
#ifdef GLXEXT
|
#ifdef GLXEXT
|
||||||
#ifndef __DARWIN__
|
#ifndef __DARWIN__
|
||||||
GlxExtensionInit();
|
if (!noGlxExtension) GlxExtensionInit();
|
||||||
#else
|
#else
|
||||||
DarwinGlxExtensionInit();
|
if (!noGlxExtension) DarwinGlxExtensionInit();
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
#ifdef DPSEXT
|
#ifdef DPSEXT
|
||||||
#ifndef XPRINT
|
#ifndef XPRINT
|
||||||
DPSExtensionInit();
|
if (!noDPSExtension) DPSExtensionInit();
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
#ifdef XFIXES
|
#ifdef XFIXES
|
||||||
/* must be before Render to layer DisplayCursor correctly */
|
/* must be before Render to layer DisplayCursor correctly */
|
||||||
XFixesExtensionInit();
|
if (!noXFixesExtension) XFixesExtensionInit();
|
||||||
#endif
|
#endif
|
||||||
#ifdef RENDER
|
#ifdef RENDER
|
||||||
if (!noRenderExtension) RenderExtensionInit();
|
if (!noRenderExtension) RenderExtensionInit();
|
||||||
#endif
|
#endif
|
||||||
#ifdef RANDR
|
#ifdef RANDR
|
||||||
RRExtensionInit();
|
if (!noRRExtension) RRExtensionInit();
|
||||||
#endif
|
#endif
|
||||||
#ifdef RES
|
#ifdef RES
|
||||||
ResExtensionInit();
|
if (!noResExtension) ResExtensionInit();
|
||||||
#endif
|
#endif
|
||||||
#ifdef DMXEXT
|
#ifdef DMXEXT
|
||||||
DMXExtensionInit();
|
DMXExtensionInit(); /* server-specific extension, cannot be disabled */
|
||||||
#endif
|
#endif
|
||||||
#ifdef XEVIE
|
#ifdef XEVIE
|
||||||
if (!noXevieExtension) XevieExtensionInit();
|
if (!noXevieExtension) XevieExtensionInit();
|
||||||
|
|
@ -493,7 +694,7 @@ InitExtensions(argc, argv)
|
||||||
if (!noCompositeExtension) CompositeExtensionInit();
|
if (!noCompositeExtension) CompositeExtensionInit();
|
||||||
#endif
|
#endif
|
||||||
#ifdef DAMAGE
|
#ifdef DAMAGE
|
||||||
DamageExtensionInit();
|
if (!noDamageExtension) DamageExtensionInit();
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
130
os/utils.c
130
os/utils.c
|
|
@ -1,4 +1,4 @@
|
||||||
/* $XdotOrg: xc/programs/Xserver/os/utils.c,v 1.5 2004/07/31 09:14:06 kem Exp $ */
|
/* $XdotOrg: xc/programs/Xserver/os/utils.c,v 1.6 2004/08/11 22:27:50 kem Exp $ */
|
||||||
/* $Xorg: utils.c,v 1.5 2001/02/09 02:05:24 xorgcvs Exp $ */
|
/* $Xorg: utils.c,v 1.5 2001/02/09 02:05:24 xorgcvs Exp $ */
|
||||||
/*
|
/*
|
||||||
|
|
||||||
|
|
@ -119,8 +119,126 @@ OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
|
|
||||||
#ifdef RENDER
|
#ifdef RENDER
|
||||||
#include "picture.h"
|
#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;
|
Bool noRenderExtension = FALSE;
|
||||||
#endif
|
#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
|
#define X_INCLUDE_NETDB_H
|
||||||
#include <X11/Xos_r.h>
|
#include <X11/Xos_r.h>
|
||||||
|
|
@ -128,24 +246,14 @@ Bool noRenderExtension = FALSE;
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
|
||||||
Bool CoreDump;
|
Bool CoreDump;
|
||||||
Bool noTestExtensions;
|
|
||||||
|
|
||||||
#ifdef PANORAMIX
|
#ifdef PANORAMIX
|
||||||
Bool noPanoramiXExtension = TRUE;
|
|
||||||
Bool PanoramiXVisibilityNotifySent = FALSE;
|
Bool PanoramiXVisibilityNotifySent = FALSE;
|
||||||
Bool PanoramiXMapped = FALSE;
|
Bool PanoramiXMapped = FALSE;
|
||||||
Bool PanoramiXWindowExposureSent = FALSE;
|
Bool PanoramiXWindowExposureSent = FALSE;
|
||||||
Bool PanoramiXOneExposeRequest = FALSE;
|
Bool PanoramiXOneExposeRequest = FALSE;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef XEVIE
|
|
||||||
Bool noXevieExtension = TRUE;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef COMPOSITE
|
|
||||||
Bool noCompositeExtension = TRUE;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
int auditTrailLevel = 1;
|
int auditTrailLevel = 1;
|
||||||
|
|
||||||
Bool Must_have_memory = FALSE;
|
Bool Must_have_memory = FALSE;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue