merge XFree86 4.3.0.1 to -CURRENT

include/cursor.h

@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/include/cursor.h,v 1.6 2002/09/17 01:15:14 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -54,6 +55,11 @@ SOFTWARE.
 
 #define NullCursor ((CursorPtr)NULL)
 
+/* Provide support for alpha composited cursors */
+#ifdef RENDER
+#define ARGB_CURSOR
+#endif
+
 typedef struct _Cursor *CursorPtr;
 typedef struct _CursorMetric *CursorMetricPtr;
 
@@ -66,6 +72,11 @@ extern int FreeCursor(
 #endif
 );
 
+/* Quartz support on Mac OS X pulls in the QuickDraw
+   framework whose AllocCursor function conflicts here. */ 
+#ifdef __DARWIN__
+#define AllocCursor Darwin_X_AllocCursor
+#endif
 extern CursorPtr AllocCursor(
 #if NeedFunctionPrototypes
     unsigned char* /*psrcbits*/,
@@ -80,6 +91,21 @@ extern CursorPtr AllocCursor(
 #endif
 );
 
+extern CursorPtr AllocCursorARGB(
+#if NeedFunctionPrototypes
+    unsigned char* /*psrcbits*/,
+    unsigned char* /*pmaskbits*/,
+    CARD32* /*argb*/,
+    CursorMetricPtr /*cm*/,
+    unsigned /*foreRed*/,
+    unsigned /*foreGreen*/,
+    unsigned /*foreBlue*/,
+    unsigned /*backRed*/,
+    unsigned /*backGreen*/,
+    unsigned /*backBlue*/
+#endif
+);
+
 extern int AllocGlyphCursor(
 #if NeedFunctionPrototypes
     Font /*source*/,
@@ -148,4 +174,12 @@ extern void GetSpritePosition(
 #endif
 );
 
+#ifdef PANORAMIX
+extern int XineramaGetCursorScreen(
+#if NeedFunctionPrototypes
+    void
+#endif
+);
+#endif /* PANORAMIX */
+
 #endif /* CURSOR_H */