os: move out extension disable flags to corresponing extensions
The OS abstraction isn't really the right place for those flags, they are're probably better off in their corresponding extensions. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net> Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1519>
This commit is contained in:
parent
8539f35818
commit
356e18dcc6
|
@ -45,6 +45,8 @@ Equipment Corporation.
|
|||
#include "windowstr.h"
|
||||
#include "protocol-versions.h"
|
||||
|
||||
Bool noDPMSExtension = FALSE;
|
||||
|
||||
CARD16 DPMSPowerLevel = 0;
|
||||
Bool DPMSDisabledSwitch = FALSE;
|
||||
CARD32 DPMSStandbyTime = -1;
|
||||
|
|
|
@ -32,6 +32,8 @@
|
|||
#include "protocol-versions.h"
|
||||
#include "extinit_priv.h"
|
||||
|
||||
Bool noGEExtension = FALSE;
|
||||
|
||||
DevPrivateKeyRec GEClientPrivateKeyRec;
|
||||
|
||||
GEExtension GEExtensions[MAXEXTENSIONS];
|
||||
|
|
|
@ -63,6 +63,9 @@ extern VisualPtr glxMatchVisual(ScreenPtr pScreen,
|
|||
VisualPtr pVisual, ScreenPtr pMatchScreen);
|
||||
#endif
|
||||
|
||||
/* Xinerama is disabled by default unless enabled via +xinerama */
|
||||
Bool noPanoramiXExtension = TRUE;
|
||||
|
||||
/*
|
||||
* PanoramiX data declarations
|
||||
*/
|
||||
|
|
|
@ -67,6 +67,8 @@ in this Software without prior written authorization from the X Consortium.
|
|||
// see: https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1355
|
||||
#undef CreateWindow
|
||||
|
||||
Bool noScreenSaverExtension = FALSE;
|
||||
|
||||
static int ScreenSaverEventBase = 0;
|
||||
|
||||
static Bool ScreenSaverHandle(ScreenPtr pScreen, int xstate, Bool force);
|
||||
|
|
|
@ -48,6 +48,8 @@ in this Software without prior written authorization from The Open Group.
|
|||
#include "extinit.h"
|
||||
#include "protocol-versions.h"
|
||||
|
||||
Bool noSecurityExtension = FALSE;
|
||||
|
||||
/* Extension stuff */
|
||||
static int SecurityErrorBase; /* first Security error number */
|
||||
static int SecurityEventBase; /* first Security event number */
|
||||
|
|
|
@ -48,6 +48,8 @@ in this Software without prior written authorization from The Open Group.
|
|||
#include "extinit_priv.h"
|
||||
#include "protocol-versions.h"
|
||||
|
||||
Bool noShapeExtension = FALSE;
|
||||
|
||||
typedef RegionPtr (*CreateDftPtr) (WindowPtr /* pWin */
|
||||
);
|
||||
|
||||
|
|
|
@ -100,6 +100,8 @@ typedef struct _ShmScrPrivateRec {
|
|||
DestroyPixmapProcPtr destroyPixmap;
|
||||
} ShmScrPrivateRec;
|
||||
|
||||
Bool noMITShmExtension = FALSE;
|
||||
|
||||
static PixmapPtr fbShmCreatePixmap(XSHM_CREATE_PIXMAP_ARGS);
|
||||
static int ShmDetachSegment(void *value, XID shmseg);
|
||||
static void ShmResetProc(ExtensionEntry *extEntry);
|
||||
|
|
|
@ -69,6 +69,8 @@
|
|||
|
||||
#include "xf86bigfontsrv.h"
|
||||
|
||||
Bool noXFree86BigfontExtension = FALSE;
|
||||
|
||||
static void XF86BigfontResetProc(ExtensionEntry *extEntry );
|
||||
|
||||
#ifdef MITSHM
|
||||
|
|
|
@ -34,6 +34,8 @@
|
|||
#include "compint.h"
|
||||
#endif
|
||||
|
||||
Bool noResExtension = FALSE;
|
||||
|
||||
/** @brief Holds fragments of responses for ConstructClientIds.
|
||||
*
|
||||
* note: there is no consideration for data alignment */
|
||||
|
|
|
@ -60,6 +60,8 @@
|
|||
#include "inpututils.h"
|
||||
#include "extinit_priv.h"
|
||||
|
||||
Bool noTestExtensions = FALSE;
|
||||
|
||||
/* XTest events are sent during request processing and may be interrupted by
|
||||
* a SIGIO. We need a separate event list to avoid events overwriting each
|
||||
* other's memory.
|
||||
|
|
|
@ -49,6 +49,8 @@
|
|||
#include "compint.h"
|
||||
#include "compositeext.h"
|
||||
|
||||
Bool noCompositeExtension = FALSE;
|
||||
|
||||
DevPrivateKeyRec CompScreenPrivateKeyRec;
|
||||
DevPrivateKeyRec CompWindowPrivateKeyRec;
|
||||
DevPrivateKeyRec CompSubwindowsPrivateKeyRec;
|
||||
|
|
|
@ -53,6 +53,8 @@ static DevPrivateKeyRec DamageClientPrivateKeyRec;
|
|||
|
||||
#define DamageClientPrivateKey (&DamageClientPrivateKeyRec)
|
||||
|
||||
Bool noDamageExtension = FALSE;
|
||||
|
||||
static void
|
||||
DamageNoteCritical(ClientPtr pClient)
|
||||
{
|
||||
|
|
|
@ -51,6 +51,7 @@
|
|||
#include "xace.h"
|
||||
|
||||
/* GLOBALS */
|
||||
Bool noDbeExtension = FALSE;
|
||||
|
||||
/* These are globals for use by DDX */
|
||||
DevPrivateKeyRec dbeScreenPrivKeyRec;
|
||||
|
|
|
@ -42,6 +42,8 @@
|
|||
|
||||
#include "dix/dix_priv.h"
|
||||
|
||||
Bool noGlxExtension = FALSE;
|
||||
|
||||
ExtensionEntry *GlxExtensionEntry;
|
||||
int GlxErrorBase = 0;
|
||||
static CallbackListRec vndInitCallbackList;
|
||||
|
|
|
@ -51,6 +51,11 @@
|
|||
#include "vidmodestr.h"
|
||||
#endif
|
||||
|
||||
Bool noXFree86VidModeExtension = FALSE;
|
||||
Bool noXFree86DGAExtension = FALSE;
|
||||
Bool noXFree86DRIExtension = FALSE;
|
||||
Bool noDRI2Extension = FALSE;
|
||||
|
||||
/*
|
||||
* DDX-specific extensions.
|
||||
*/
|
||||
|
|
|
@ -52,11 +52,15 @@ is" without express or implied warranty.
|
|||
|
||||
Bool xnestDoFullGeneration = TRUE;
|
||||
|
||||
/* Xnest doesn't support GLX yet, so we don't link it, but still have
|
||||
satisfy DIX's symbol requirements */
|
||||
#ifdef GLXEXT
|
||||
void
|
||||
GlxExtensionInit(void)
|
||||
{
|
||||
}
|
||||
|
||||
Bool noGlxExtension = FALSE;
|
||||
#endif
|
||||
|
||||
void
|
||||
|
|
|
@ -52,6 +52,7 @@
|
|||
#include <os.h>
|
||||
#include <propertyst.h>
|
||||
#include <version-config.h>
|
||||
#include "extinit.h"
|
||||
|
||||
#include "os/auth.h"
|
||||
|
||||
|
@ -60,7 +61,7 @@
|
|||
|
||||
#ifdef XF86VIDMODE
|
||||
#include <X11/extensions/xf86vmproto.h>
|
||||
extern _X_EXPORT Bool noXFree86VidModeExtension;
|
||||
Bool noXFree86VidModeExtension;
|
||||
#endif
|
||||
|
||||
void
|
||||
|
|
59
os/utils.c
59
os/utils.c
|
@ -117,66 +117,7 @@ __stdcall unsigned long GetTickCount(void);
|
|||
#include "miinitext.h"
|
||||
#include "present.h"
|
||||
#include "dixstruct_priv.h"
|
||||
|
||||
Bool noTestExtensions;
|
||||
|
||||
#ifdef COMPOSITE
|
||||
Bool noCompositeExtension = FALSE;
|
||||
#endif
|
||||
|
||||
#ifdef DAMAGE
|
||||
Bool noDamageExtension = FALSE;
|
||||
#endif
|
||||
#ifdef DBE
|
||||
Bool noDbeExtension = FALSE;
|
||||
#endif
|
||||
#ifdef DPMSExtension
|
||||
#include "dpmsproc.h"
|
||||
Bool noDPMSExtension = FALSE;
|
||||
#endif
|
||||
#ifdef GLXEXT
|
||||
Bool noGlxExtension = FALSE;
|
||||
#endif
|
||||
#ifdef SCREENSAVER
|
||||
Bool noScreenSaverExtension = FALSE;
|
||||
#endif
|
||||
#ifdef MITSHM
|
||||
Bool noMITShmExtension = FALSE;
|
||||
#endif
|
||||
#ifdef RANDR
|
||||
Bool noRRExtension = FALSE;
|
||||
#endif
|
||||
Bool noRenderExtension = FALSE;
|
||||
Bool noShapeExtension = FALSE;
|
||||
|
||||
#ifdef XCSECURITY
|
||||
Bool noSecurityExtension = FALSE;
|
||||
#endif
|
||||
#ifdef RES
|
||||
Bool noResExtension = FALSE;
|
||||
#endif
|
||||
#ifdef XF86BIGFONT
|
||||
Bool noXFree86BigfontExtension = FALSE;
|
||||
#endif
|
||||
#ifdef XFreeXDGA
|
||||
Bool noXFree86DGAExtension = FALSE;
|
||||
#endif
|
||||
#ifdef XF86DRI
|
||||
Bool noXFree86DRIExtension = FALSE;
|
||||
#endif
|
||||
#ifdef XF86VIDMODE
|
||||
Bool noXFree86VidModeExtension = FALSE;
|
||||
#endif
|
||||
Bool noXFixesExtension = FALSE;
|
||||
#ifdef XINERAMA
|
||||
/* Xinerama is disabled by default unless enabled via +xinerama */
|
||||
Bool noPanoramiXExtension = TRUE;
|
||||
#endif /* XINERAMA */
|
||||
#ifdef DRI2
|
||||
Bool noDRI2Extension = FALSE;
|
||||
#endif
|
||||
|
||||
Bool noGEExtension = FALSE;
|
||||
|
||||
#define X_INCLUDE_NETDB_H
|
||||
#include <X11/Xos_r.h>
|
||||
|
|
|
@ -36,6 +36,8 @@
|
|||
#define SubPixelUnknown 0
|
||||
#endif
|
||||
|
||||
Bool noRRExtension = FALSE;
|
||||
|
||||
#define RR_VALIDATE
|
||||
static int RRNScreens;
|
||||
|
||||
|
|
|
@ -57,6 +57,8 @@
|
|||
#include "panoramiXsrv.h"
|
||||
#endif /* XINERAMA */
|
||||
|
||||
Bool noRenderExtension = FALSE;
|
||||
|
||||
static int ProcRenderQueryVersion(ClientPtr pClient);
|
||||
static int ProcRenderQueryPictFormats(ClientPtr pClient);
|
||||
static int ProcRenderQueryPictIndexValues(ClientPtr pClient);
|
||||
|
|
|
@ -48,6 +48,8 @@
|
|||
#include "protocol-versions.h"
|
||||
#include "extinit_priv.h"
|
||||
|
||||
Bool noXFixesExtension = FALSE;
|
||||
|
||||
static unsigned char XFixesReqCode;
|
||||
int XFixesEventBase;
|
||||
int XFixesErrorBase;
|
||||
|
|
Loading…
Reference in New Issue