[xserver-commit] xserver/miext/shadow Makefile.am,1.2,1.3 shadow.c,1.16,1.17 shadow.h,1.8,1.9 shpacked.c,1.7,1.8 shplanar.c,1.6,1.7 shplanar8.c,1.6,1.7 shrotate.c,1.7,1.8 shrotpack.h,1.6,1.7

[Keith Packard]

Committed by: keithp

Update of /cvs/xserver/xserver/miext/shadow
In directory pdx:/tmp/cvs-serv23831/miext/shadow

Modified Files:
	Makefile.am shadow.c shadow.h shpacked.c shplanar.c 
	shplanar8.c shrotate.c shrotpack.h 
Log Message:
	merge xfixes_2_branch back to HEAD


Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xserver/miext/shadow/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am	29 Sep 2003 01:42:40 -0000	1.2
+++ Makefile.am	2 Nov 2003 19:56:11 -0000	1.3
@@ -3,7 +3,8 @@
 	-I$(top_srcdir)/include			\
 	-I$(top_srcdir)/mi			\
 	-I$(top_srcdir)/render			\
-	$(XSERVER_CFLAGS)
+	-I$(top_srcdir)/miext/damage		\
+	@XSERVER_CFLAGS@
 
 noinst_LIBRARIES = libshadow.a
 

Index: shadow.c
===================================================================
RCS file: /cvs/xserver/xserver/miext/shadow/shadow.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- shadow.c	11 Sep 2003 05:12:51 -0000	1.16
+++ shadow.c	2 Nov 2003 19:56:11 -0000	1.17
@@ -38,20 +38,9 @@
 #include    "gcstruct.h"
 #include    "shadow.h"
 
-typedef struct _shadowGCPriv {
-    GCOps   *ops;
-    GCFuncs *funcs;
-} shadowGCPrivRec, *shadowGCPrivPtr;
-
 int shadowScrPrivateIndex;
-int shadowGCPrivateIndex;
 int shadowGeneration;
[...1513 lines suppressed...]
+    PixmapPtr	pPixmap;
+    
+    pPixmap = (*pScreen->CreatePixmap) (pScreen, pScreen->width,
+					pScreen->height,
+					pScreen->rootDepth);
+    if (!pPixmap)
+	return FALSE;
+    
     if (!shadowSetup (pScreen))
+    {
+	(*pScreen->DestroyPixmap) (pPixmap);
 	return FALSE;
+    }
 
-    if (!shadowAdd (pScreen, 0, update, window, SHADOW_ROTATE_0, 0))
-	return FALSE;
+    shadowSet (pScreen, pPixmap, update, window, SHADOW_ROTATE_0, 0);
 
     return TRUE;
 }

Index: shadow.h
===================================================================
RCS file: /cvs/xserver/xserver/miext/shadow/shadow.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- shadow.h	11 Sep 2003 05:12:51 -0000	1.8
+++ shadow.h	2 Nov 2003 19:56:11 -0000	1.9
@@ -31,6 +31,8 @@
 #include "picturestr.h"
 #endif
 
+#include "damage.h"
+
 typedef struct _shadowBuf   *shadowBufPtr;
 
 typedef void (*ShadowUpdateProc) (ScreenPtr pScreen,
@@ -48,13 +50,17 @@
 				   void		*closure);
 
 typedef struct _shadowBuf {
-    shadowBufPtr	pNext;
+    
     ShadowUpdateProc	update;
     ShadowWindowProc	window;
-    RegionRec		damage;
     PixmapPtr		pPixmap;
     void		*closure;
     int			randr;
+    DamagePtr		pDamage;
+    
+    /* screen wrappers */
+    GetImageProcPtr	GetImage;
+    CloseScreenProcPtr	CloseScreen;
 } shadowBufRec;
 
 /* Match defines from randr extension */
@@ -68,31 +74,17 @@
 #define SHADOW_REFLECT_Y    32
 #define SHADOW_REFLECT_ALL  (SHADOW_REFLECT_X|SHADOW_REFLECT_Y)
 
-typedef struct _shadowScrPriv {
-    PaintWindowBackgroundProcPtr PaintWindowBackground;
-    PaintWindowBorderProcPtr	PaintWindowBorder;
-    CopyWindowProcPtr		CopyWindow;
-    CloseScreenProcPtr		CloseScreen;
-    CreateGCProcPtr		CreateGC;
-    GetImageProcPtr		GetImage;
-#ifdef RENDER
-    CompositeProcPtr		Composite;
-    GlyphsProcPtr		Glyphs;
-#endif
-    shadowBufPtr		pBuf;
-    BSFuncRec			BackingStoreFuncs;
-} shadowScrPrivRec, *shadowScrPrivPtr;
-
 extern int shadowScrPrivateIndex;
 
-#define shadowGetScrPriv(pScr)  ((shadowScrPrivPtr) (pScr)->devPrivates[shadowScrPrivateIndex].ptr)
-#define shadowScrPriv(pScr)	shadowScrPrivPtr    pScrPriv = shadowGetScrPriv(pScr)
+#define shadowGetBuf(pScr)  ((shadowBufPtr) (pScr)->devPrivates[shadowScrPrivateIndex].ptr)
+#define shadowBuf(pScr)	    shadowBufPtr pBuf = shadowGetBuf(pScr)
+#define shadowDamage(pBuf)  DamageRegion(pBuf->pDamage)
 
 Bool
 shadowSetup (ScreenPtr pScreen);
 
 Bool
-shadowAdd (ScreenPtr	    pScreen,
+shadowSet (ScreenPtr	    pScreen,
 	   PixmapPtr	    pPixmap,
 	   ShadowUpdateProc update,
 	   ShadowWindowProc window,
@@ -100,10 +92,7 @@
 	   void		    *closure);
 
 void
-shadowRemove (ScreenPtr pScreen, PixmapPtr pPixmap);
-
-shadowBufPtr
-shadowFindBuf (WindowPtr pWindow);
+shadowUnset (ScreenPtr pScreen);
 
 Bool
 shadowInit (ScreenPtr pScreen, ShadowUpdateProc update, ShadowWindowProc window);
@@ -163,10 +152,4 @@
 shadowUpdateRotate32_270 (ScreenPtr    pScreen,
 			  shadowBufPtr pBuf);
 
-void
-shadowWrapGC (GCPtr pGC);
-
-void
-shadowUnwrapGC (GCPtr pGC);
-
 #endif /* _SHADOW_H_ */

Index: shpacked.c
===================================================================
RCS file: /cvs/xserver/xserver/miext/shadow/shpacked.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- shpacked.c	11 Sep 2003 05:12:51 -0000	1.7
+++ shpacked.c	2 Nov 2003 19:56:11 -0000	1.8
@@ -42,7 +42,7 @@
 shadowUpdatePacked (ScreenPtr	    pScreen,
 		    shadowBufPtr    pBuf)
 {
-    RegionPtr	damage = &pBuf->damage;
+    RegionPtr	damage = shadowDamage (pBuf);
     PixmapPtr	pShadow = pBuf->pPixmap;
     int		nbox = REGION_NUM_RECTS (damage);
     BoxPtr	pbox = REGION_RECTS (damage);

Index: shplanar.c
===================================================================
RCS file: /cvs/xserver/xserver/miext/shadow/shplanar.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- shplanar.c	11 Sep 2003 05:12:51 -0000	1.6
+++ shplanar.c	2 Nov 2003 19:56:11 -0000	1.7
@@ -88,7 +88,7 @@
 shadowUpdatePlanar4 (ScreenPtr	    pScreen,
 		     shadowBufPtr   pBuf)
 {
-    RegionPtr	damage = &pBuf->damage;
+    RegionPtr	damage = shadowDamage(pBuf);
     PixmapPtr	pShadow = pBuf->pPixmap;
     int		nbox = REGION_NUM_RECTS (damage);
     BoxPtr	pbox = REGION_RECTS (damage);

Index: shplanar8.c
===================================================================
RCS file: /cvs/xserver/xserver/miext/shadow/shplanar8.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- shplanar8.c	11 Sep 2003 05:12:51 -0000	1.6
+++ shplanar8.c	2 Nov 2003 19:56:11 -0000	1.7
@@ -91,7 +91,7 @@
 shadowUpdatePlanar4x8 (ScreenPtr	pScreen,
 		       shadowBufPtr	pBuf)
 {
-    RegionPtr	damage = &pBuf->damage;
+    RegionPtr	damage = shadowDamage(pBuf);
     PixmapPtr	pShadow = pBuf->pPixmap;
     int		nbox = REGION_NUM_RECTS (damage);
     BoxPtr	pbox = REGION_RECTS (damage);

Index: shrotate.c
===================================================================
RCS file: /cvs/xserver/xserver/miext/shadow/shrotate.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- shrotate.c	11 Sep 2003 05:12:51 -0000	1.7
+++ shrotate.c	2 Nov 2003 19:56:11 -0000	1.8
@@ -52,7 +52,7 @@
 shadowUpdateRotatePacked (ScreenPtr	pScreen,
 			  shadowBufPtr	pBuf)
 {
-    RegionPtr	damage = &pBuf->damage;
+    RegionPtr	damage = shadowDamage(pBuf);
     PixmapPtr	pShadow = pBuf->pPixmap;
     int		nbox = REGION_NUM_RECTS (damage);
     BoxPtr	pbox = REGION_RECTS (damage);

Index: shrotpack.h
===================================================================
RCS file: /cvs/xserver/xserver/miext/shadow/shrotpack.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- shrotpack.h	11 Sep 2003 05:12:51 -0000	1.6
+++ shrotpack.h	2 Nov 2003 19:56:11 -0000	1.7
@@ -90,9 +90,13 @@
 
 void
 FUNC (ScreenPtr	    pScreen,
+      shadowBufPtr  pBuf);
+
+void
+FUNC (ScreenPtr	    pScreen,
       shadowBufPtr  pBuf)
 {
-    RegionPtr	damage = &pBuf->damage;
+    RegionPtr	damage = shadowDamage(pBuf);
     PixmapPtr	pShadow = pBuf->pPixmap;
     int		nbox = REGION_NUM_RECTS (damage);
     BoxPtr	pbox = REGION_RECTS (damage);