miinitext: General cleanup (v2)
This really just wants to be the list of disable booleans and initialization functions, and nothing else. Stop including the protocol headers from extinit.h, remove a stray mention of xgl, and move an XInput declaration to a better place. v2: A bunch of drivers assume they'll get the DPMS tokens implicitly, so add it to globals.h. Signed-off-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
parent
4d5aab66c0
commit
c2b2f06aa0
|
@ -37,6 +37,7 @@
|
||||||
|
|
||||||
#include "glxserver.h"
|
#include "glxserver.h"
|
||||||
#include <GL/glxtokens.h>
|
#include <GL/glxtokens.h>
|
||||||
|
#include <X11/extensions/presenttokens.h>
|
||||||
#include <unpack.h>
|
#include <unpack.h>
|
||||||
#include <pixmapstr.h>
|
#include <pixmapstr.h>
|
||||||
#include <windowstr.h>
|
#include <windowstr.h>
|
||||||
|
|
|
@ -32,6 +32,7 @@
|
||||||
#include <xf86drm.h>
|
#include <xf86drm.h>
|
||||||
#include <xf86Crtc.h>
|
#include <xf86Crtc.h>
|
||||||
#include <damage.h>
|
#include <damage.h>
|
||||||
|
#include <X11/extensions/dpmsconst.h>
|
||||||
|
|
||||||
#ifdef GLAMOR_HAS_GBM
|
#ifdef GLAMOR_HAS_GBM
|
||||||
#define GLAMOR_FOR_XORG 1
|
#define GLAMOR_FOR_XORG 1
|
||||||
|
|
|
@ -69,7 +69,6 @@ extern void DbeExtensionInit(void);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(DPMSExtension)
|
#if defined(DPMSExtension)
|
||||||
#include <X11/extensions/dpmsconst.h>
|
|
||||||
extern _X_EXPORT Bool noDPMSExtension;
|
extern _X_EXPORT Bool noDPMSExtension;
|
||||||
extern void DPMSExtensionInit(void);
|
extern void DPMSExtensionInit(void);
|
||||||
#endif
|
#endif
|
||||||
|
@ -82,7 +81,6 @@ extern _X_EXPORT Bool noGlxExtension;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef PANORAMIX
|
#ifdef PANORAMIX
|
||||||
#include <X11/extensions/panoramiXproto.h>
|
|
||||||
extern _X_EXPORT Bool noPanoramiXExtension;
|
extern _X_EXPORT Bool noPanoramiXExtension;
|
||||||
extern void PanoramiXExtensionInit(void);
|
extern void PanoramiXExtensionInit(void);
|
||||||
#endif
|
#endif
|
||||||
|
@ -100,23 +98,18 @@ extern _X_EXPORT Bool noRenderExtension;
|
||||||
extern void RenderExtensionInit(void);
|
extern void RenderExtensionInit(void);
|
||||||
|
|
||||||
#if defined(RES)
|
#if defined(RES)
|
||||||
#include <X11/extensions/XResproto.h>
|
|
||||||
extern _X_EXPORT Bool noResExtension;
|
extern _X_EXPORT Bool noResExtension;
|
||||||
extern void ResExtensionInit(void);
|
extern void ResExtensionInit(void);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(SCREENSAVER)
|
#if defined(SCREENSAVER)
|
||||||
#include <X11/extensions/saver.h>
|
|
||||||
extern _X_EXPORT Bool noScreenSaverExtension;
|
extern _X_EXPORT Bool noScreenSaverExtension;
|
||||||
extern void ScreenSaverExtensionInit(void);
|
extern void ScreenSaverExtensionInit(void);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <X11/extensions/shapeproto.h>
|
|
||||||
extern void ShapeExtensionInit(void);
|
extern void ShapeExtensionInit(void);
|
||||||
|
|
||||||
#ifdef MITSHM
|
#ifdef MITSHM
|
||||||
#include <X11/extensions/shm.h>
|
|
||||||
#include <X11/extensions/shmproto.h>
|
|
||||||
extern _X_EXPORT Bool noMITShmExtension;
|
extern _X_EXPORT Bool noMITShmExtension;
|
||||||
extern void ShmExtensionInit(void);
|
extern void ShmExtensionInit(void);
|
||||||
#endif
|
#endif
|
||||||
|
@ -126,14 +119,11 @@ extern void SyncExtensionInit(void);
|
||||||
extern void XCMiscExtensionInit(void);
|
extern void XCMiscExtensionInit(void);
|
||||||
|
|
||||||
#ifdef XCSECURITY
|
#ifdef XCSECURITY
|
||||||
#include <X11/extensions/secur.h>
|
|
||||||
#include "securitysrv.h"
|
|
||||||
extern _X_EXPORT Bool noSecurityExtension;
|
extern _X_EXPORT Bool noSecurityExtension;
|
||||||
extern void SecurityExtensionInit(void);
|
extern void SecurityExtensionInit(void);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef XF86BIGFONT
|
#ifdef XF86BIGFONT
|
||||||
#include <X11/extensions/xf86bigfproto.h>
|
|
||||||
extern _X_EXPORT Bool noXFree86BigfontExtension;
|
extern _X_EXPORT Bool noXFree86BigfontExtension;
|
||||||
extern void XFree86BigfontExtensionInit(void);
|
extern void XFree86BigfontExtensionInit(void);
|
||||||
#endif
|
#endif
|
||||||
|
@ -144,40 +134,29 @@ extern _X_EXPORT Bool noXFixesExtension;
|
||||||
extern void XFixesExtensionInit(void);
|
extern void XFixesExtensionInit(void);
|
||||||
|
|
||||||
extern void XInputExtensionInit(void);
|
extern void XInputExtensionInit(void);
|
||||||
extern _X_EXPORT void AssignTypeAndName(DeviceIntPtr dev,
|
|
||||||
Atom type,
|
|
||||||
const char *name);
|
|
||||||
|
|
||||||
#include <X11/extensions/XKB.h>
|
|
||||||
extern void XkbExtensionInit(void);
|
extern void XkbExtensionInit(void);
|
||||||
|
|
||||||
#if defined(XSELINUX)
|
#if defined(XSELINUX)
|
||||||
#include "xselinux.h"
|
|
||||||
extern _X_EXPORT Bool noSELinuxExtension;
|
extern _X_EXPORT Bool noSELinuxExtension;
|
||||||
extern void SELinuxExtensionInit(void);
|
extern void SELinuxExtensionInit(void);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef XTEST
|
#ifdef XTEST
|
||||||
#include <X11/extensions/xtestconst.h>
|
|
||||||
#include <X11/extensions/xtestproto.h>
|
|
||||||
extern void XTestExtensionInit(void);
|
extern void XTestExtensionInit(void);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(XV)
|
#if defined(XV)
|
||||||
#include <X11/extensions/Xv.h>
|
|
||||||
#include <X11/extensions/XvMC.h>
|
|
||||||
extern _X_EXPORT Bool noXvExtension;
|
extern _X_EXPORT Bool noXvExtension;
|
||||||
extern void XvExtensionInit(void);
|
extern void XvExtensionInit(void);
|
||||||
extern void XvMCExtensionInit(void);
|
extern void XvMCExtensionInit(void);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(DRI3)
|
#if defined(DRI3)
|
||||||
#include <X11/extensions/dri3proto.h>
|
|
||||||
extern void dri3_extension_init(void);
|
extern void dri3_extension_init(void);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(PRESENT)
|
#if defined(PRESENT)
|
||||||
#include <X11/extensions/presentproto.h>
|
|
||||||
#include "presentext.h"
|
#include "presentext.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -4,6 +4,10 @@
|
||||||
|
|
||||||
#include "window.h" /* for WindowPtr */
|
#include "window.h" /* for WindowPtr */
|
||||||
#include "extinit.h"
|
#include "extinit.h"
|
||||||
|
#ifdef DPMSExtension
|
||||||
|
/* sigh, too many drivers assume this */
|
||||||
|
#include <X11/extensions/dpmsconst.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Global X server variables that are visible to mi, dix, os, and ddx */
|
/* Global X server variables that are visible to mi, dix, os, and ddx */
|
||||||
|
|
||||||
|
|
|
@ -57,6 +57,10 @@ SOFTWARE.
|
||||||
#include "geext.h"
|
#include "geext.h"
|
||||||
#include "privates.h"
|
#include "privates.h"
|
||||||
|
|
||||||
|
extern _X_EXPORT void AssignTypeAndName(DeviceIntPtr dev,
|
||||||
|
Atom type,
|
||||||
|
const char *name);
|
||||||
|
|
||||||
#define BitIsOn(ptr, bit) (!!(((const BYTE *) (ptr))[(bit)>>3] & (1 << ((bit) & 7))))
|
#define BitIsOn(ptr, bit) (!!(((const BYTE *) (ptr))[(bit)>>3] & (1 << ((bit) & 7))))
|
||||||
#define SetBit(ptr, bit) (((BYTE *) (ptr))[(bit)>>3] |= (1 << ((bit) & 7)))
|
#define SetBit(ptr, bit) (((BYTE *) (ptr))[(bit)>>3] |= (1 << ((bit) & 7)))
|
||||||
#define ClearBit(ptr, bit) (((BYTE *)(ptr))[(bit)>>3] &= ~(1 << ((bit) & 7)))
|
#define ClearBit(ptr, bit) (((BYTE *)(ptr))[(bit)>>3] &= ~(1 << ((bit) & 7)))
|
||||||
|
|
|
@ -97,10 +97,6 @@ SOFTWARE.
|
||||||
#undef DPMSExtension
|
#undef DPMSExtension
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_XGL_CONFIG_H
|
|
||||||
#include <xgl-config.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "misc.h"
|
#include "misc.h"
|
||||||
#include "extension.h"
|
#include "extension.h"
|
||||||
#include "extinit.h"
|
#include "extinit.h"
|
||||||
|
@ -140,7 +136,7 @@ static ExtensionToggle ExtensionToggleList[] = {
|
||||||
{"MIT-SCREEN-SAVER", &noScreenSaverExtension},
|
{"MIT-SCREEN-SAVER", &noScreenSaverExtension},
|
||||||
#endif
|
#endif
|
||||||
#ifdef MITSHM
|
#ifdef MITSHM
|
||||||
{SHMNAME, &noMITShmExtension},
|
{"MIT-SHM", &noMITShmExtension},
|
||||||
#endif
|
#endif
|
||||||
#ifdef RANDR
|
#ifdef RANDR
|
||||||
{"RANDR", &noRRExtension},
|
{"RANDR", &noRRExtension},
|
||||||
|
@ -237,21 +233,21 @@ static const ExtensionModule staticExtensions[] = {
|
||||||
{GEExtensionInit, "Generic Event Extension", &noGEExtension},
|
{GEExtensionInit, "Generic Event Extension", &noGEExtension},
|
||||||
{ShapeExtensionInit, "SHAPE", NULL},
|
{ShapeExtensionInit, "SHAPE", NULL},
|
||||||
#ifdef MITSHM
|
#ifdef MITSHM
|
||||||
{ShmExtensionInit, SHMNAME, &noMITShmExtension},
|
{ShmExtensionInit, "MIT-SHM", &noMITShmExtension},
|
||||||
#endif
|
#endif
|
||||||
{XInputExtensionInit, "XInputExtension", NULL},
|
{XInputExtensionInit, "XInputExtension", NULL},
|
||||||
#ifdef XTEST
|
#ifdef XTEST
|
||||||
{XTestExtensionInit, XTestExtensionName, &noTestExtensions},
|
{XTestExtensionInit, "XTEST", &noTestExtensions},
|
||||||
#endif
|
#endif
|
||||||
{BigReqExtensionInit, "BIG-REQUESTS", NULL},
|
{BigReqExtensionInit, "BIG-REQUESTS", NULL},
|
||||||
{SyncExtensionInit, "SYNC", NULL},
|
{SyncExtensionInit, "SYNC", NULL},
|
||||||
{XkbExtensionInit, XkbName, NULL},
|
{XkbExtensionInit, "XKEYBOARD", NULL},
|
||||||
{XCMiscExtensionInit, "XC-MISC", NULL},
|
{XCMiscExtensionInit, "XC-MISC", NULL},
|
||||||
#ifdef XCSECURITY
|
#ifdef XCSECURITY
|
||||||
{SecurityExtensionInit, SECURITY_EXTENSION_NAME, &noSecurityExtension},
|
{SecurityExtensionInit, "SECURITY", &noSecurityExtension},
|
||||||
#endif
|
#endif
|
||||||
#ifdef PANORAMIX
|
#ifdef PANORAMIX
|
||||||
{PanoramiXExtensionInit, PANORAMIX_PROTOCOL_NAME, &noPanoramiXExtension},
|
{PanoramiXExtensionInit, "XINERAMA", &noPanoramiXExtension},
|
||||||
#endif
|
#endif
|
||||||
#ifdef INXQUARTZ
|
#ifdef INXQUARTZ
|
||||||
/* PseudoramiXExtensionInit must be done before RRExtensionInit, or
|
/* PseudoramiXExtensionInit must be done before RRExtensionInit, or
|
||||||
|
@ -262,7 +258,7 @@ static const ExtensionModule staticExtensions[] = {
|
||||||
/* must be before Render to layer DisplayCursor correctly */
|
/* must be before Render to layer DisplayCursor correctly */
|
||||||
{XFixesExtensionInit, "XFIXES", &noXFixesExtension},
|
{XFixesExtensionInit, "XFIXES", &noXFixesExtension},
|
||||||
#ifdef XF86BIGFONT
|
#ifdef XF86BIGFONT
|
||||||
{XFree86BigfontExtensionInit, XF86BIGFONTNAME, &noXFree86BigfontExtension},
|
{XFree86BigfontExtensionInit, "XFree86-Bigfont", &noXFree86BigfontExtension},
|
||||||
#endif
|
#endif
|
||||||
{RenderExtensionInit, "RENDER", &noRenderExtension},
|
{RenderExtensionInit, "RENDER", &noRenderExtension},
|
||||||
#ifdef RANDR
|
#ifdef RANDR
|
||||||
|
@ -275,7 +271,7 @@ static const ExtensionModule staticExtensions[] = {
|
||||||
{DamageExtensionInit, "DAMAGE", &noDamageExtension},
|
{DamageExtensionInit, "DAMAGE", &noDamageExtension},
|
||||||
#endif
|
#endif
|
||||||
#ifdef SCREENSAVER
|
#ifdef SCREENSAVER
|
||||||
{ScreenSaverExtensionInit, ScreenSaverName, &noScreenSaverExtension},
|
{ScreenSaverExtensionInit, "MIT-SCREEN-SAVER", &noScreenSaverExtension},
|
||||||
#endif
|
#endif
|
||||||
#ifdef DBE
|
#ifdef DBE
|
||||||
{DbeExtensionInit, "DOUBLE-BUFFER", &noDbeExtension},
|
{DbeExtensionInit, "DOUBLE-BUFFER", &noDbeExtension},
|
||||||
|
@ -284,23 +280,23 @@ static const ExtensionModule staticExtensions[] = {
|
||||||
{RecordExtensionInit, "RECORD", &noTestExtensions},
|
{RecordExtensionInit, "RECORD", &noTestExtensions},
|
||||||
#endif
|
#endif
|
||||||
#ifdef DPMSExtension
|
#ifdef DPMSExtension
|
||||||
{DPMSExtensionInit, DPMSExtensionName, &noDPMSExtension},
|
{DPMSExtensionInit, "DPMS", &noDPMSExtension},
|
||||||
#endif
|
#endif
|
||||||
#ifdef PRESENT
|
#ifdef PRESENT
|
||||||
{present_extension_init, PRESENT_NAME, NULL},
|
{present_extension_init, "Present", NULL},
|
||||||
#endif
|
#endif
|
||||||
#ifdef DRI3
|
#ifdef DRI3
|
||||||
{dri3_extension_init, DRI3_NAME, NULL},
|
{dri3_extension_init, "DRI3", NULL},
|
||||||
#endif
|
#endif
|
||||||
#ifdef RES
|
#ifdef RES
|
||||||
{ResExtensionInit, XRES_NAME, &noResExtension},
|
{ResExtensionInit, "X-Resource", &noResExtension},
|
||||||
#endif
|
#endif
|
||||||
#ifdef XV
|
#ifdef XV
|
||||||
{XvExtensionInit, XvName, &noXvExtension},
|
{XvExtensionInit, "XVideo", &noXvExtension},
|
||||||
{XvMCExtensionInit, XvMCName, &noXvExtension},
|
{XvMCExtensionInit, "XVideo-MotionCompensation", &noXvExtension},
|
||||||
#endif
|
#endif
|
||||||
#ifdef XSELINUX
|
#ifdef XSELINUX
|
||||||
{SELinuxExtensionInit, SELINUX_EXTENSION_NAME, &noSELinuxExtension},
|
{SELinuxExtensionInit, "SELinux", &noSELinuxExtension},
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue