From 88ed5cc82d2a0e362fae0e93e3974932005e5af8 Mon Sep 17 00:00:00 2001
From: sandmann <sandmann@fedoraproject.org>
Date: Oct 05 2006 03:19:54 +0000
Subject: Call miHandleExposures() with old, non-translated coordinates


---

diff --git a/xorg-x11-server-1.1.1-graphics-expose.patch b/xorg-x11-server-1.1.1-graphics-expose.patch
index cd82832..8bb069a 100644
--- a/xorg-x11-server-1.1.1-graphics-expose.patch
+++ b/xorg-x11-server-1.1.1-graphics-expose.patch
@@ -1,84 +1,77 @@
 --- xorg-server-1.1.1/miext/cw/cw_ops.c.graphics-expose	2006-07-05 20:23:57.000000000 -0400
-+++ xorg-server-1.1.1/miext/cw/cw_ops.c	2006-10-04 22:01:13.000000000 -0400
-@@ -30,6 +30,7 @@
- #include "gcstruct.h"
- #include "pixmapstr.h"
- #include "cw.h"
-+#include "mi.h"
- 
- #define SETUP_BACKING_DST(_pDst, _pGC) \
-     cwGCPtr pGCPrivate = getCwGC (_pGC); \
-@@ -184,56 +185,46 @@
- cwCopyArea(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC, int srcx, int srcy,
++++ xorg-server-1.1.1/miext/cw/cw_ops.c	2006-10-04 23:14:36.000000000 -0400
+@@ -185,7 +185,7 @@
  	   int w, int h, int dstx, int dsty)
  {
--    int		odstx, odsty;
+     int		odstx, odsty;
 -    RegionPtr	exposed = NULL;
++    int		osrcx, osrcy;
      SETUP_BACKING_DST(pDst, pGC);
      SETUP_BACKING_SRC(pSrc, pGC);
  
-     PROLOGUE(pGC);
+@@ -193,19 +193,20 @@
  
--    odstx = dstx;
--    odsty = dsty;
+     odstx = dstx;
+     odsty = dsty;
++    osrcx = srcx;
++    osrcy = srcy;
      CW_OFFSET_XY_DST(dstx, dsty);
      CW_OFFSET_XY_SRC(srcx, srcy);
--
+ 
 -    exposed = (*pBackingGC->ops->CopyArea)(pBackingSrc, pBackingDst,
 -					   pBackingGC, srcx, srcy, w, h,
 -					   dstx, dsty);
 -
 -    if (exposed != NULL)
 -	REGION_TRANSLATE(pDst->pScreen, exposed, odstx - dstx, odsty - dsty);
-+    
+-
 +    (*pBackingGC->ops->CopyArea)(pBackingSrc, pBackingDst,
 +				 pBackingGC, srcx, srcy, w, h,
 +				 dstx, dsty);
- 
++    
      EPILOGUE(pGC);
  
 -    return exposed;
-+    return miHandleExposures (pSrc, pDst, pBackingGC,
-+			      srcx, srcy, w, h,
-+			      dstx, dsty, 0);
++    return miHandleExposure(pSrc, pDst, pGC,
++			    osrcx, osrcy, w, h,
++			    odstx, odsty);
  }
  
  static RegionPtr
- cwCopyPlane(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC, int srcx, int srcy,
+@@ -213,7 +214,7 @@
  	    int w, int h, int dstx, int dsty, unsigned long plane)
  {
--    int		odstx, odsty;
+     int		odstx, odsty;
 -    RegionPtr	exposed = NULL;
++    int		osrcx, osrcy;
      SETUP_BACKING_DST(pDst, pGC);
      SETUP_BACKING_SRC(pSrc, pGC);
  
-     PROLOGUE(pGC);
+@@ -221,19 +222,20 @@
  
--    odstx = dstx;
--    odsty = dsty;
+     odstx = dstx;
+     odsty = dsty;
++    osrcx = srcx;
++    osrcy = srcy;
      CW_OFFSET_XY_DST(dstx, dsty);
      CW_OFFSET_XY_SRC(srcx, srcy);
--
+ 
 -    exposed = (*pBackingGC->ops->CopyPlane)(pBackingSrc, pBackingDst,
 -					    pBackingGC, srcx, srcy, w, h,
 -					    dstx, dsty, plane);
 -
 -    if (exposed != NULL)
 -	REGION_TRANSLATE(pDst->pScreen, exposed, odstx - dstx, odsty - dsty);
--
--    EPILOGUE(pGC);
--
--    return exposed;
-+    
 +    (*pBackingGC->ops->CopyPlane)(pBackingSrc, pBackingDst,
 +				  pBackingGC, srcx, srcy, w, h,
 +				  dstx, dsty, plane);
-+    
-+    EPILOGUE(pGC);
-+ 
-+    return miHandleExposures (pSrc, pDst, pBackingGC,
-+			      srcx, srcy, w, h,
-+			      dstx, dsty, plane);
+ 
+     EPILOGUE(pGC);
+ 
+-    return exposed;
++    return miHandleExposure(pSrc, pDst, pGC,
++			    osrcx, osrcy, w, h
++			    odstx, odsty);
  }
  
  static void
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 88dee48..03781ff 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -3,7 +3,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.1.1
-Release:   46%{?dist}
+Release:   47%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -721,6 +721,10 @@ rm -rf $RPM_BUILD_ROOT
 # -------------------------------------------------------------------
 
 %changelog
+* Wed Oct  4 2006 Soren Sandmann <sandmann@redhat.com> - 1.1.1-47.fc6
+- graphics-expose.patch: Call miHandleExposures() with non-translated
+  coordinates. 
+
 * Wed Oct  4 2006 Soren Sandmann <sandmann@redhat.com> - 1.1.1-46.fc6
 - Fix over-zealous code deletion in graphics-expose.patch.