fix glyph upload,drv-uxa

metacity renders okay now

1 files changed, 6 insertions, 5 deletions

diff --git a/drvuxa/uxa-glyphs.c b/drvuxa/uxa-glyphs.c
index 3583bdcb..38156f3f 100644
--- a/drvuxa/uxa-glyphs.c
+++ b/drvuxa/uxa-glyphs.c
@@ -67,6 +67,7 @@
 #include "uxa-priv.h"
 #include "../src/common.h"
 
+#include "drv_picturestr.h"
 #include "mipict.h"
 
 /* Width of the pixmaps we use for the caches; this should be less than
@@ -238,12 +239,12 @@ uxa_copy_upload(DrvPixmapPtr pSrc, DrvPixmapPtr pDst, DrvGCPtr pGC,
 		func = drv_uxa_copy_n_to_n;
 
 	
-	box.x1 = srcx;
-	box.x2 = srcx + width;
-	box.y1 = srcy;
-	box.y2 = srcy + height;
+	box.x1 = srcx + dstx;
+	box.x2 = srcx + dstx + width;
+	box.y1 = srcy + dsty;
+	box.y2 = srcy + dsty + height;
 
-	(*func)(pSrc, pDst, pGC, &box, 1, dstx, dsty, 0, 0, 0, NULL);
+	(*func)(pSrc, pDst, pGC, &box, 1, -dstx, -dsty, 0, 0, 0, NULL);
 	
 }