fixup damage ext

FIXME: needs Xnest fixes merged first

Xext/panoramiX.c

@@ -54,9 +54,7 @@ Equipment Corporation.
 #include "picturestr_priv.h"
 #include "xfixesint.h"
 #include "damageextint.h"
-#ifdef COMPOSITE
 #include "compint.h"
-#endif
 #include "extinit_priv.h"
 #include "protocol-versions.h"
 
@@ -583,10 +581,7 @@ PanoramiXExtensionInit(void)
     PanoramiXRenderInit();
     PanoramiXFixesInit();
     PanoramiXDamageInit();
-#ifdef COMPOSITE
     PanoramiXCompositeInit();
-#endif
-
 }
 
 Bool
@@ -888,9 +883,7 @@ PanoramiXResetProc(ExtensionEntry * extEntry)
     PanoramiXRenderReset();
     PanoramiXFixesReset();
     PanoramiXDamageReset();
-#ifdef COMPOSITE
     PanoramiXCompositeReset ();
-#endif
     screenInfo.numScreens = PanoramiXNumScreens;
     for (i = 256; i--;)
         ProcVector[i] = SavedProcVector[i];

Xext/xres.c

@@ -31,10 +31,7 @@
 #include <string.h>
 #include "hashtable.h"
 #include "picturestr.h"
-
-#ifdef COMPOSITE
 #include "compint.h"
-#endif
 
 /** @brief Holds fragments of responses for ConstructClientIds.
  *

dix/colormap.c

@@ -186,12 +186,8 @@ static void FindColorInRootCmap(ColormapPtr /* pmap */ ,
 #define NUMRED(vis) ((vis->redMask >> vis->offsetRed) + 1)
 #define NUMGREEN(vis) ((vis->greenMask >> vis->offsetGreen) + 1)
 #define NUMBLUE(vis) ((vis->blueMask >> vis->offsetBlue) + 1)
-#if COMPOSITE
 #define ALPHAMASK(vis)	((vis)->nplanes < 32 ? 0 : \
 			 (CARD32) ~((vis)->redMask|(vis)->greenMask|(vis)->blueMask))
-#else
-#define ALPHAMASK(vis)	0
-#endif
 
 #define RGBMASK(vis) (vis->redMask | vis->greenMask | vis->blueMask | ALPHAMASK(vis))
 

dix/dispatch.c

