Commit e9aa61e9 authored by Søren Sandmann Pedersen's avatar Søren Sandmann Pedersen
Browse files

Fix clipping when windows are used as sources

The new clipping rules:

	- client clips happen after transformation
	- pixels unavailable due to the hierarchy are undefined

The first one is implemented in pixman; the second one is realized by
making a copy of window sources (to prevent out-of-bounds access).
parent d9b5e77a
......@@ -701,7 +701,7 @@ XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la'
dnl Core modules for most extensions, et al.
REQUIRED_MODULES="[randrproto >= 1.2.99.3] [renderproto >= 0.9.3] [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto [xextproto >= 7.0.3] [xproto >= 7.0.13] [xtrans >= 1.2.2] bigreqsproto resourceproto fontsproto [inputproto >= 1.9.99.12] [kbproto >= 1.0.3]"
REQUIRED_LIBS="xfont xau fontenc [pixman-1 >= 0.13.2]"
REQUIRED_LIBS="xfont xau fontenc [pixman-1 >= 0.15.12]"
dnl HAVE_DBUS is true if we actually have the D-Bus library, whereas
dnl CONFIG_DBUS_API is true if we want to enable the D-Bus config
......
......@@ -2068,7 +2068,8 @@ fbFillRegionSolid (DrawablePtr pDrawable,
extern _X_EXPORT pixman_image_t *
image_from_pict (PicturePtr pict,
Bool has_clip);
Bool has_clip,
Bool is_src);
extern _X_EXPORT void free_pixman_pict (PicturePtr, pixman_image_t *);
#endif /* _FB_H_ */
......
......@@ -163,9 +163,9 @@ fbComposite (CARD8 op,
if (pMask)
miCompositeSourceValidate (pMask, xMask - xDst, yMask - yDst, width, height);
src = image_from_pict (pSrc, TRUE);
mask = image_from_pict (pMask, TRUE);
dest = image_from_pict (pDst, TRUE);
src = image_from_pict (pSrc, TRUE, TRUE);
mask = image_from_pict (pMask, TRUE, TRUE);
dest = image_from_pict (pDst, TRUE, FALSE);
if (src && dest && !(pMask && !mask))
{
......@@ -268,23 +268,77 @@ create_conical_gradient_image (PictGradient *gradient)
gradient->nstops);
}
static DrawablePtr
copy_drawable (DrawablePtr pDraw)
{
ScreenPtr pScreen = pDraw->pScreen;
PixmapPtr pPixmap;
GCPtr pGC;
int width, height;
ChangeGCVal gcv[1];
width = pDraw->width;
height = pDraw->height;
pPixmap = (*pScreen->CreatePixmap) (pScreen, width, height, pDraw->depth, 0);
if (!pPixmap)
return NULL;
pGC = GetScratchGC (pDraw->depth, pScreen);
if (!pGC)
{
(*pScreen->DestroyPixmap) (pPixmap);
return NULL;
}
/* First fill the pixmap with zeros */
gcv[0].val = 0x00000000;
dixChangeGC (NullClient, pGC, GCBackground, NULL, gcv);
ValidateGC ((DrawablePtr)pPixmap, pGC);
miClearDrawable ((DrawablePtr)pPixmap, pGC);
/* Then copy the window there */
ValidateGC(&pPixmap->drawable, pGC);
(* pGC->ops->CopyArea) (pDraw, &pPixmap->drawable, pGC, 0, 0, width, height, 0, 0);
FreeScratchGC (pGC);
return &pPixmap->drawable;
}
static void
destroy_drawable (pixman_image_t *image, void *data)
{
DrawablePtr pDrawable = data;
ScreenPtr pScreen = pDrawable->pScreen;
pScreen->DestroyPixmap ((PixmapPtr)pDrawable);
}
static pixman_image_t *
create_bits_picture (PicturePtr pict,
Bool has_clip)
Bool has_clip,
Bool is_src)
{
FbBits *bits;
FbStride stride;
int bpp, xoff, yoff;
pixman_image_t *image;
DrawablePtr drawable;
if (is_src && pict->pDrawable->type == DRAWABLE_WINDOW)
drawable = copy_drawable (pict->pDrawable);
else
drawable = pict->pDrawable;
fbGetDrawable (pict->pDrawable, bits, stride, bpp, xoff, yoff);
fbGetDrawable (drawable, bits, stride, bpp, xoff, yoff);
bits = (FbBits*)((CARD8*)bits +
pict->pDrawable->y * stride * sizeof(FbBits) + pict->pDrawable->x * (bpp / 8));
bits = (FbBits*)((CARD8*)bits + drawable->y * stride * sizeof(FbBits) + drawable->x * (bpp / 8));
image = pixman_image_create_bits (
pict->format,
pict->pDrawable->width, pict->pDrawable->height,
pict->format, drawable->width, drawable->height,
(uint32_t *)bits, stride * sizeof (FbStride));
......@@ -302,25 +356,46 @@ create_bits_picture (PicturePtr pict,
#endif
#endif
/* pCompositeClip is undefined for source pictures, so
* only set the clip region for pictures with drawables
*/
if (has_clip)
{
if (pict->clientClipType != CT_NONE)
pixman_image_set_has_client_clip (image, TRUE);
if (is_src)
{
if (pict->clientClipType != CT_NONE)
{
pixman_image_set_has_client_clip (image, TRUE);
pixman_region_translate (pict->pCompositeClip, - pict->pDrawable->x, - pict->pDrawable->y);
pixman_image_set_clip_region (image, pict->pCompositeClip);
pixman_region_translate (pict->clientClip,
pict->clipOrigin.x,
pict->clipOrigin.y);
pixman_image_set_clip_region (image, pict->clientClip);
pixman_region_translate (pict->pCompositeClip, pict->pDrawable->x, pict->pDrawable->y);
pixman_region_translate (pict->clientClip,
- pict->clipOrigin.x,
- pict->clipOrigin.y);
}
}
else
{
pixman_region_translate (pict->pCompositeClip,
- pict->pDrawable->x,
- pict->pDrawable->y);
pixman_image_set_clip_region (image, pict->pCompositeClip);
pixman_region_translate (pict->pCompositeClip,
pict->pDrawable->x,
pict->pDrawable->y);
}
}
/* Indexed table */
if (pict->pFormat->index.devPrivate)
pixman_image_set_indexed (image, pict->pFormat->index.devPrivate);
if (drawable != pict->pDrawable)
pixman_image_set_destroy_function (image, destroy_drawable, drawable);
return image;
}
......@@ -360,7 +435,7 @@ set_image_properties (pixman_image_t *image, PicturePtr pict)
if (pict->alphaMap)
{
pixman_image_t *alpha_map = image_from_pict (pict->alphaMap, TRUE);
pixman_image_t *alpha_map = image_from_pict (pict->alphaMap, TRUE, TRUE);
pixman_image_set_alpha_map (
image, alpha_map, pict->alphaOrigin.x, pict->alphaOrigin.y);
......@@ -394,7 +469,8 @@ set_image_properties (pixman_image_t *image, PicturePtr pict)
pixman_image_t *
image_from_pict (PicturePtr pict,
Bool has_clip)
Bool has_clip,
Bool is_src)
{
pixman_image_t *image = NULL;
......@@ -403,7 +479,7 @@ image_from_pict (PicturePtr pict,
if (pict->pDrawable)
{
image = create_bits_picture (pict, has_clip);
image = create_bits_picture (pict, has_clip, is_src);
}
else if (pict->pSourcePict)
{
......
......@@ -40,7 +40,7 @@ fbAddTraps (PicturePtr pPicture,
int ntrap,
xTrap *traps)
{
pixman_image_t *image = image_from_pict (pPicture, FALSE);
pixman_image_t *image = image_from_pict (pPicture, FALSE, FALSE);
if (!image)
return;
......@@ -56,7 +56,7 @@ fbRasterizeTrapezoid (PicturePtr pPicture,
int x_off,
int y_off)
{
pixman_image_t *image = image_from_pict (pPicture, FALSE);
pixman_image_t *image = image_from_pict (pPicture, FALSE, FALSE);
if (!image)
return;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment