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

Fix over-zealous code deletion in graphics-expose.patch

Browse Source
This commit is contained in:
sandmann 2006-10-05 02:04:23 +00:00
parent f4d5d10ab1
commit 4ff4f04e25
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
--- xorg-server-1.1.1/miext/cw/cw_ops.c.graphics-expose 2006-10-04 20:46:11.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 20:52:32.000000000 -0400 +++ xorg-server-1.1.1/miext/cw/cw_ops.c 2006-10-04 22:01:13.000000000 -0400
@@ -30,6 +30,7 @@ @@ -30,6 +30,7 @@
#include "gcstruct.h" #include "gcstruct.h"
#include "pixmapstr.h" #include "pixmapstr.h"
@ -8,7 +8,7 @@
#define SETUP_BACKING_DST(_pDst, _pGC) \ #define SETUP_BACKING_DST(_pDst, _pGC) \
cwGCPtr pGCPrivate = getCwGC (_pGC); \ cwGCPtr pGCPrivate = getCwGC (_pGC); \
@@ -184,56 +185,40 @@ @@ -184,56 +185,46 @@
cwCopyArea(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC, int srcx, int srcy, 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)
{ {
@ -21,8 +21,8 @@
- odstx = dstx; - odstx = dstx;
- odsty = dsty; - odsty = dsty;
- 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,
@ -30,6 +30,7 @@
- -
- 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);
@ -55,8 +56,8 @@
- odstx = dstx; - odstx = dstx;
- odsty = dsty; - odsty = dsty;
- 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,
@ -68,6 +69,7 @@
- EPILOGUE(pGC); - EPILOGUE(pGC);
- -
- return exposed; - 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);

5
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: 45%{?dist} Release: 46%{?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,9 @@ rm -rf $RPM_BUILD_ROOT
# ------------------------------------------------------------------- # -------------------------------------------------------------------
%changelog %changelog
* Wed Oct 4 2006 Soren Sandmann <sandmann@redhat.com> - 1.1.1-46.fc6
- Fix over-zealous code deletion in graphics-expose.patch.
* Wed Oct 4 2006 Soren Sandmann <sandmann@redhat.com> - 1.1.1-45.fc6 * Wed Oct 4 2006 Soren Sandmann <sandmann@redhat.com> - 1.1.1-45.fc6
- xorg-x11-server-1.1.1-graphics-expose.patch: call - xorg-x11-server-1.1.1-graphics-expose.patch: call
miHandleExposures() in CopyArea/CopyPlane explicitly in cw to miHandleExposures() in CopyArea/CopyPlane explicitly in cw to