xorg-x11-server/xorg-x11-server-1.1.1-graphics-expose.patch

86 lines
2.2 KiB
Diff
Raw Normal View History

--- xorg-server-1.1.1/miext/cw/cw_ops.c.graphics-expose 2006-07-05 20:23:57.000000000 -0400
2006-10-05 03:54:57 +00:00
+++ xorg-server-1.1.1/miext/cw/cw_ops.c 2006-10-04 23:54:03.000000000 -0400
2006-10-05 03:41:36 +00:00
@@ -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); \
@@ -185,7 +186,7 @@
2006-10-05 01:22:18 +00:00
int w, int h, int dstx, int dsty)
{
int odstx, odsty;
2006-10-05 01:22:18 +00:00
- RegionPtr exposed = NULL;
+ int osrcx, osrcy;
2006-10-05 01:22:18 +00:00
SETUP_BACKING_DST(pDst, pGC);
SETUP_BACKING_SRC(pSrc, pGC);
2006-10-05 03:41:36 +00:00
@@ -193,19 +194,20 @@
2006-10-05 01:22:18 +00:00
odstx = dstx;
odsty = dsty;
+ osrcx = srcx;
+ osrcy = srcy;
CW_OFFSET_XY_DST(dstx, dsty);
CW_OFFSET_XY_SRC(srcx, srcy);
2006-10-05 01:22:18 +00:00
- 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);
-
2006-10-05 01:22:18 +00:00
+ (*pBackingGC->ops->CopyArea)(pBackingSrc, pBackingDst,
+ pBackingGC, srcx, srcy, w, h,
+ dstx, dsty);
+
2006-10-05 01:22:18 +00:00
EPILOGUE(pGC);
- return exposed;
2006-10-05 03:54:57 +00:00
+ return miHandleExposures(pSrc, pDst, pGC,
+ osrcx, osrcy, w, h,
+ odstx, odsty, 0);
2006-10-05 01:22:18 +00:00
}
static RegionPtr
2006-10-05 03:41:36 +00:00
@@ -213,7 +215,7 @@
2006-10-05 01:22:18 +00:00
int w, int h, int dstx, int dsty, unsigned long plane)
{
int odstx, odsty;
2006-10-05 01:22:18 +00:00
- RegionPtr exposed = NULL;
+ int osrcx, osrcy;
2006-10-05 01:22:18 +00:00
SETUP_BACKING_DST(pDst, pGC);
SETUP_BACKING_SRC(pSrc, pGC);
2006-10-05 03:41:36 +00:00
@@ -221,19 +223,20 @@
2006-10-05 01:22:18 +00:00
odstx = dstx;
odsty = dsty;
+ osrcx = srcx;
+ osrcy = srcy;
CW_OFFSET_XY_DST(dstx, dsty);
CW_OFFSET_XY_SRC(srcx, srcy);
2006-10-05 01:22:18 +00:00
- 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);
+ (*pBackingGC->ops->CopyPlane)(pBackingSrc, pBackingDst,
+ pBackingGC, srcx, srcy, w, h,
+ dstx, dsty, plane);
EPILOGUE(pGC);
- return exposed;
2006-10-05 03:54:57 +00:00
+ return miHandleExposures(pSrc, pDst, pGC,
+ osrcx, osrcy, w, h,
+ odstx, odsty, plane);
2006-10-05 01:22:18 +00:00
}
static void