xserver git update 20/5/2010

4 files changed, 94 insertions, 219 deletions

diff --git a/xorg-server/mi/midispcur.c b/xorg-server/mi/midispcur.c
index d4b7f132b..d8fe26ada 100644
--- a/xorg-server/mi/midispcur.c
+++ b/xorg-server/mi/midispcur.c
@@ -97,44 +97,6 @@ typedef struct {
 #endif

 } miDCCursorRec, *miDCCursorPtr;

 

-/*

- * sprite/cursor method table

- */

-

-static Bool	miDCRealizeCursor(ScreenPtr pScreen, CursorPtr pCursor);

-static Bool	miDCUnrealizeCursor(ScreenPtr pScreen, CursorPtr pCursor);

-static Bool	miDCPutUpCursor(DeviceIntPtr pDev, ScreenPtr pScreen, 

-                                CursorPtr pCursor, int x, int y, 

-                                unsigned long source, unsigned long mask);

-static Bool	miDCSaveUnderCursor(DeviceIntPtr pDev, ScreenPtr pScreen, 

-                                    int x, int y,

-				    int w, int h);

-static Bool	miDCRestoreUnderCursor(DeviceIntPtr pDev, ScreenPtr pScreen, 

-                                       int x, int y,

-				       int w, int h);

-static 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);

-static Bool	miDCChangeSave(DeviceIntPtr pDev, ScreenPtr pScreen, 

-                               int x, int y, int w, int h,	

-                               int dx, int dy);

-

-static Bool     miDCDeviceInitialize(DeviceIntPtr pDev, ScreenPtr pScreen);

-static void     miDCDeviceCleanup(DeviceIntPtr pDev, ScreenPtr pScreen);

-

-static miSpriteCursorFuncRec miDCFuncs = {

-    miDCRealizeCursor,

-    miDCUnrealizeCursor,

-    miDCPutUpCursor,

-    miDCSaveUnderCursor,

-    miDCRestoreUnderCursor,

-    miDCMoveCursor,

-    miDCChangeSave,

-    miDCDeviceInitialize,

-    miDCDeviceCleanup

-};

-

 Bool

 miDCInitialize (ScreenPtr pScreen, miPointerScreenFuncPtr screenFuncs)

 {

@@ -150,7 +112,7 @@ miDCInitialize (ScreenPtr pScreen, miPointerScreenFuncPtr screenFuncs)
 

     dixSetPrivate(&pScreen->devPrivates, miDCScreenKey, pScreenPriv);

 

-    if (!miSpriteInitialize (pScreen, &miDCFuncs, screenFuncs))

+    if (!miSpriteInitialize (pScreen, screenFuncs))

     {

 	free((pointer) pScreenPriv);

 	return FALSE;

@@ -170,7 +132,7 @@ miDCCloseScreen (int index, ScreenPtr pScreen)
     return (*pScreen->CloseScreen) (index, pScreen);

 }

 

-static Bool

+Bool

 miDCRealizeCursor (ScreenPtr pScreen, CursorPtr pCursor)

 {

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

@@ -329,7 +291,7 @@ miDCRealize (ScreenPtr pScreen, CursorPtr pCursor)
     return pPriv;

 }

 

-static Bool

+Bool

 miDCUnrealizeCursor (ScreenPtr pScreen, CursorPtr pCursor)

 {

     miDCCursorPtr   pPriv;

@@ -426,7 +388,7 @@ miDCMakeGC(WindowPtr pWin)
 }

 

 

-static Bool

+Bool

 miDCPutUpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor,

                  int x, int y, unsigned long source, unsigned long mask)

 {

@@ -471,7 +433,7 @@ miDCPutUpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor,
     return TRUE;

 }

 

-static Bool

