Add missing offsets for window coordinates - reported by Colin Harrison

1 files changed, 13 insertions, 0 deletions

diff --git a/fb/fbpict.c b/fb/fbpict.c
index eb78ceda6..3ad4a2240 100644
--- a/fb/fbpict.c
+++ b/fb/fbpict.c
@@ -384,6 +384,19 @@ fbComposite (CARD8      op,
     pixman_region16_t region;
     pixman_image_t *src, *mask, *dest;
     
+    xDst += pDst->pDrawable->x;
+    yDst += pDst->pDrawable->y;
+    if (pSrc->pDrawable)
+    {
+        xSrc += pSrc->pDrawable->x;
+        ySrc += pSrc->pDrawable->y;
+    }
+    if (pMask && pMask->pDrawable)
+    {
+	xMask += pMask->pDrawable->x;
+	yMask += pMask->pDrawable->y;
+    }
+
     if (!miComputeCompositeRegion (&region, pSrc, pMask, pDst, xSrc, ySrc,
 				   xMask, yMask, xDst, yDst, width, height))
         return;