diff options
| author | Keith Packard <keithp@keithp.com> | 2009-12-01 11:05:04 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2009-12-11 11:51:14 -0800 |
| commit | 071b3c1810d9f2602173acc8578caac20e0b771e (patch) | |
| tree | 6ad4554f1862b3f50c7f6713071c0b35aeb3847a | |
| parent | 8e640d6b131d2865a9725d8997023865b0ef3d69 (diff) | |
Revert "Use IncludeInferiors when copying windows before compositing."
This reverts commit 7c7f0c2c6a04f7044d5ce69e97a615735e5831f1.
Signed-off-by: Keith Packard <keithp@keithp.com>
Acked-by: Soeren Sandmann <sandmann@daimi.au.dk>
| -rw-r--r-- | fb/fbpict.c | 7 |
1 files 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); |