Implement core protocol backing store exclusively in terms of Composite.

Composite's automatic redirection is a more general mechanism than the
ad-hoc BS machinery, so it's much prettier to implement the one in terms
of the other.  Composite now wraps ChangeWindowAttributes and activates
automatic redirection for windows with backing store requested.  The old
backing store infrastructure is completely gutted: ABI-visible structures
retain the function pointers, but they never get called, and all the
open-coded conditionals throughout the DIX layer to implement BS are gone.

Note that this is still not a strictly complete implementation of backing
store, since Composite will throw the bits away on unmap and therefore
WhenMapped and Always hints are equivalent.

4 files changed, 1 insertions, 182 deletions

diff --git a/mfb/Makefile.am b/mfb/Makefile.am
index fe0bb1c26..8ff0260e7 100644
--- a/mfb/Makefile.am
+++ b/mfb/Makefile.am
@@ -17,7 +17,7 @@ libmfb_la_SOURCES = mfbgc.c mfbwindow.c mfbfont.c \
 	 mfbpushpxl.c mfbzerarc.c mfbfillarc.c \
          mfbfillsp.c mfbsetsp.c mfbscrinit.c mfbscrclse.c mfbclip.c \
          mfbbitblt.c mfbgetsp.c mfbpolypnt.c \
-	 mfbcmap.c mfbmisc.c mfbbstore.c $(libmfb_gen_sources)
+	 mfbcmap.c mfbmisc.c $(libmfb_gen_sources)
 
 EXTRA_DIST = maskbits.h mergerop.h fastblt.h mfbline.c mfbblt.c mfbtile.c \
              mfbplygblt.c mfbimggblt.c mfbpntarea.c mfbtegblt.c mfbply1rct.c
diff --git a/mfb/mfb.h b/mfb/mfb.h
index f597b16a5..bc07f02a3 100644
--- a/mfb/mfb.h
+++ b/mfb/mfb.h
@@ -205,23 +205,7 @@ extern void mfbBresD(
     int /*e2*/,
     int /*len*/
 );
-/* mfbbstore.c */
 
