From 808303fe5232ba0320ae5a4310b1ed1322e85f1d Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mon, 4 Nov 2013 17:49:34 -0500 Subject: fixes: Fix PanoramiXSetWindowShapeRegion for root windows (v2) Root windows in Xinerama are in the coordinate space of their root window pixmap, not in protocol space. v2: Only translate for root windows, sice the window shape is drawable-relative. Reviewed-by: Keith Packard Signed-off-by: Adam Jackson --- xfixes/region.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'xfixes') diff --git a/xfixes/region.c b/xfixes/region.c index f2ae8511a..14a02ba1d 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,22 @@ PanoramiXFixesSetWindowShapeRegion(ClientPtr client) return result; } + if (win->u.win.root) + 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; } -- cgit v1.2.3