e16
/
e16
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Start renaming/rewrapping stuff preparing for other api changes. 

SVN revision: 22185
This commit is contained in:
Kim Woelders 2006-04-17 21:55:34 +00:00
parent 063c9e345f
commit 0218e123c2
12 changed files with 75 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/backgrounds.c
View File

@ -583,12 +583,12 @@ BackgroundRealize(Background * bg, Drawable draw, unsigned int rw,
if (!is_win)
{
gc = ECreateGC(draw, 0, NULL);
gc = EXCreateGC(draw, 0, NULL);
XSetClipMask(disp, gc, 0);
XSetFillStyle(disp, gc, FillSolid);
XSetForeground(disp, gc, bg->bg_solid.pixel);
XFillRectangle(disp, draw, gc, 0, 0, rw, rh);
EFreeGC(gc);
EXFreeGC(gc);
}
if (ppmap)
*ppmap = None;
@ -622,12 +622,12 @@ BackgroundRealize(Background * bg, Drawable draw, unsigned int rw,
}
else
{
gc = ECreateGC(draw, 0, NULL);
gc = EXCreateGC(draw, 0, NULL);
XSetTile(disp, gc, pmap);
XSetTSOrigin(disp, gc, x, y);
XSetFillStyle(disp, gc, FillTiled);
XFillRectangle(disp, draw, gc, 0, 0, rw, rh);
EFreeGC(gc);
EXFreeGC(gc);
}
#endif
goto done;
@ -1713,7 +1713,7 @@ BG_RedrawView(void)
DialogItemAreaGetSize(bg_sel, &w, &h);
pmap = ECreatePixmap(win, w, h, VRoot.depth);
gc = ECreateGC(pmap, 0, NULL);
gc = EXCreateGC(pmap, 0, NULL);
ic_button = ImageclassFind("DIALOG_BUTTON", 0);
@ -1763,7 +1763,7 @@ BG_RedrawView(void)
}
x += (64 + 8);
}
EFreeGC(gc);
EXFreeGC(gc);
EFreePixmap(pmap);
EClearWindow(win);

34
src/draw.c
View File