@@ -2198,10 +2198,8 @@ DoGetImage(ClientPtr client, int format, Drawable drawable,
             PixmapPtr pPix = (*pDraw->pScreen->GetWindowPixmap) (pWin);
 
             pBoundingDraw = &pPix->drawable;
-#if defined(COMPOSITE) || defined(ROOTLESS)
             relx -= pPix->screen_x;
             rely -= pPix->screen_y;
-#endif
         }
         else {
             pBoundingDraw = (DrawablePtr) pDraw->pScreen->root;

dix/window.c

@@ -131,9 +131,7 @@ Equipment Corporation.
 #include "dixevents.h"
 #include "globals.h"
 #include "mi.h"                 /* miPaintWindow */
-#ifdef COMPOSITE
 #include "compint.h"
-#endif
 #include "selection.h"
 #include "inpututils.h"
 #include "privates.h"
@@ -188,9 +186,7 @@ static Bool TileScreenSaver(ScreenPtr pScreen, int kind);
 
 #define SubStrSend(pWin,pParent) (StrSend(pWin) || SubSend(pParent))
 
-#ifdef COMPOSITE
 static const char *overlay_win_name = "<composite overlay>";
-#endif
 
 static const char *
 get_window_name(WindowPtr pWin)
@@ -200,12 +196,10 @@ get_window_name(WindowPtr pWin)
     static char buf[WINDOW_NAME_BUF_LEN];
     int len;
 
-#ifdef COMPOSITE
     CompScreenPtr comp_screen = GetCompScreen(pWin->drawable.pScreen);
 
     if (comp_screen && pWin == comp_screen->pOverlayWin)
         return overlay_win_name;
-#endif
 
     for (prop = wUserProps(pWin); prop; prop = prop->next) {
         if (prop->propertyName == XA_WM_NAME && prop->type == XA_STRING &&
@@ -241,13 +235,11 @@ log_window_info(WindowPtr pWin, int depth)
 
     if (pWin->overrideRedirect)
         ErrorF(" (override redirect)");
-#ifdef COMPOSITE
     if (pWin->redirectDraw)
         ErrorF(" (%s compositing: pixmap %x)",
                (pWin->redirectDraw == RedirectDrawAutomatic) ?
                "automatic" : "manual",
                (unsigned) pWin->drawable.pScreen->GetWindowPixmap(pWin)->drawable.id);
-#endif
 
     switch (pWin->visibility) {
     case VisibilityUnobscured:
@@ -508,9 +500,7 @@ SetWindowToDefaults(WindowPtr pWin)
     pWin->forcedBG = FALSE;
     pWin->unhittable = FALSE;
 
-#ifdef COMPOSITE
     pWin->damagedDescendants = FALSE;
-#endif
 }
 
 static void
@@ -653,10 +643,8 @@ CreateRootWindow(ScreenPtr pScreen)
         pScreen->backingStoreSupport = NotUseful;
     if (enableBackingStore)
         pScreen->backingStoreSupport = WhenMapped;
-#ifdef COMPOSITE
     if (noCompositeExtension)
         pScreen->backingStoreSupport = NotUseful;
-#endif
 
     pScreen->saveUnderSupport = NotUseful;
 
@@ -1718,7 +1706,6 @@ MoveWindowInStack(WindowPtr pWin, WindowPtr pNextSib)
 void
 SetWinSize(WindowPtr pWin)
 {
-#ifdef COMPOSITE
     if (pWin->redirectDraw != RedirectDrawNone) {
         BoxRec box;
 
@@ -1733,7 +1720,6 @@ SetWinSize(WindowPtr pWin)
         RegionReset(&pWin->winSize, &box);
     }
     else
-#endif
         ClippedRegionFromBox(pWin->parent, &pWin->winSize,
                              pWin->drawable.x, pWin->drawable.y,
                              (int) pWin->drawable.width,
@@ -1756,7 +1742,6 @@ SetBorderSize(WindowPtr pWin)
 
     if (HasBorder(pWin)) {
         bw = wBorderWidth(pWin);
-#ifdef COMPOSITE
         if (pWin->redirectDraw != RedirectDrawNone) {
             BoxRec box;
 
@@ -1771,7 +1756,6 @@ SetBorderSize(WindowPtr pWin)
             RegionReset(&pWin->borderSize, &box);
         }
         else
-#endif
             ClippedRegionFromBox(pWin->parent, &pWin->borderSize,
                                  pWin->drawable.x - bw, pWin->drawable.y - bw,
                                  (int) (pWin->drawable.width + (bw << 1)),

exa/exa.c

@@ -125,13 +125,11 @@ exaGetDrawablePixmap(DrawablePtr pDrawable)
 void
 exaGetDrawableDeltas(DrawablePtr pDrawable, PixmapPtr pPixmap, int *xp, int *yp)
 {
-#if defined(COMPOSITE) || defined(ROOTLESS)
     if (pDrawable->type == DRAWABLE_WINDOW) {
         *xp = -pPixmap->screen_x;
         *yp = -pPixmap->screen_y;
         return;
     }
-#endif
 
     *xp = 0;
     *yp = 0;

exa/exa_accel.c

@@ -963,10 +963,8 @@ exaCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
     RegionInit(&rgnDst, NullBox, 0);
 
     RegionIntersect(&rgnDst, &pWin->borderClip, prgnSrc);
-#if defined(COMPOSITE) || defined(ROOTLESS)
     if (pPixmap->screen_x || pPixmap->screen_y)
         RegionTranslate(&rgnDst, -pPixmap->screen_x, -pPixmap->screen_y);
-#endif
 
     if (pExaScr->fallback_counter) {
         pExaScr->fallback_flags |= EXA_FALLBACK_COPYWINDOW;

fb/fb.h

@@ -441,13 +441,8 @@ typedef struct {
 #define __fbPixDrawableX(pPix)	((pPix)->drawable.x)
 #define __fbPixDrawableY(pPix)	((pPix)->drawable.y)
 
-#if defined(COMPOSITE) || defined(ROOTLESS)
 #define __fbPixOffXWin(pPix)	(__fbPixDrawableX(pPix) - (pPix)->screen_x)
 #define __fbPixOffYWin(pPix)	(__fbPixDrawableY(pPix) - (pPix)->screen_y)
-#else
-#define __fbPixOffXWin(pPix)	(__fbPixDrawableX(pPix))
-#define __fbPixOffYWin(pPix)	(__fbPixDrawableY(pPix))
-#endif
 #define __fbPixOffXPix(pPix)	(__fbPixDrawableX(pPix))
 #define __fbPixOffYPix(pPix)	(__fbPixDrawableY(pPix))
 

fb/fbpixmap.c

@@ -76,10 +76,8 @@ fbCreatePixmap(ScreenPtr pScreen, int width, int height, int depth,
     fbInitializeDrawable(&pPixmap->drawable);
 #endif
 
-#if defined(COMPOSITE) || defined(ROOTLESS)
     pPixmap->screen_x = 0;
     pPixmap->screen_y = 0;
-#endif
 
     pPixmap->usage_hint = usage_hint;
 

fb/fbwindow.c

@@ -116,10 +116,8 @@ fbCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
 
     RegionIntersect(&rgnDst, &pWin->borderClip, prgnSrc);
 
-#if defined(COMPOSITE) || defined(ROOTLESS)
     if (pPixmap->screen_x || pPixmap->screen_y)
         RegionTranslate(&rgnDst, -pPixmap->screen_x, -pPixmap->screen_y);
-#endif
 
     miCopyRegion(pDrawable, pDrawable,
                  0, &rgnDst, dx, dy, fbCopyWindowProc, 0, 0);

glamor/glamor_copy.c

@@ -781,10 +781,8 @@ glamor_copy_window(WindowPtr window, DDXPointRec old_origin, RegionPtr src_regio
 
     RegionIntersect(&dst_region, &window->borderClip, src_region);
 
-#if defined(COMPOSITE) || defined(ROOTLESS)
     if (pixmap->screen_x || pixmap->screen_y)
         RegionTranslate(&dst_region, -pixmap->screen_x, -pixmap->screen_y);
-#endif
 
     miCopyRegion(drawable, drawable,
                  0, &dst_region, dx, dy, glamor_copy, 0, 0);

glamor/glamor_pixmap.c

@@ -39,13 +39,11 @@ void
 glamor_get_drawable_deltas(DrawablePtr drawable, PixmapPtr pixmap,
                            int *x, int *y)
 {
-#if defined(COMPOSITE) || defined(ROOTLESS)
     if (drawable->type == DRAWABLE_WINDOW) {
         *x = -pixmap->screen_x;
         *y = -pixmap->screen_y;
         return;
     }
-#endif
 
     *x = 0;
     *y = 0;

glx/glxdricommon.c

@@ -204,7 +204,6 @@ createModeFromConfig(const __DRIcoreExtension * core,
     config->config.drawableType = drawableType;
     config->config.yInverted = GL_TRUE;
 
-#ifdef COMPOSITE
     if (!noCompositeExtension) {
         /*
         * Here we decide what fbconfigs will be duplicated for compositing.
@@ -229,7 +228,6 @@ createModeFromConfig(const __DRIcoreExtension * core,
 
         config->config.duplicatedForComp = duplicateForComp;
     }
-#endif
 
     return &config->config;
 }
@@ -261,7 +259,6 @@ glxConvertConfigs(const __DRIcoreExtension * core,
         tail = tail->next;
     }
 
-#ifdef COMPOSITE
     if (!noCompositeExtension) {
         /* Duplicate fbconfigs for use with compositing visuals */
         for (i = 0; configs[i]; i++) {
@@ -273,7 +270,6 @@ glxConvertConfigs(const __DRIcoreExtension * core,
             tail = tail->next;
         }
     }
-#endif
 
     return head.next;
 }

glx/glxscreens.c

@@ -44,10 +44,7 @@
 #include "glxutil.h"
 #include "glxext.h"
 #include "protocol-versions.h"
-
-#ifdef COMPOSITE
 #include "compositeext.h"
-#endif
 
 static DevPrivateKeyRec glxScreenPrivateKeyRec;
 
@@ -280,14 +277,12 @@ pickFBConfig(__GLXscreen * pGlxScreen, VisualPtr visual)
         /* Can't use the same FBconfig for multiple X visuals.  I think. */
         if (config->visualID != 0)
             continue;
-#ifdef COMPOSITE
         if (!noCompositeExtension) {
             /* Use only duplicated configs for compIsAlternateVisuals */
             if (!!compIsAlternateVisual(pGlxScreen->pScreen, visual->vid) !=
                 !!config->duplicatedForComp)
                 continue;
         }
-#endif
         /*
          * If possible, use the same swapmethod for all built-in visual
          * fbconfigs, to avoid getting the 32-bit composite visual when
@@ -355,12 +350,10 @@ __glXScreenInit(__GLXscreen * pGlxScreen, ScreenPtr pScreen)
         if (config) {
             pGlxScreen->visuals[pGlxScreen->numVisuals++] = config;
             config->visualID = visual->vid;
-#ifdef COMPOSITE
             if (!noCompositeExtension) {
                 if (compIsAlternateVisual(pScreen, visual->vid))
                     config->visualSelectGroup++;
             }
-#endif
         }
     }
 
@@ -380,14 +373,12 @@ __glXScreenInit(__GLXscreen * pGlxScreen, ScreenPtr pScreen)
          * set up above is for.
          */
         depth = config->redBits + config->greenBits + config->blueBits;
-#ifdef COMPOSITE
         if (!noCompositeExtension) {
             if (config->duplicatedForComp) {
                     depth += config->alphaBits;
                     config->visualSelectGroup++;
             }
         }
-#endif
         /* Make sure that our FBconfig's depth can actually be displayed
          * (corresponds to an existing visual).
          */
@@ -410,12 +401,10 @@ __glXScreenInit(__GLXscreen * pGlxScreen, ScreenPtr pScreen)
         if (visual == NULL)
             continue;
 
-#ifdef COMPOSITE
         if (!noCompositeExtension) {
             if (config->duplicatedForComp)
                 (void) CompositeRegisterAlternateVisuals(pScreen, &visual->vid, 1);
         }
-#endif
         pGlxScreen->visuals[pGlxScreen->numVisuals++] = config;
         initGlxVisual(visual, config);
     }

glx/glxscreens.h

@@ -42,9 +42,7 @@ typedef struct __GLXconfig __GLXconfig;
 struct __GLXconfig {
     /* Management */
     __GLXconfig *next;
-#ifdef COMPOSITE
     GLboolean duplicatedForComp;
-#endif
     GLuint doubleBufferMode;
     GLuint stereoMode;
 

hw/vfb/InitOutput.c

@@ -343,9 +343,7 @@ ddxProcessArgument(int argc, char *argv[], int i)
 
     if (strcmp(argv[i], "-render") == 0) {      /* -render */
         Render = FALSE;
-#ifdef COMPOSITE
         noCompositeExtension = TRUE;
-#endif
         return 1;
     }
 

hw/xfree86/common/xf86Helper.c

@@ -1567,11 +1567,9 @@ xf86SetBackingStore(ScreenPtr pScreen)
     else {
         if (xf86GetOptValBool(options, OPTION_BACKING_STORE, &useBS))
             from = X_CONFIG;
-#ifdef COMPOSITE
         if (from != X_CONFIG)
             useBS = xf86ReturnOptValBool(options, OPTION_BACKING_STORE,
                                          !noCompositeExtension);
-#endif
     }
     free(options);
     pScreen->backingStoreSupport = useBS ? WhenMapped : NotUseful;

hw/xfree86/dri2/dri2.c

@@ -872,10 +872,8 @@ DrawablePtr DRI2UpdatePrime(DrawablePtr pDraw, DRI2BufferPtr pDest)
         return NULL;
 
     pPriv->prime_secondary_pixmap = spix;
-#ifdef COMPOSITE
     spix->screen_x = mpix->screen_x;
     spix->screen_y = mpix->screen_y;
-#endif
 
     DRI2InvalidateDrawableAll(pDraw);
     return &spix->drawable;
@@ -963,9 +961,7 @@ DRI2CanFlip(DrawablePtr pDraw)
 
     /* Does the window match the pixmap exactly? */
     if (pDraw->x != 0 || pDraw->y != 0 ||
-#ifdef COMPOSITE
         pDraw->x != pWinPixmap->screen_x || pDraw->y != pWinPixmap->screen_y ||
-#endif
         pDraw->width != pWinPixmap->drawable.width ||
         pDraw->height != pWinPixmap->drawable.height)
         return FALSE;

hw/xfree86/drivers/modesetting/dri2.c

@@ -291,11 +291,9 @@ ms_dri2_copy_region2(ScreenPtr screen, DrawablePtr drawable, RegionPtr pRegion,
     }
 
     if (translate && drawable->type == DRAWABLE_WINDOW) {
-#ifdef COMPOSITE
         PixmapPtr pixmap = get_drawable_pixmap(drawable);
         off_x = -pixmap->screen_x;
         off_y = -pixmap->screen_y;
-#endif
         off_x += drawable->x;
         off_y += drawable->y;
     }

hw/xfree86/sdksyms.sh

@@ -213,9 +213,7 @@ cat > sdksyms.c << EOF
 #include "exa.h"
  */
 
-#ifdef COMPOSITE
 #include "compositeext.h"
-#endif
 
 /* xfixes/Makefile.am */
 #include "xfixes.h"

hw/xquartz/mach-startup/bundle-main.c

@@ -74,10 +74,7 @@ extern void
 FatalError(const char *f, ...) _X_ATTRIBUTE_PRINTF(1, 2) _X_NORETURN;
 
 extern int noPanoramiXExtension;
-
-#ifdef COMPOSITE
 extern Bool noCompositeExtension;
-#endif
 
 #define DEFAULT_CLIENT X11BINDIR "/xterm"
 #define DEFAULT_STARTX X11BINDIR "/startx -- " X11BINDIR "/Xquartz"
@@ -642,10 +639,8 @@ main(int argc, char **argv, char **envp)
     /* The server must not run the PanoramiX operations. */
     noPanoramiXExtension = TRUE;
 
-#ifdef COMPOSITE
     /* https://gitlab.freedesktop.org/xorg/xserver/-/issues/1409 */
     noCompositeExtension = TRUE;
-#endif
 
     /* Setup the initial crasherporter info */
     strlcpy(__crashreporter_info_buff__, __crashreporter_info__base,

hw/xquartz/xpr/xprScreen.c

@@ -48,11 +48,7 @@
 #include "micmap.h"
 
 #include "rootlessCommon.h"
-
-#ifdef DAMAGE
 #include "damage.h"
-#endif
-
 #include "nonsdk_extinit.h"
 #include "extinit_priv.h"
 
@@ -439,12 +435,10 @@ have_depth:
 static Bool
 xprSetupScreen(int index, ScreenPtr pScreen)
 {
-#ifdef DAMAGE
     // The Damage extension needs to wrap underneath the
     // generic rootless layer, so do it now.
     if (!DamageSetup(pScreen))
         return FALSE;
-#endif
 
     // Initialize generic rootless code
     if (!xprInit(pScreen))

hw/xwayland/xwayland-present.c

@@ -1111,10 +1111,8 @@ retry:
                 PixmapPtr old_pixmap = screen->GetWindowPixmap(window);
 
                 /* Replace window pixmap with flip pixmap */
-#ifdef COMPOSITE
                 vblank->pixmap->screen_x = old_pixmap->screen_x;
                 vblank->pixmap->screen_y = old_pixmap->screen_y;
-#endif
                 present_set_tree_pixmap(toplvl_window, old_pixmap, vblank->pixmap);
 
                 if (toplvl_window == screen->root &&

hw/xwayland/xwayland-window-buffers.c

@@ -310,10 +310,8 @@ xwl_window_set_pixmap(WindowPtr window, PixmapPtr pixmap)
     visit.old = screen->GetWindowPixmap(window);
     visit.new = pixmap;
 
-#ifdef COMPOSITE
     pixmap->screen_x = visit.old->screen_x;
     pixmap->screen_y = visit.old->screen_y;
-#endif
 
     TraverseTree(window, xwl_set_pixmap_visit_window, &visit);
 

hw/xwayland/xwayland-window.c

@@ -259,10 +259,8 @@ xwl_source_validate(DrawablePtr drawable, int x, int y, int width, int height,
         if (!RegionNotEmpty(xwl_window->surface_window_damage))
             need_source_validate_dec(xwl_window->xwl_screen);
 
-#if defined(COMPOSITE)
         if (dst_pix->screen_x || dst_pix->screen_y)
             RegionTranslate(&region, -dst_pix->screen_x, -dst_pix->screen_y);
-#endif
 
         pbox = RegionRects(&region);
         nbox = RegionNumRects(&region);

hw/xwin/winmultiwindowwindow.c

@@ -1071,10 +1071,8 @@ winCreatePixmapMultiwindow(ScreenPtr pScreen, int width, int height, int depth,
     pPixmap->refcnt = 1;
     pPixmap->devPrivate.ptr = NULL; // later set to pbBits
     pPixmap->primary_pixmap = NULL;
-#ifdef COMPOSITE
     pPixmap->screen_x = 0;
     pPixmap->screen_y = 0;
-#endif
     pPixmap->usage_hint = usage_hint;
 
     /* Check for zero width or height pixmaps */

hw/xwin/winshadgdi.c

@@ -828,7 +828,6 @@ winBltExposedWindowRegionShadowGDI(ScreenPtr pScreen, WindowPtr pWin)
         return 0;
     }
 
-#ifdef COMPOSITE
     if (pWin->redirectDraw != RedirectDrawNone) {
         HBITMAP hBitmap;
         HDC hdcPixmap;
@@ -870,7 +869,6 @@ winBltExposedWindowRegionShadowGDI(ScreenPtr pScreen, WindowPtr pWin)
         DeleteDC(hdcPixmap);
     }
     else
-#endif
     {
     /* Try to copy from the shadow buffer to the invalidated region */
     if (!BitBlt(hdcUpdate,

include/extinit.h

@@ -53,13 +53,8 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include "extnsionst.h"
 
-#ifdef COMPOSITE
 extern _X_EXPORT Bool noCompositeExtension;
-#endif
-
-#ifdef DAMAGE
 extern _X_EXPORT Bool noDamageExtension;
-#endif
 
 #if defined(DBE)
 extern _X_EXPORT Bool noDbeExtension;

include/meson.build

@@ -196,13 +196,9 @@ if conf_data.get('HAVE_GETPEEREID').to_int() == 0 and conf_data.get('HAVE_GETPEE
     endif
 endif
 
-conf_data.set('TCPCONN', '1')
 conf_data.set('UNIXCONN', host_machine.system() != 'windows' ? '1' : false)
 conf_data.set('IPv6', build_ipv6 ? '1' : false)
 
-conf_data.set('BIGREQS', '1')
-conf_data.set('COMPOSITE', '1')
-conf_data.set('DAMAGE', '1')
 conf_data.set('DBE', '1')
 conf_data.set('DGA', build_dga ? '1' : false)
 conf_data.set('DPMSExtension', build_dpms ? '1' : false)

include/pixmapstr.h

@@ -78,10 +78,8 @@ typedef struct _Pixmap {
     int refcnt;
     int devKind;                /* This is the pitch of the pixmap, typically width*bpp/8. */
     DevUnion devPrivate;        /* When !NULL, devPrivate.ptr points to the raw pixel data. */
-#if defined(COMPOSITE) || defined(ROOTLESS)
     short screen_x;
     short screen_y;
-#endif
     unsigned usage_hint;        /* see CREATE_PIXMAP_USAGE_* */
 
     PixmapPtr primary_pixmap;    /* pointer to primary copy of pixmap for pixmap sharing */

include/windowstr.h

@@ -161,10 +161,8 @@ typedef struct _Window {
     unsigned redirectDraw:2;    /* COMPOSITE rendering redirect */
     unsigned forcedBG:1;        /* must have an opaque background */
     unsigned unhittable:1;      /* doesn't hit-test, for rootless */
-#ifdef COMPOSITE
     unsigned damagedDescendants:1;      /* some descendants are damaged */
     unsigned inhibitBGPaint:1;  /* paint the background? */
-#endif
 } WindowRec;
 
 /*

include/xorg-server.h.meson.in

@@ -20,9 +20,6 @@
 #error Include xorg-config.h when building the X server
 #endif
 
-/* Support BigRequests extension */
-#mesondefine BIGREQS
-
 /* Default font path */
 #mesondefine COMPILEDDEFAULTFONTPATH
 
@@ -92,9 +89,6 @@
 /* Define to 1 on systems derived from System V Release 4 */
 #mesondefine SVR4
 
-/* Support TCP socket connections */
-#mesondefine TCPCONN
-
 /* Support UNIX socket connections */
 #mesondefine UNIXCONN
 

mi/miexpose.c

@@ -407,9 +407,7 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
     BoxPtr pbox;
     xRectangle *prect;
     int numRects, regionnumrects;
-#ifdef COMPOSITE
     WindowPtr orig_pWin = pWin;
-#endif
 
     /*
      * Distance from screen to destination drawable, use this
@@ -436,10 +434,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;
@@ -466,15 +462,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;
@@ -493,7 +484,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) {
             int effective_depth = orig_pWin->drawable.depth;
@@ -513,7 +503,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

@@ -125,12 +125,8 @@ static const ExtensionModule staticExtensions[] = {
 #ifdef RANDR
     {RRExtensionInit, "RANDR", &noRRExtension},
 #endif
-#ifdef COMPOSITE
     {CompositeExtensionInit, "COMPOSITE", &noCompositeExtension},
-#endif
-#ifdef DAMAGE
     {DamageExtensionInit, "DAMAGE", &noDamageExtension},
-#endif
 #ifdef SCREENSAVER
     {ScreenSaverExtensionInit, "MIT-SCREEN-SAVER", &noScreenSaverExtension},
 #endif

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

@@ -317,7 +317,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
@@ -325,7 +324,6 @@ miRecomputeExposures(WindowPtr pWin, void *value)
          */
         if (pWin->redirectDraw != RedirectDrawNone)
             return WT_DONTWALKCHILDREN;
-#endif
         /*
          * compute exposed regions of this window
          */
@@ -570,9 +568,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
                 ) {
                 (*pWin->drawable.pScreen->CopyWindow) (pWin, oldpt,
                                                        gravitate[g]);

miext/damage/damage.c

@@ -145,15 +145,12 @@ damageRegionAppend(DrawablePtr pDrawable, RegionPtr pRegion, Bool clip,
     RegionRec pixClip;
     int draw_x, draw_y;
 
-#if defined(COMPOSITE) || defined(ROOTLESS)
     int screen_x = 0, screen_y = 0;
-#endif
 
     /* short circuit for empty regions */
     if (!RegionNotEmpty(pRegion))
         return;
 
-#if defined(COMPOSITE) || defined(ROOTLESS)
     /*
      * When drawing to a pixmap which is storing window contents,
      * the region presented is in pixmap relative coordinates which
@@ -165,7 +162,6 @@ damageRegionAppend(DrawablePtr pDrawable, RegionPtr pRegion, Bool clip,
     }
     if (screen_x || screen_y)
         RegionTranslate(pRegion, screen_x, screen_y);
-#endif
 
     if (pDrawable->type == DRAWABLE_WINDOW &&
         ((WindowPtr) (pDrawable))->backingStore == NotUseful) {
@@ -204,7 +200,6 @@ damageRegionAppend(DrawablePtr pDrawable, RegionPtr pRegion, Bool clip,
 
         draw_x = pDamage->pDrawable->x;
         draw_y = pDamage->pDrawable->y;
-#if defined(COMPOSITE) || defined(ROOTLESS)
         /*
          * Need to move everyone to screen coordinates
          * XXX what about off-screen pixmaps with non-zero x/y?
@@ -213,7 +208,6 @@ damageRegionAppend(DrawablePtr pDrawable, RegionPtr pRegion, Bool clip,
             draw_x += ((PixmapPtr) pDamage->pDrawable)->screen_x;
             draw_y += ((PixmapPtr) pDamage->pDrawable)->screen_y;
         }
-#endif
 
         /*
          * Clip against border or pixmap bounds
@@ -277,10 +271,8 @@ damageRegionAppend(DrawablePtr pDrawable, RegionPtr pRegion, Bool clip,
         if (pDamageRegion == pRegion && (draw_x || draw_y))
             RegionTranslate(pDamageRegion, draw_x, draw_y);
     }
-#if defined(COMPOSITE) || defined(ROOTLESS)
     if (screen_x || screen_y)
         RegionTranslate(pRegion, -screen_x, -screen_y);
-#endif
 
     RegionUninit(&clippedRec);
 }

os/access.c

@@ -105,9 +105,7 @@ SOFTWARE.
 #include <pwd.h>
 #endif
 
-#if defined(TCPCONN)
 #include <netinet/in.h>
-#endif                          /* TCPCONN */
 
 #ifdef HAVE_GETPEERUCRED
 #include <ucred.h>
@@ -400,9 +398,6 @@ AccessUsingXdmcp(void)
 void
 DefineSelf(int fd)
 {
-#if !defined(TCPCONN) && !defined(UNIXCONN)
-    return;
-#else
     int len;
     caddr_t addr;
     int family;
@@ -515,7 +510,6 @@ DefineSelf(int fd)
             selfhosts = host;
         }
     }
-#endif                          /* !TCPCONN && !UNIXCONN */
 }
 
 #else
@@ -897,7 +891,7 @@ ResetHosts(const char *display)
     char *ptr;
     int i, hostlen;
 
-#if defined(TCPCONN) &&  (!defined(IPv6))
+#if !defined(IPv6)
     union {
         struct sockaddr sa;
         struct sockaddr_in in;
@@ -944,7 +938,6 @@ ResetHosts(const char *display)
                 NewHost(family, "", 0, FALSE);
                 LocalHostRequested = TRUE;      /* Fix for XFree86 bug #156 */
             }
-#if defined(TCPCONN)
             else if (!strncmp("inet:", lhostname, 5)) {
                 family = FamilyInternet;
                 hostname = ohostname + 5;
@@ -954,7 +947,6 @@ ResetHosts(const char *display)
                 family = FamilyInternet6;
                 hostname = ohostname + 6;
             }
-#endif
 #endif
             else if (!strncmp("si:", lhostname, 3)) {
                 family = FamilyServerInterpreted;
@@ -969,7 +961,6 @@ ResetHosts(const char *display)
                 }
             }
             else
-#if defined(TCPCONN)
             {
 #if defined(IPv6)
                 if ((family == FamilyInternet) || (family == FamilyInternet6) ||
@@ -1020,7 +1011,6 @@ ResetHosts(const char *display)
                 }
 #endif                          /* IPv6 */
             }
-#endif                          /* TCPCONN */
             family = FamilyWild;
         }
         fclose(fd);
@@ -1442,7 +1432,6 @@ CheckAddr(int family, const void *pAddr, unsigned length)
     int len;
 
     switch (family) {
-#if defined(TCPCONN)
     case FamilyInternet:
         if (length == sizeof(struct in_addr))
             len = length;
@@ -1456,7 +1445,6 @@ CheckAddr(int family, const void *pAddr, unsigned length)
         else
             len = -1;
         break;
-#endif
 #endif
     case FamilyServerInterpreted:
         len = siCheckAddr(pAddr, length);
@@ -1525,7 +1513,6 @@ ConvertAddr(register struct sockaddr *saddr, int *len, void **addr)
     case AF_UNIX:
 #endif
         return FamilyLocal;
-#if defined(TCPCONN)
     case AF_INET:
 #ifdef WIN32
         if (16777343 == *(long *) &((struct sockaddr_in *) saddr)->sin_addr)
@@ -1550,7 +1537,6 @@ ConvertAddr(register struct sockaddr *saddr, int *len, void **addr)
             return FamilyInternet6;
         }
     }
-#endif
 #endif
     default:
         return -1;

os/connection.c

@@ -84,7 +84,6 @@ SOFTWARE.
 #ifndef WIN32
 #include <sys/socket.h>
 
-#if defined(TCPCONN)
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #ifdef CSRG_BASED
@@ -92,9 +91,8 @@ SOFTWARE.
 #endif
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
-#endif
 #include <sys/uio.h>
-#endif                          /* WIN32 */
+#endif                          /* !WIN32 */
 
 #include "dix/dix_priv.h"
 #include "os/audit.h"
@@ -391,7 +389,6 @@ AuthAudit(ClientPtr client, Bool letin,
 #endif
             strlcpy(addr, "local host", sizeof(addr));
             break;
-#if defined(TCPCONN)
         case AF_INET:
             snprintf(addr, sizeof(addr), "IP %s",
                      inet_ntoa(((struct sockaddr_in *) saddr)->sin_addr));
@@ -405,7 +402,6 @@ AuthAudit(ClientPtr client, Bool letin,
             snprintf(addr, sizeof(addr), "IP %s", ipaddr);
         }
             break;
-#endif
 #endif
         default:
             strlcpy(addr, "unknown address", sizeof(addr));

os/meson.build

@@ -94,6 +94,6 @@ libxserver_os = static_library('libxserver_os',
         os_dep,
         dependency('xau')
     ],
-    c_args: os_c_args,
+    c_args: [os_c_args, '-DTCPCONN'],
     link_with: libxlibc,
 )

os/utils.c

@@ -99,11 +99,9 @@ __stdcall unsigned long GetTickCount(void);
 #include <stdarg.h>
 #include <stdlib.h>             /* for malloc() */
 
-#if defined(TCPCONN)
 #ifndef WIN32
 #include <netdb.h>
 #endif
-#endif
 
 #include "dix/dix_priv.h"
 #include "dix/input_priv.h"
@@ -121,14 +119,9 @@ __stdcall unsigned long GetTickCount(void);
 #include "dixstruct_priv.h"
 
 Bool noTestExtensions;
-
-#ifdef COMPOSITE
 Bool noCompositeExtension = FALSE;
-#endif
-
-#ifdef DAMAGE
 Bool noDamageExtension = FALSE;
-#endif
+
 #ifdef DBE
 Bool noDbeExtension = FALSE;
 #endif
@@ -881,7 +874,6 @@ int
 set_font_authorizations(char **authorizations, int *authlen, void *client)
 {
 #define AUTHORIZATION_NAME "hp-hostname-1"
-#if defined(TCPCONN)
     static char *result = NULL;
     static char *p = NULL;
 
@@ -939,9 +931,6 @@ set_font_authorizations(char **authorizations, int *authlen, void *client)
     *authlen = p - result;
     *authorizations = result;
     return 1;
-#else                           /* TCPCONN */
-    return 0;
-#endif                          /* TCPCONN */
 }
 
 void

os/xdmauth.c

@@ -282,7 +282,6 @@ XdmAuthorizationValidate(unsigned char *plain, int length,
         if (_XSERVTransGetPeerAddr(((OsCommPtr) xclient->osPrivate)->trans_conn,
                                    &family, &addr_len, &addr) == 0
             && _XSERVTransConvertAddress(&family, &addr_len, &addr) == 0) {
-#if defined(TCPCONN)
             if (family == FamilyInternet &&
                 memcmp((char *) addr, client->client, 4) != 0) {
                 free(client);
@@ -293,7 +292,6 @@ XdmAuthorizationValidate(unsigned char *plain, int length,
                 return NULL;
 
             }
-#endif
             free(addr);
         }
     }

os/xdmcp.c

@@ -1408,7 +1408,7 @@ get_addr_by_name(const char *argtype,
 #ifdef XTHREADS_NEEDS_BYNAMEPARAMS
     _Xgethostbynameparams hparams;
 #endif
-#if defined(WIN32) && defined(TCPCONN)
+#if defined(WIN32)
     _XSERVTransWSAStartup();
 #endif
     if (!(hep = _XGethostbyname(namestr, hparams))) {

present/present_scmd.c

@@ -134,9 +134,7 @@ present_check_flip(RRCrtcPtr            crtc,
 
     /* Does the window match the pixmap exactly? */
     if (window->drawable.x != 0 || window->drawable.y != 0 ||
-#if defined(COMPOSITE) || defined(ROOTLESS)
         window->drawable.x != pixmap->screen_x || window->drawable.y != pixmap->screen_y ||
-#endif
         window->drawable.width != pixmap->drawable.width ||
         window->drawable.height != pixmap->drawable.height) {
         return FALSE;