From 6ecbccac75d40f5ced0dda7ff61bf499a29c7c3c Mon Sep 17 00:00:00 2001 From: =?utf-8?q?S=C3=B8ren=20Sandmann=20Pedersen?= Date: Fri, 3 Jul 2009 14:36:54 -0400 Subject: [PATCH] Use IncludeInferiors when copying windows before compositing. --- fb/fbpict.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/fb/fbpict.c b/fb/fbpict.c index 32052e9..c5199af 100644 --- a/fb/fbpict.c +++ b/fb/fbpict.c @@ -159,9 +159,9 @@ fbComposite (CARD8 op, { pixman_image_t *src, *mask, *dest; - miCompositeSourceValidate (pSrc, xSrc - xDst, ySrc - yDst, width, height); + miCompositeSourceValidate (pSrc, xSrc, ySrc, width, height); if (pMask) - miCompositeSourceValidate (pMask, xMask - xDst, yMask - yDst, width, height); + miCompositeSourceValidate (pMask, xMask, yMask, width, height); src = image_from_pict (pSrc, TRUE, TRUE); mask = image_from_pict (pMask, TRUE, TRUE); @@ -295,7 +295,8 @@ copy_drawable (DrawablePtr pDraw) /* First fill the pixmap with zeros */ gcv[0].val = 0x00000000; - dixChangeGC (NullClient, pGC, GCBackground, NULL, gcv); + gcv[1].val = IncludeInferiors; + dixChangeGC (NullClient, pGC, GCBackground | GCSubwindowMode, NULL, gcv); ValidateGC ((DrawablePtr)pPixmap, pGC); miClearDrawable ((DrawablePtr)pPixmap, pGC); -- 1.6.2.2