From ad2ba329d91157cd5ad09d871d0d5a74998d2518 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mon, 4 Nov 2013 17:49:34 -0500 Subject: [PATCH 6/6] fixes: Fix PanoramiXSetWindowShapeRegion Windows in Xinerama are in the coordinate space of their root window pixmap, not in protocol space. Signed-off-by: Adam Jackson --- xfixes/region.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/xfixes/region.c b/xfixes/region.c index eb4a082..752cef1 100644 --- a/xfixes/region.c +++ b/xfixes/region.c @@ -857,6 +857,7 @@ PanoramiXFixesSetWindowShapeRegion(ClientPtr client) { int result = Success, j; PanoramiXRes *win; + RegionPtr reg = NULL; REQUEST(xXFixesSetWindowShapeRegionReq); @@ -869,10 +870,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