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

Fix rendering of argb windows in pager when compositing is enabled. 

SVN revision: 53809
This commit is contained in:
Kim Woelders 2010-10-23 10:22:56 +00:00
parent d3895d6eec
commit 94bdab5de8
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/pager.c
View File

@ -312,7 +312,7 @@ PagerEwinUpdateMini(Pager * p, EWin * ewin)
p->do_update = 1;
PmapMaskInit(&ewin->mini_pmm, p->win, w, h);
PmapMaskInit(&ewin->mini_pmm, EoGetWin(ewin), w, h);
draw = None;
if (pager_mode != PAGER_MODE_SIMPLE)
@ -328,13 +328,13 @@ PagerEwinUpdateMini(Pager * p, EWin * ewin)
ImageClass *ic;
ic = ImageclassFind("PAGER_WIN", 1);
ImageclassApplySimple(ic, p->win, ewin->mini_pmm.pmap,
ImageclassApplySimple(ic, EoGetWin(ewin), ewin->mini_pmm.pmap,
STATE_NORMAL, 0, 0, w, h);
Dprintf("Use Iclass, pmap=%#lx\n", ewin->mini_pmm.pmap);
}
else
{
ScaleRect(EoGetWin(ewin), draw, p->win, ewin->mini_pmm.pmap,
ScaleRect(EoGetWin(ewin), draw, EoGetWin(ewin), ewin->mini_pmm.pmap,
0, 0, EoGetW(ewin), EoGetH(ewin), 0, 0, w, h, HIQ);
Dprintf("Grab scaled, pmap=%#lx\n", ewin->mini_pmm.pmap);
}
@ -444,14 +444,16 @@ doPagerUpdate(Pager * p)
if (ewin->mini_pmm.pmap)
{
#if USE_COMPOSITE
pict = EPictureCreate(NULL, ewin->mini_pmm.pmap);
/* pmap set by depth determined by
* PagerEwinUpdateMini() ewin
* PagerEwinUpdateFromPager() p->win
*/
pict = EPictureCreate(ewin->mini_pmm.depth == WinGetDepth(p->win) ?
p->win : EoGetWin(ewin),
ewin->mini_pmm.pmap);
alpha = ECompMgrWinGetAlphaPict(EoObj(ewin));
if (alpha)
XRenderComposite(disp, PictOpOver, pict, alpha, pager_pict,
0, 0, 0, 0, wx, wy, ww, wh);
else
XRenderComposite(disp, PictOpSrc, pict, None, pager_pict,
0, 0, 0, 0, wx, wy, ww, wh);
XRenderComposite(disp, PictOpOver, pict, alpha, pager_pict,
0, 0, 0, 0, wx, wy, ww, wh);
EPictureDestroy(pict);
#else
#if 0 /* Mask is currently not set anywhere */