svn merge ^/branches/released .

1 files changed, 47 insertions, 286 deletions

diff --git a/xorg-server/mi/midispcur.c b/xorg-server/mi/midispcur.c
index d56080488..7d79042f4 100644
--- a/xorg-server/mi/midispcur.c
+++ b/xorg-server/mi/midispcur.c
@@ -54,40 +54,40 @@ in this Software without prior written authorization from The Open Group.
 # include "inputstr.h"

 

 /* per-screen private data */

-static int miDCScreenKeyIndex;

-static DevPrivateKey miDCScreenKey = &miDCScreenKeyIndex;

+static DevPrivateKeyRec miDCScreenKeyRec;

+#define miDCScreenKey (&miDCScreenKeyRec)

 

 static Bool	miDCCloseScreen(int index, ScreenPtr pScreen);

 

-/* per device per-screen private data */

-static int miDCSpriteKeyIndex[MAXSCREENS];

-static DevPrivateKey miDCSpriteKey = miDCSpriteKeyIndex;

-

+/* per device private data */

 typedef struct {

     GCPtr	    pSourceGC, pMaskGC;

     GCPtr	    pSaveGC, pRestoreGC;

-    GCPtr	    pMoveGC;

-    GCPtr	    pPixSourceGC, pPixMaskGC;

-    PixmapPtr	    pSave, pTemp;

+    PixmapPtr	    pSave;

 #ifdef ARGB_CURSOR

     PicturePtr	    pRootPicture;

-    PicturePtr	    pTempPicture;

 #endif

 } miDCBufferRec, *miDCBufferPtr;

 

-#define MIDCBUFFER(dev, screen) \

+#define miGetDCDevice(dev, screen) \

  ((DevHasCursor(dev)) ? \

-  (miDCBufferPtr)dixLookupPrivate(&dev->devPrivates, miDCSpriteKey + (screen)->myNum) : \

-  (miDCBufferPtr)dixLookupPrivate(&dev->u.master->devPrivates, miDCSpriteKey + (screen)->myNum))

+  (miDCBufferPtr)dixLookupPrivate(&dev->devPrivates, miDCDeviceKey(screen)) : \

+  (miDCBufferPtr)dixLookupPrivate(&dev->u.master->devPrivates, miDCDeviceKey(screen)))

 

 /* 

  * The core pointer buffer will point to the index of the virtual core pointer

  * in the pCursorBuffers array. 

  */

 typedef struct {

-    CloseScreenProcPtr CloseScreen;

+    CloseScreenProcPtr	CloseScreen;

+    DevPrivateKey	device_key;

+    DevPrivateKey	cursor_bits_key;

 } miDCScreenRec, *miDCScreenPtr;

 

+#define miGetDCScreen(s)	((miDCScreenPtr)(dixLookupPrivate(&(s)->devPrivates, miDCScreenKey)))

+#define miDCDeviceKey(s) 	(miGetDCScreen(s)->device_key)

+#define miDCCursorBitsKey(s)	(miGetDCScreen(s)->cursor_bits_key)

+

 /* per-cursor per-screen private data */

 typedef struct {

     PixmapPtr		sourceBits;	    /* source bits */

@@ -102,11 +102,19 @@ miDCInitialize (ScreenPtr pScreen, miPointerScreenFuncPtr screenFuncs)
 {

     miDCScreenPtr   pScreenPriv;

 

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

+	return FALSE;

+

     pScreenPriv = malloc(sizeof (miDCScreenRec));

     if (!pScreenPriv)

 	return FALSE;

 

-

+    pScreenPriv->cursor_bits_key = dixCreatePrivateKey(PRIVATE_CURSOR_BITS, 0);

+    pScreenPriv->device_key = dixCreatePrivateKey(PRIVATE_DEVICE, 0);

+    if (!pScreenPriv->cursor_bits_key || !pScreenPriv->device_key) {

+	free(pScreenPriv);

+	return FALSE;

+    }

     pScreenPriv->CloseScreen = pScreen->CloseScreen;

     pScreen->CloseScreen = miDCCloseScreen;

 

@@ -136,7 +144,7 @@ Bool
 miDCRealizeCursor (ScreenPtr pScreen, CursorPtr pCursor)

 {

     if (pCursor->bits->refcnt <= 1)

-	dixSetPrivate(&pCursor->bits->devPrivates, CursorScreenKey(pScreen), NULL);

+	dixSetPrivate(&pCursor->bits->devPrivates, miDCCursorBitsKey(pScreen), NULL);

     return TRUE;

 }

 

@@ -235,7 +243,7 @@ miDCRealize (ScreenPtr pScreen, CursorPtr pCursor)
 	    free((pointer) pPriv);

 	    return NULL;

 	}

-	dixSetPrivate(&pCursor->bits->devPrivates, CursorScreenKey(pScreen), pPriv);

+	dixSetPrivate(&pCursor->bits->devPrivates, miDCCursorBitsKey(pScreen), pPriv);

 	return pPriv;

     }

     pPriv->pPicture = 0;

