From e41e907b3c19908f5316346fa587ced3115478cd Mon Sep 17 00:00:00 2001 From: Ville Syrjälä Date: Wed, 5 Jan 2011 20:41:04 +0200 Subject: Add subWindowMode parameter to SourceValidate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Pass the subWindowMode from the GC/source Picture to SourceValidate. Signed-off-by: Ville Syrjälä Reviewed-by: Daniel Stone Reviewed-by: Keith Packard Signed-off-by: Keith Packard --- miext/damage/damage.c | 6 ++++-- miext/rootless/rootlessScreen.c | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'miext') diff --git a/miext/damage/damage.c b/miext/damage/damage.c index 21cbb78c9..d0e0fe4d3 100644 --- a/miext/damage/damage.c +++ b/miext/damage/damage.c @@ -898,7 +898,8 @@ damageCopyArea(DrawablePtr pSrc, pSrc->type == DRAWABLE_WINDOW && ((WindowPtr)pSrc)->viewable) { - (*pSrc->pScreen->SourceValidate) (pSrc, srcx, srcy, width, height); + (*pSrc->pScreen->SourceValidate) (pSrc, srcx, srcy, width, height, + pGC->subWindowMode); } if (checkGCDamage (pDst, pGC)) @@ -944,7 +945,8 @@ damageCopyPlane(DrawablePtr pSrc, pSrc->type == DRAWABLE_WINDOW && ((WindowPtr)pSrc)->viewable) { - (*pSrc->pScreen->SourceValidate) (pSrc, srcx, srcy, width, height); + (*pSrc->pScreen->SourceValidate) (pSrc, srcx, srcy, width, height, + pGC->subWindowMode); } if (checkGCDamage (pDst, pGC)) diff --git a/miext/rootless/rootlessScreen.c b/miext/rootless/rootlessScreen.c index 61d2f5dab..510d6fdb1 100644 --- a/miext/rootless/rootlessScreen.c +++ b/miext/rootless/rootlessScreen.c @@ -223,7 +223,8 @@ out: * here and leave StopDrawing for the block handler. */ static void -RootlessSourceValidate(DrawablePtr pDrawable, int x, int y, int w, int h) +RootlessSourceValidate(DrawablePtr pDrawable, int x, int y, int w, int h, + unsigned int subWindowMode) { SCREEN_UNWRAP(pDrawable->pScreen, SourceValidate); if (pDrawable->type == DRAWABLE_WINDOW) { @@ -231,7 +232,7 @@ RootlessSourceValidate(DrawablePtr pDrawable, int x, int y, int w, int h) RootlessStartDrawing(pWin); } if (pDrawable->pScreen->SourceValidate) { - pDrawable->pScreen->SourceValidate(pDrawable, x, y, w, h); + pDrawable->pScreen->SourceValidate(pDrawable, x, y, w, h, subWindowMode); } SCREEN_WRAP(pDrawable->pScreen, SourceValidate); } -- cgit v1.2.3