svn merge ^/branches/released .

1 files changed, 15 insertions, 73 deletions

diff --git a/xorg-server/mi/misprite.c b/xorg-server/mi/misprite.c
index 7dce00672..64eed4bd3 100644
--- a/xorg-server/mi/misprite.c
+++ b/xorg-server/mi/misprite.c
@@ -182,10 +182,10 @@ miSpriteIsDown(miCursorInfoPtr pDevCursor)
  * screen wrappers

  */

 

-static int miSpriteScreenKeyIndex;

-static DevPrivateKey miSpriteScreenKey = &miSpriteScreenKeyIndex;

-static int miSpriteDevPrivatesKeyIndex;

-static DevPrivateKey miSpriteDevPrivatesKey = &miSpriteDevPrivatesKeyIndex;

+static DevPrivateKeyRec miSpriteScreenKeyRec;

+#define miSpriteScreenKey (&miSpriteScreenKeyRec)

+static DevPrivateKeyRec miSpriteDevPrivatesKeyRec;

+#define miSpriteDevPrivatesKey (&miSpriteDevPrivatesKeyRec)

 

 static Bool	    miSpriteCloseScreen(int i, ScreenPtr pScreen);

 static void	    miSpriteGetImage(DrawablePtr pDrawable, int sx, int sy,

@@ -268,7 +268,7 @@ miSpriteReportDamage (DamagePtr pDamage, RegionPtr pRegion, void *closure)
 

             if (pCursorInfo->isUp &&

                 pCursorInfo->pScreen == pScreen &&

-                miRectIn(pRegion, &pCursorInfo->saved) != rgnOUT)

+                RegionContainsRect(pRegion, &pCursorInfo->saved) != rgnOUT)

             {

                 SPRITE_DEBUG(("Damage remove\n"));

                 miSpriteRemoveCursor (pDev, pScreen);

@@ -293,6 +293,12 @@ miSpriteInitialize (ScreenPtr               pScreen,
     if (!DamageSetup (pScreen))

 	return FALSE;

 

+    if (!dixRegisterPrivateKey(&miSpriteScreenKeyRec, PRIVATE_SCREEN, 0))

+	return FALSE;

+

+    if (!dixRegisterPrivateKey(&miSpriteDevPrivatesKeyRec, PRIVATE_DEVICE, 0))

+	return FALSE;

+

     pScreenPriv = malloc(sizeof (miSpriteScreenRec));

     if (!pScreenPriv)

 	return FALSE;

@@ -523,7 +529,7 @@ miSpriteCopyWindow (WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
              * Damage will take care of destination check

              */

             if (pCursorInfo && pCursorInfo->isUp && pCursorInfo->pScreen == pScreen &&

-                    miRectIn(prgnSrc, &pCursorInfo->saved) != rgnOUT)

+                    RegionContainsRect(prgnSrc, &pCursorInfo->saved) != rgnOUT)

             {

                 SPRITE_DEBUG (("CopyWindow remove\n"));

                 miSpriteRemoveCursor (pDev, pScreen);

@@ -801,73 +807,9 @@ miSpriteSetCursor (DeviceIntPtr pDev, ScreenPtr pScreen,
 	miSpriteFindColors (pPointer, pScreen);

     }

     if (pPointer->isUp) {

-#if 0

-        /* FIXME: Disabled for MPX, should be rewritten */

-	int	sx, sy;

-	/*

-	 * check to see if the old saved region

-	 * encloses the new sprite, in which case we use

-	 * the flicker-free MoveCursor primitive.

-	 */

-	sx = pointer->x - (int)pCursor->bits->xhot;

-	sy = pointer->y - (int)pCursor->bits->yhot;

-	if (sx + (int) pCursor->bits->width >= pointer->saved.x1 &&

-	    sx < pointer->saved.x2 &&

-	    sy + (int) pCursor->bits->height >= pointer->saved.y1 &&

-	    sy < pointer->saved.y2 &&

-	    (int) pCursor->bits->width + (2 * SPRITE_PAD) ==

-		pointer->saved.x2 - pointer->saved.x1 &&

-	    (int) pCursor->bits->height + (2 * SPRITE_PAD) ==

-		pointer->saved.y2 - pointer->saved.y1

-	    )

-	{

-	    DamageDrawInternal (pScreen, TRUE);

-	    miSpriteIsDown(pCursorInfo);

-	    if (!(sx >= pointer->saved.x1 &&

-                  sx + (int)pCursor->bits->width < pointer->saved.x2

-                  && sy >= pointer->saved.y1 &&

-                  sy + (int)pCursor->bits->height <

-                                pointer->saved.y2))

-            {

-		int oldx1, oldy1, dx, dy;

-

-		oldx1 = pointer->saved.x1;

-		oldy1 = pointer->saved.y1;

-		dx = oldx1 - (sx - SPRITE_PAD);

-		dy = oldy1 - (sy - SPRITE_PAD);

-		pointer->saved.x1 -= dx;

-		pointer->saved.y1 -= dy;

-		pointer->saved.x2 -= dx;

-		pointer->saved.y2 -= dy;

-		(void) miDCChangeSave(pScreen,

-				pointer->saved.x1,

- 				pointer->saved.y1,

-                                pointer->saved.x2 -

-                                pointer->saved.x1,

-                                pointer->saved.y2 -

-                                pointer->saved.y1,

-				dx, dy);

-	    }

-	    (void) miDCMoveCursor(pScreen, pCursor,

-				  pointer->saved.x1,

- 				  pointer->saved.y1,

-                                  pointer->saved.x2 -

-                                  pointer->saved.x1,

-                                  pointer->saved.y2 -

-                                  pointer->saved.y1,

-				  sx - pointer->saved.x1,

-				  sy - pointer->saved.y1,

-				  pointer->colors[SOURCE_COLOR].pixel,

-				  pointer->colors[MASK_COLOR].pixel);

-	    miSpriteIsUp(pCursorInfo);

-	    DamageDrawInternal (pScreen, FALSE);

-	}

-	else

-#endif

-	{

-	    SPRITE_DEBUG (("SetCursor remove %d\n", pDev->id));

-	    miSpriteRemoveCursor (pDev, pScreen);

-	}

+	/* TODO: reimplement flicker-free MoveCursor */

+	SPRITE_DEBUG (("SetCursor remove %d\n", pDev->id));

+	miSpriteRemoveCursor (pDev, pScreen);

     }

 

     if (!pPointer->isUp && pPointer->pCursor)