[xserver-commit] xserver/include cursorstr.h,1.11,1.11.2.1 picture.h,1.20,1.20.2.1 window.h,1.5,1.5.2.1

[Keith Packard]

Committed by: keithp

Update of /cvs/xserver/xserver/include
In directory pdx:/tmp/cvs-serv31522/include

Modified Files:
      Tag: xfixes_2_branch
	cursorstr.h picture.h window.h 
Log Message:
	* Xext/shape.c: (ShapeExtensionInit), (SendShapeNotify):
	* Xext/shapeint.h:
	* dix/cursor.c:
	* dix/window.c:
	* include/cursorstr.h:
	* include/picture.h:
	* include/window.h:
	* xfixes/Makefile.am:
	* xfixes/cursor.c: (CursorDisplayCursor),
	(SProcXFixesSelectCursorInput), (SXFixesCursorNotifyEvent),
	(CopyCursorToImage), (ProcXFixesGetCursorImage),
	(SProcXFixesGetCursorImage), (ProcXFixesSetCursorName),
	(SProcXFixesSetCursorName), (ProcXFixesGetCursorName),
	(SProcXFixesGetCursorName), (ProcXFixesGetCursorImageAndName),
	(SProcXFixesGetCursorImageAndName), (ReplaceCursorLookup),
	(ReplaceCursor), (TestForCursor), (ProcXFixesChangeCursor),
	(SProcXFixesChangeCursor), (TestForCursorName),
	(ProcXFixesChangeCursorByName), (SProcXFixesChangeCursorByName):
	* xfixes/xfixes.c: (ProcXFixesQueryVersion),
	(XFixesNumberRequests), (ProcXFixesDispatch),
	(SProcXFixesQueryVersion), (SProcXFixesDispatch),
	(XFixesClientCallback), (XFixesExtensionInit):
	* xfixes/xfixesint.h:
	Add cursor name and region requests to XFixes extension for
	version 2 support


Index: cursorstr.h
===================================================================
RCS file: /cvs/xserver/xserver/include/cursorstr.h,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -d -r1.11 -r1.11.2.1
--- cursorstr.h	9 Oct 2003 06:36:26 -0000	1.11
+++ cursorstr.h	19 Oct 2003 20:34:20 -0000	1.11.2.1
@@ -79,6 +79,7 @@
     pointer devPriv[MAXSCREENS];		/* set by pScr->RealizeCursor*/
 #ifdef XFIXES
     CARD32 serialNumber;
+    Atom name;
 #endif
 } CursorRec;
 

Index: picture.h
===================================================================
RCS file: /cvs/xserver/xserver/include/picture.h,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -u -d -r1.20 -r1.20.2.1
--- picture.h	11 Sep 2003 05:12:51 -0000	1.20
+++ picture.h	19 Oct 2003 20:34:20 -0000	1.20.2.1
@@ -160,6 +160,9 @@
 
 int	PictureParseCmapPolicy (const char *name);
 
+extern int	RenderErrBase;
+extern int	RenderClientPrivateIndex;
+
 /* Fixed point updates from Carl Worth, USC, Information Sciences Institute */
 
 #ifdef WIN32

Index: window.h
===================================================================
RCS file: /cvs/xserver/xserver/include/window.h,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- window.h	27 Apr 2003 21:31:05 -0000	1.5
+++ window.h	19 Oct 2003 20:34:20 -0000	1.5.2.1
@@ -251,4 +251,10 @@
     int /*dw*/,
     int /*dh*/);
 
+RegionPtr
+CreateBoundingShape (WindowPtr pWin);
+
+RegionPtr
+CreateClipShape (WindowPtr pWin);
+
 #endif /* WINDOW_H */