From 071b3c1810d9f2602173acc8578caac20e0b771e Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Tue, 1 Dec 2009 11:05:04 -0800 Subject: Revert "Use IncludeInferiors when copying windows before compositing." This reverts commit 7c7f0c2c6a04f7044d5ce69e97a615735e5831f1. Signed-off-by: Keith Packard Acked-by: Soeren Sandmann --- fb/fbpict.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/fb/fbpict.c b/fb/fbpict.c index 18ef2e150..5d3708cfd 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, ySrc, width, height); + miCompositeSourceValidate (pSrc, xSrc - xDst, ySrc - yDst, width, height); if (pMask) - miCompositeSourceValidate (pMask, xMask, yMask, width, height); + miCompositeSourceValidate (pMask, xMask - xDst, yMask - yDst, width, height); src = image_from_pict (pSrc, TRUE, TRUE); mask = image_from_pict (pMask, TRUE, TRUE); @@ -295,8 +295,7 @@ copy_drawable (DrawablePtr pDraw) /* First fill the pixmap with zeros */ gcv[0].val = 0x00000000; - gcv[1].val = IncludeInferiors; - dixChangeGC (NullClient, pGC, GCBackground | GCSubwindowMode, NULL, gcv); + dixChangeGC (NullClient, pGC, GCBackground, NULL, gcv); ValidateGC ((DrawablePtr)pPixmap, pGC); miClearDrawable ((DrawablePtr)pPixmap, pGC); -- cgit v1.2.3