[PATCH 2/2] fixes: Fix PanoramiXSetWindowShapeRegion

[Adam Jackson]

Windows in Xinerama are in the coordinate space of their root window
pixmap, not in protocol space.

Signed-off-by: Adam Jackson <ajax at redhat.com>
---
 xfixes/region.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/xfixes/region.c b/xfixes/region.c
index be0c886..72954c5 100644
--- a/xfixes/region.c
+++ b/xfixes/region.c
@@ -855,6 +855,7 @@ PanoramiXFixesSetWindowShapeRegion(ClientPtr client)
 {
     int result = Success, j;
     PanoramiXRes *win;
+    RegionPtr reg = NULL;
 
     REQUEST(xXFixesSetWindowShapeRegionReq);
 
@@ -867,10 +868,21 @@ PanoramiXFixesSetWindowShapeRegion(ClientPtr client)
         return result;
     }
 
+    VERIFY_REGION_OR_NONE(reg, stuff->region, client, DixReadAccess);
+
     FOR_NSCREENS_FORWARD(j) {
+        ScreenPtr screen = screenInfo.screens[j];
         stuff->dest = win->info[j].id;
+
+        if (reg)
+            RegionTranslate(reg, -screen->x, -screen->y);
+
         result =
             (*PanoramiXSaveXFixesVector[X_XFixesSetWindowShapeRegion]) (client);
+
+        if (reg)
+            RegionTranslate(reg, screen->x, screen->y);
+
         if (result != Success)
             break;
     }
-- 
1.8.3.1