nxagent: Fake backing store support via Composite extension.

Author: sunweaver

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

@@ -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/fbbstore.c

@@ -146,12 +146,6 @@ fbSetupScreen(ScreenPtr	pScreen,
 #ifndef FB_OLD_SCREEN
     pScreen->GetWindowPixmap = _fbGetWindowPixmap;
     pScreen->SetWindowPixmap = _fbSetWindowPixmap;
-
-    pScreen->BackingStoreFuncs.SaveAreas = fbSaveAreas;
-    pScreen->BackingStoreFuncs.RestoreAreas = fbRestoreAreas;
-    pScreen->BackingStoreFuncs.SetClipmaskRgn = 0;
-    pScreen->BackingStoreFuncs.GetImagePixmap = 0;
-    pScreen->BackingStoreFuncs.GetSpansPixmap = 0;
 #endif
 
     return TRUE;
@@ -245,14 +239,6 @@ fbFinishScreenInit(ScreenPtr	pScreen,
 	pScreen->ModifyPixmapHeader = fb24_32ModifyPixmapHeader;
 	pScreen->CreateScreenResources = fb24_32CreateScreenResources;
     }
-#endif
-#if 0
-    /* leave backing store initialization to the enclosing code so
-     * it can choose the correct order of wrappers
-     */
-    /* init backing store here so we can overwrite CloseScreen without stepping
-     * on the backing store wrapped version */
-    fbInitializeBackingStore (pScreen);
 #endif
     return TRUE;
 }
@@ -275,26 +261,3 @@ fbScreenInit(ScreenPtr	pScreen,
 	return FALSE;
     return TRUE;
 }
-
-
-#ifdef FB_OLD_SCREEN
-const miBSFuncRec fbBSFuncRec = {
-    fbSaveAreas,
-    fbRestoreAreas,
-    (void (*)(GCPtr, RegionPtr)) 0,
-    (PixmapPtr (*)(void)) 0,
-    (PixmapPtr (*)(void)) 0,
-};
-#endif
-
-#if 0
-void
-fbInitializeBackingStore (ScreenPtr pScreen)
-{
-#ifdef FB_OLD_SCREEN
-    miInitializeBackingStore (pScreen, (miBSFuncRec *) &fbBSFuncRec);
-#else
-    miInitializeBackingStore (pScreen);
-#endif
-}
-#endif

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

@@ -44,8 +44,6 @@
 
 #include "compext/Compext.h"
 
-#include "mibstorest.h"
-
 #define PANIC
 #define WARNING
 #undef  TEST
@@ -3055,7 +3053,6 @@ int nxagentSynchronizationPredicate()
 void nxagentSendBackgroundExpose(WindowPtr pWin, PixmapPtr pBackground, RegionPtr pExpose)
 {
   RegionRec expose;
-  miBSWindowPtr pBackingStore;
 
   RegionInit(&expose, NullBox, 1);
 
@@ -3111,21 +3108,6 @@ void nxagentSendBackgroundExpose(WindowPtr pWin, PixmapPtr pBackground, RegionPt
               expose.extents.x1, expose.extents.y1, expose.extents.x2, expose.extents.y2);
   #endif
 
-  /*
-   * This prevents hidden region to be exposed.
-   */
-
-  pBackingStore = (miBSWindowPtr)pWin->backStorage;
-
-  if ((pBackingStore != NULL) && (RegionNil(&pBackingStore->SavedRegion) == 0))
-  {
-    RegionTranslate(&expose, -pWin -> drawable.x, -pWin -> drawable.y);
-
-    RegionSubtract(&expose, &expose, &pBackingStore -> SavedRegion);
-
-    RegionTranslate(&expose, pWin -> drawable.x, pWin -> drawable.y);
-  }
-
   RegionIntersect(&expose, &expose, &pWin -> clipList);
 
   /*

nx-X11/programs/Xserver/hw/nxagent/Drawable.c

@@ -38,7 +38,6 @@
 #include "selection.h"
 #include "keysym.h"
 #include "fb.h"
-#include "mibstorest.h"
 #include "osdep.h"
 
 #include "Agent.h"
@@ -2537,55 +2536,15 @@ int nxagentHandleGraphicsExposeEvent(XEvent *X)
 {
   /*
    * Send an expose event to client, instead of graphics
-   * expose. If target drawable is a backing pixmap, send
-   * expose event for the saved window, else do nothing.
+   * expose.
    */
 
   RegionPtr exposeRegion;
   BoxRec rect;
   WindowPtr pWin;
-  StoringPixmapPtr pStoringPixmapRec = NULL;
-  miBSWindowPtr pBSwindow = NULL;
-  int drawableType;
 
   pWin = nxagentWindowPtr(X -> xgraphicsexpose.drawable);
 
-  if (pWin != NULL)
-  {
-    drawableType = DRAWABLE_WINDOW;
-  }
-  else
-  {
-    drawableType = DRAWABLE_PIXMAP;
-  }
-
-  if (drawableType == DRAWABLE_PIXMAP)
-  {
-    pStoringPixmapRec = nxagentFindItemBSPixmapList(X -> xgraphicsexpose.drawable);
-
-    if (pStoringPixmapRec == NULL)
-    {
-      #ifdef TEST
-      fprintf(stderr, "nxagentHandleGraphicsExposeEvent: WARNING! Storing pixmap not found.\n");
-      #endif
-
-      return 1;
-    }
-
-    pBSwindow = (miBSWindowPtr) pStoringPixmapRec -> pSavedWindow -> backStorage;
-
-    if (pBSwindow == NULL)
-    {
-      #ifdef TEST
-      fprintf(stderr, "nxagentHandleGraphicsExposeEvent: WARNING! Back storage not found.\n");
-      #endif
-
-      return 1;
-    }
-
-    pWin = pStoringPixmapRec -> pSavedWindow;
-  }
-
   /*
    * Rectangle affected by GraphicsExpose
    * event.
@@ -2598,33 +2557,6 @@ int nxagentHandleGraphicsExposeEvent(XEvent *X)
 
   exposeRegion = RegionCreate(&rect, 0);
 
-  if (drawableType == DRAWABLE_PIXMAP)
-  {
-    #ifdef TEST
-    fprintf(stderr, "nxagentHandleGraphicsExposeEvent: Handling GraphicsExpose event on pixmap with id"
-                " [%lu].\n", X -> xgraphicsexpose.drawable);
-    #endif
-
-    /*
-     * The exposeRegion coordinates are relative
-     * to the pixmap to which GraphicsExpose
-     * event refers. But the BS coordinates of
-     * the savedRegion  are relative to the
-     * window.
-     */
-
-    RegionTranslate(exposeRegion, pStoringPixmapRec -> backingStoreX,
-                         pStoringPixmapRec -> backingStoreY);
-
-    /*
-     * We remove from SavedRegion the part
-     * affected by the GraphicsExpose event.
-     */
-
-    RegionSubtract(&(pBSwindow -> SavedRegion), &(pBSwindow -> SavedRegion),
-                        exposeRegion);
-  }
-
   /*
    * Store the exposeRegion in order to send
    * the expose event later. The coordinates

nx-X11/programs/Xserver/hw/nxagent/Events.c

@@ -315,8 +315,6 @@ void InitOutput(ScreenInfo *screenInfo, int argc, char *argv[])
     }
   }
 
-  nxagentInitBSPixmapList();
-
   /*
    * Open the display. We are at the early startup and
    * the information we'll get from the remote X server