@@ -253,7 +261,7 @@ miDCRealize (ScreenPtr pScreen, CursorPtr pCursor)
 	free((pointer) pPriv);

 	return NULL;

     }

-    dixSetPrivate(&pCursor->bits->devPrivates, CursorScreenKey(pScreen), pPriv);

+    dixSetPrivate(&pCursor->bits->devPrivates, miDCCursorBitsKey(pScreen), pPriv);

 

     /* create the two sets of bits, clipping as appropriate */

 

@@ -298,7 +306,7 @@ miDCUnrealizeCursor (ScreenPtr pScreen, CursorPtr pCursor)
     miDCCursorPtr   pPriv;

 

     pPriv = (miDCCursorPtr)dixLookupPrivate(&pCursor->bits->devPrivates,

-					    CursorScreenKey(pScreen));

+					    miDCCursorBitsKey(pScreen));

     if (pPriv && (pCursor->bits->refcnt <= 1))

     {

 	if (pPriv->sourceBits)

@@ -310,7 +318,7 @@ miDCUnrealizeCursor (ScreenPtr pScreen, CursorPtr pCursor)
 	    FreePicture (pPriv->pPicture, 0);

 #endif

 	free((pointer) pPriv);

-	dixSetPrivate(&pCursor->bits->devPrivates, CursorScreenKey(pScreen), NULL);

+	dixSetPrivate(&pCursor->bits->devPrivates, miDCCursorBitsKey(pScreen), NULL);

     }

     return TRUE;

 }

@@ -399,7 +407,7 @@ miDCPutUpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor,
     WindowPtr	    pWin;

 

     pPriv = (miDCCursorPtr)dixLookupPrivate(&pCursor->bits->devPrivates,

-					    CursorScreenKey(pScreen));

+					    miDCCursorBitsKey(pScreen));

     if (!pPriv)

     {

 	pPriv = miDCRealize(pScreen, pCursor);

@@ -408,8 +416,8 @@ miDCPutUpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor,
     }

     pScreenPriv = (miDCScreenPtr)dixLookupPrivate(&pScreen->devPrivates,

 						  miDCScreenKey);

-    pWin = WindowTable[pScreen->myNum];

-    pBuffer = MIDCBUFFER(pDev, pScreen);

+    pWin = pScreen->root;

+    pBuffer = miGetDCDevice(pDev, pScreen);

 

 #ifdef ARGB_CURSOR

     if (pPriv->pPicture)

