svn merge "^/branches/released" .

1 files changed, 57 insertions, 107 deletions

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