merge XFree86 4.3.0.1 to -CURRENT

include/cursorstr.h

@@ -45,6 +45,8 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
+/* $XFree86: xc/programs/Xserver/include/cursorstr.h,v 1.9 2003/01/12 02:44:27 dawes Exp $ */
+
 #ifndef CURSORSTRUCT_H
 #define CURSORSTRUCT_H 
 
@@ -60,9 +62,13 @@ SOFTWARE.
 typedef struct _CursorBits {
     unsigned char *source;			/* points to bits */
     unsigned char *mask;			/* points to bits */
+    Bool emptyMask;				/* all zeros mask */
     unsigned short width, height, xhot, yhot;	/* metrics */
     int refcnt;					/* can be shared */
     pointer devPriv[MAXSCREENS];		/* set by pScr->RealizeCursor*/
+#ifdef ARGB_CURSOR
+    CARD32 *argb;				/* full-color alpha blended */
+#endif
 } CursorBits, *CursorBitsPtr;
 
 typedef struct _Cursor {