@ -36,9 +36,9 @@ EFillPixmap(Window win, Pixmap pmap, int x, int y, int w, int h)
GC gc;
gcv.subwindow_mode = IncludeInferiors;
gc = ECreateGC(win, GCSubwindowMode, &gcv);
gc = EXCreateGC(win, GCSubwindowMode, &gcv);
XCopyArea(disp, win, pmap, gc, x, y, w, h, x, y);
EFreeGC(gc);
EXFreeGC(gc);
}
static void
@ -48,9 +48,9 @@ EPastePixmap(Window win, Pixmap pmap, int x, int y, int w, int h)
GC gc;
gcv.subwindow_mode = IncludeInferiors;
gc = ECreateGC(win, GCSubwindowMode, &gcv);
gc = EXCreateGC(win, GCSubwindowMode, &gcv);
XCopyArea(disp, pmap, win, gc, x, y, w, h, x, y);
EFreeGC(gc);
EXFreeGC(gc);
}
typedef struct _PixImg
@ -96,7 +96,7 @@ ECreatePixImg(Window win, int w, int h)
if (pi->pmap)
{
gcv.subwindow_mode = IncludeInferiors;
pi->gc = ECreateGC(win, GCSubwindowMode, &gcv);
pi->gc = EXCreateGC(win, GCSubwindowMode, &gcv);
if (pi->gc)
return pi;
@ -127,7 +127,7 @@ EDestroyPixImg(PixImg * pi)
XDestroyImage(pi->xim);
Efree(pi->shminfo);
EFreePixmap(pi->pmap);
EFreeGC(pi->gc);
EXFreeGC(pi->gc);
Efree(pi);
}
@ -147,9 +147,9 @@ EBlendRemoveShape(EWin * ewin, Pixmap pmap, int x, int y)
if (rl)
XFree(rl);
if (gc)
EFreeGC(gc);
EXFreeGC(gc);
if (gcm)
EFreeGC(gcm);
EXFreeGC(gcm);
if (mask)
EFreePixmap(mask);
mask = 0;
@ -182,11 +182,11 @@ EBlendRemoveShape(EWin * ewin, Pixmap pmap, int x, int y)
if (!mask)
mask = ECreatePixmap(root, w, h, 1);
if (!gcm)
gcm = ECreateGC(mask, 0, &gcv);
gcm = EXCreateGC(mask, 0, &gcv);
if (!gc)
{
gcv.subwindow_mode = IncludeInferiors;
gc = ECreateGC(root, GCSubwindowMode, &gcv);
gc = EXCreateGC(root, GCSubwindowMode, &gcv);
XSetForeground(disp, gcm, 1);
XFillRectangle(disp, mask, gcm, 0, 0, w, h);
XSetForeground(disp, gcm, 0);
@ -213,7 +213,7 @@ EBlendPixImg(EWin * ewin, PixImg * s1, PixImg * s2, PixImg * dst, int x, int y,
if (!s1)
{
if (gc)
EFreeGC(gc);
EXFreeGC(gc);
if (rl > (XRectangle *) 1)
XFree(rl);
gc = 0;
@ -223,7 +223,7 @@ EBlendPixImg(EWin * ewin, PixImg * s1, PixImg * s2, PixImg * dst, int x, int y,
if (!gc)
{
gcv.subwindow_mode = IncludeInferiors;
gc = ECreateGC(root, GCSubwindowMode, &gcv);
gc = EXCreateGC(root, GCSubwindowMode, &gcv);
}
if (!rl)
{
@ -699,8 +699,8 @@ DrawEwinShape(EWin * ewin, int md, int x, int y, int w, int h, char firstlast)
if (gcv.foreground == 0)
gcv.foreground = BlackPixel(disp, VRoot.scr);
gcv.subwindow_mode = IncludeInferiors;
gc = ECreateGC(root,
GCFunction | GCForeground | GCSubwindowMode, &gcv);
gc = EXCreateGC(root,
GCFunction | GCForeground | GCSubwindowMode, &gcv);
}
#define DRAW_H_ARROW(x1, x2, y1) \
if (((x2) - (x1)) >= 12) \
@ -857,10 +857,10 @@ DrawEwinShape(EWin * ewin, int md, int x, int y, int w, int h, char firstlast)
}
EFillPixmap(root, root_pi->pmap, x1, y1, EoGetW(ewin),
EoGetH(ewin));
gc2 = ECreateGC(root_pi->pmap, 0, &gcv2);
gc2 = EXCreateGC(root_pi->pmap, 0, &gcv2);
XCopyArea(disp, root_pi->pmap, ewin_pi->pmap, gc2, x1, y1,
EoGetW(ewin), EoGetH(ewin), 0, 0);
EFreeGC(gc2);
EXFreeGC(gc2);
EBlendPixImg(ewin, root_pi, ewin_pi, draw_pi, x, y,
EoGetW(ewin), EoGetH(ewin));
}
@ -965,7 +965,7 @@ DrawEwinShape(EWin * ewin, int md, int x, int y, int w, int h, char firstlast)
if (firstlast == 2)
{
EFreeGC(gc);
EXFreeGC(gc);
gc = 0;
}
break;

4
src/ecompmgr.c
View File

@ -547,12 +547,12 @@ ECompMgrDeskConfigure(Desk * dsk)
GC gc;
pmap = XCreatePixmap(disp, VRoot.win, 1, 1, VRoot.depth);
gc = ECreateGC(pmap, 0, NULL);
gc = EXCreateGC(pmap, 0, NULL);
XSetClipMask(disp, gc, 0);
XSetFillStyle(disp, gc, FillSolid);
XSetForeground(disp, gc, dsk->bg.pixel);
XFillRectangle(disp, pmap, gc, 0, 0, 1, 1);
EFreeGC(gc);
EXFreeGC(gc);
}
else
{

24
src/fx.c
View File

@ -98,12 +98,12 @@ FX_ripple_timeout(int val __UNUSED__, void *data __UNUSED__)
ECreatePixmap(fx_ripple_win, VRoot.w, fx_ripple_waterh * 2,
VRoot.depth);
if (gc)
EFreeGC(gc);
EXFreeGC(gc);
if (gc1)
EFreeGC(gc1);
EXFreeGC(gc1);
gcv.subwindow_mode = IncludeInferiors;
gc = ECreateGC(fx_ripple_win, GCSubwindowMode, &gcv);
gc1 = ECreateGC(fx_ripple_win, 0L, &gcv);
gc = EXCreateGC(fx_ripple_win, GCSubwindowMode, &gcv);
gc1 = EXCreateGC(fx_ripple_win, 0L, &gcv);
FX_ripple_info();
}
@ -267,13 +267,13 @@ FX_raindrops_timeout(int val __UNUSED__, void *data __UNUSED__)
fx_raindrops_win = DeskGetBackgroundWin(DesksGetCurrent());
if (gc)
EFreeGC(gc);
EXFreeGC(gc);
if (gc1)
EFreeGC(gc1);
EXFreeGC(gc1);
gcv.subwindow_mode = IncludeInferiors;
gc = ECreateGC(fx_raindrops_win, GCSubwindowMode, &gcv);
gc1 = ECreateGC(fx_raindrops_win, 0L, &gcv);
gc = EXCreateGC(fx_raindrops_win, GCSubwindowMode, &gcv);
gc1 = EXCreateGC(fx_raindrops_win, 0L, &gcv);
fx_raindrops_draw =
ECreatePixImg(fx_raindrops_win, fx_raindrop_size, fx_raindrop_size);
@ -541,12 +541,12 @@ FX_Wave_timeout(int val __UNUSED__, void *data __UNUSED__)
fx_wave_above =
ECreatePixmap(fx_wave_win, VRoot.w, FX_WAVE_WATERH * 2, VRoot.depth);
if (gc)
EFreeGC(gc);
EXFreeGC(gc);
if (gc1)
EFreeGC(gc1);
EXFreeGC(gc1);
gcv.subwindow_mode = IncludeInferiors;
gc = ECreateGC(fx_wave_win, GCSubwindowMode, &gcv);
gc1 = ECreateGC(fx_wave_win, 0L, &gcv);
gc = EXCreateGC(fx_wave_win, GCSubwindowMode, &gcv);
gc1 = EXCreateGC(fx_wave_win, 0L, &gcv);
FX_Wave_info();
}

