Merge branch 'master' into mpx

Conflicts:

	Xi/extinit.c
	Xi/grabdev.c
	Xi/setmode.c
	Xi/ungrdev.c
	dix/devices.c
	dix/events.c
	dix/getevents.c
	include/dix.h
	mi/midispcur.c
	mi/misprite.c
	xkb/xkbActions.c
	xkb/xkbEvents.c
	xkb/xkbPrKeyEv.c

1 files changed, 0 insertions, 59 deletions

diff --git a/mi/misprite.c b/mi/misprite.c
index 6e4215270..6a2fd37fa 100644
--- a/mi/misprite.c
+++ b/mi/misprite.c
@@ -106,9 +106,6 @@ static void	    miSpriteInstallColormap(ColormapPtr pMap);
 static void	    miSpriteStoreColors(ColormapPtr pMap, int ndef,
 					xColorItem *pdef);
 
-static void	    miSpriteSaveDoomedAreas(WindowPtr pWin,
-					    RegionPtr pObscured, int dx,
-					    int dy);
 static void	    miSpriteComputeSaved(DeviceIntPtr pDev, 
                                          ScreenPtr pScreen);
 
@@ -241,8 +238,6 @@ miSpriteInitialize (pScreen, cursorFuncs, screenFuncs)
 
     pScreenPriv->CopyWindow = pScreen->CopyWindow;
     
-    pScreenPriv->SaveDoomedAreas = pScreen->SaveDoomedAreas;
-    
     pScreenPriv->InstallColormap = pScreen->InstallColormap;
     pScreenPriv->StoreColors = pScreen->StoreColors;
     
@@ -268,9 +263,6 @@ miSpriteInitialize (pScreen, cursorFuncs, screenFuncs)
     pScreen->SourceValidate = miSpriteSourceValidate;
 
     pScreen->CopyWindow = miSpriteCopyWindow;
-
-    pScreen->SaveDoomedAreas = miSpriteSaveDoomedAreas;
-
     pScreen->InstallColormap = miSpriteInstallColormap;
     pScreen->StoreColors = miSpriteStoreColors;
 
@@ -309,7 +301,6 @@ miSpriteCloseScreen (i, pScreen)
     pScreen->InstallColormap = pScreenPriv->InstallColormap;
     pScreen->StoreColors = pScreenPriv->StoreColors;
 
-    pScreen->SaveDoomedAreas = pScreenPriv->SaveDoomedAreas;
     DamageDestroy (pScreenPriv->pDamage);
 
     xfree ((pointer) pScreenPriv);
@@ -694,56 +685,6 @@ miSpriteFindColors (miCursorInfoPtr pDevCursor, ScreenPtr pScreen)
 }
 
 /*
- * BackingStore wrappers
- */
-
-static void
-miSpriteSaveDoomedAreas (pWin, pObscured, dx, dy)
-    WindowPtr	pWin;
-    RegionPtr	pObscured;
-    int		dx, dy;
-{
-    ScreenPtr		pScreen;
-    miSpriteScreenPtr   pScreenPriv;
-    BoxRec		cursorBox;
-    DeviceIntPtr        pDev = inputInfo.pointer;
-    miCursorInfoPtr     pCursorInfo;
-
-    pScreen = pWin->drawable.pScreen;
-    
-    SCREEN_PROLOGUE (pScreen, SaveDoomedAreas);
-
-    pScreenPriv = (miSpriteScreenPtr) pScreen->devPrivates[miSpriteScreenIndex].ptr;
-
-    for (pDev = inputInfo.devices; pDev; pDev = pDev->next)
-    {
-        if(DevHasCursor(pDev))
-        {
-            pCursorInfo = MISPRITE(pDev);
-            if (pCursorInfo->isUp && pCursorInfo->pScreen == pScreen)
-            {
-                cursorBox = pCursorInfo->saved;
-
-                if (dx || dy)
-                {
-                    cursorBox.x1 += dx;
-                    cursorBox.y1 += dy;
-                    cursorBox.x2 += dx;
-                    cursorBox.y2 += dy;
-                }
-                if (RECT_IN_REGION( pScreen, pObscured, &cursorBox) != rgnOUT)
-                    miSpriteRemoveCursor (pDev, pScreen);
-            }
-
-        }
-    }
-
-    (*pScreen->SaveDoomedAreas) (pWin, pObscured, dx, dy);
-
-    SCREEN_EPILOGUE (pScreen, SaveDoomedAreas);
-}
-
-/*
  * miPointer interface routines
  */