[xserver-commit] xserver/fb fbwindow.c,1.11,1.12

[Keith Packard]

Committed by: keithp

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

Modified Files:
	fbwindow.c 
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: fbwindow.c
===================================================================
RCS file: /cvs/xserver/xserver/fb/fbwindow.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- fbwindow.c	11 Sep 2003 05:12:51 -0000	1.11
+++ fbwindow.c	7 Nov 2003 04:26:08 -0000	1.12
@@ -124,9 +124,7 @@
 {
     RegionRec	rgnDst;
     int		dx, dy;
-    WindowPtr	pwinRoot;
-
-    pwinRoot = WindowTable[pWin->drawable.pScreen->myNum];
+    PixmapPtr	pPixmap = fbGetWindowPixmap (pWin);
 
     dx = ptOldOrg.x - pWin->drawable.x;
     dy = ptOldOrg.y - pWin->drawable.y;
@@ -136,7 +134,7 @@
     
     REGION_INTERSECT(pWin->drawable.pScreen, &rgnDst, &pWin->borderClip, prgnSrc);
 
-    fbCopyRegion ((DrawablePtr)pwinRoot, (DrawablePtr)pwinRoot,
+    fbCopyRegion (&pPixmap->drawable, &pPixmap->drawable,
 		  0,
 		  &rgnDst, dx, dy, fbCopyWindowProc, 0, 0);