4
src/hiwin.c
View File

@ -161,7 +161,7 @@ static const HiwinRender HiwinRenderIclass = {
static void
HiwinRenderPixmapInit(Hiwin * phi)
{
phi->gc = ECreateGC(EoGetWin(phi), 0, NULL);
phi->gc = EXCreateGC(EoGetWin(phi), 0, NULL);
}
static void
@ -195,7 +195,7 @@ HiwinRenderPixmapFini(Hiwin * phi, int shown)
EClearWindow(EoGetWin(phi));
}
EFreeGC(phi->gc);
EXFreeGC(phi->gc);
phi->gc = None;
}

22
src/iclass.c
View File

@ -1230,9 +1230,9 @@ ITApply(Window win, ImageClass * ic, ImageState * is, int w, int h,
{
GC gc;
gc = ECreateGC(win, 0, NULL);
gc = EXCreateGC(win, 0, NULL);
ImagestateDrawBevel(is, win, gc, w, h);
EFreeGC(gc);
EXFreeGC(gc);
}
}
@ -1287,10 +1287,10 @@ ImageclassApplyCopy(ImageClass * ic, Window win, int w, int h, int active,
gcv.tile = pmm->pmap;
gcv.ts_x_origin = 0;
gcv.ts_y_origin = 0;
gc = ECreateGC(tp, GCFillStyle | GCTile |
GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
gc = EXCreateGC(tp, GCFillStyle | GCTile |
GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
XFillRectangle(disp, tp, gc, 0, 0, w, h);
EFreeGC(gc);
EXFreeGC(gc);
if (pmm->mask)
{
tm = ECreatePixmap(win, w, h, 1);
@ -1298,11 +1298,11 @@ ImageclassApplyCopy(ImageClass * ic, Window win, int w, int h, int active,
gcv.tile = pmm->mask;
gcv.ts_x_origin = 0;
gcv.ts_y_origin = 0;
gc = ECreateGC(tm, GCFillStyle | GCTile |
GCTileStipXOrigin | GCTileStipYOrigin,
&gcv);
gc = EXCreateGC(tm, GCFillStyle | GCTile |
GCTileStipXOrigin | GCTileStipYOrigin,
&gcv);
XFillRectangle(disp, tm, gc, 0, 0, w, h);
EFreeGC(gc);
EXFreeGC(gc);
}
FreePmapMask(pmm);
pmm->type = 0;
@ -1329,14 +1329,14 @@ ImageclassApplyCopy(ImageClass * ic, Window win, int w, int h, int active,
pmm->pmap = pmap;
pmm->mask = 0;
gc = ECreateGC(pmap, 0, NULL);
gc = EXCreateGC(pmap, 0, NULL);
/* bg color */
XSetForeground(disp, gc, is->bg.pixel);
XFillRectangle(disp, pmap, gc, 0, 0, w, h);
/* if there is a bevel to draw, draw it */
if (is->bevelstyle != BEVEL_NONE)
ImagestateDrawBevel(is, pmap, gc, w, h);
EFreeGC(gc);
EXFreeGC(gc);
/* FIXME - No text */
}
}

8
src/iconify.c
View File

@ -176,9 +176,9 @@ IB_Animate(char iconify, EWin * from, EWin * to)
gcv.foreground = WhitePixel(disp, VRoot.scr);
if (gcv.foreground == 0)
gcv.foreground = BlackPixel(disp, VRoot.scr);
gc = ECreateGC(root,
GCFunction | GCForeground | GCSubwindowMode | GCFillStyle,
&gcv);
gc = EXCreateGC(root,
GCFunction | GCForeground | GCSubwindowMode | GCFillStyle,
&gcv);
t1 = GetTime();
if (iconify)
{
@ -320,7 +320,7 @@ IB_Animate(char iconify, EWin * from, EWin * to)
XDrawLine(disp, root, gc, x4 + 2, y4 + 2, x1 - 2, y1 - 2);
}
}
EFreeGC(gc);
EXFreeGC(gc);
EUngrabServer();
}

4
src/menus.c
View File

@ -927,7 +927,7 @@ MenuDrawItem(Menu * m, MenuItem * mi, char shape, int state)
if (!m->style->use_item_bg)
{
gc = ECreateGC(m->pmm.pmap, 0, NULL);
gc = EXCreateGC(m->pmm.pmap, 0, NULL);
XCopyArea(disp, m->pmm.pmap, mi_pmm->pmap, gc, x, y, w, h, 0, 0);
if ((mi->state != STATE_NORMAL) || (mi->child))
{
@ -943,7 +943,7 @@ MenuDrawItem(Menu * m, MenuItem * mi, char shape, int state)
XCopyArea(disp, pmm.pmap, mi_pmm->pmap, gc, 0, 0, w, h, 0, 0);
FreePmapMask(&pmm);
}
EFreeGC(gc);
EXFreeGC(gc);
}
else
{

10
src/pager.c
View File

@ -329,7 +329,7 @@ doPagerUpdate(Pager * p)
vx = cx * VRoot.w;
vy = cy * VRoot.h;
gc = ECreateGC(p->pmap, 0, NULL);
gc = EXCreateGC(p->pmap, 0, NULL);
if (gc == None)
return;
@ -424,7 +424,7 @@ doPagerUpdate(Pager * p)
p->x1 = p->y1 = 99999;
p->x2 = p->y2 = -99999;
EFreeGC(gc);
EXFreeGC(gc);
}
static void
@ -555,7 +555,7 @@ PagerUpdateBg(Pager * p)
return;
}
gc = ECreateGC(pmap, 0, NULL);
gc = EXCreateGC(pmap, 0, NULL);
if (gc == None)
return;
@ -564,7 +564,7 @@ PagerUpdateBg(Pager * p)
XSetForeground(disp, gc, WhitePixel(disp, VRoot.scr));
XFillRectangle(disp, pmap, gc, 1, 1, p->dw - 2, p->dh - 2);
EFreeGC(gc);
EXFreeGC(gc);
}
static void
@ -806,7 +806,7 @@ PagerEwinUpdateFromPager(Pager * p, EWin * ewin)
h = 1;
if (!gc)
gc = ECreateGC(p->pmap, 0, NULL);
gc = EXCreateGC(p->pmap, 0, NULL);
/* NB! If the pixmap/mask was created by imlib, free it. Due to imlibs */
/* image/pixmap cache it may be in use elsewhere. */

