hugok
/
e16
forked from e16/e16
1
0
Fork 0
Code Pull Requests Activity

Introduce EPictureSetClip(). 

SVN revision: 44602
This commit is contained in:
Kim Woelders 2009-12-20 12:13:29 +00:00
parent 4645431e1d
commit be0c63b4b7
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ecompmgr.c
View File

@ -1218,7 +1218,7 @@ ECompMgrWinSetPicts(EObj * eo)
XserverRegion clip;
clip = ERegionCreateFromWindow(EobjGetWin(eo));
XFixesSetPictureClipRegion(disp, cw->picture, 0, 0, clip);
EPictureSetClip(cw->picture, clip);
ERegionDestroy(clip);
}
}
@ -1809,7 +1809,7 @@ ECompMgrRepaintObj(Picture pbuf, XserverRegion region, EObj * eo, int mode)
clip = ECompMgrRepaintObjSetClip(rgn_clip, region, cw->clip, x, y);
if (EDebug(EDBUG_TYPE_COMPMGR2))
ECompMgrWinDumpInfo("ECompMgrRepaintObj solid", eo, clip, 0);
XFixesSetPictureClipRegion(dpy, pbuf, 0, 0, clip);
EPictureSetClip(pbuf, clip);
XRenderComposite(dpy, PictOpSrc, cw->picture, None, pbuf,
0, 0, 0, 0, x + cw->rcx, y + cw->rcy, cw->rcw,
cw->rch);
@ -1831,7 +1831,7 @@ ECompMgrRepaintObj(Picture pbuf, XserverRegion region, EObj * eo, int mode)
clip = ECompMgrRepaintObjSetClip(rgn_clip, region, cw->clip, x, y);
if (EDebug(EDBUG_TYPE_COMPMGR2))
ECompMgrWinDumpInfo("ECompMgrRepaintObj trans", eo, clip, 0);
XFixesSetPictureClipRegion(dpy, pbuf, 0, 0, clip);
EPictureSetClip(pbuf, clip);
if (cw->opacity != OPAQUE && !cw->pict_alpha)
cw->pict_alpha =
EPictureCreateSolid(Mode_compmgr.root, True,
@ -1850,7 +1850,7 @@ ECompMgrRepaintObj(Picture pbuf, XserverRegion region, EObj * eo, int mode)
if (clip == None)
clip = ECompMgrRepaintObjSetClip(rgn_clip, region, cw->clip, x, y);
ERegionSubtractOffset(clip, x, y, cw->shape, rgn_tmp);
XFixesSetPictureClipRegion(dpy, pbuf, 0, 0, clip);
EPictureSetClip(pbuf, clip);
switch (Mode_compmgr.shadow_mode)
{
@ -1969,7 +1969,7 @@ ECompMgrRepaint(void)
/* Repaint background, clipped by damage region and opaque windows */
pict = dsk->o.cmhook->picture;
D1printf("ECompMgrRepaint desk picture=%#lx\n", pict);
XFixesSetPictureClipRegion(dpy, pbuf, 0, 0, region);
EPictureSetClip(pbuf, region);
XRenderComposite(dpy, PictOpSrc, pict, None, pbuf,
0, 0, 0, 0, 0, 0, WinGetW(VROOT), WinGetH(VROOT));
#endif
@ -1984,7 +1984,7 @@ ECompMgrRepaint(void)
if (pbuf != rootPicture)
{
XFixesSetPictureClipRegion(dpy, pbuf, 0, 0, Mode_compmgr.damage);
EPictureSetClip(pbuf, Mode_compmgr.damage);
XRenderComposite(dpy, PictOpSrc, pbuf, None, rootPicture,
0, 0, 0, 0, 0, 0, WinGetW(VROOT), WinGetH(VROOT));
}

6
src/x.c
View File

@ -1946,6 +1946,12 @@ EPictureCreateBuffer(Win win, int w, int h, Pixmap * ppmap)
return pict;
}
void
EPictureSetClip(Picture pict, XserverRegion clip)
{
XFixesSetPictureClipRegion(disp, pict, 0, 0, clip);
}
/*
* Regions
*/

1
src/xwin.h
View File

@ -318,6 +318,7 @@ Picture EPictureCreate(Window win, int depth, Visual * vis);
Picture EPictureCreateSolid(Window xwin, int argb,
unsigned int a, unsigned int rgb);
Picture EPictureCreateBuffer(Win win, int w, int h, Pixmap * ppmap);
void EPictureSetClip(Picture pict, XserverRegion clip);
#endif /* USE_COMPOSITE */