treewide: drop COMPOSITE symbol

It's always enabled for very long time now (at least since meson transition),
there doesn't seem to be any need to ever disable it again. So we can reduce
code complexity by removing all the ifdef's.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>

mi/miexpose.c

@@ -429,10 +429,8 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
         tile_x_off = pWin->drawable.x - draw_x_off;
         tile_y_off = pWin->drawable.y - draw_y_off;
         fill = pWin->background;
-#ifdef COMPOSITE
         if (pWin->inhibitBGPaint)
             return;
-#endif
         switch (pWin->backgroundState) {
         case None:
             return;
@@ -459,15 +457,10 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
         tile_x_off = pWin->drawable.x;
         tile_y_off = pWin->drawable.y;
 
-#if defined(COMPOSITE) || defined(ROOTLESS)
         draw_x_off = pixmap->screen_x;
         draw_y_off = pixmap->screen_y;
         tile_x_off -= draw_x_off;
         tile_y_off -= draw_y_off;
-#else
-        draw_x_off = 0;
-        draw_y_off = 0;
-#endif
     }
 
     gcval[0].val = GXcopy;
@@ -486,7 +479,6 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
         gcval[1].val =
             fill.pixel | RootlessAlphaMask(pWin->drawable.bitsPerPixel);
 #else
-#ifdef COMPOSITE
         /* Make sure alpha will sample as 1.0 for opaque windows */
         if (drawable->depth == 32) {
             WindowPtr orig_pWin = pWin;
@@ -507,7 +499,6 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
             if (effective_depth == 24)
                 fill.pixel |= 0xff000000;
         }
-#endif
         gcval[1].val = fill.pixel;
 #endif
         gcval[2].val = FillSolid;

mi/miinitext.c

@@ -79,10 +79,6 @@ SOFTWARE.
 #endif
 
 /* some DDXes must explicitly prohibit some extensions */
-#ifdef DISABLE_EXT_COMPOSITE
-#undef COMPOSITE
-#endif
-
 #ifdef DISABLE_EXT_DPMS
 #undef DPMSExtension
 #endif
@@ -130,7 +126,7 @@ static const ExtensionModule staticExtensions[] = {
 #ifdef RANDR
     {RRExtensionInit, "RANDR", &noRRExtension},
 #endif
-#ifdef COMPOSITE
+#ifndef DISABLE_EXT_COMPOSITE
     {CompositeExtensionInit, "COMPOSITE", &noCompositeExtension},
 #endif
 #ifdef DAMAGE

mi/mivaltree.c

@@ -100,9 +100,7 @@ Equipment Corporation.
 #include    "regionstr.h"
 #include    "mivalidate.h"
 #include    "globals.h"
-#ifdef COMPOSITE
 #include    "compint.h"
-#endif
 
 /*
  * Compute the visibility of a shaped window
@@ -167,11 +165,7 @@ miShapedWindowIn(RegionPtr universe, RegionPtr bounding,
  * siblings or parent windows
  */
 
-#ifdef COMPOSITE
 #define TreatAsTransparent(w)	((w)->redirectDraw == RedirectDrawManual)
-#else
-#define TreatAsTransparent(w)	FALSE
-#endif
 
 #define HasParentRelativeBorder(w) (!(w)->borderIsPixel && \
 				    HasBorder(w) && \
@@ -228,7 +222,6 @@ miComputeClips(WindowPtr pParent,
         dy = 32767;
     borderSize.y2 = dy;
 
-#ifdef COMPOSITE
     /*
      * In redirected drawing case, reset universe to borderSize
      */
@@ -238,7 +231,6 @@ miComputeClips(WindowPtr pParent,
         compSetRedirectBorderClip (pParent, universe);
         RegionCopy(universe, &pParent->borderSize);
     }
-#endif
 
     oldVis = pParent->visibility;
     switch (RegionContainsRect(universe, &borderSize)) {
@@ -508,11 +500,9 @@ miTreeObscured(WindowPtr pParent)
 static RegionPtr
 getBorderClip(WindowPtr pWin)
 {
-#ifdef COMPOSITE
     if (pWin->redirectDraw != RedirectDrawNone)
         return compGetRedirectBorderClip(pWin);
     else
-#endif
         return &pWin->borderClip;
 }
 

mi/miwindow.c

@@ -316,7 +316,6 @@ miRecomputeExposures(WindowPtr pWin, void *value)
     RegionPtr pValid = (RegionPtr) value;
 
     if (pWin->valdata) {
-#ifdef COMPOSITE
         /*
          * Redirected windows are not affected by parent window
          * gravity manipulations, so don't recompute their
@@ -324,7 +323,6 @@ miRecomputeExposures(WindowPtr pWin, void *value)
          */
         if (pWin->redirectDraw != RedirectDrawNone)
             return WT_DONTWALKCHILDREN;
-#endif
         /*
          * compute exposed regions of this window
          */
@@ -568,11 +566,7 @@ miResizeWindow(WindowPtr pWin, int x, int y, unsigned int w, unsigned int h,
 
             /* and move those bits */
 
-            if (oldpt.x != x || oldpt.y != y
-#ifdef COMPOSITE
-                || pWin->redirectDraw
-#endif
-                ) {
+            if (oldpt.x != x || oldpt.y != y || pWin->redirectDraw) {
                 (*pWin->drawable.pScreen->CopyWindow) (pWin, oldpt,
                                                        gravitate[g]);
             }