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

FreePmapMask() -> PmapMaskFree(). 

SVN revision: 53806
This commit is contained in:
Kim Woelders 2010-10-23 10:22:50 +00:00
parent 01838c8e58
commit 288a6c0541
7 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/dialog.c
View File

@ -259,7 +259,7 @@ DialogDestroy(Dialog * d)
ImageclassFree(d->iclass);
TextclassFree(d->tclass);
FreePmapMask(&(d->pmm_bg));
PmapMaskFree(&d->pmm_bg);
Efree(d);
}
@ -337,7 +337,7 @@ DialogRedraw(Dialog * d)
WinGetXwin(d->win), WinGetPmap(d->win));
#endif
FreePmapMask(&(d->pmm_bg));
PmapMaskFree(&d->pmm_bg);
ImageclassApplyCopy(d->iclass, d->win, d->w, d->h, 0, 0, STATE_NORMAL,
&(d->pmm_bg), IC_FLAG_FULL_SIZE, ST_DIALOG);
if (d->pmm_bg.pmap == None)

2
src/eimage.c
View File

@ -604,7 +604,7 @@ EDrawableDumpImage(Drawable draw, const char *txt)
#endif
void
FreePmapMask(PmapMask * pmm)
PmapMaskFree(PmapMask * pmm)
{
/* type !=0: Created by imlib_render_pixmaps_for_whole_image... */
if (pmm->pmap)

2
src/ewins.c
View File

@ -427,7 +427,7 @@ EwinDestroy(EWin * ewin)
Efree(ewin->ewmh.wm_icon);
Efree(ewin->bits);
Efree(ewin->session_id);
FreePmapMask(&ewin->mini_pmm);
PmapMaskFree(&ewin->mini_pmm);
GroupsEwinRemove(ewin);
Efree(ewin);

4
src/iclass.c
View File

@ -1169,7 +1169,7 @@ ITApply(Win win, ImageClass * ic, ImageState * is,
EShapeSetMaskTiled(win, 0, 0, pmm.mask, w, h);
}
FreePmapMask(&pmm);
PmapMaskFree(&pmm);
if ((is->unloadable) || (Conf.memory_paranoia))
{
@ -1225,7 +1225,7 @@ PmapMaskTile(PmapMask * pmm, Win win, unsigned int w, unsigned int h)
if (mask != None)
EXCopyAreaTiled(pmm->mask, None, mask, 0, 0, w, h, 0, 0);
FreePmapMask(pmm);
PmapMaskFree(pmm);
pmm->type = 0;
pmm->w = w;
pmm->h = h;

16
src/menus.c
View File

@ -625,7 +625,7 @@ MenuEmpty(Menu * m, int destroying)
Efree(mi->text);
Efree(mi->params);
for (j = 0; j < 3; j++)
FreePmapMask(&(mi->pmm[j]));
PmapMaskFree(&(mi->pmm[j]));
if (!destroying && mi->win)
EDestroyWindow(mi->win);
else
@ -638,7 +638,7 @@ MenuEmpty(Menu * m, int destroying)
m->num = 0;
m->sel_item = NULL;
FreePmapMask(&m->pmm);
PmapMaskFree(&m->pmm);
m->last_change = 0;
m->filled = 0;
@ -655,10 +655,10 @@ MenuFreePixmaps(Menu * m)
mi = m->items[i];
for (j = 0; j < 3; j++)
FreePmapMask(mi->pmm + j);
PmapMaskFree(mi->pmm + j);
}
FreePmapMask(&m->pmm);
PmapMaskFree(&m->pmm);
m->last_change = 0;
m->filled = 0;
@ -927,7 +927,7 @@ MenuRedraw(Menu * m)
for (i = 0; i < m->num; i++)
{
for (j = 0; j < 3; j++)
FreePmapMask(&(m->items[i]->pmm[j]));
PmapMaskFree(&(m->items[i]->pmm[j]));
}
m->redraw = 0;
@ -935,7 +935,7 @@ MenuRedraw(Menu * m)
if (!m->style->use_item_bg)
{
FreePmapMask(&m->pmm);
PmapMaskFree(&m->pmm);
ImageclassApplyCopy(m->style->bg_iclass, m->win, m->w, m->h, 0,
0, STATE_NORMAL, &m->pmm, IC_FLAG_MAKE_MASK,
ST_MENU);
@ -994,7 +994,7 @@ MenuDrawItem(Menu * m, MenuItem * mi, char shape, int state)
IC_FLAG_MAKE_MASK, item_type);
EXCopyAreaTiled(pmm.pmap, pmm.mask, mi_pmm->pmap,
0, 0, w, h, 0, 0);
FreePmapMask(&pmm);
PmapMaskFree(&pmm);
}
EXFreeGC(gc);
}
@ -1004,7 +1004,7 @@ MenuDrawItem(Menu * m, MenuItem * mi, char shape, int state)
IC_FLAG_MAKE_MASK, item_type);
EXCopyAreaTiled(pmm.pmap, pmm.mask, mi_pmm->pmap,
0, 0, w, h, 0, 0);
FreePmapMask(&pmm);
PmapMaskFree(&pmm);
}
if (mi->text)

4
src/pager.c
View File

@ -312,7 +312,7 @@ PagerEwinUpdateMini(Pager * p, EWin * ewin)
p->do_update = 1;
FreePmapMask(&ewin->mini_pmm);
PmapMaskFree(&ewin->mini_pmm);
ewin->mini_w = w;
ewin->mini_h = h;
@ -920,7 +920,7 @@ PagerEwinUpdateFromPager(Pager * p, EWin * ewin)
/* image/pixmap cache it may be in use elsewhere. */
if (ewin->mini_pmm.pmap &&
((ewin->mini_pmm.type) || (ewin->mini_w != w) || (ewin->mini_h != h)))
FreePmapMask(&ewin->mini_pmm);
PmapMaskFree(&ewin->mini_pmm);
if (!ewin->mini_pmm.pmap)
{

2
src/xwin.h
View File

@ -287,7 +287,7 @@ typedef struct {
int w, h;
} PmapMask;
void FreePmapMask(PmapMask * pmm);
void PmapMaskFree(PmapMask * pmm);
#if USE_COMPOSITE
#include <X11/extensions/Xfixes.h>