@@ -448,10 +456,10 @@ miDCSaveUnderCursor (DeviceIntPtr pDev, ScreenPtr pScreen,
 

     pScreenPriv = (miDCScreenPtr)dixLookupPrivate(&pScreen->devPrivates,

 						  miDCScreenKey);

-    pBuffer = MIDCBUFFER(pDev, pScreen);

+    pBuffer = miGetDCDevice(pDev, pScreen);

 

     pSave = pBuffer->pSave;

-    pWin = WindowTable[pScreen->myNum];

+    pWin = pScreen->root;

     if (!pSave || pSave->drawable.width < w || pSave->drawable.height < h)

     {

 	if (pSave)

@@ -482,10 +490,10 @@ miDCRestoreUnderCursor (DeviceIntPtr pDev, ScreenPtr pScreen,
 

     pScreenPriv = (miDCScreenPtr)dixLookupPrivate(&pScreen->devPrivates,

 						  miDCScreenKey);

-    pBuffer = MIDCBUFFER(pDev, pScreen);

+    pBuffer = miGetDCDevice(pDev, pScreen);

     pSave = pBuffer->pSave;

 

-    pWin = WindowTable[pScreen->myNum];

+    pWin = pScreen->root;

     if (!pSave)

 	return FALSE;

 

@@ -498,243 +506,10 @@ miDCRestoreUnderCursor (DeviceIntPtr pDev, ScreenPtr pScreen,
 }

 

 Bool

-miDCChangeSave (DeviceIntPtr pDev, ScreenPtr pScreen,

-                int x, int y, int w, int h, int dx, int dy)

-{

-    miDCScreenPtr   pScreenPriv;

-    miDCBufferPtr   pBuffer;

-    PixmapPtr	    pSave;

-    WindowPtr	    pWin;

-    GCPtr	    pGC;

-    int		    sourcex, sourcey, destx, desty, copyw, copyh;

-

-    pScreenPriv = (miDCScreenPtr)dixLookupPrivate(&pScreen->devPrivates,

-						  miDCScreenKey);

-    pBuffer = MIDCBUFFER(pDev, pScreen);

-

-    pSave = pBuffer->pSave;

-    pWin = WindowTable[pScreen->myNum];

-    /*

-     * restore the bits which are about to get trashed

-     */

-    if (!pSave)

-	return FALSE;

-

-    pGC = pBuffer->pRestoreGC;

-    if (pWin->drawable.serialNumber != pGC->serialNumber)

-	ValidateGC ((DrawablePtr) pWin, pGC);

-    /*

-     * copy the old bits to the screen.

-     */

-    if (dy > 0)

-    {

-	(*pGC->ops->CopyArea) ((DrawablePtr) pSave, (DrawablePtr) pWin, pGC,

-			       0, h - dy, w, dy, x + dx, y + h);

-    }

-    else if (dy < 0)

-    {

-	(*pGC->ops->CopyArea) ((DrawablePtr) pSave, (DrawablePtr) pWin, pGC,

-			       0, 0, w, -dy, x + dx, y + dy);

-    }

-    if (dy >= 0)

-    {

-	desty = y + dy;

-	sourcey = 0;

-	copyh = h - dy;

-    }

-    else

-    {

-	desty = y;

-	sourcey = - dy;

-	copyh = h + dy;

-    }

-    if (dx > 0)

-    {

-	(*pGC->ops->CopyArea) ((DrawablePtr) pSave, (DrawablePtr) pWin, pGC,

-			       w - dx, sourcey, dx, copyh, x + w, desty);

-    }

-    else if (dx < 0)

-    {

-	(*pGC->ops->CopyArea) ((DrawablePtr) pSave, (DrawablePtr) pWin, pGC,

-			       0, sourcey, -dx, copyh, x + dx, desty);

-    }

-

-    pGC = pBuffer->pSaveGC;

-    if (pSave->drawable.serialNumber != pGC->serialNumber)

-	ValidateGC ((DrawablePtr) pSave, pGC);

-    /*

-     * move the bits that are still valid within the pixmap

-     */

-    if (dx >= 0)

-    {

-	sourcex = 0;

-	destx = dx;

-	copyw = w - dx;

-    }

-    else

-    {

-	destx = 0;

-	sourcex = - dx;

-	copyw = w + dx;

-    }

-    if (dy >= 0)

-    {

-	sourcey = 0;

-	desty = dy;

-	copyh = h - dy;

-    }

-    else

-    {

-	desty = 0;

-	sourcey = -dy;

-	copyh = h + dy;

-    }

-    (*pGC->ops->CopyArea) ((DrawablePtr) pSave, (DrawablePtr) pSave, pGC,

-			   sourcex, sourcey, copyw, copyh, destx, desty);

-    /*

-     * copy the new bits from the screen into the remaining areas of the

-     * pixmap

-     */

-    if (dy > 0)

-    {

-	(*pGC->ops->CopyArea) ((DrawablePtr) pWin, (DrawablePtr) pSave, pGC,

-			       x, y, w, dy, 0, 0);

-    }

-    else if (dy < 0)

-    {

-	(*pGC->ops->CopyArea) ((DrawablePtr) pWin, (DrawablePtr) pSave, pGC,

-			       x, y + h + dy, w, -dy, 0, h + dy);

-    }

-    if (dy >= 0)

-    {

-	desty = dy;

-	sourcey = y + dy;

-	copyh = h - dy;

-    }

-    else

-    {

-	desty = 0;

-	sourcey = y;

-	copyh = h + dy;

-    }

-    if (dx > 0)

-    {

-	(*pGC->ops->CopyArea) ((DrawablePtr) pWin, (DrawablePtr) pSave, pGC,

-			       x, sourcey, dx, copyh, 0, desty);

-    }

-    else if (dx < 0)

-    {

-	(*pGC->ops->CopyArea) ((DrawablePtr) pWin, (DrawablePtr) pSave, pGC,

-			       x + w + dx, sourcey, -dx, copyh, w + dx, desty);

-    }

-    return TRUE;

-}

-

-Bool

-miDCMoveCursor (DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor,

-                int x, int y, int w, int h, int dx, int dy,

-                unsigned long source, unsigned long mask)

-{

-    miDCCursorPtr   pPriv;

-    miDCScreenPtr   pScreenPriv;

-    miDCBufferPtr   pBuffer;

-    int		    status;

-    WindowPtr	    pWin;

-    GCPtr	    pGC;

-    XID		    gcval = FALSE;

-    PixmapPtr	    pTemp;

-

-    pPriv = (miDCCursorPtr)dixLookupPrivate(&pCursor->bits->devPrivates,

-					    CursorScreenKey(pScreen));

-    if (!pPriv)

-    {

-	pPriv = miDCRealize(pScreen, pCursor);

-	if (!pPriv)

-	    return FALSE;

-    }

-    pScreenPriv = (miDCScreenPtr)dixLookupPrivate(&pScreen->devPrivates,

-						  miDCScreenKey);

-    pWin = WindowTable[pScreen->myNum];

-    pBuffer = MIDCBUFFER(pDev, pScreen);

-

-    pTemp = pBuffer->pTemp;

-    if (!pTemp ||

-	pTemp->drawable.width != pBuffer->pSave->drawable.width ||

-	pTemp->drawable.height != pBuffer->pSave->drawable.height)

-    {

-	if (pTemp)

-	    (*pScreen->DestroyPixmap) (pTemp);

-#ifdef ARGB_CURSOR

-	if (pBuffer->pTempPicture)

-	{

-	    FreePicture (pBuffer->pTempPicture, 0);

-	    pBuffer->pTempPicture = 0;

-	}

-#endif

-	pBuffer->pTemp = pTemp = (*pScreen->CreatePixmap)

-	    (pScreen, w, h, pBuffer->pSave->drawable.depth, 0);

-	if (!pTemp)

-	    return FALSE;

-    }

-    if (!pBuffer->pMoveGC)

-    {

-	pBuffer->pMoveGC = CreateGC ((DrawablePtr)pTemp,

-	    GCGraphicsExposures, &gcval, &status, (XID)0, serverClient);

-	if (!pBuffer->pMoveGC)

-	    return FALSE;

-    }

-    /*

-     * copy the saved area to a temporary pixmap

-     */

-    pGC = pBuffer->pMoveGC;

-    if (pGC->serialNumber != pTemp->drawable.serialNumber)

-	ValidateGC ((DrawablePtr) pTemp, pGC);

-    (*pGC->ops->CopyArea)((DrawablePtr)pBuffer->pSave,

-			  (DrawablePtr)pTemp, pGC, 0, 0, w, h, 0, 0);

-    

-    /*

-     * draw the cursor in the temporary pixmap

-     */

-#ifdef ARGB_CURSOR

-    if (pPriv->pPicture)

-    {

-	if (!EnsurePicture(pBuffer->pTempPicture, &pTemp->drawable, pWin))

-	    return FALSE;

-	CompositePicture (PictOpOver,

-			  pPriv->pPicture,

-			  NULL,

-			  pBuffer->pTempPicture,

-			  0, 0, 0, 0, 

-			  dx, dy, 

-			  pCursor->bits->width,

-			  pCursor->bits->height);

-    }

-    else

-#endif

-    {

-	miDCPutBits ((DrawablePtr)pTemp, pPriv,

-		     pBuffer->pPixSourceGC, pBuffer->pPixMaskGC,

-		     dx, dy, pCursor->bits->width, pCursor->bits->height,

-		     source, mask);

-    }

-

-    pGC = pBuffer->pRestoreGC;

-    if (pWin->drawable.serialNumber != pGC->serialNumber)

-	ValidateGC ((DrawablePtr) pWin, pGC);

-

-    (*pGC->ops->CopyArea) ((DrawablePtr) pTemp, (DrawablePtr) pWin,

-			    pGC,

-			    0, 0, w, h, x, y);

-    return TRUE;

-}

-

-Bool

 miDCDeviceInitialize(DeviceIntPtr pDev, ScreenPtr pScreen)

 {

     miDCBufferPtr   pBuffer;

     WindowPtr       pWin;

-    XID             gcval = FALSE;

-    int             status;

     int             i;

 

     if (!DevHasCursor(pDev))

@@ -748,8 +523,8 @@ miDCDeviceInitialize(DeviceIntPtr pDev, ScreenPtr pScreen)
         if (!pBuffer)

             goto failure;

 

-        dixSetPrivate(&pDev->devPrivates, miDCSpriteKey + pScreen->myNum, pBuffer);

-        pWin = WindowTable[pScreen->myNum];

+        dixSetPrivate(&pDev->devPrivates, miDCDeviceKey(pScreen), pBuffer);

+        pWin = pScreen->root;

 

         pBuffer->pSourceGC = miDCMakeGC(pWin);

         if (!pBuffer->pSourceGC)

@@ -767,28 +542,12 @@ miDCDeviceInitialize(DeviceIntPtr pDev, ScreenPtr pScreen)
         if (!pBuffer->pRestoreGC)

             goto failure;

 

-        pBuffer->pMoveGC = CreateGC ((DrawablePtr)pWin,

-            GCGraphicsExposures, &gcval, &status, (XID)0, serverClient);

-        if (!pBuffer->pMoveGC)

-            goto failure;

-

-        pBuffer->pPixSourceGC = CreateGC ((DrawablePtr)pWin,

-            GCGraphicsExposures, &gcval, &status, (XID)0, serverClient);

-        if (!pBuffer->pPixSourceGC)

-            goto failure;

-

-        pBuffer->pPixMaskGC = CreateGC ((DrawablePtr)pWin,

-            GCGraphicsExposures, &gcval, &status, (XID)0, serverClient);

-        if (!pBuffer->pPixMaskGC)

-            goto failure;

-

 #ifdef ARGB_CURSOR

         pBuffer->pRootPicture = NULL;

-        pBuffer->pTempPicture = NULL;

 #endif

 

-        // these get (re)allocated lazily depending on the cursor size

-        pBuffer->pSave = pBuffer->pTemp = NULL;

+        /* (re)allocated lazily depending on the cursor size */

+        pBuffer->pSave = NULL;

     }

 

     return TRUE;

@@ -812,7 +571,7 @@ miDCDeviceCleanup(DeviceIntPtr pDev, ScreenPtr pScreen)
         {

             pScreen = screenInfo.screens[i];

 

-            pBuffer = MIDCBUFFER(pDev, pScreen);

+            pBuffer = miGetDCDevice(pDev, pScreen);

 

             if (pBuffer)

             {

@@ -820,15 +579,17 @@ miDCDeviceCleanup(DeviceIntPtr pDev, ScreenPtr pScreen)
                 if (pBuffer->pMaskGC) FreeGC(pBuffer->pMaskGC, (GContext) 0);

                 if (pBuffer->pSaveGC) FreeGC(pBuffer->pSaveGC, (GContext) 0);

                 if (pBuffer->pRestoreGC) FreeGC(pBuffer->pRestoreGC, (GContext) 0);

-                if (pBuffer->pMoveGC) FreeGC(pBuffer->pMoveGC, (GContext) 0);

-                if (pBuffer->pPixSourceGC) FreeGC(pBuffer->pPixSourceGC, (GContext) 0);

-                if (pBuffer->pPixMaskGC) FreeGC(pBuffer->pPixMaskGC, (GContext) 0);

+

+#ifdef ARGB_CURSOR

+                /* If a pRootPicture was allocated for a root window, it

+                 * is freed when that root window is destroyed, so don't

+                 * free it again here. */

+#endif

 

                 if (pBuffer->pSave) (*pScreen->DestroyPixmap)(pBuffer->pSave);

-                if (pBuffer->pTemp) (*pScreen->DestroyPixmap)(pBuffer->pTemp);

 

                 free(pBuffer);

-                dixSetPrivate(&pDev->devPrivates, miDCSpriteKey + pScreen->myNum, NULL);

+                dixSetPrivate(&pDev->devPrivates, miDCDeviceKey(pScreen), NULL);

             }

         }

     }