andreacavalli
/
xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move extension initialisation prototypes into extinit.h 

Create extinit.h (and xf86Extensions.h, for Xorg-specific extensions) to
hold all our extension initialisation prototypes, rather than
duplicating them everywhere.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Daniel Stone 2012-07-10 02:02:56 +01:00 committed by Keith Packard
parent b86aa74caf
commit a1d41e311c
65 changed files with 264 additions and 274 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Xext/bigreq.c
View File

@ -38,9 +38,7 @@ from The Open Group.
#include "extnsionst.h"
#include <X11/extensions/bigreqsproto.h>
#include "opaque.h"
#include "modinit.h"
void BigReqExtensionInit(void);
#include "extinit.h"
static int
ProcBigReqDispatch(ClientPtr client)

2
Xext/dpms.c
View File

@ -39,7 +39,7 @@ Equipment Corporation.
#include "opaque.h"
#include <X11/extensions/dpmsproto.h>
#include "dpmsproc.h"
#include "modinit.h"
#include "extinit.h"
static int
ProcDPMSGetVersion(ClientPtr client)

1
Xext/geext.c
View File

@ -32,6 +32,7 @@
#include "geint.h"
#include "geext.h"
#include "protocol-versions.h"
#include "extinit.h"
DevPrivateKeyRec GEClientPrivateKeyRec;

2
Xext/geext.h
View File