+Bool

 miDCSaveUnderCursor (DeviceIntPtr pDev, ScreenPtr pScreen,

                      int x, int y, int w, int h)

 {

@@ -505,7 +467,7 @@ miDCSaveUnderCursor (DeviceIntPtr pDev, ScreenPtr pScreen,
     return TRUE;

 }

 

-static Bool

+Bool

 miDCRestoreUnderCursor (DeviceIntPtr pDev, ScreenPtr pScreen,

                         int x, int y, int w, int h)

 {

@@ -532,7 +494,7 @@ miDCRestoreUnderCursor (DeviceIntPtr pDev, ScreenPtr pScreen,
     return TRUE;

 }

 

-static Bool

+Bool

 miDCChangeSave (DeviceIntPtr pDev, ScreenPtr pScreen,

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

 {

@@ -665,7 +627,7 @@ miDCChangeSave (DeviceIntPtr pDev, ScreenPtr pScreen,
     return TRUE;

 }

 

-static Bool

+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)

@@ -764,7 +726,7 @@ miDCMoveCursor (DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor,
     return TRUE;

 }

 

-static Bool

+Bool

 miDCDeviceInitialize(DeviceIntPtr pDev, ScreenPtr pScreen)

 {

     miDCBufferPtr   pBuffer;

@@ -839,7 +801,7 @@ failure:
     return FALSE;

 }

 

-static void

+void

 miDCDeviceCleanup(DeviceIntPtr pDev, ScreenPtr pScreen)

 {

     miDCBufferPtr   pBuffer;

diff --git a/xorg-server/mi/miexpose.c b/xorg-server/mi/miexpose.c
index f6f195daa..2fc19f6ec 100644
--- a/xorg-server/mi/miexpose.c
+++ b/xorg-server/mi/miexpose.c
@@ -374,6 +374,8 @@ miSendGraphicsExpose (ClientPtr client, RegionPtr pRgn, XID drawable,
 	    pe->u.graphicsExposure.majorEvent = major;

 	    pe->u.graphicsExposure.minorEvent = minor;

 	}

+	/* GraphicsExpose is a "critical event", which TryClientEvents

+	 * handles specially. */

 	TryClientEvents(client, NULL, pEvent, numRects,

 			    (Mask)0, NoEventMask, NullGrab);

 	free(pEvent);

@@ -386,8 +388,7 @@ miSendGraphicsExpose (ClientPtr client, RegionPtr pRgn, XID drawable,
 	event.u.noExposure.drawable = drawable;

 	event.u.noExposure.majorEvent = major;

 	event.u.noExposure.minorEvent = minor;

-	TryClientEvents(client, NULL, &event, 1,

-	    (Mask)0, NoEventMask, NullGrab);

+	WriteEventsToClient(client, 1, &event);

     }

 }

 

diff --git a/xorg-server/mi/misprite.c b/xorg-server/mi/misprite.c
index b0f7ecd39..69494b9dc 100644
--- a/xorg-server/mi/misprite.c
+++ b/xorg-server/mi/misprite.c
@@ -94,7 +94,6 @@ typedef struct {
     ColormapPtr     pInstalledMap;

     ColormapPtr     pColormap;

     VisualPtr	    pVisual;

-    miSpriteCursorFuncPtr    funcs;

     DamagePtr	    pDamage;		/* damage tracking structure */

     Bool            damageRegistered;

 } miSpriteScreenRec, *miSpriteScreenPtr;

@@ -258,12 +257,9 @@ static void
 miSpriteReportDamage (DamagePtr pDamage, RegionPtr pRegion, void *closure)

 {

     ScreenPtr		    pScreen = closure;

-    miSpriteScreenPtr	    pScreenPriv;

     miCursorInfoPtr         pCursorInfo;

     DeviceIntPtr            pDev;

 

-    pScreenPriv = dixLookupPrivate(&pScreen->devPrivates, miSpriteScreenKey);

-

     for (pDev = inputInfo.devices; pDev; pDev = pDev->next)

     {

         if (DevHasCursor(pDev))

@@ -289,7 +285,6 @@ miSpriteReportDamage (DamagePtr pDamage, RegionPtr pRegion, void *closure)
 

 Bool

 miSpriteInitialize (ScreenPtr               pScreen,

-                    miSpriteCursorFuncPtr   cursorFuncs,

                     miPointerScreenFuncPtr  screenFuncs)

 {

     miSpriteScreenPtr	pScreenPriv;

@@ -336,7 +331,6 @@ miSpriteInitialize (ScreenPtr               pScreen,
 

     pScreenPriv->pInstalledMap = NULL;

     pScreenPriv->pColormap = NULL;

-    pScreenPriv->funcs = cursorFuncs;

     pScreenPriv->colors[SOURCE_COLOR].red = 0;

     pScreenPriv->colors[SOURCE_COLOR].green = 0;

     pScreenPriv->colors[SOURCE_COLOR].blue = 0;

@@ -397,7 +391,6 @@ miSpriteGetImage (DrawablePtr pDrawable, int sx, int sy, int w, int h,
                   char *pdstLine)

 {

     ScreenPtr	    pScreen = pDrawable->pScreen;

-    miSpriteScreenPtr    pScreenPriv;

     DeviceIntPtr    pDev;

     miCursorInfoPtr pCursorInfo;

 

@@ -405,7 +398,6 @@ miSpriteGetImage (DrawablePtr pDrawable, int sx, int sy, int w, int h,
 

     if (pDrawable->type == DRAWABLE_WINDOW)

     {

-        pScreenPriv = dixLookupPrivate(&pScreen->devPrivates,miSpriteScreenKey);

         for(pDev = inputInfo.devices; pDev; pDev = pDev->next)

         {

             if (DevHasCursor(pDev))

@@ -433,7 +425,6 @@ miSpriteGetSpans (DrawablePtr pDrawable, int wMax, DDXPointPtr ppt,
                   int *pwidth, int nspans, char *pdstStart)

 {

     ScreenPtr		    pScreen = pDrawable->pScreen;

-    miSpriteScreenPtr	    pScreenPriv;

     DeviceIntPtr            pDev;

     miCursorInfoPtr         pCursorInfo;

 

@@ -441,8 +432,6 @@ miSpriteGetSpans (DrawablePtr pDrawable, int wMax, DDXPointPtr ppt,
 

     if (pDrawable->type == DRAWABLE_WINDOW)

     {

-        pScreenPriv = dixLookupPrivate(&pScreen->devPrivates,miSpriteScreenKey);

-

         for(pDev = inputInfo.devices; pDev; pDev = pDev->next)

         {

             if (DevHasCursor(pDev))

@@ -487,7 +476,6 @@ miSpriteSourceValidate (DrawablePtr pDrawable, int x, int y, int width,
                         int height)

 {

     ScreenPtr		    pScreen = pDrawable->pScreen;

-    miSpriteScreenPtr	    pScreenPriv;

     DeviceIntPtr            pDev;

     miCursorInfoPtr         pCursorInfo;

 

@@ -495,8 +483,6 @@ miSpriteSourceValidate (DrawablePtr pDrawable, int x, int y, int width,
 

     if (pDrawable->type == DRAWABLE_WINDOW)

     {

-	pScreenPriv = dixLookupPrivate(&pScreen->devPrivates,miSpriteScreenKey);

-

 	for(pDev = inputInfo.devices; pDev; pDev = pDev->next)

 	{

 	    if (DevHasCursor(pDev))

@@ -523,14 +509,11 @@ static void
 miSpriteCopyWindow (WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc)

 {

     ScreenPtr	pScreen = pWindow->drawable.pScreen;

-    miSpriteScreenPtr	    pScreenPriv;

     DeviceIntPtr            pDev;

     miCursorInfoPtr         pCursorInfo;

 

     SCREEN_PROLOGUE (pScreen, CopyWindow);

 

-    pScreenPriv = dixLookupPrivate(&pScreen->devPrivates, miSpriteScreenKey);

-

     for(pDev = inputInfo.devices; pDev; pDev = pDev->next)

     {

         if (DevHasCursor(pDev))

@@ -760,10 +743,8 @@ miSpriteFindColors (miCursorInfoPtr pDevCursor, ScreenPtr pScreen)
 static Bool

 miSpriteRealizeCursor (DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)

 {

-    miSpriteScreenPtr	pScreenPriv;

     miCursorInfoPtr pCursorInfo;

 

-    pScreenPriv = dixLookupPrivate(&pScreen->devPrivates, miSpriteScreenKey);

     if (!IsMaster(pDev) && !pDev->u.master)

         return FALSE;

 

@@ -772,27 +753,21 @@ miSpriteRealizeCursor (DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
     if (pCursor == pCursorInfo->pCursor)

 	pCursorInfo->checkPixels = TRUE;

 

-    return (*pScreenPriv->funcs->RealizeCursor) (pScreen, pCursor);

+    return miDCRealizeCursor(pScreen, pCursor);

 }

 

 static Bool

 miSpriteUnrealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)

 {

-    miSpriteScreenPtr	pScreenPriv;

-

-    pScreenPriv = dixLookupPrivate(&pScreen->devPrivates, miSpriteScreenKey);

-    return (*pScreenPriv->funcs->UnrealizeCursor) (pScreen, pCursor);

+    return miDCUnrealizeCursor(pScreen, pCursor);

 }

 

 static void

 miSpriteSetCursor (DeviceIntPtr pDev, ScreenPtr pScreen,

                    CursorPtr pCursor, int x, int y)

 {

-    miSpriteScreenPtr	pScreenPriv;

     miCursorInfoPtr pPointer;

 

-    pScreenPriv = dixLookupPrivate(&pScreen->devPrivates, miSpriteScreenKey);

-

     if (!IsMaster(pDev) && !pDev->u.master)

         return;

 

@@ -861,7 +836,7 @@ miSpriteSetCursor (DeviceIntPtr pDev, ScreenPtr pScreen,
 		pointer->saved.y1 -= dy;

 		pointer->saved.x2 -= dx;

 		pointer->saved.y2 -= dy;

-		(void) (*pScreenPriv->funcs->ChangeSave) (pScreen,

+		(void) miDCChangeSave(pScreen,

 				pointer->saved.x1,

  				pointer->saved.y1,

                                 pointer->saved.x2 -

@@ -870,7 +845,7 @@ miSpriteSetCursor (DeviceIntPtr pDev, ScreenPtr pScreen,
                                 pointer->saved.y1,

 				dx, dy);

 	    }

-	    (void) (*pScreenPriv->funcs->MoveCursor) (pScreen, pCursor,

+	    (void) miDCMoveCursor(pScreen, pCursor,

 				  pointer->saved.x1,

  				  pointer->saved.y1,

                                   pointer->saved.x2 -

@@ -904,10 +879,8 @@ miSpriteSetCursor (DeviceIntPtr pDev, ScreenPtr pScreen,
 static void

 miSpriteMoveCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)

 {

-    miSpriteScreenPtr	pScreenPriv;

     CursorPtr pCursor;

 

-    pScreenPriv = dixLookupPrivate(&pScreen->devPrivates, miSpriteScreenKey);

     if (!IsMaster(pDev) && !pDev->u.master)

         return;

 

@@ -920,12 +893,9 @@ miSpriteMoveCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
 static Bool

 miSpriteDeviceCursorInitialize(DeviceIntPtr pDev, ScreenPtr pScreen)

 {

-    miSpriteScreenPtr pScreenPriv;

     miCursorInfoPtr pCursorInfo;

     int ret = FALSE;

 

-    pScreenPriv = dixLookupPrivate(&pScreen->devPrivates, miSpriteScreenKey);

-

     pCursorInfo = malloc(sizeof(miCursorInfoRec));

     if (!pCursorInfo)

         return FALSE;

@@ -940,7 +910,7 @@ miSpriteDeviceCursorInitialize(DeviceIntPtr pDev, ScreenPtr pScreen)
     pCursorInfo->checkPixels = TRUE;

     pCursorInfo->pScreen = FALSE;

 

-    ret = (*pScreenPriv->funcs->DeviceCursorInitialize)(pDev, pScreen);

+    ret = miDCDeviceInitialize(pDev, pScreen);

     if (!ret)

     {

         free(pCursorInfo);

@@ -954,13 +924,7 @@ static void
 miSpriteDeviceCursorCleanup(DeviceIntPtr pDev, ScreenPtr pScreen)

 {

     if (DevHasCursor(pDev))

-    {

-        miSpriteScreenPtr pScreenPriv;

-        pScreenPriv = dixLookupPrivate(&pScreen->devPrivates,

-                                       miSpriteScreenKey);

-

-        (*pScreenPriv->funcs->DeviceCursorCleanup)(pDev, pScreen);

-    }

+        miDCDeviceCleanup(pDev, pScreen);

 }

 

 /*

@@ -984,16 +948,16 @@ miSpriteRemoveCursor (DeviceIntPtr pDev, ScreenPtr pScreen)
     miSpriteIsDown(pCursorInfo);

     pCursorInfo->pCacheWin = NullWindow;

     miSpriteDisableDamage(pScreen, pScreenPriv);

-    if (!(*pScreenPriv->funcs->RestoreUnderCursor) (pDev,

-                                         pScreen,

-					 pCursorInfo->saved.x1,

-                                         pCursorInfo->saved.y1,

-                                         pCursorInfo->saved.x2 -

-                                         pCursorInfo->saved.x1,

-                                         pCursorInfo->saved.y2 -

-                                         pCursorInfo->saved.y1))

+    if (!miDCRestoreUnderCursor(pDev,

+                                pScreen,

+                                pCursorInfo->saved.x1,

+                                pCursorInfo->saved.y1,

+                                pCursorInfo->saved.x2 -

+                                pCursorInfo->saved.x1,

+                                pCursorInfo->saved.y2 -

+                                pCursorInfo->saved.y1))

     {

-	miSpriteIsUp(pCursorInfo);

+        miSpriteIsUp(pCursorInfo);

     }

     miSpriteEnableDamage(pScreen, pScreenPriv);

     DamageDrawInternal (pScreen, FALSE);

@@ -1026,14 +990,14 @@ miSpriteSaveUnderCursor(DeviceIntPtr pDev, ScreenPtr pScreen)
     y = pCursorInfo->y - (int)pCursor->bits->yhot;

     miSpriteDisableDamage(pScreen, pScreenPriv);

 

-    (*pScreenPriv->funcs->SaveUnderCursor) (pDev,

-                                      pScreen,

-				      pCursorInfo->saved.x1,

-				      pCursorInfo->saved.y1,

-                                      pCursorInfo->saved.x2 -

-                                      pCursorInfo->saved.x1,

-                                      pCursorInfo->saved.y2 -

-                                      pCursorInfo->saved.y1);

+    miDCSaveUnderCursor(pDev,

+                        pScreen,

+                        pCursorInfo->saved.x1,

+                        pCursorInfo->saved.y1,

+                        pCursorInfo->saved.x2 -

+                        pCursorInfo->saved.x1,

+                        pCursorInfo->saved.y2 -

+                        pCursorInfo->saved.y1);

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

     miSpriteEnableDamage(pScreen, pScreenPriv);

     DamageDrawInternal (pScreen, FALSE);

@@ -1069,7 +1033,7 @@ miSpriteRestoreCursor (DeviceIntPtr pDev, ScreenPtr pScreen)
     SPRITE_DEBUG(("RestoreCursor %d\n", pDev->id));

     if (pCursorInfo->checkPixels)

         miSpriteFindColors (pCursorInfo, pScreen);

-    if ((*pScreenPriv->funcs->PutUpCursor) (pDev, pScreen,

+    if (miDCPutUpCursor(pDev, pScreen,

                 pCursor, x, y,

                 pScreenPriv->colors[SOURCE_COLOR].pixel,

                 pScreenPriv->colors[MASK_COLOR].pixel))

@@ -1088,7 +1052,6 @@ miSpriteRestoreCursor (DeviceIntPtr pDev, ScreenPtr pScreen)
 static void

 miSpriteComputeSaved (DeviceIntPtr pDev, ScreenPtr pScreen)

 {

-    miSpriteScreenPtr   pScreenPriv;

     int		    x, y, w, h;

     int		    wpad, hpad;

     CursorPtr	    pCursor;

@@ -1097,7 +1060,6 @@ miSpriteComputeSaved (DeviceIntPtr pDev, ScreenPtr pScreen)
     if (!IsMaster(pDev) && !pDev->u.master)

         return;

 

-    pScreenPriv = dixLookupPrivate(&pScreen->devPrivates, miSpriteScreenKey);

     pCursorInfo = MISPRITE(pDev);

 

     pCursor = pCursorInfo->pCursor;

diff --git a/xorg-server/mi/misprite.h b/xorg-server/mi/misprite.h
index 72dc06fc7..6dbc48460 100644
--- a/xorg-server/mi/misprite.h
+++ b/xorg-server/mi/misprite.h
@@ -1,107 +1,57 @@
-/*
- * misprite.h
- *
- * software-sprite/sprite drawing interface spec
- *
- * mi versions of these routines exist.
- */
-
-
-/*
-
-Copyright 1989, 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.
-*/
-
-typedef struct {
-    Bool	(*RealizeCursor)(
-		ScreenPtr /*pScreen*/,
-		CursorPtr /*pCursor*/
-);
-    Bool	(*UnrealizeCursor)(
-		ScreenPtr /*pScreen*/,
-		CursorPtr /*pCursor*/
-);
-    Bool	(*PutUpCursor)(
-                DeviceIntPtr /*pDev*/,
-		ScreenPtr /*pScreen*/,
-		CursorPtr /*pCursor*/,
-		int /*x*/,
-		int /*y*/,
-		unsigned long /*source*/,
-		unsigned long /*mask*/
-);
-    Bool	(*SaveUnderCursor)(
-                DeviceIntPtr /*pDev*/,
-		ScreenPtr /*pScreen*/,
-		int /*x*/,
-		int /*y*/,
-		int /*w*/,
-		int /*h*/
-);
-    Bool	(*RestoreUnderCursor)(
-                DeviceIntPtr /*pDev*/,
-		ScreenPtr /*pScreen*/,
-		int /*x*/,
-		int /*y*/,
-		int /*w*/,
-		int /*h*/
-);
-    Bool	(*MoveCursor)(
-                DeviceIntPtr /*pDev*/,
-		ScreenPtr /*pScreen*/,
-		CursorPtr /*pCursor*/,
-		int /*x*/,
-		int /*y*/,
-		int /*w*/,
-		int /*h*/,
-		int /*dx*/,
-		int /*dy*/,
-		unsigned long /*source*/,
-		unsigned long /*mask*/
-);
-    Bool	(*ChangeSave)(
-                DeviceIntPtr /*pDev*/,
-		ScreenPtr /*pScreen*/,
-		int /*x*/,
-		int /*y*/,
-		int /*w*/,
-		int /*h*/,
-		int /*dx*/,
-		int /*dy*/
-);
-    Bool	(*DeviceCursorInitialize)(
-                DeviceIntPtr /*pDev*/,
-		ScreenPtr /*pScreen*/
-);
-    void	(*DeviceCursorCleanup)(
-                DeviceIntPtr /*pDev*/,
-		ScreenPtr /*pScreen*/
-);
-
-} miSpriteCursorFuncRec, *miSpriteCursorFuncPtr;
-
-extern Bool miSpriteInitialize(
-    ScreenPtr /*pScreen*/,
-    miSpriteCursorFuncPtr /*cursorFuncs*/,
-    miPointerScreenFuncPtr /*screenFuncs*/
-);
+/*

+ * misprite.h

+ *

+ * software-sprite/sprite drawing interface spec

+ *

+ * mi versions of these routines exist.

+ */

+

+

+/*

+

+Copyright 1989, 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.

+*/

+

+extern Bool miSpriteInitialize(

+    ScreenPtr /*pScreen*/,

+    miPointerScreenFuncPtr /*screenFuncs*/

+);

+

+extern Bool miDCRealizeCursor(ScreenPtr pScreen, CursorPtr pCursor);

+extern Bool miDCUnrealizeCursor(ScreenPtr pScreen, CursorPtr pCursor);

+extern Bool miDCPutUpCursor(DeviceIntPtr pDev, ScreenPtr pScreen,

+                            CursorPtr pCursor, int x, int y,

+                            unsigned long source, unsigned long mask);

+extern Bool miDCSaveUnderCursor(DeviceIntPtr pDev, ScreenPtr pScreen,

+                                int x, int y, int w, int h);

+extern Bool miDCRestoreUnderCursor(DeviceIntPtr pDev, ScreenPtr pScreen,

+                                   int x, int y, int w, int h);

+extern 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);

+extern Bool miDCChangeSave(DeviceIntPtr pDev, ScreenPtr pScreen,

+                           int x, int y, int w, int h,

+                           int dx, int dy);

+extern Bool miDCDeviceInitialize(DeviceIntPtr pDev, ScreenPtr pScreen);

+extern void miDCDeviceCleanup(DeviceIntPtr pDev, ScreenPtr pScreen);