rpms/xorg-x11-server
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Call miHandleExposures() with old, non-translated coordinates

Browse Source
This commit is contained in:
sandmann 2006-10-05 03:19:54 +00:00
parent 4ff4f04e25
commit 88ed5cc82d
2 changed files with 36 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
xorg-x11-server-1.1.1-graphics-expose.patch
View File

@ -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.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 +++ xorg-server-1.1.1/miext/cw/cw_ops.c 2006-10-04 23:14:36.000000000 -0400
@@ -30,6 +30,7 @@ @@ -185,7 +185,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,
int w, int h, int dstx, int dsty) int w, int h, int dstx, int dsty)
{ {
- int odstx, odsty; int odstx, odsty;
- RegionPtr exposed = NULL; - RegionPtr exposed = NULL;
+ int osrcx, osrcy;
SETUP_BACKING_DST(pDst, pGC); SETUP_BACKING_DST(pDst, pGC);
SETUP_BACKING_SRC(pSrc, pGC); SETUP_BACKING_SRC(pSrc, pGC);
PROLOGUE(pGC); @@ -193,19 +193,20 @@
- odstx = dstx; odstx = dstx;
- odsty = dsty; odsty = dsty;
+ osrcx = srcx;
+ osrcy = srcy;
CW_OFFSET_XY_DST(dstx, dsty); CW_OFFSET_XY_DST(dstx, dsty);
CW_OFFSET_XY_SRC(srcx, srcy); CW_OFFSET_XY_SRC(srcx, srcy);
-
- exposed = (*pBackingGC->ops->CopyArea)(pBackingSrc, pBackingDst, - exposed = (*pBackingGC->ops->CopyArea)(pBackingSrc, pBackingDst,
- pBackingGC, srcx, srcy, w, h, - pBackingGC, srcx, srcy, w, h,
- dstx, dsty); - dstx, dsty);
- -
- if (exposed != NULL) - if (exposed != NULL)
- REGION_TRANSLATE(pDst->pScreen, exposed, odstx - dstx, odsty - dsty); - REGION_TRANSLATE(pDst->pScreen, exposed, odstx - dstx, odsty - dsty);
+ -
+ (*pBackingGC->ops->CopyArea)(pBackingSrc, pBackingDst, + (*pBackingGC->ops->CopyArea)(pBackingSrc, pBackingDst,
+ pBackingGC, srcx, srcy, w, h, + pBackingGC, srcx, srcy, w, h,
+ dstx, dsty); + dstx, dsty);
+
EPILOGUE(pGC); EPILOGUE(pGC);
- return exposed; - return exposed;
+ return miHandleExposures (pSrc, pDst, pBackingGC, + return miHandleExposure(pSrc, pDst, pGC,
+ srcx, srcy, w, h, + osrcx, osrcy, w, h,
+ dstx, dsty, 0); + odstx, odsty);
} }
static RegionPtr 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 w, int h, int dstx, int dsty, unsigned long plane)
{ {
- int odstx, odsty; int odstx, odsty;
- RegionPtr exposed = NULL; - RegionPtr exposed = NULL;
+ int osrcx, osrcy;
SETUP_BACKING_DST(pDst, pGC); SETUP_BACKING_DST(pDst, pGC);
SETUP_BACKING_SRC(pSrc, pGC); SETUP_BACKING_SRC(pSrc, pGC);
PROLOGUE(pGC); @@ -221,19 +222,20 @@
- odstx = dstx; odstx = dstx;
- odsty = dsty; odsty = dsty;
+ osrcx = srcx;
+ osrcy = srcy;
CW_OFFSET_XY_DST(dstx, dsty); CW_OFFSET_XY_DST(dstx, dsty);
CW_OFFSET_XY_SRC(srcx, srcy); CW_OFFSET_XY_SRC(srcx, srcy);
-
- exposed = (*pBackingGC->ops->CopyPlane)(pBackingSrc, pBackingDst, - exposed = (*pBackingGC->ops->CopyPlane)(pBackingSrc, pBackingDst,
- pBackingGC, srcx, srcy, w, h, - pBackingGC, srcx, srcy, w, h,
- dstx, dsty, plane); - dstx, dsty, plane);
- -
- if (exposed != NULL) - if (exposed != NULL)
- REGION_TRANSLATE(pDst->pScreen, exposed, odstx - dstx, odsty - dsty); - REGION_TRANSLATE(pDst->pScreen, exposed, odstx - dstx, odsty - dsty);
-
- EPILOGUE(pGC);
-
- return exposed;
+
+ (*pBackingGC->ops->CopyPlane)(pBackingSrc, pBackingDst, + (*pBackingGC->ops->CopyPlane)(pBackingSrc, pBackingDst,
+ pBackingGC, srcx, srcy, w, h, + pBackingGC, srcx, srcy, w, h,
+ dstx, dsty, plane); + dstx, dsty, plane);
+
+ EPILOGUE(pGC); EPILOGUE(pGC);
+
+ return miHandleExposures (pSrc, pDst, pBackingGC, - return exposed;
+ srcx, srcy, w, h, + return miHandleExposure(pSrc, pDst, pGC,
+ dstx, dsty, plane); + osrcx, osrcy, w, h
+ odstx, odsty);
} }
static void static void

6
xorg-x11-server.spec
View File

@ -3,7 +3,7 @@
Summary: X.Org X11 X server Summary: X.Org X11 X server
Name: xorg-x11-server Name: xorg-x11-server
Version: 1.1.1 Version: 1.1.1
Release: 46%{?dist} Release: 47%{?dist}
URL: http://www.x.org URL: http://www.x.org
License: MIT/X11 License: MIT/X11
Group: User Interface/X Group: User Interface/X
@ -721,6 +721,10 @@ rm -rf $RPM_BUILD_ROOT
# ------------------------------------------------------------------- # -------------------------------------------------------------------
%changelog %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 * Wed Oct 4 2006 Soren Sandmann <sandmann@redhat.com> - 1.1.1-46.fc6
- Fix over-zealous code deletion in graphics-expose.patch. - Fix over-zealous code deletion in graphics-expose.patch.