@ -78,6 +78,4 @@ extern _X_EXPORT void GERegisterExtension(int extension,
extern _X_EXPORT void GEInitEvent(xGenericEvent *ev, int extension);
extern _X_EXPORT void GEExtensionInit(void);
#endif /* _GEEXT_H_ */

2
Xext/panoramiX.c
View File

@ -59,7 +59,7 @@ Equipment Corporation.
#ifdef COMPOSITE
#include "compint.h"
#endif
#include "modinit.h"
#include "extinit.h"
#include "protocol-versions.h"
#ifdef GLXPROXY

2
Xext/saver.c
View File

@ -58,7 +58,7 @@ in this Software without prior written authorization from the X Consortium.
#include <stdio.h>
#include "modinit.h"
#include "extinit.h"
static int ScreenSaverEventBase = 0;

2
Xext/security.c
View File

@ -38,7 +38,7 @@ in this Software without prior written authorization from The Open Group.
#include "xacestr.h"
#include "securitysrv.h"
#include <X11/extensions/securproto.h>
#include "modinit.h"
#include "extinit.h"
#include "protocol-versions.h"
/* Extension stuff */

2
Xext/shape.c
View File

@ -44,7 +44,7 @@ in this Software without prior written authorization from The Open Group.
#include <X11/extensions/shapeproto.h>
#include "regionstr.h"
#include "gcstruct.h"
#include "modinit.h"
#include "extinit.h"
#include "protocol-versions.h"
typedef RegionPtr (*CreateDftPtr) (WindowPtr /* pWin */

2
Xext/shm.c
View File

@ -87,7 +87,7 @@ in this Software without prior written authorization from The Open Group.
#include "panoramiXsrv.h"
#endif
#include "modinit.h"
#include "extinit.h"
typedef struct _ShmDesc {
struct _ShmDesc *next;

2
Xext/sync.c
View File

@ -76,7 +76,7 @@ PERFORMANCE OF THIS SOFTWARE.
#include <sys/time.h>
#endif
#include "modinit.h"
#include "extinit.h"
/*
* Local Global Variables

2
Xext/syncsrv.h
View File

@ -134,8 +134,6 @@ extern void SyncChangeCounter(SyncCounter *pCounter,
extern void SyncDestroySystemCounter(pointer pCounter);
extern void SyncExtensionInit(void);
extern SyncCounter *SyncInitDeviceIdleTime(DeviceIntPtr dev);
extern void SyncRemoveDeviceIdleTime(SyncCounter *counter);
#endif /* _SYNCSRV_H_ */

2
Xext/xcmisc.c
View File

@ -38,7 +38,7 @@ from The Open Group.
#include "extnsionst.h"
#include "swaprep.h"
#include <X11/extensions/xcmiscproto.h>
#include "modinit.h"
#include "extinit.h"
#include <stdint.h>

1
Xext/xf86bigfont.c
View File

@ -71,6 +71,7 @@
#include "gcstruct.h"
#include "dixfontstr.h"
#include "extnsionst.h"
#include "extinit.h"
#include "protocol-versions.h"
#include <X11/extensions/xf86bigfproto.h>

1
Xext/xf86bigfontsrv.h
View File

@ -27,7 +27,6 @@
#include <X11/fonts/font.h>
extern void XFree86BigfontExtensionInit(void);
extern void XF86BigfontFreeFontShm(FontPtr);
extern void XF86BigfontCleanup(void);

2
Xext/xres.c
View File

@ -21,7 +21,7 @@
#include "pixmapstr.h"
#include "windowstr.h"
#include "gcstruct.h"
#include "modinit.h"
#include "extinit.h"
#include "protocol-versions.h"
#include "client.h"
#include "list.h"

2
Xext/xselinux_ext.c
View File

@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "windowstr.h"
#include "propertyst.h"
#include "extnsionst.h"
#include "modinit.h"
#include "extinit.h"
#include "xselinuxint.h"
#define CTX_DEV offsetof(SELinuxSubjectRec, dev_create_sid)

2
Xext/xtest.c
View File

@ -55,7 +55,7 @@
#include "eventstr.h"
#include "inpututils.h"
#include "modinit.h"
#include "extinit.h"
extern int DeviceValuator;

1
Xext/xvdix.h
View File

@ -235,7 +235,6 @@ typedef struct {
extern _X_EXPORT int ProcXvDispatch(ClientPtr);
extern _X_EXPORT int SProcXvDispatch(ClientPtr);
extern _X_EXPORT void XvExtensionInit(void);
extern _X_EXPORT int XvScreenInit(ScreenPtr);
extern _X_EXPORT DevPrivateKey XvGetScreenKey(void);
extern _X_EXPORT unsigned long XvGetRTPort(void);

1
Xext/xvmain.c
View File

@ -88,6 +88,7 @@ SOFTWARE.
#include "pixmapstr.h"
#include "gc.h"
#include "extnsionst.h"
#include "extinit.h"
#include "dixstruct.h"
#include "resource.h"
#include "opaque.h"

1
Xext/xvmc.c
View File

@ -13,6 +13,7 @@
#include "resource.h"
#include "scrnintstr.h"
#include "extnsionst.h"
#include "extinit.h"
#include "servermd.h"
#include <X11/Xfuncproto.h>
#include "xvdix.h"

2
Xext/xvmcext.h
View File

@ -85,8 +85,6 @@ typedef struct {
} XvMCAdaptorRec, *XvMCAdaptorPtr;
#ifndef XorgLoader
extern _X_EXPORT void XvMCExtensionInit(void);
extern _X_EXPORT int XvMCScreenInit(ScreenPtr pScreen,
int num, XvMCAdaptorPtr adapt);

1
composite/compext.c
View File

@ -48,6 +48,7 @@
#include "compint.h"
#include "xace.h"
#include "protocol-versions.h"
#include "extinit.h"
static CARD8 CompositeReqCode;
static DevPrivateKeyRec CompositeClientPrivateKeyRec;

7
composite/compint.h
View File

@ -228,13 +228,6 @@ Bool
compReallocPixmap(WindowPtr pWin, int x, int y,
unsigned int w, unsigned int h, int bw);
/*
* compext.c
*/
void
CompositeExtensionInit(void);
/*
* compinit.c
*/

1
damageext/Makefile.am
View File

@ -4,5 +4,4 @@ AM_CFLAGS = $(DIX_CFLAGS)
libdamageext_la_SOURCES = \
damageext.c \
damageext.h \
damageextint.h

1
damageext/damageext.c
View File

@ -26,6 +26,7 @@
#include "damageextint.h"
#include "protocol-versions.h"
#include "extinit.h"
static unsigned char DamageReqCode;
static int DamageEventBase;

1
damageext/damageextint.h
View File

@ -37,7 +37,6 @@
#include "windowstr.h"
#include "selection.h"
#include "scrnintstr.h"
#include "damageext.h"
#include "damage.h"
#include "xfixes.h"

1
dbe/dbe.c
View File

@ -42,6 +42,7 @@
#include <X11/Xproto.h>
#include "scrnintstr.h"
#include "extnsionst.h"
#include "extinit.h"
#include "gcstruct.h"
#include "dixstruct.h"
#define NEED_DBE_PROTOCOL

2
dbe/dbestruct.h
View File

@ -83,8 +83,6 @@ typedef struct {
/* Marker for free elements in the buffer ID array. */
#define DBE_FREE_ID_ELEMENT 0
extern _X_EXPORT void DbeExtensionInit(void);
/* TYPEDEFS */
/* Record used to pass swap information between DIX and DDX swapping

4
glx/glxext.c
View File

@ -39,6 +39,7 @@
#include <registry.h>
#include "privates.h"
#include <os.h>
#include "extinit.h"
#include "unpack.h"
#include "glxutil.h"
#include "glxext.h"
@ -338,6 +339,9 @@ GlxExtensionInit(void)
if (!__glXContextRes || !__glXDrawableRes)
return;
if (serverGeneration == 1)
GlxPushProvider(&__glXDRISWRastProvider);
if (!dixRegisterPrivateKey
(&glxClientPrivateKeyRec, PRIVATE_CLIENT, sizeof(__GLXclientState)))
return;

2
glx/glxserver.h
View File

@ -76,8 +76,6 @@ extern __GLXclientState *glxGetClient(ClientPtr pClient);
/************************************************************************/
void GlxExtensionInit(void);
void GlxSetVisualConfigs(int nconfigs, void *configs, void **privates);
void __glXScreenInitVisuals(__GLXscreen * screen);

3
hw/dmx/dmx.c
View File

@ -52,6 +52,7 @@
#include "os.h"
#include "dixstruct.h"
#include "extnsionst.h"
#include "extinit.h"
#include "opaque.h"
#include "dmxextension.h"
@ -65,8 +66,6 @@ extern unsigned long XRT_WINDOW;
extern int PanoramiXNumScreens;
#endif
extern void DMXExtensionInit(void);
static unsigned char DMXCode;
static int

1
hw/dmx/glxProxy/glxext.c
View File

@ -44,6 +44,7 @@
#include "glxvisuals.h"
#include "micmap.h"
#include "glxswap.h"
#include "extinit.h"
/*
** Forward declarations.

2
hw/dmx/glxProxy/glxext.h
View File

@ -64,8 +64,6 @@ extern void __glXResetLargeCommandStatus(__GLXclientState *);
extern int __glXQueryContextInfoEXT(__GLXclientState * cl, GLbyte * pc);
extern int __glXSwapQueryContextInfoEXT(__GLXclientState * cl, char *pc);
extern void GlxExtensionInit(void);
extern Bool __glXCoreType(void);
#endif /* _glxext_h_ */

2
hw/xfree86/common/Makefile.am
View File

@ -45,7 +45,7 @@ libcommon_la_SOURCES = xf86Configure.c xf86Bus.c xf86Config.c \
xf86Option.c xf86Init.c \
xf86VidMode.c xf86fbman.c xf86cmap.c \
xf86Helper.c xf86PM.c xf86Xinput.c xisb.c \
xf86Mode.c xorgHelper.c \
xf86Mode.c xorgHelper.c xf86Extensions.h \
$(XVSOURCES) $(BUSSOURCES) $(RANDRSOURCES)
nodist_libcommon_la_SOURCES = xf86DefModeSet.c xf86Build.h
libcommon_la_LIBADD = $(top_builddir)/config/libconfig.la

2
hw/xfree86/common/vidmodeproc.h
View File

@ -39,7 +39,7 @@ typedef union {
float f;
} vidMonitorValue;
extern _X_EXPORT void XFree86VidModeExtensionInit(void);
extern Bool VidModeExtensionInit(ScreenPtr pScreen);
extern _X_EXPORT Bool VidModeAvailable(int scrnIndex);
extern _X_EXPORT Bool VidModeGetCurrentModeline(int scrnIndex, pointer *mode,

5
hw/xfree86/common/xf86.h
View File

@ -449,11 +449,6 @@ xf86RandRSetNewVirtualAndDimensions(ScreenPtr pScreen,
Bool resetMode);
#endif
/* xf86VidModeExtentionInit.c */
extern _X_EXPORT Bool
VidModeExtensionInit(ScreenPtr pScreen);
/* convert ScreenPtr to ScrnInfoPtr */
extern _X_EXPORT ScrnInfoPtr xf86ScreenToScrn(ScreenPtr pScreen);
/* convert ScrnInfoPtr to ScreenPtr */

54
hw/xfree86/common/xf86Extensions.h Normal file
View File

@ -0,0 +1,54 @@
/*
* Copyright © 2011 Daniel Stone
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the
* Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*
* Author: Daniel Stone <daniel@fooishbar.org>
*/
#ifndef XF86EXTENSIONS_H
#define XF86EXTENSIONS_H
#include "extnsionst.h"
#ifdef XF86DRI
extern Bool noXFree86DRIExtension;
extern void XFree86DRIExtensionInit(void);
#endif
#ifdef DRI2
#include <X11/extensions/dri2proto.h>
extern void DRI2ExtensionInit(void);
#endif
#ifdef XF86VIDMODE
#include <X11/extensions/xf86vmproto.h>
extern Bool noXFree86VidModeExtension;
extern void XFree86VidModeExtensionInit(void);
#endif
#ifdef XFreeXDGA
#include <X11/extensions/xf86dgaproto.h>
extern Bool noXFree86DGAExtension;
extern void XFree86DGAExtensionInit(void);
extern void XFree86DGARegister(void);
#endif
#endif

3
hw/xfree86/dixmods/dbemodule.c
View File

@ -4,11 +4,10 @@
#include "xf86Module.h"
#include "globals.h"
#include "extinit.h"
static MODULESETUPPROTO(dbeSetup);
extern void DbeExtensionInit(void);
static ExtensionModule dbeExt = {
DbeExtensionInit,
"DOUBLE-BUFFER",

1
hw/xfree86/dixmods/extmod/Makefile.am
View File

@ -23,7 +23,6 @@ INCLUDES = @XORG_INCS@ \
libextmod_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG)
libextmod_la_SOURCES = modinit.c \
modinit.h \
$(DGA_SRCS) \
$(XF86VMODE_SRCS) \
$(XV_SRCS)

3
hw/xfree86/dixmods/extmod/modinit.c
View File

@ -29,7 +29,8 @@
#include <X11/Xproto.h>
#include "modinit.h"
#include "extinit.h"
#include "xf86Extensions.h"
#include "globals.h"
static MODULESETUPPROTO(extmodSetup);

3
hw/xfree86/dixmods/extmod/xf86dga2.c
View File

@ -17,6 +17,7 @@
#include "dixevents.h"
#include "pixmapstr.h"
#include "extnsionst.h"
#include "xf86Extensions.h"
#include "colormapst.h"
#include "cursorstr.h"
#include "scrnintstr.h"
@ -28,7 +29,7 @@
#include <string.h>
#include "modinit.h"
#include "extinit.h"
#define DGA_PROTOCOL_OLD_SUPPORT 1

1
hw/xfree86/dixmods/extmod/xf86vmode.c
View File

@ -39,6 +39,7 @@ from Kaleb S. KEITHLEY
#include "misc.h"
#include "dixstruct.h"
#include "extnsionst.h"
#include "xf86Extensions.h"
#include "scrnintstr.h"
#include "servermd.h"
#include <X11/extensions/xf86vmproto.h>

1
hw/xfree86/dixmods/glxmodule.c
View File

@ -42,6 +42,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "micmap.h"
#include "globals.h"
#include "glxserver.h"
#include "extinit.h"
static MODULESETUPPROTO(glxSetup);

3
hw/xfree86/dixmods/recordmod.c
View File

@ -3,13 +3,12 @@
#endif
#include "xf86Module.h"
#include "extinit.h"
extern Bool noTestExtensions;
static MODULESETUPPROTO(recordSetup);
extern void RecordExtensionInit(void);
static ExtensionModule recordExt = {
RecordExtensionInit,
"RECORD",

2
hw/xfree86/dri/dri.c
View File

@ -51,6 +51,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "misc.h"
#include "dixstruct.h"
#include "extnsionst.h"
#include "extinit.h"
#include "colormapst.h"
#include "cursorstr.h"
#include "scrnintstr.h"
@ -68,6 +69,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "xf86_OSproc.h"
#include "inputstr.h"
#include "xf86VGAarbiter.h"
#include "xf86Extensions.h"
static int DRIEntPrivIndex = -1;
static DevPrivateKeyRec DRIScreenPrivKeyRec;

2
hw/xfree86/dri/drimodule.c
View File

@ -37,6 +37,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#endif
#include "xf86Module.h"
#include "xf86Extensions.h"
#include "globals.h"
#include "xf86drm.h"
@ -57,7 +58,6 @@ static XF86ModuleVersionInfo VersRec = {
{0, 0, 0, 0}
};
extern void XFree86DRIExtensionInit(void);
#define _XF86DRI_SERVER_
#include <X11/dri/xf86driproto.h>

11
hw/xfree86/dri/xf86dri.c
View File

@ -47,6 +47,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "misc.h"
#include "dixstruct.h"
#include "extnsionst.h"
#include "extinit.h"
#include "colormapst.h"
#include "cursorstr.h"
#include "scrnintstr.h"
@ -60,17 +61,17 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "dristruct.h"
#include "xf86drm.h"
#include "protocol-versions.h"
#include "xf86Extensions.h"
static int DRIErrorBase;
static void XF86DRIResetProc(ExtensionEntry * extEntry);
static void XF86DRIResetProc(ExtensionEntry *extEntry);
static unsigned char DRIReqCode = 0;
extern void XFree86DRIExtensionInit(void);
/*ARGSUSED*/ static void
XF86DRIResetProc(ExtensionEntry * extEntry)
/*ARGSUSED*/
static void
XF86DRIResetProc(ExtensionEntry *extEntry)
{
DRIReset();
}

1
hw/xfree86/sdksyms.sh
View File

@ -279,7 +279,6 @@ cat > sdksyms.c << EOF
#include "dixstruct.h"
#include "exevents.h"
#include "extension.h"
#include "extinit.h"
#include "extnsionst.h"
#include "gc.h"
#include "gcstruct.h"

1
hw/xquartz/pseudoramiX.c
View File

@ -40,6 +40,7 @@
#include "darwin.h"
#include "pseudoramiX.h"
#include "extnsionst.h"
#include "extinit.h"
#include "dixstruct.h"
#include "window.h"
#include <X11/extensions/panoramiXproto.h>

1
hw/xquartz/pseudoramiX.h
View File

@ -6,6 +6,5 @@ extern int noPseudoramiXExtension;
void
PseudoramiXAddScreen(int x, int y, int w, int h);
void PseudoramiXExtensionInit(int argc, char *argv[]);
void
PseudoramiXResetScreens(void);

1
hw/xquartz/xpr/dri.c
View File

@ -55,6 +55,7 @@
#include "misc.h"
#include "dixstruct.h"
#include "extnsionst.h"
#include "extinit.h"
#include "colormapst.h"
#include "cursorstr.h"
#include "scrnintstr.h"

3
hw/xquartz/xpr/dri.h
View File

@ -72,9 +72,6 @@ DRIFinishScreenInit(ScreenPtr pScreen);
extern void
DRICloseScreen(ScreenPtr pScreen);
extern Bool
DRIExtensionInit(void);
extern void
DRIReset(void);

164
include/extinit.h
View File

@ -23,8 +23,29 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
/********************************************************************
* Interface of extinit.c
/*
* Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy of
* this software and associated documentation files (the "Software"), to deal in
* the Software without restriction, including without limitation the rights to
* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
* of the Software, and to permit persons to whom the Software is furnished to do
* so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
* NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
* AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
* Except as contained in this notice, the name of the XFree86 Project shall not
* be used in advertising or otherwise to promote the sale, use or other dealings
* in this Software without prior written authorization from the XFree86 Project.
*/
#ifndef EXTINIT_H
@ -32,14 +53,135 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "extnsionst.h"
extern void
XInputExtensionInit(void
);
#ifdef COMPOSITE
extern Bool noCompositeExtension;
extern void CompositeExtensionInit(void);
#endif
extern _X_EXPORT void
AssignTypeAndName(DeviceIntPtr /* dev */ ,
Atom /* type */ ,
const char * /* name */
);
#ifdef DAMAGE
extern Bool noDamageExtension;
extern void DamageExtensionInit(void);
#endif
#endif /* EXTINIT_H */
#if defined(DBE) && !defined(XorgLoader)
extern Bool noDbeExtension;
extern void DbeExtensionInit(void);
#endif
#ifdef DMXEXT
extern void DMXExtensionInit(void);
#endif
#if defined(DPMSExtension) && !defined(XorgLoader)
#include <X11/extensions/dpmsconst.h>
extern Bool noDPMSExtension;
extern void DPMSExtensionInit(void);
#endif
extern Bool noGEExtension;
extern void GEExtensionInit(void);
#ifdef GLXEXT
extern _X_EXPORT Bool noGlxExtension;
extern void GlxExtensionInit(void);
#endif
#ifdef PANORAMIX
#include <X11/extensions/panoramiXproto.h>
extern Bool noPanoramiXExtension;
extern void PanoramiXExtensionInit(void);
#endif
#ifdef RANDR
extern Bool noRRExtension;
extern void RRExtensionInit(void);
#endif
#if defined(XRECORD) && !defined(XorgLoader)
extern void RecordExtensionInit(void);
#endif
extern Bool noRenderExtension;
extern void RenderExtensionInit(void);
#if defined(RES) && !defined(XorgLoader)
#include <X11/extensions/XResproto.h>
extern Bool noResExtension;
extern void ResExtensionInit(void);
#endif
#if defined(SCREENSAVER) && !defined(XorgLoader)
#include <X11/extensions/saver.h>
extern Bool noScreenSaverExtension;
extern void ScreenSaverExtensionInit(void);
#endif
#include <X11/extensions/shapeproto.h>
extern void ShapeExtensionInit(void);
#ifdef MITSHM
#include <X11/extensions/shm.h>
#include <X11/extensions/shmproto.h>
extern Bool noMITShmExtension;
extern void ShmExtensionInit(void);
#endif
extern void SyncExtensionInit(void);
extern void XCMiscExtensionInit(void);
#ifdef XCSECURITY
#include <X11/extensions/secur.h>
#include "securitysrv.h"
extern Bool noSecurityExtension;
extern void SecurityExtensionInit(void);
#endif
#ifdef XF86BIGFONT
#include <X11/extensions/xf86bigfproto.h>
extern Bool noXFree86BigfontExtension;
extern void XFree86BigfontExtensionInit(void);
#endif
extern void BigReqExtensionInit(void);
#ifdef XFIXES
extern Bool noXFixesExtension;
extern void XFixesExtensionInit(void);
#endif
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);
#if defined(XSELINUX) && !defined(XorgLoader)
#include "xselinux.h"
extern Bool noSELinuxExtension;
extern void SELinuxExtensionInit(void);
#endif
#ifdef XTEST
#include <X11/extensions/xtestconst.h>
#include <X11/extensions/xtestproto.h>
extern void XTestExtensionInit(void);
#endif
#ifdef INXQUARTZ
extern Bool noPseudoramiXExtension;
extern void PseudoramiXExtensionInit(void);
#endif
#if defined(XV) && !defined(XorgLoader)
#include <X11/extensions/Xv.h>
#include <X11/extensions/XvMC.h>
extern Bool noXvExtension;
extern void XvExtensionInit(void);
extern void XvMCExtensionInit(void);
extern void XvRegister(void);
#endif
#endif

81
include/globals.h
View File

@ -5,6 +5,7 @@
#include <signal.h>
#include "window.h" /* for WindowPtr */
#include "extinit.h"
/* Global X server variables that are visible to mi, dix, os, and ddx */
@ -41,79 +42,7 @@ extern _X_EXPORT Bool DPMSCapableFlag;
extern _X_EXPORT Bool PanoramiXExtensionDisabledHack;
#endif
#ifdef COMPOSITE
extern _X_EXPORT Bool noCompositeExtension;
#endif
#ifdef DAMAGE
extern _X_EXPORT Bool noDamageExtension;
#endif
#ifdef DBE
extern _X_EXPORT Bool noDbeExtension;
#endif
#ifdef DPMSExtension
extern _X_EXPORT Bool noDPMSExtension;
#endif
#ifdef GLXEXT
extern _X_EXPORT Bool noGlxExtension;
#endif
#ifdef SCREENSAVER
extern _X_EXPORT Bool noScreenSaverExtension;
#endif
#ifdef MITSHM
extern _X_EXPORT Bool noMITShmExtension;
#endif
#ifdef RANDR
extern _X_EXPORT Bool noRRExtension;
#endif
extern _X_EXPORT Bool noRenderExtension;
#ifdef XCSECURITY
extern _X_EXPORT Bool noSecurityExtension;
#endif
#ifdef RES
extern _X_EXPORT Bool noResExtension;
#endif
#ifdef XF86BIGFONT
extern _X_EXPORT Bool noXFree86BigfontExtension;
#endif
#ifdef XFreeXDGA
extern _X_EXPORT Bool noXFree86DGAExtension;
#endif
#ifdef XF86DRI
extern _X_EXPORT Bool noXFree86DRIExtension;
#endif
#ifdef XF86VIDMODE
extern _X_EXPORT Bool noXFree86VidModeExtension;
#endif
#ifdef XFIXES
extern _X_EXPORT Bool noXFixesExtension;
#endif
#ifdef PANORAMIX
extern _X_EXPORT Bool noPanoramiXExtension;
#endif
#ifdef INXQUARTZ
extern _X_EXPORT Bool noPseudoramiXExtension;
#endif
#ifdef XSELINUX
extern _X_EXPORT Bool noSELinuxExtension;
#define SELINUX_MODE_DEFAULT 0
#define SELINUX_MODE_DISABLED 1
#define SELINUX_MODE_PERMISSIVE 2
@ -121,12 +50,4 @@ extern _X_EXPORT Bool noSELinuxExtension;
extern _X_EXPORT int selinuxEnforcingState;
#endif
#ifdef XV
extern _X_EXPORT Bool noXvExtension;
#endif
#ifdef DRI2
extern _X_EXPORT Bool noDRI2Extension;
#endif
#endif /* !_XSERV_GLOBAL_H_ */

4
include/window.h
View File

@ -214,10 +214,8 @@ extern _X_EXPORT void ResizeChildrenWinSize(WindowPtr /*pWin */ ,
int /*dw */ ,
int /*dh */ );
extern _X_EXPORT void ShapeExtensionInit(void);
extern _X_EXPORT void SendShapeNotify(WindowPtr /* pWin */ ,
int /* which */ );
int /* which */);
extern _X_EXPORT RegionPtr CreateBoundingShape(WindowPtr /* pWin */ );

105
mi/miinitext.c
View File

@ -90,114 +90,15 @@ SOFTWARE.
#include "misc.h"
#include "extension.h"
#include "extinit.h"
#include "micmap.h"
#include "globals.h"
extern Bool noGEExtension;
#ifndef XFree86LOADER
typedef void (*InitExtension) (void);
#else /* XFree86Loader */
#include "loaderProcs.h"
#endif
#ifdef MITSHM
#include <X11/extensions/shm.h>
#endif
#ifdef XTEST
#include <X11/extensions/xtestconst.h>
#endif
#include <X11/extensions/XKB.h>
#ifdef XCSECURITY
#include "securitysrv.h"
#include <X11/extensions/secur.h>
#endif
#ifdef XSELINUX
#include "xselinux.h"
#endif
#ifdef PANORAMIX
#include <X11/extensions/panoramiXproto.h>
#endif
#ifdef XF86BIGFONT
#include <X11/extensions/xf86bigfproto.h>
#endif
#ifdef RES
#include <X11/extensions/XResproto.h>
#endif
/* FIXME: this whole block of externs should be from the appropriate headers */
#ifdef MITSHM
extern void ShmExtensionInit(void);
#endif
#ifdef PANORAMIX
extern void PanoramiXExtensionInit(void);
#endif
#ifdef INXQUARTZ
extern void PseudoramiXExtensionInit(void);
#endif
extern void XInputExtensionInit(void);
#ifdef XTEST
extern void XTestExtensionInit(void);
#endif
extern void BigReqExtensionInit(void);
#ifdef SCREENSAVER
extern void ScreenSaverExtensionInit(void);
#endif
#ifdef XV
extern void XvExtensionInit(void);
extern void XvMCExtensionInit(void);
#endif
extern void SyncExtensionInit(void);
extern void XkbExtensionInit(void);
extern void XCMiscExtensionInit(void);
#ifdef XRECORD
extern void RecordExtensionInit(void);
#endif
#ifdef DBE
extern void DbeExtensionInit(void);
#endif
#ifdef XCSECURITY
extern void SecurityExtensionInit(void);
#endif
#ifdef XSELINUX
extern void SELinuxExtensionInit(void);
#endif
#ifdef XF86BIGFONT
extern void XFree86BigfontExtensionInit(void);
#endif
#ifdef XF86VIDMODE
extern void XFree86VidModeExtensionInit(void);
#endif
#ifdef XFreeXDGA
extern void XFree86DGAExtensionInit(void);
#endif
#ifdef GLXEXT
extern void GlxExtensionInit(void);
#endif
#ifdef XF86DRI
extern void XFree86DRIExtensionInit(void);
#endif
#ifdef DPMSExtension
extern void DPMSExtensionInit(void);
#endif
extern void RenderExtensionInit(void);
#ifdef RANDR
extern void RRExtensionInit(void);
#endif
#ifdef RES
extern void ResExtensionInit(void);
#endif
#ifdef DMXEXT
extern void DMXExtensionInit(void);
#endif
#ifdef XFIXES
extern void XFixesExtensionInit(void);
#endif
#ifdef DAMAGE
extern void DamageExtensionInit(void);
#endif
#ifdef COMPOSITE
extern void CompositeExtensionInit(void);
#include "xf86Extensions.h"
#endif
/* The following is only a small first step towards run-time
@ -245,6 +146,7 @@ static ExtensionToggle ExtensionToggleList[] = {
#ifdef XF86BIGFONT
{"XFree86-Bigfont", &noXFree86BigfontExtension},
#endif
#ifndef NO_HW_ONLY_EXTS
#ifdef XFreeXDGA
{"XFree86-DGA", &noXFree86DGAExtension},
#endif
@ -254,6 +156,7 @@ static ExtensionToggle ExtensionToggleList[] = {
#ifdef XF86VIDMODE
{"XFree86-VidModeExtension", &noXFree86VidModeExtension},
#endif
#endif
#ifdef XFIXES
{"XFIXES", &noXFixesExtension},
#endif

1
randr/randr.c
View File

@ -30,6 +30,7 @@
#endif
#include "randrstr.h"
#include "extinit.h"
/* From render.h */
#ifndef SubPixelUnknown

4
randr/randrstr.h
View File

@ -418,10 +418,6 @@ extern _X_EXPORT RESTYPE RRCrtcType, RRModeType, RROutputType, RRProviderType;
#define GetRRClient(pClient) ((RRClientPtr)dixLookupPrivate(&(pClient)->devPrivates, RRClientPrivateKey))
#define rrClientPriv(pClient) RRClientPtr pRRClient = GetRRClient(pClient)
/* Initialize the extension */
extern _X_EXPORT void
RRExtensionInit(void);
#ifdef RANDR_12_INTERFACE
/*
* Set the range of sizes for the screen

3
record/record.c
View File

@ -38,6 +38,7 @@ and Jim Haggerty of Metheus.
#include "dixstruct.h"
#include "extnsionst.h"
#include "extinit.h"
#include <X11/extensions/recordproto.h>
#include "set.h"
#include "swaprep.h"
@ -139,8 +140,6 @@ static int RecordDeleteContext(pointer /*value */ ,
XID /*id */
);
void RecordExtensionInit(void);
/***************************************************************************/
/* client private stuff */

2
render/picturestr.h
View File

@ -547,8 +547,6 @@ CompositeTriFan(CARD8 op,
PictFormatPtr maskFormat,
INT16 xSrc, INT16 ySrc, int npoints, xPointFixed * points);
extern _X_EXPORT void RenderExtensionInit(void);
Bool
AnimCurInit(ScreenPtr pScreen);

1
render/render.c
View File

@ -37,6 +37,7 @@
#include "pixmapstr.h"
#include "colormapst.h"
#include "extnsionst.h"
#include "extinit.h"
#include "servermd.h"
#include <X11/extensions/render.h>
#include <X11/extensions/renderproto.h>

1
xfixes/xfixes.c
View File

@ -48,6 +48,7 @@
#include "xfixesint.h"
#include "protocol-versions.h"
#include "extinit.h"
static unsigned char XFixesReqCode;
int XFixesEventBase;

5
xfixes/xfixesint.h
View File

@ -71,11 +71,6 @@ typedef struct _XFixesClient {
extern int (*ProcXFixesVector[XFixesNumberRequests]) (ClientPtr);
/* Initialize extension at server startup time */
void
XFixesExtensionInit(void);
/* Save set */
int
ProcXFixesChangeSaveSet(ClientPtr client);

1
xkb/xkb.c
View File

@ -36,6 +36,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define XKBSRV_NEED_FILE_FUNCS
#include <xkbsrv.h>
#include "extnsionst.h"
#include "extinit.h"
#include "xace.h"
#include "xkb.h"
#include "protocol-versions.h"

2
xkb/xkb.h
View File

@ -27,6 +27,4 @@ extern int ProcXkbGetKbdByName(ClientPtr client);
extern int ProcXkbGetDeviceInfo(ClientPtr client);
extern int ProcXkbSetDeviceInfo(ClientPtr client);
extern int ProcXkbSetDebuggingFlags(ClientPtr client);
extern void XkbExtensionInit(void);
#endif