[PATCH 05/37] Reorder extension initialisation for non-Xorg

[Daniel Stone]

Reorder static extension initialisation in miinitext for non-Xorg
servers to match Xorg's order.

Tested with Xephyr; checked that the extension list was identical before
and after.

Signed-off-by: Daniel Stone <daniel at fooishbar.org>
---
 mi/miinitext.c |   84 ++++++++++++++++++++++++++++---------------------------
 1 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/mi/miinitext.c b/mi/miinitext.c
index 3155bda..ff70a1d 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -386,13 +386,6 @@ void
 InitExtensions(int argc, char *argv[])
 {
     if (!noGEExtension) GEExtensionInit();
-
-#ifdef PANORAMIX
-  if (!noPanoramiXExtension) PanoramiXExtensionInit();
-#endif
-#ifdef INXQUARTZ
-    if(!noPseudoramiXExtension) PseudoramiXExtensionInit();
-#endif
     ShapeExtensionInit();
 #ifdef MITSHM
     if (!noMITShmExtension) ShmExtensionInit();
@@ -402,36 +395,43 @@ InitExtensions(int argc, char *argv[])
     if (!noTestExtensions) XTestExtensionInit();
 #endif
     BigReqExtensionInit();
-#if defined(SCREENSAVER)
-    if (!noScreenSaverExtension) ScreenSaverExtensionInit ();
-#endif
-#ifdef XV
-    if (!noXvExtension) {
-      XvExtensionInit();
-      XvMCExtensionInit();
-    }
-#endif
     SyncExtensionInit();
     XkbExtensionInit();
     XCMiscExtensionInit();
-#ifdef XRECORD
-    if (!noTestExtensions) RecordExtensionInit(); 
-#endif
-#ifdef DBE
-    if (!noDbeExtension) DbeExtensionInit();
-#endif
 #ifdef XCSECURITY
     if (!noSecurityExtension) SecurityExtensionInit();
 #endif
-#ifdef XSELINUX
-    if (!noSELinuxExtension) SELinuxExtensionInit();
+#ifdef PANORAMIX
+    if (!noPanoramiXExtension) PanoramiXExtensionInit();
 #endif
-#if defined(DPMSExtension) && !defined(NO_HW_ONLY_EXTS)
-    if (!noDPMSExtension) DPMSExtensionInit();
+#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)
 #if defined(XF86VIDMODE)
     if (!noXFree86VidModeExtension) XFree86VidModeExtensionInit();
@@ -439,29 +439,31 @@ InitExtensions(int argc, char *argv[])
 #if defined(XFreeXDGA)
     if (!noXFree86DGAExtension) XFree86DGAExtensionInit();
 #endif
-#ifdef XF86DRI
-    if (!noXFree86DRIExtension) XFree86DRIExtensionInit();
-#endif
+#if defined(DPMSExtension)
+    if (!noDPMSExtension) DPMSExtensionInit();
 #endif
-#ifdef XFIXES
-    /* must be before Render to layer DisplayCursor correctly */
-    if (!noXFixesExtension) XFixesExtensionInit();
 #endif
-    if (!noRenderExtension) RenderExtensionInit();
-#ifdef RANDR
-    if (!noRRExtension) RRExtensionInit();
+
+#ifdef XV
+    if (!noXvExtension) {
+      XvExtensionInit();
+      XvMCExtensionInit();
+    }
 #endif
 #ifdef RES
     if (!noResExtension) ResExtensionInit();
 #endif
-#ifdef DMXEXT
-    DMXExtensionInit(); /* server-specific extension, cannot be disabled */
+#ifdef XRECORD
+    if (!noTestExtensions) RecordExtensionInit(); 
 #endif
-#ifdef COMPOSITE
-    if (!noCompositeExtension) CompositeExtensionInit();
+#ifdef DBE
+    if (!noDbeExtension) DbeExtensionInit();
 #endif
-#ifdef DAMAGE
-    if (!noDamageExtension) DamageExtensionInit();
+#if !defined(NO_HW_ONLY_EXTS) && defined(XF86DRI)
+    if (!noXFree86DRIExtension) XFree86DRIExtensionInit();
+#endif
+#ifdef DMXEXT
+    DMXExtensionInit(); /* server-specific extension, cannot be disabled */
 #endif
 
 #ifdef GLXEXT
-- 
1.7.5.4