2
src/text.c
View File

@ -294,7 +294,7 @@ TextstateDrawText(TextState * ts, Window win, const char *text, int x, int y,
return;
if (!gc)
gc = ECreateGC(win, 0, NULL);
gc = EXCreateGC(win, 0, NULL);
if (ts->style.orientation == FONT_TO_RIGHT ||
ts->style.orientation == FONT_TO_LEFT)

20
src/x.c
View File

@ -1008,10 +1008,10 @@ EShapeCombineMaskTiled(Window win, int dest, int x, int y,
gcv.ts_x_origin = 0;
gcv.ts_y_origin = 0;
tm = ECreatePixmap(win, w, h, 1);
gc = ECreateGC(tm, GCFillStyle | GCTile |
GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
gc = EXCreateGC(tm, GCFillStyle | GCTile |
GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
XFillRectangle(disp, tm, gc, 0, 0, w, h);
EFreeGC(gc);
EXFreeGC(gc);
EShapeCombineMask(win, dest, x, y, tm, op);
EFreePixmap(tm);
}
@ -1338,9 +1338,9 @@ ECreatePixmapCopy(Pixmap src, unsigned int w, unsigned int h,
GC gc;
pmap = ECreatePixmap(src, w, h, depth);
gc = ECreateGC(src, 0, NULL);
gc = EXCreateGC(src, 0, NULL);
XCopyArea(disp, src, pmap, gc, 0, 0, w, h, 0, 0);
EFreeGC(gc);
EXFreeGC(gc);
return pmap;
}
@ -1351,13 +1351,13 @@ ECopyArea(Drawable src, Drawable dst, int sx, int sy, unsigned int w,
{
GC gc;
gc = ECreateGC(src, 0, NULL);
gc = EXCreateGC(src, 0, NULL);
XCopyArea(disp, src, dst, gc, sx, sy, w, h, dx, dy);
EFreeGC(gc);
EXFreeGC(gc);
}
GC
ECreateGC(Drawable d, unsigned long mask, XGCValues * val)
EXCreateGC(Drawable draw, unsigned long mask, XGCValues * val)
{
XGCValues xgcv;
@ -1372,11 +1372,11 @@ ECreateGC(Drawable d, unsigned long mask, XGCValues * val)
val = &xgcv;
val->graphics_exposures = False;
}
return XCreateGC(disp, d, mask, val);
return XCreateGC(disp, draw, mask, val);
}
int
EFreeGC(GC gc)
EXFreeGC(GC gc)
{
return XFreeGC(disp, gc);
}

5
src/xwin.h
View File

@ -115,8 +115,9 @@ Pixmap ECreatePixmapCopy(Pixmap src, unsigned int w,
void ECopyArea(Drawable src, Drawable dst, int sx, int sy,
unsigned int w, unsigned int h, int dx, int dy);
GC ECreateGC(Drawable d, unsigned long mask, XGCValues * val);
int EFreeGC(GC gc);
GC EXCreateGC(Drawable draw, unsigned long mask,
XGCValues * val);
int EXFreeGC(GC gc);
#define EAllocColor(pxc) \
XAllocColor(disp, VRoot.cmap, pxc)