[xserver-commit] xserver/xfixes region.c,1.3,1.4 xfixes.h,1.4,1.5

[Keith Packard]

Committed by: keithp

Update of /cvs/xserver/xserver/xfixes
In directory pdx:/tmp/cvs-serv20575/xfixes

Modified Files:
	region.c xfixes.h 
Log Message:
	* composite/Makefile.am:
	* composite/compalloc.c: (compRedirectWindow),
	(compFreeClientWindow), (compUnredirectWindow),
	(compRedirectSubwindows), (compFreeClientSubwindows),
	(compUnredirectSubwindows), (compAllocPixmap), (compFreePixmap):
	* composite/compinit.c: (compScreenInit):
	* composite/compint.h:
	* composite/compwindow.c: (compShouldBeRedirected),
	(compCheckRedirect), (compCreateWindow):
	* fb/fbwindow.c: (fbCopyWindow):
	* xfixes/region.c: (XFixesRegionCopy),
	(ProcXFixesCreateRegionFromWindow), (ProcXFixesCreateRegionFromGC),
	(ProcXFixesCreateRegionFromPicture), (ProcXFixesSetGCClipRegion),
	(ProcXFixesSetWindowShapeRegion):
	* xfixes/xfixes.h:
	Finish up preliminary Composite extension implementation.
	Export XFixesRegionCopy from xfixes for Composite.
	Use window pixmap for fbCopyWindow, not root window.


Index: region.c
===================================================================
RCS file: /cvs/xserver/xserver/xfixes/region.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- region.c	5 Nov 2003 05:45:31 -0000	1.3
+++ region.c	7 Nov 2003 04:26:08 -0000	1.4
@@ -46,8 +46,8 @@
     return Success;
 }
 
-static RegionPtr
-RegionCopy (RegionPtr pRegion)
+RegionPtr
+XFixesRegionCopy (RegionPtr pRegion)
 {
     RegionPtr   pNew = REGION_CREATE (0, REGION_EXTENTS(0, pRegion),
 				      REGION_NUM_RECTS(pRegion));
@@ -192,7 +192,7 @@
 	return BadValue;
     }
     if (copy && pRegion)
-	pRegion = RegionCopy (pRegion);
+	pRegion = XFixesRegionCopy (pRegion);
     if (!pRegion)
 	return BadAlloc;
     if (!AddResource (stuff->region, RegionResType, (pointer) pRegion))
@@ -234,7 +234,7 @@
 	break;
     case CT_REGION:
 	pClip = (RegionPtr) pGC->clientClip;
-	pRegion = RegionCopy (pClip);
+	pRegion = XFixesRegionCopy (pClip);
 	if (!pRegion)
 	    return BadAlloc;
 	break;
@@ -283,7 +283,7 @@
 	    return BadAlloc;
 	break;
     case CT_REGION:
-	pRegion = RegionCopy ((RegionPtr) pPicture->clientClip);
+	pRegion = XFixesRegionCopy ((RegionPtr) pPicture->clientClip);
 	if (!pRegion)
 	    return BadAlloc;
 	break;
@@ -628,7 +628,7 @@
 
     if (pRegion)
     {
-	pRegion = RegionCopy (pRegion);
+	pRegion = XFixesRegionCopy (pRegion);
 	if (!pRegion)
 	    return BadAlloc;
     }
@@ -691,7 +691,7 @@
     pScreen = pWin->drawable.pScreen;
     if (pRegion)
     {
-	pRegion = RegionCopy (pRegion);
+	pRegion = XFixesRegionCopy (pRegion);
 	if (!pRegion)
 	    return BadAlloc;
 	if (!pWin->optional)

Index: xfixes.h
===================================================================
RCS file: /cvs/xserver/xserver/xfixes/xfixes.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- xfixes.h	2 Nov 2003 19:56:11 -0000	1.4
+++ xfixes.h	7 Nov 2003 04:26:08 -0000	1.5
@@ -46,4 +46,7 @@
 void
 XFixesExtensionInit(void);
 
+RegionPtr
+XFixesRegionCopy (RegionPtr pRegion);
+
 #endif /* _XFIXES_H_ */