jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

X11rdp: in composite, use pCompositeClip, not clientClip

Browse Source
This commit is contained in:
Jay Sorg 2013-02-28 15:54:09 -08:00
parent 4607de10a6
commit b53cefbea4
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
xorg/X11R7.6/rdp/rdpdraw.c
View File

@ -1242,8 +1242,6 @@ rdpComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst,
int post_process; int post_process;
int reset_surface; int reset_surface;
int got_id; int got_id;
int lx;
int ly;
WindowPtr pDstWnd; WindowPtr pDstWnd;
PixmapPtr pDstPixmap; PixmapPtr pDstPixmap;
rdpPixmapRec *pDstPriv; rdpPixmapRec *pDstPriv;
@ -1324,7 +1322,7 @@ rdpComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst,
return; return;
} }
if (pDst->clientClipType == CT_REGION) if (pDst->pCompositeClip != 0)
{ {
box.x1 = p->x + xDst; box.x1 = p->x + xDst;
box.y1 = p->y + yDst; box.y1 = p->y + yDst;
@ -1332,10 +1330,7 @@ rdpComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst,
box.y2 = box.y1 + height; box.y2 = box.y1 + height;
RegionInit(&reg1, &box, 0); RegionInit(&reg1, &box, 0);
RegionInit(&reg2, NullBox, 0); RegionInit(&reg2, NullBox, 0);
RegionCopy(&reg2, pDst->clientClip); RegionCopy(&reg2, pDst->pCompositeClip);
lx = p->x + pDst->clipOrigin.x;
ly = p->y + pDst->clipOrigin.y;
RegionTranslate(&reg2, lx, ly);
RegionIntersect(&reg1, &reg1, &reg2); RegionIntersect(&reg1, &reg1, &reg2);
if (dirty_type != 0) if (dirty_type != 0)