nxagent: Fake backing store support via Composite extension.

Makefile

@@ -23,7 +23,7 @@ SHLIBDIR        ?= $(LIBDIR)
 NXLIBDIR        ?= $(SHLIBDIR)/nx
 USRLIBDIR       ?= $(NXLIBDIR)/X11
 INCLUDEDIR      ?= $(PREFIX)/include
-CONFIGURE       ?= ./configure --prefix=$(DESTDIR)$(PREFIX) --libexecdir=$(NXLIBDIR)/bin
+CONFIGURE       ?= ./configure --prefix=$(PREFIX)
 
 # use Xfont2 if available in the build env
 FONT_DEFINES	?= $(shell pkg-config --modversion xfont2 1>/dev/null 2>/dev/null && echo "-DHAS_XFONT2")
@@ -75,8 +75,6 @@ NX_XTRANS_HEADERS =		\
 	    rm -Rf nx-X11/extras/Mesa/.pc/; \
 	    rm -f nx-X11/config/cf/nxversion.def; \
 	    rm -f nx-X11/config/cf/date.def; \
-	    rm -f bin/nxagent; \
-	    rm -f bin/nxproxy; \
 	    ${MAKE} clean-env; \
 	fi
 
@@ -168,30 +166,24 @@ install-lite:
 	# install nxcomp library
 	$(MAKE) -C nxcomp install
 
-	# install nxproxy wrapper script
-	$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
-	sed -e 's|@@NXLIBDIR@@|$(NXLIBDIR)|g' bin/nxproxy.in > bin/nxproxy
-	$(INSTALL_PROGRAM) bin/nxproxy $(DESTDIR)$(BINDIR)
-
 	# install the nxproxy executable and its man page
 	$(MAKE) -C nxproxy install
 
 install-full:
-	# install nxagent wrapper script
-	$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
-	sed -e 's|@@NXLIBDIR@@|$(NXLIBDIR)|g' bin/nxagent.in > bin/nxagent
-	$(INSTALL_PROGRAM) bin/nxagent $(DESTDIR)$(BINDIR)
-
 	$(MAKE) -C nxcompshad install
 
+	$(INSTALL_DIR) $(DESTDIR)$(BINDIR)/bin
+	$(INSTALL_PROGRAM) nx-X11/programs/Xserver/nxagent $(DESTDIR)$(BINDIR)
+
 	$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/pixmaps
 	$(INSTALL_FILE) nx-X11/programs/Xserver/hw/nxagent/nxagent.xpm $(DESTDIR)$(PREFIX)/share/pixmaps
 
 	$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/nx
 	$(INSTALL_FILE) nx-X11/programs/Xserver/Xext/SecurityPolicy $(DESTDIR)$(PREFIX)/share/nx
 
