composite: Introduce various macros that reflect the outdatedness of nx-libs's internal Xserver ABI.

Author: sunweaver

nx-X11/programs/Xserver/composite/Imakefile

@@ -17,8 +17,12 @@
  NX_DEFINES = -DNXAGENT_SERVER
 #endif
 
-    DEFINES = 			\
-              $(NX_DEFINES)	\
+    DEFINES = 					\
+              $(NX_DEFINES)			\
+              -DXSERVER_LACKS_DIXLOOKUP		\
+              -DXSERVER_LACKS_PRIVATES_ABI	\
+              -DXSERVER_LACKS_XACE_EXT		\
+              -DXSERVER_OLD_MEMFUNCS		\
               $(NULL)
 
 NormalLibraryTarget(composite,$(OBJS))

nx-X11/programs/Xserver/composite/compext.c

@@ -34,13 +34,13 @@
 
 static CARD8	CompositeReqCode;
 
-#ifndef NXAGENT_SERVER
+#ifndef XSERVER_LACKS_PRIVATES_ABI
 static DevPrivateKeyRec CompositeClientPrivateKeyRec;
 
 #define CompositeClientPrivateKey (&CompositeClientPrivateKeyRec)
-#else /* !defined(NXAGENT_SERVER) */
+#else /* !defined(XSERVER_LACKS_PRIVATES_ABI) */
 static int CompositeClientPrivIndex = -1;
-#endif /* !defined(NXAGENT_SERVER) */
+#endif /* !defined(XSERVER_LACKS_PRIVATES_ABI) */
 
 RESTYPE		CompositeClientWindowType;
 RESTYPE		CompositeClientSubwindowsType;
@@ -51,13 +51,13 @@ typedef struct _CompositeClient {
     int	    minor_version;
 } CompositeClientRec, *CompositeClientPtr;
 
-#ifndef NXAGENT_SERVER
+#ifndef XSERVER_LACKS_PRIVATES_ABI
 #define GetCompositeClient(pClient) ((CompositeClientPtr) \
     dixLookupPrivate(&(pClient)->devPrivates, CompositeClientPrivateKey))
-#else /* !defined(NXAGENT_SERVER) */
+#else /* !defined(XSERVER_LACKS_PRIVATES_ABI) */
 #define GetCompositeClient(pClient) ((CompositeClientPtr) \
     (pClient)->devPrivates[CompositeClientPrivIndex].ptr)
