xserver: Branch 'master'

[Søren Sandmann Pedersen]

 fb/fbpict.c |   13 +++++++++++++
 1 files changed, 13 insertions(+)

New commits:
diff-tree 3ba3ede9bbdfc6376b6f6e0b6ce8280a05e6584d (from cc648e609d472472bac4a2e568eb3598b3690ba3)
Author: Soren Sandmann Pedersen <ssp at dhcp83-218.boston.redhat.com>
Date:   Wed May 23 12:56:04 2007 -0400

    Add missing offsets for window coordinates - reported by Colin Harrison

diff --git a/fb/fbpict.c b/fb/fbpict.c
index eb78ced..3ad4a22 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;