[xserver-commit] xserver/dix cursor.c,3.11,3.11.2.1 window.c,3.34,3.34.2.1

[Keith Packard]

Committed by: keithp

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

Modified Files:
      Tag: xfixes_2_branch
	cursor.c window.c 
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: cursor.c
===================================================================
RCS file: /cvs/xserver/xserver/dix/cursor.c,v
retrieving revision 3.11
retrieving revision 3.11.2.1
diff -u -d -r3.11 -r3.11.2.1
--- cursor.c	9 Oct 2003 06:36:26 -0000	3.11
+++ cursor.c	19 Oct 2003 20:34:20 -0000	3.11.2.1
@@ -203,6 +203,7 @@
     pCurs->refcnt = 1;		
 #ifdef XFIXES
     pCurs->serialNumber = ++cursorSerial;
+    pCurs->name = None;
 #endif
 
     pCurs->foreRed = foreRed;
@@ -396,6 +397,7 @@
     pCurs->refcnt = 1;
 #ifdef XFIXES
     pCurs->serialNumber = ++cursorSerial;
+    pCurs->name = None;
 #endif
 
     pCurs->foreRed = foreRed;

Index: window.c
===================================================================
RCS file: /cvs/xserver/xserver/dix/window.c,v
retrieving revision 3.34
retrieving revision 3.34.2.1
diff -u -d -r3.34 -r3.34.2.1
--- window.c	9 Oct 2003 06:36:26 -0000	3.34
+++ window.c	19 Oct 2003 20:34:20 -0000	3.34.2.1
@@ -3310,6 +3310,33 @@
     return(pReg);
 }
 
+
+RegionPtr
+CreateBoundingShape (pWin)
+    WindowPtr	pWin;
+{
+    BoxRec	extents;
+
+    extents.x1 = -wBorderWidth (pWin);
+    extents.y1 = -wBorderWidth (pWin);
+    extents.x2 = pWin->drawable.width + wBorderWidth (pWin);
+    extents.y2 = pWin->drawable.height + wBorderWidth (pWin);
+    return REGION_CREATE(pWin->drawable.pScreen, &extents, 1);
+}
+
+RegionPtr
+CreateClipShape (pWin)
+    WindowPtr	pWin;
+{
+    BoxRec	extents;
+
+    extents.x1 = 0;
+    extents.y1 = 0;
+    extents.x2 = pWin->drawable.width;
+    extents.y2 = pWin->drawable.height;
+    return REGION_CREATE(pWin->drawable.pScreen, &extents, 1);
+}
+
 void
 SendVisibilityNotify(pWin)
     WindowPtr pWin;