-#endif /* !edefined(NXAGENT_SERVER) */
+#endif /* !edefined(XSERVER_LACKS_PRIVATES_ABI) */
 
 static void
 CompositeClientCallback (CallbackListPtr	*list,
@@ -667,16 +667,16 @@ CompositeExtensionInit (void)
     if (!CompositeClientOverlayType)
         return;
 
-#ifndef NXAGENT_SERVER
+#ifndef XSERVER_LACKS_PRIVATES_ABI
     if (!dixRegisterPrivateKey(&CompositeClientPrivateKeyRec, PRIVATE_CLIENT,
 				sizeof (CompositeClientRec)))
 	return;
-#else /* !defined(NXAGENT_SERVER) */
+#else /* !defined(XSERVER_LACKS_PRIVATES_ABI) */
     if ((CompositeClientPrivIndex = AllocateClientPrivateIndex()) < 0)
         return;
     if (!AllocateClientPrivate(CompositeClientPrivIndex, sizeof (CompositeClientRec)))
         return;
-#endif /* !defined(NXAGENT_SERVER) */
+#endif /* !defined(XSERVER_LACKS_PRIVATES_ABI) */
 
     if (!AddCallback (&ClientStateCallback, CompositeClientCallback, 0))
 	return;

nx-X11/programs/Xserver/composite/compinit.c

@@ -29,11 +29,11 @@
 #include "compint.h"
 #include "compositeext.h"
 
-#ifndef NXAGENT_SERVER
+#ifndef XSERVER_LACKS_PRIVATES_ABI
 DevPrivateKeyRec CompScreenPrivateKeyRec;
 DevPrivateKeyRec CompWindowPrivateKeyRec;
 DevPrivateKeyRec CompSubwindowsPrivateKeyRec;
-#else /* !defined(NXAGENT_SERVER) */
+#else /* !defined(XSERVER_LACKS_PRIVATES_ABI) */
 int CompScreenPrivIndex = -1;
 int CompWindowPrivIndex = -1;
 int CompSubwindowsPrivIndex = -1;
@@ -226,7 +226,7 @@ compRegisterAlternateVisuals(CompScreenPtr cs, VisualID * vids, int nVisuals)
 {
     VisualID *p;
 
-#ifndef NXAGENT_SERVER
+#ifndef XSERVER_OLD_MEMFUNCS
     p = reallocarray(cs->alternateVisuals,
                      cs->numAlternateVisuals + nVisuals, sizeof(VisualID));
 #else
@@ -261,7 +261,7 @@ CompositeRegisterImplicitRedirectionException(ScreenPtr pScreen,
     CompScreenPtr cs = GetCompScreen(pScreen);
     CompImplicitRedirectException *p;
 
-#ifndef NXAGENT_SERVER
+#ifndef XSERVER_OLD_MEMFUNCS
     p = reallocarray(cs->implicitRedirectExceptions,
                      cs->numImplicitRedirectExceptions + 1, sizeof(p[0]));
 #else
@@ -381,14 +381,14 @@ compScreenInit (ScreenPtr pScreen)
 {
     CompScreenPtr   cs;
 
-#ifndef NXAGENT_SERVER
+#ifndef XSERVER_LACKS_PRIVATES_ABI
     if (!dixRegisterPrivateKey(&CompScreenPrivateKeyRec, PRIVATE_SCREEN, 0))
 	    return FALSE;
     if (!dixRegisterPrivateKey(&CompWindowPrivateKeyRec, PRIVATE_WINDOW, 0))
 	return FALSE;
     if (!dixRegisterPrivateKey(&CompSubwindowsPrivateKeyRec, PRIVATE_WINDOW, 0))
 	return FALSE;
-#else /* !defined(NXAGENT_SERVER) */
+#else /* !defined(XSERVER_LACKS_PRIVATES_ABI) */
     if ((CompScreenPrivIndex = AllocateScreenPrivateIndex()) < 0)
         return FALSE;
     if ((CompWindowPrivIndex = AllocateWindowPrivateIndex()) < 0)

nx-X11/programs/Xserver/composite/compint.h

@@ -160,7 +160,7 @@ typedef struct _CompScreen {
     SourceValidateProcPtr SourceValidate;
 } CompScreenRec, *CompScreenPtr;
 
-#ifndef NXAGENT_SERVER
+#ifndef XSERVER_LACKS_PRIVATES_ABI
 extern DevPrivateKeyRec CompScreenPrivateKeyRec;
 
 #define CompScreenPrivateKey (&CompScreenPrivateKeyRec)
@@ -179,33 +179,33 @@ extern DevPrivateKeyRec CompSubwindowsPrivateKeyRec;
     dixLookupPrivate(&(w)->devPrivates, CompWindowPrivateKey))
 #define GetCompSubwindows(w) ((CompSubwindowsPtr) \
     dixLookupPrivate(&(w)->devPrivates, CompSubwindowsPrivateKey))
-#else /* !defined(NXAGENT_SERVER) */
+#else /* !defined(XSERVER_LACKS_PRIVATES_ABI) */
 extern int CompScreenPrivIndex;
 extern int CompWindowPrivIndex;
 extern int CompSubwindowsPrivIndex;
 
 #define GetCompScreen(s) ((CompScreenPtr) (s)->devPrivates[CompScreenPrivIndex].ptr)
 #define GetCompWindow(w) ((CompWindowPtr) (w)->devPrivates[CompWindowPrivIndex].ptr)
 #define GetCompSubwindows(w) ((CompSubwindowsPtr) (w)->devPrivates[CompSubwindowsPrivIndex].ptr)
-#endif /* !defined(NXAGENT_SERVER) */
+#endif /* !defined(XSERVER_LACKS_PRIVATES_ABI) */
 
 extern RESTYPE		CompositeClientSubwindowsType;
 extern RESTYPE CompositeClientOverlayType;
 
 /* Shim for less ifdefs within the actual code. */
-#ifndef NXAGENT_SERVER
+#ifndef XSERVER_LACKS_PRIVATES_ABI
 #define FAKE_DIX_SET_PRIVATE_IMPL(obj, privateKey, ptr_val) do { dixSetPrivate(&(obj)->devPrivates, privateKey, ptr_val); } while (0)
 
 #define FAKE_DIX_SET_SCREEN_PRIVATE(pScreen, ptr_val) FAKE_DIX_SET_PRIVATE_IMPL(pScreen, CompScreenPrivateKey, ptr_val)
 #define FAKE_DIX_SET_WINDOW_PRIVATE(pWin, ptr_val) FAKE_DIX_SET_PRIVATE_IMPL(pWin, CompWindowPrivateKey, ptr_val)
 #define FAKE_DIX_SET_SUBWINDOWS_PRIVATE(pWin, ptr_val) FAKE_DIX_SET_PRIVATE_IMPL(pWin, CompSubwindowsPrivateKey, ptr_val)
-#else /* !defined(NXAGENT_SERVER) */
+#else /* !defined(XSERVER_LACKS_PRIVATES_ABI) */
 #define FAKE_DIX_SET_PRIVATE_IMPL(obj, privIndex, ptr_val) do { (obj)->devPrivates[privIndex].ptr = (void *) (ptr_val); } while (0)
 
 #define FAKE_DIX_SET_SCREEN_PRIVATE(pScreen, ptr_val) FAKE_DIX_SET_PRIVATE_IMPL(pScreen, CompScreenPrivIndex, ptr_val)
 #define FAKE_DIX_SET_WINDOW_PRIVATE(pWin, ptr_val) FAKE_DIX_SET_PRIVATE_IMPL(pWin, CompWindowPrivIndex, ptr_val)
 #define FAKE_DIX_SET_SUBWINDOWS_PRIVATE(pWin, ptr_val) FAKE_DIX_SET_PRIVATE_IMPL(pWin, CompSubwindowsPrivIndex, ptr_val)
-#endif /* !defined(NXAGENT_SERVER) */
+#endif /* !defined(XSERVER_LACKS_PRIVATES_ABI) */
 
 /*
  * compalloc.c

nx-X11/programs/Xserver/composite/compoverlay.c

@@ -46,7 +46,7 @@
 #endif
 
 #include "compint.h"
-#ifndef NXAGENT_SERVER
+#ifndef XSERVER_LACKS_XACE_EXT
 #include "xace.h"
 #endif
 

nx-X11/programs/Xserver/composite/compwindow.c

@@ -78,7 +78,7 @@ static Bool
 compRepaintBorder (ClientPtr pClient, void * closure)
 {
     WindowPtr	pWindow;
-#ifndef NXAGENT_SERVER
+#ifndef XSERVER_LACKS_DIXLOOKUP
     int rc =
         dixLookupWindow(&pWindow, (XID) (intptr_t) closure, pClient,
                         DixWriteAccess);