[xorg-commit-diffs] xc/programs/Xserver/include cursorstr.h, 1.1.4.2, 1.1.4.2.2.1

[Stuart Kreitman]

Committed by: stukreit

Update of /cvs/xorg/xc/programs/Xserver/include
In directory pdx:/tmp/cvs-serv6788

Modified Files:
      Tag: DAMAGE-XFIXES
	cursorstr.h 
Log Message:
integration from modular tree
Modified Files:
  Tag: DAMAGE-XFIXES
 	cursorstr.h 


Index: cursorstr.h
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/include/cursorstr.h,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.2.2.1
diff -u -d -r1.1.4.2 -r1.1.4.2.2.1
--- a/cursorstr.h	5 Mar 2004 13:41:05 -0000	1.1.4.2
+++ b/cursorstr.h	30 Mar 2004 16:59:17 -0000	1.1.4.2.2.1
@@ -77,10 +77,18 @@
     unsigned short backRed, backGreen, backBlue; /* device-independent color */
     int refcnt;
     pointer devPriv[MAXSCREENS];		/* set by pScr->RealizeCursor*/
+#ifdef XFIXES
+    CARD32 serialNumber;
+    Atom name;
+#endif
 } CursorRec;
 
 typedef struct _CursorMetric {
     unsigned short width, height, xhot, yhot;
 } CursorMetricRec;
 
+typedef struct {
+    int		x, y;
+    ScreenPtr	pScreen;
+} HotSpot;
 #endif /* CURSORSTRUCT_H */