frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes: Fix PanoramiXSetPictureClipRegion for root windows (v2) 

Root windows in Xinerama are in the coordinate space of their root
window pixmap, not in protocol space.  This fixes 'xcompmgr -n' when
Xinerama is active.

v2: Only translate for root windows, since the clip origin is
drawable-relative.

Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Adam Jackson 2013-11-04 17:49:33 -05:00
parent 1dd839a425
commit 5c10c7ea21
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
xfixes/region.c
View File

@ -886,6 +886,7 @@ PanoramiXFixesSetPictureClipRegion(ClientPtr client)
REQUEST(xXFixesSetPictureClipRegionReq); REQUEST(xXFixesSetPictureClipRegionReq);
int result = Success, j; int result = Success, j;
PanoramiXRes *pict; PanoramiXRes *pict;
RegionPtr reg = NULL;
REQUEST_SIZE_MATCH(xXFixesSetPictureClipRegionReq); REQUEST_SIZE_MATCH(xXFixesSetPictureClipRegionReq);
@ -896,10 +897,22 @@ PanoramiXFixesSetPictureClipRegion(ClientPtr client)
return result; return result;
} }
if (pict->u.pict.root)
VERIFY_REGION_OR_NONE(reg, stuff->region, client, DixReadAccess);
FOR_NSCREENS_BACKWARD(j) { FOR_NSCREENS_BACKWARD(j) {
ScreenPtr screen = screenInfo.screens[j];
stuff->picture = pict->info[j].id; stuff->picture = pict->info[j].id;
if (reg)
RegionTranslate(reg, -screen->x, -screen->y);
result = result =
(*PanoramiXSaveXFixesVector[X_XFixesSetPictureClipRegion]) (client); (*PanoramiXSaveXFixesVector[X_XFixesSetPictureClipRegion]) (client);
if (reg)
RegionTranslate(reg, screen->x, screen->y);
if (result != Success) if (result != Success)
break; break;
} }