From c2b2f06aa03fe738301ebaa82f220d9cfed5ab1a Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Wed, 10 Jan 2018 13:05:42 -0500 Subject: [PATCH] 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 Reviewed-by: Eric Anholt --- glx/glxcmds.c | 1 + hw/xfree86/drivers/modesetting/driver.h | 1 + include/extinit.h | 21 --------------- include/globals.h | 4 +++ include/inputstr.h | 4 +++ mi/miinitext.c | 34 +++++++++++-------------- 6 files changed, 25 insertions(+), 40 deletions(-) diff --git a/glx/glxcmds.c b/glx/glxcmds.c index 2ebf4a350..f4820d8e4 100644 --- a/glx/glxcmds.c +++ b/glx/glxcmds.c @@ -37,6 +37,7 @@ #include "glxserver.h" #include +#include #include #include #include diff --git a/hw/xfree86/drivers/modesetting/driver.h b/hw/xfree86/drivers/modesetting/driver.h index 08dc3b58a..fe835918b 100644 --- a/hw/xfree86/drivers/modesetting/driver.h +++ b/hw/xfree86/drivers/modesetting/driver.h @@ -32,6 +32,7 @@ #include #include #include +#include #ifdef GLAMOR_HAS_GBM #define GLAMOR_FOR_XORG 1 diff --git a/include/extinit.h b/include/extinit.h index 4ad4fcac0..67e300d18 100644 --- a/include/extinit.h +++ b/include/extinit.h @@ -69,7 +69,6 @@ extern void DbeExtensionInit(void); #endif #if defined(DPMSExtension) -#include extern _X_EXPORT Bool noDPMSExtension; extern void DPMSExtensionInit(void); #endif @@ -82,7 +81,6 @@ extern _X_EXPORT Bool noGlxExtension; #endif #ifdef PANORAMIX -#include extern _X_EXPORT Bool noPanoramiXExtension; extern void PanoramiXExtensionInit(void); #endif @@ -100,23 +98,18 @@ extern _X_EXPORT Bool noRenderExtension; extern void RenderExtensionInit(void); #if defined(RES) -#include extern _X_EXPORT Bool noResExtension; extern void ResExtensionInit(void); #endif #if defined(SCREENSAVER) -#include extern _X_EXPORT Bool noScreenSaverExtension; extern void ScreenSaverExtensionInit(void); #endif -#include extern void ShapeExtensionInit(void); #ifdef MITSHM -#include -#include extern _X_EXPORT Bool noMITShmExtension; extern void ShmExtensionInit(void); #endif @@ -126,14 +119,11 @@ extern void SyncExtensionInit(void); extern void XCMiscExtensionInit(void); #ifdef XCSECURITY -#include -#include "securitysrv.h" extern _X_EXPORT Bool noSecurityExtension; extern void SecurityExtensionInit(void); #endif #ifdef XF86BIGFONT -#include extern _X_EXPORT Bool noXFree86BigfontExtension; extern void XFree86BigfontExtensionInit(void); #endif @@ -144,40 +134,29 @@ extern _X_EXPORT Bool noXFixesExtension; extern void XFixesExtensionInit(void); extern void XInputExtensionInit(void); -extern _X_EXPORT void AssignTypeAndName(DeviceIntPtr dev, - Atom type, - const char *name); -#include extern void XkbExtensionInit(void); #if defined(XSELINUX) -#include "xselinux.h" extern _X_EXPORT Bool noSELinuxExtension; extern void SELinuxExtensionInit(void); #endif #ifdef XTEST -#include -#include extern void XTestExtensionInit(void); #endif #if defined(XV) -#include -#include extern _X_EXPORT Bool noXvExtension; extern void XvExtensionInit(void); extern void XvMCExtensionInit(void); #endif #if defined(DRI3) -#include extern void dri3_extension_init(void); #endif #if defined(PRESENT) -#include #include "presentext.h" #endif diff --git a/include/globals.h b/include/globals.h index 44314f03f..341ce832c 100644 --- a/include/globals.h +++ b/include/globals.h @@ -4,6 +4,10 @@ #include "window.h" /* for WindowPtr */ #include "extinit.h" +#ifdef DPMSExtension +/* sigh, too many drivers assume this */ +#include +#endif /* Global X server variables that are visible to mi, dix, os, and ddx */ diff --git a/include/inputstr.h b/include/inputstr.h index 5f0026b9b..bf35dbf4b 100644 --- a/include/inputstr.h +++ b/include/inputstr.h @@ -57,6 +57,10 @@ SOFTWARE. #include "geext.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 SetBit(ptr, bit) (((BYTE *) (ptr))[(bit)>>3] |= (1 << ((bit) & 7))) #define ClearBit(ptr, bit) (((BYTE *)(ptr))[(bit)>>3] &= ~(1 << ((bit) & 7))) diff --git a/mi/miinitext.c b/mi/miinitext.c index 9e6578d4a..ce9325e29 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -97,10 +97,6 @@ SOFTWARE. #undef DPMSExtension #endif -#ifdef HAVE_XGL_CONFIG_H -#include -#endif - #include "misc.h" #include "extension.h" #include "extinit.h" @@ -140,7 +136,7 @@ static ExtensionToggle ExtensionToggleList[] = { {"MIT-SCREEN-SAVER", &noScreenSaverExtension}, #endif #ifdef MITSHM - {SHMNAME, &noMITShmExtension}, + {"MIT-SHM", &noMITShmExtension}, #endif #ifdef RANDR {"RANDR", &noRRExtension}, @@ -237,21 +233,21 @@ static const ExtensionModule staticExtensions[] = { {GEExtensionInit, "Generic Event Extension", &noGEExtension}, {ShapeExtensionInit, "SHAPE", NULL}, #ifdef MITSHM - {ShmExtensionInit, SHMNAME, &noMITShmExtension}, + {ShmExtensionInit, "MIT-SHM", &noMITShmExtension}, #endif {XInputExtensionInit, "XInputExtension", NULL}, #ifdef XTEST - {XTestExtensionInit, XTestExtensionName, &noTestExtensions}, + {XTestExtensionInit, "XTEST", &noTestExtensions}, #endif {BigReqExtensionInit, "BIG-REQUESTS", NULL}, {SyncExtensionInit, "SYNC", NULL}, - {XkbExtensionInit, XkbName, NULL}, + {XkbExtensionInit, "XKEYBOARD", NULL}, {XCMiscExtensionInit, "XC-MISC", NULL}, #ifdef XCSECURITY - {SecurityExtensionInit, SECURITY_EXTENSION_NAME, &noSecurityExtension}, + {SecurityExtensionInit, "SECURITY", &noSecurityExtension}, #endif #ifdef PANORAMIX - {PanoramiXExtensionInit, PANORAMIX_PROTOCOL_NAME, &noPanoramiXExtension}, + {PanoramiXExtensionInit, "XINERAMA", &noPanoramiXExtension}, #endif #ifdef INXQUARTZ /* PseudoramiXExtensionInit must be done before RRExtensionInit, or @@ -262,7 +258,7 @@ static const ExtensionModule staticExtensions[] = { /* must be before Render to layer DisplayCursor correctly */ {XFixesExtensionInit, "XFIXES", &noXFixesExtension}, #ifdef XF86BIGFONT - {XFree86BigfontExtensionInit, XF86BIGFONTNAME, &noXFree86BigfontExtension}, + {XFree86BigfontExtensionInit, "XFree86-Bigfont", &noXFree86BigfontExtension}, #endif {RenderExtensionInit, "RENDER", &noRenderExtension}, #ifdef RANDR @@ -275,7 +271,7 @@ static const ExtensionModule staticExtensions[] = { {DamageExtensionInit, "DAMAGE", &noDamageExtension}, #endif #ifdef SCREENSAVER - {ScreenSaverExtensionInit, ScreenSaverName, &noScreenSaverExtension}, + {ScreenSaverExtensionInit, "MIT-SCREEN-SAVER", &noScreenSaverExtension}, #endif #ifdef DBE {DbeExtensionInit, "DOUBLE-BUFFER", &noDbeExtension}, @@ -284,23 +280,23 @@ static const ExtensionModule staticExtensions[] = { {RecordExtensionInit, "RECORD", &noTestExtensions}, #endif #ifdef DPMSExtension - {DPMSExtensionInit, DPMSExtensionName, &noDPMSExtension}, + {DPMSExtensionInit, "DPMS", &noDPMSExtension}, #endif #ifdef PRESENT - {present_extension_init, PRESENT_NAME, NULL}, + {present_extension_init, "Present", NULL}, #endif #ifdef DRI3 - {dri3_extension_init, DRI3_NAME, NULL}, + {dri3_extension_init, "DRI3", NULL}, #endif #ifdef RES - {ResExtensionInit, XRES_NAME, &noResExtension}, + {ResExtensionInit, "X-Resource", &noResExtension}, #endif #ifdef XV - {XvExtensionInit, XvName, &noXvExtension}, - {XvMCExtensionInit, XvMCName, &noXvExtension}, + {XvExtensionInit, "XVideo", &noXvExtension}, + {XvMCExtensionInit, "XVideo-MotionCompensation", &noXvExtension}, #endif #ifdef XSELINUX - {SELinuxExtensionInit, SELINUX_EXTENSION_NAME, &noSELinuxExtension}, + {SELinuxExtensionInit, "SELinux", &noSELinuxExtension}, #endif };