frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use IncludeInferiors when copying windows before compositing. 

Part of bug 22484.
This commit is contained in:
Søren Sandmann Pedersen 2009-07-03 14:36:54 -04:00
parent 43ee8d2ead
commit 7c7f0c2c6a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fb/fbpict.c
View File

@ -159,9 +159,9 @@ fbComposite (CARD8 op,
{ {
pixman_image_t *src, *mask, *dest; pixman_image_t *src, *mask, *dest;
miCompositeSourceValidate (pSrc, xSrc - xDst, ySrc - yDst, width, height); miCompositeSourceValidate (pSrc, xSrc, ySrc, width, height);
if (pMask) if (pMask)
miCompositeSourceValidate (pMask, xMask - xDst, yMask - yDst, width, height); miCompositeSourceValidate (pMask, xMask, yMask, width, height);
src = image_from_pict (pSrc, TRUE, TRUE); src = image_from_pict (pSrc, TRUE, TRUE);
mask = image_from_pict (pMask, TRUE, TRUE); mask = image_from_pict (pMask, TRUE, TRUE);
@ -295,7 +295,8 @@ copy_drawable (DrawablePtr pDraw)
/* First fill the pixmap with zeros */ /* First fill the pixmap with zeros */
gcv[0].val = 0x00000000; 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); ValidateGC ((DrawablePtr)pPixmap, pGC);
miClearDrawable ((DrawablePtr)pPixmap, pGC); miClearDrawable ((DrawablePtr)pPixmap, pGC);