-extern void mfbSaveAreas(
-    PixmapPtr /*pPixmap*/,
-    RegionPtr /*prgnSave*/,
-    int /*xorg*/,
-    int /*yorg*/,
-    WindowPtr /*pWin*/
-);
-
-extern void mfbRestoreAreas(
-    PixmapPtr /*pPixmap*/,
-    RegionPtr /*prgnRestore*/,
-    int /*xorg*/,
-    int /*yorg*/,
-    WindowPtr /*pWin*/
-);
 /* mfbclip.c */
 
 extern RegionPtr mfbPixmapToRegion(
diff --git a/mfb/mfbbstore.c b/mfb/mfbbstore.c
deleted file mode 100644
index 784df4e84..000000000
--- a/mfb/mfbbstore.c
+++ /dev/null
@@ -1,154 +0,0 @@
-/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
-/*
-
-Copyright 1987, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include    "mfb.h"
-#include    <X11/X.h>
-#include    "mibstore.h"
-#include    "regionstr.h"
-#include    "scrnintstr.h"
-#include    "pixmapstr.h"
-#include    "windowstr.h"
-
-/*-
- *-----------------------------------------------------------------------
- * mfbSaveAreas --
- *	Function called by miSaveAreas to actually fetch the areas to be
- *	saved into the backing pixmap. This is very simple to do, since
- *	mfbDoBitblt is designed for this very thing. The region to save is
- *	already destination-relative and we're given the offset to the
- *	window origin, so we have only to create an array of points of the
- *	u.l. corners of the boxes in the region translated to the screen
- *	coordinate system and fetch the screen pixmap out of its devPrivate
- *	field....
- *
- * Results:
- *	None.
- *
- * Side Effects:
- *	Data are copied from the screen into the pixmap.
- *
- *-----------------------------------------------------------------------
- */
-void
-mfbSaveAreas(pPixmap, prgnSave, xorg, yorg, pWin)
-    PixmapPtr	  	pPixmap;  	/* Backing pixmap */
-    RegionPtr	  	prgnSave; 	/* Region to save (pixmap-relative) */
-    int	    	  	xorg;	    	/* X origin of region */
-    int	    	  	yorg;	    	/* Y origin of region */
-    WindowPtr		pWin;
-{
-    register DDXPointPtr pPt;
-    DDXPointPtr		pPtsInit;
-    register BoxPtr	pBox;
-    register int	numRects;
-    
-    numRects = REGION_NUM_RECTS(prgnSave);
-    pPtsInit = (DDXPointPtr)ALLOCATE_LOCAL(numRects * sizeof(DDXPointRec));
-    if (!pPtsInit)
-	return;
-    
-    pBox = REGION_RECTS(prgnSave);
-    pPt = pPtsInit;
-    while (numRects--)
-    {
-	pPt->x = pBox->x1 + xorg;
- 	pPt->y = pBox->y1 + yorg;
- 	pPt++;
- 	pBox++;
-    }
-
-    mfbDoBitblt((DrawablePtr)pPixmap->drawable.pScreen->devPrivate,
-		(DrawablePtr)pPixmap,
-		GXcopy,
-		prgnSave,
-		pPtsInit);
-
-    DEALLOCATE_LOCAL(pPtsInit);
-}
-
-/*-
- *-----------------------------------------------------------------------
- * mfbRestoreAreas --
- *	Function called by miRestoreAreas to actually fetch the areas to be
- *	restored from the backing pixmap. This is very simple to do, since
- *	mfbDoBitblt is designed for this very thing. The region to restore is
- *	already destination-relative and we're given the offset to the
- *	window origin, so we have only to create an array of points of the
- *	u.l. corners of the boxes in the region translated to the pixmap
- *	coordinate system and fetch the screen pixmap out of its devPrivate
- *	field....
- *
- * Results:
- *	None.
- *
- * Side Effects:
- *	Data are copied from the pixmap into the screen.
- *
- *-----------------------------------------------------------------------
- */
-void
-mfbRestoreAreas(pPixmap, prgnRestore, xorg, yorg, pWin)
-    PixmapPtr	  	pPixmap;  	/* Backing pixmap */
-    RegionPtr	  	prgnRestore; 	/* Region to restore (screen-relative)*/
-    int	    	  	xorg;	    	/* X origin of window */
-    int	    	  	yorg;	    	/* Y origin of window */
-    WindowPtr		pWin;
-{
-    register DDXPointPtr pPt;
-    DDXPointPtr		pPtsInit;
-    register BoxPtr	pBox;
-    register int	numRects;
-    
-    numRects = REGION_NUM_RECTS(prgnRestore);
-    pPtsInit = (DDXPointPtr)ALLOCATE_LOCAL(numRects*sizeof(DDXPointRec));
-    if (!pPtsInit)
-	return;
-    
-    pBox = REGION_RECTS(prgnRestore);
-    pPt = pPtsInit;
-    while (numRects--)
-    {
-	pPt->x = pBox->x1 - xorg;
- 	pPt->y = pBox->y1 - yorg;
- 	pPt++;
- 	pBox++;
-    }
-
-    mfbDoBitblt((DrawablePtr)pPixmap,
-		(DrawablePtr)pPixmap->drawable.pScreen->devPrivate,
-		GXcopy,
-		prgnRestore,
-		pPtsInit);
-
-    DEALLOCATE_LOCAL(pPtsInit);
-}
diff --git a/mfb/mfbscrinit.c b/mfb/mfbscrinit.c
index 0707c1a74..13ea5d365 100644
--- a/mfb/mfbscrinit.c
+++ b/mfb/mfbscrinit.c
@@ -89,16 +89,6 @@ static DepthRec depth = {
     1,		1,		&VID
 };
 
-
-BSFuncRec mfbBSFuncRec = {
-    mfbSaveAreas,
-    mfbRestoreAreas,
-    (BackingStoreSetClipmaskRgnProcPtr) 0,
-    (BackingStoreGetImagePixmapProcPtr) 0,
-    (BackingStoreGetSpansPixmapProcPtr) 0,
-};
-
-
 Bool
 mfbAllocatePrivates(pScreen, pWinIndex, pGCIndex)
     ScreenPtr pScreen;
@@ -169,7 +159,6 @@ mfbScreenInit(pScreen, pbits, xsize, ysize, dpix, dpiy, width)
     if (!miScreenInit(pScreen, pbits, xsize, ysize, dpix, dpiy, width,
 			1, 1, &depth, VID, 1, &visual))
 	return FALSE;
-    pScreen->BackingStoreFuncs = mfbBSFuncRec;
     return TRUE;
 }