[PATCH 30/37] Unify miinitext.c

[Jeremy Huddleston]

This patch removes this XQuartz extension which needs to be initialized in the new common path.

#ifdef INXQUARTZ
    if(!noPseudoramiXExtension) PseudoramiXExtensionInit();
#endif

Is this on a branch of your personal git repo for testing?

On Jun 28, 2011, at 12:27, Daniel Stone wrote:

> Rather than having a non-Xorg and an Xorg-specific path which basically
> just duplicated each other for no reason, we could ... just have one.
> 
> Signed-off-by: Daniel Stone <daniel at fooishbar.org>
> ---
> hw/xfree86/dixmods/Makefile.am |    2 +-
> mi/miinitext.c                 |   91 ----------------------------------------
> 2 files changed, 1 insertions(+), 92 deletions(-)
> 
> diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am
> index 4173983..546a2f7 100644
> --- a/hw/xfree86/dixmods/Makefile.am
> +++ b/hw/xfree86/dixmods/Makefile.am
> @@ -41,7 +41,7 @@ libshadow_la_LIBADD = $(top_builddir)/miext/shadow/libshadow.la
> libshadow_la_SOURCES = shmodule.c
> 
> libdixmods_la_SOURCES = $(top_srcdir)/mi/miinitext.c
> -libdixmods_la_CFLAGS = -DXFree86LOADER $(AM_CFLAGS)
> +libdixmods_la_CFLAGS = $(AM_CFLAGS)
> 
> libxorgxkb_la_SOURCES = xkbVT.c xkbPrivate.c xkbKillSrv.c
> libxorgxkb_la_LIBADD = $(top_builddir)/dix/libdix.la
> diff --git a/mi/miinitext.c b/mi/miinitext.c
> index 9d359e7..c1141fb 100644
> --- a/mi/miinitext.c
> +++ b/mi/miinitext.c
> @@ -162,11 +162,6 @@ extern Bool noXvExtension;
> #endif
> extern Bool noGEExtension;
> 
> -#ifndef XFree86LOADER
> -#else /* XFree86Loader */
> -#include "loaderProcs.h"
> -#endif
> -
> #ifdef MITSHM
> #include <X11/extensions/shm.h>
> #endif
> @@ -397,90 +392,6 @@ void EnableDisableExtensionError(char *name, Bool enable)
>     }
> }
> 
> -#ifndef XFree86LOADER
> -
> -/*ARGSUSED*/
> -void
> -InitExtensions(int argc, char *argv[])
> -{
> -    if (!noGEExtension) GEExtensionInit();
> -    ShapeExtensionInit();
> -#ifdef MITSHM
> -    if (!noMITShmExtension) ShmExtensionInit();
> -#endif
> -    XInputExtensionInit();
> -#ifdef XTEST
> -    if (!noTestExtensions) XTestExtensionInit();
> -#endif
> -    BigReqExtensionInit();
> -    SyncExtensionInit();
> -    XkbExtensionInit();
> -    XCMiscExtensionInit();
> -#ifdef XCSECURITY
> -    if (!noSecurityExtension) SecurityExtensionInit();
> -#endif
> -#ifdef PANORAMIX
> -    if (!noPanoramiXExtension) PanoramiXExtensionInit();
> -#endif
> -#ifdef INXQUARTZ
> -    if(!noPseudoramiXExtension) PseudoramiXExtensionInit();
> -#endif
> -#ifdef XFIXES
> -    /* must be before Render to layer DisplayCursor correctly */
> -    if (!noXFixesExtension) XFixesExtensionInit();
> -#endif
> -#ifdef XF86BIGFONT
> -    if (!noXFree86BigfontExtension) XFree86BigfontExtensionInit();
> -#endif
> -    if (!noRenderExtension) RenderExtensionInit();
> -#ifdef RANDR
> -    if (!noRRExtension) RRExtensionInit();
> -#endif
> -#ifdef COMPOSITE
> -    if (!noCompositeExtension) CompositeExtensionInit();
> -#endif
> -#ifdef DAMAGE
> -    if (!noDamageExtension) DamageExtensionInit();
> -#endif
> -
> -#ifdef XSELINUX
> -    if (!noSELinuxExtension) SELinuxExtensionInit();
> -#endif
> -#if defined(SCREENSAVER)
> -    if (!noScreenSaverExtension) ScreenSaverExtensionInit ();
> -#endif
> -
> -#if !defined(NO_HW_ONLY_EXTS) && defined(DPMSExtension)
> -    if (!noDPMSExtension) DPMSExtensionInit();
> -#endif
> -
> -#ifdef XV
> -    if (!noXvExtension) {
> -      XvExtensionInit();
> -      XvMCExtensionInit();
> -    }
> -#endif
> -#ifdef RES
> -    if (!noResExtension) ResExtensionInit();
> -#endif
> -#ifdef XRECORD
> -    if (!noTestExtensions) RecordExtensionInit(); 
> -#endif
> -#ifdef DBE
> -    if (!noDbeExtension) DbeExtensionInit();
> -#endif
> -#ifdef DMXEXT
> -    DMXExtensionInit(); /* server-specific extension, cannot be disabled */
> -#endif
> -
> -#ifdef GLXEXT
> -    if (serverGeneration == 1)
> -	GlxPushProvider(&__glXDRISWRastProvider);
> -    if (!noGlxExtension) GlxExtensionInit();
> -#endif
> -}
> -
> -#else /* XFree86LOADER */
> /* List of built-in (statically linked) extensions */
> static ExtensionModule staticExtensions[] = {
>     { GEExtensionInit, "Generic Event Extension", &noGEExtension, NULL, NULL},
> @@ -619,5 +530,3 @@ LoadExtension(ExtensionModule * e, Bool builtin)
>     if (e->setupFunc != NULL)
> 	e->setupFunc();
> }
> -
> -#endif /* XFree86LOADER */
> -- 
> 1.7.5.4
> 
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel
>