+	# FIXME: Drop this symlink for 3.6.0. Requires that third party frameworks like X2Go have become aware of this...
 	$(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/bin
-	$(INSTALL_PROGRAM) nx-X11/programs/Xserver/nxagent $(DESTDIR)$(NXLIBDIR)/bin
+	$(INSTALL_SYMLINK) $(BINDIR)/nxagent $(DESTDIR)$(NXLIBDIR)/bin/nxagent
 
 	$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/man/man1/
 	$(INSTALL_FILE) nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 $(DESTDIR)$(PREFIX)/share/man/man1/
@@ -243,28 +235,19 @@ uninstall:
 
 uninstall-lite:
 	if test -f nxcomp/Makefile; then ${MAKE} -C nxcomp $@; fi
+	if test -f nxproxy/Makefile; then ${MAKE} -C nxproxy $@; fi
 
-	# uninstall nproxy wrapper script
-	$(RM_FILE) $(DESTDIR)$(BINDIR)/nxproxy
-	# FIXME: don't use uninstall rule in nxproxy/Makefile.in, let's do
-        # it on our own for now...
-	$(RM_FILE) $(DESTDIR)$(NXLIBDIR)/bin/nxproxy
-	$(RM_DIR) $(DESTDIR)$(NXLIBDIR)/bin/
-	$(RM_FILE) $(DESTDIR)$(PREFIX)/share/man/man1/*.1
 	$(RM_FILE) $(DESTDIR)$(PREFIX)/share/nx/VERSION.nxproxy
 	$(RM_DIR) $(DESTDIR)$(PREFIX)/share/nx/
 
 uninstall-full:
-	for f in nxagent; do \
-	    $(RM_FILE) $(DESTDIR)$(BINDIR)/$$f; done
+	if test -f nxcompshad/Makefile; then ${MAKE} -C nxcompshad $@; fi
+	if test -f nx-X11/lib/Makefile; then ${MAKE} -C nx-X11/lib $@; fi
+
+	$(RM_FILE) $(DESTDIR)$(BINDIR)/nxagent
 
 	$(RM_FILE) $(DESTDIR)$(PREFIX)/share/nx/VERSION.nxagent
 	$(RM_DIR) $(DESTDIR)$(PREFIX)/share/nx/
 
-	if test -d nx-X11; then \
-	    if test -f nxcompshad/Makefile; then ${MAKE} -C nxcompshad $@; fi; \
-	    if test -f nx-X11/Makefile; then \
-	        if test -d $(NXLIBDIR); then rm -rf $(NXLIBDIR); fi; \
-	        if test -d $(INCLUDEDIR)/nx; then rm -rf $(INCLUDEDIR)/nx; fi; \
-	    fi; \
-	fi
+	if test -d $(NXLIBDIR); then rm -rf $(NXLIBDIR); fi
+	if test -d $(INCLUDEDIR)/nx; then rm -rf $(INCLUDEDIR)/nx; fi

debian/nxagent.install

@@ -1,8 +1,9 @@
 etc/nxagent/keystrokes.cfg
 usr/share/nx/VERSION.nxagent
 usr/share/man/man1/nxagent.1*
-usr/lib/*/nx/bin/nxagent
 usr/lib/*/nx/X11/
 usr/bin/nxagent
 usr/share/pixmaps/nxagent.xpm
 etc/nxagent/nxagent.keyboard
+# FIXME: compatibility symlink, drop for 3.6.0 release
+usr/lib/*/nx/bin/nxagent

debian/nxproxy.install

@@ -1,4 +1,3 @@
-usr/lib/*/nx/bin/nxproxy
 usr/bin/nxproxy
 usr/share/man/man1/nxproxy.1*
 usr/share/nx/VERSION.nxproxy

nx-X11/config/cf/X11.tmpl

@@ -769,7 +769,7 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
 
 #ifndef BinDir
 #ifdef ProjectRoot
-#define BinDir Concat(ProjectRoot,/lib/nx/bin)
+#define BinDir Concat(ProjectRoot,/bin)
 #else
 #define BinDir /usr/bin/X11
 #endif

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

@@ -99,8 +99,6 @@ compInstallColormap (ColormapPtr pColormap)
     pScreen->InstallColormap = compInstallColormap;
 }
 
-/* Unsupported by current architecture, drop for now. */
-#if 0
 static void
 compCheckBackingStore(WindowPtr pWin)
 {
@@ -134,7 +132,6 @@ compChangeWindowAttributes(WindowPtr pWin, unsigned long mask)
 
     return ret;
 }
-#endif /* 0 */
 
 static void
 compGetImage(DrawablePtr pDrawable,
@@ -464,11 +461,8 @@ compScreenInit (ScreenPtr pScreen)
     cs->InstallColormap = pScreen->InstallColormap;
     pScreen->InstallColormap = compInstallColormap;
 
-    /* Unsupported by our current architecture, drop for now. */
-    /*
     cs->ChangeWindowAttributes = pScreen->ChangeWindowAttributes;
     pScreen->ChangeWindowAttributes = compChangeWindowAttributes;
-    */
 
     cs->BlockHandler = NULL;
 

nx-X11/programs/Xserver/dix/window.c

@@ -2760,7 +2760,7 @@ MapWindow(register WindowPtr pWin, ClientPtr client)
 	    (*pScreen->PostValidateTree)(NullWindow, pWin, VTMap);
 	RegionNull(&temp);
 	RegionCopy(&temp, &pWin->clipList);
-	(*pScreen->WindowExposures) (pWin, &temp, NullRegion);
+	(*pScreen->WindowExposures) (pWin, &temp);
 	RegionUninit(&temp);
     }
 
@@ -2928,9 +2928,6 @@ UnrealizeTree(
 		    deltaSaveUndersViewable--;
 #endif
 		pChild->viewable = FALSE;
-		if (pChild->backStorage)
-		    (*pChild->drawable.pScreen->SaveDoomedAreas)(
-					    pChild, &pChild->clipList, 0, 0);
 		(* MarkUnrealizedWindow)(pChild, pWin, fromConfigure);
 		pChild->drawable.serialNumber = NEXT_SERIAL_NUMBER;
 	    }
@@ -3061,9 +3058,6 @@ UnmapSubwindows(register WindowPtr pWin)
 #ifdef DO_SAVE_UNDERS
 		pChild->DIXsaveUnder = FALSE;
 #endif /* DO_SAVE_UNDERS */
-		if (pChild->backStorage)
-		    (*pScreen->SaveDoomedAreas)(
-					    pChild, &pChild->clipList, 0, 0);
 	    }
 	}
     }

nx-X11/programs/Xserver/fb/Imakefile

@@ -30,7 +30,6 @@ SRCS =	$(XFMODSRC) \
 	fbbits.c \
 	fbblt.c \
 	fbbltone.c \
-	fbbstore.c \
 	fbcmap.c \
 	$(RENDERSRC) \
 	fbcopy.c \
@@ -66,7 +65,6 @@ OBJS =	$(XFMODOBJ) \
 	fbbits.o \
 	fbblt.o \
 	fbbltone.o \
-	fbbstore.o \
 	fbcmap.o \
 	$(RENDEROBJ) \
 	fbcopy.o \
@@ -128,7 +126,6 @@ LinkSourceFile(fbarc.c,LinkDirectory)
 LinkSourceFile(fbbits.c,LinkDirectory)
 LinkSourceFile(fbblt.c,LinkDirectory)
 LinkSourceFile(fbbltone.c,LinkDirectory)
-LinkSourceFile(fbbstore.c,LinkDirectory)
 LinkSourceFile(fbcmap.c,LinkDirectory)
 #if BuildRender
 LinkSourceFile(fbcompose.c,LinkDirectory)

nx-X11/programs/Xserver/fb/fb.h

@@ -36,7 +36,6 @@
 #include "windowstr.h"
 #include "mi.h"
 #include "migc.h"
-#include "mibstore.h"
 #ifdef RENDER
 #include "picturestr.h"
 #else
@@ -1220,23 +1219,6 @@ fbBltPlane (FbBits	    *src,
 	    FbStip	    bgxor,
 	    Pixel	    planeMask);
 
-/*
- * fbbstore.c
- */
-void
-fbSaveAreas(PixmapPtr	pPixmap,
-	    RegionPtr	prgnSave,
-	    int		xorg,
-	    int		yorg,
-	    WindowPtr	pWin);
-
-void
-fbRestoreAreas(PixmapPtr    pPixmap,
-	       RegionPtr    prgnRestore,
-	       int	    xorg,
-	       int	    yorg,
-	       WindowPtr    pWin);
-
 /*
  * fbcmap.c
  */

nx-X11/programs/Xserver/fb/fboverlay.c

@@ -270,13 +270,12 @@ fbOverlayCopyWindow(WindowPtr	pWin,
 
 void
 fbOverlayWindowExposures (WindowPtr	pWin,
-			  RegionPtr	prgn,
-			  RegionPtr	other_exposed)
+			  RegionPtr	prgn)
 {
     fbOverlayUpdateLayerRegion (pWin->drawable.pScreen,
 				fbOverlayWindowLayer (pWin),
 				prgn);
-    miWindowExposures(pWin, prgn, other_exposed);
+    miWindowExposures(pWin, prgn);
 }
 
 void

nx-X11/programs/Xserver/fb/fboverlay.h

@@ -89,8 +89,7 @@ fbOverlayCopyWindow(WindowPtr	pWin,
 
 void
 fbOverlayWindowExposures (WindowPtr	pWin,
-			  RegionPtr	prgn,
-			  RegionPtr	other_exposed);
+			  RegionPtr	prgn);
 
 void
 fbOverlayPaintWindow(WindowPtr pWin, RegionPtr pRegion, int what);