Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
backgrounds.c draw.c ecompmgr.c fx.c hiwin.c iclass.c
iconify.c menus.c pager.c text.c x.c xwin.h
Log Message:
Start renaming/rewrapping stuff preparing for other api changes.
===================================================================
RCS file: /cvs/e/e16/e/src/backgrounds.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -3 -r1.66 -r1.67
--- backgrounds.c 16 Apr 2006 18:34:57 -0000 1.66
+++ backgrounds.c 17 Apr 2006 21:55:34 -0000 1.67
@@ -583,12 +583,12 @@
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 @@
}
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 @@
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 @@
}
x += (64 + 8);
}
- EFreeGC(gc);
+ EXFreeGC(gc);
EFreePixmap(pmap);
EClearWindow(win);
===================================================================
RCS file: /cvs/e/e16/e/src/draw.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -3 -r1.92 -r1.93
--- draw.c 29 Mar 2006 19:13:16 -0000 1.92
+++ draw.c 17 Apr 2006 21:55:34 -0000 1.93
@@ -36,9 +36,9 @@
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 @@
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 @@
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 @@
XDestroyImage(pi->xim);
Efree(pi->shminfo);
EFreePixmap(pi->pmap);
- EFreeGC(pi->gc);
+ EXFreeGC(pi->gc);
Efree(pi);
}
@@ -147,9 +147,9 @@
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 @@
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 @@
if (!s1)
{
if (gc)
- EFreeGC(gc);
+ EXFreeGC(gc);
if (rl > (XRectangle *) 1)
XFree(rl);
gc = 0;
@@ -223,7 +223,7 @@
if (!gc)
{
gcv.subwindow_mode = IncludeInferiors;
- gc = ECreateGC(root, GCSubwindowMode, &gcv);
+ gc = EXCreateGC(root, GCSubwindowMode, &gcv);
}
if (!rl)
{
@@ -699,8 +699,8 @@
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 @@
}
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 @@
if (firstlast == 2)
{
- EFreeGC(gc);
+ EXFreeGC(gc);
gc = 0;
}
break;
===================================================================
RCS file: /cvs/e/e16/e/src/ecompmgr.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -3 -r1.110 -r1.111
--- ecompmgr.c 16 Apr 2006 13:27:37 -0000 1.110
+++ ecompmgr.c 17 Apr 2006 21:55:34 -0000 1.111
@@ -547,12 +547,12 @@
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
{
===================================================================
RCS file: /cvs/e/e16/e/src/fx.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -3 -r1.63 -r1.64
--- fx.c 16 Apr 2006 13:27:37 -0000 1.63
+++ fx.c 17 Apr 2006 21:55:34 -0000 1.64
@@ -98,12 +98,12 @@
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_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_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();
}
===================================================================
RCS file: /cvs/e/e16/e/src/hiwin.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- hiwin.c 16 Apr 2006 22:27:06 -0000 1.10
+++ hiwin.c 17 Apr 2006 21:55:34 -0000 1.11
@@ -161,7 +161,7 @@
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 @@
EClearWindow(EoGetWin(phi));
}
- EFreeGC(phi->gc);
+ EXFreeGC(phi->gc);
phi->gc = None;
}
===================================================================
RCS file: /cvs/e/e16/e/src/iclass.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -3 -r1.94 -r1.95
--- iclass.c 17 Apr 2006 09:23:58 -0000 1.94
+++ iclass.c 17 Apr 2006 21:55:34 -0000 1.95
@@ -1230,9 +1230,9 @@
{
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 @@
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 @@
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 @@
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 */
}
}
===================================================================
RCS file: /cvs/e/e16/e/src/iconify.c,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -3 -r1.199 -r1.200
--- iconify.c 16 Apr 2006 22:27:06 -0000 1.199
+++ iconify.c 17 Apr 2006 21:55:34 -0000 1.200
@@ -176,9 +176,9 @@
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 @@
XDrawLine(disp, root, gc, x4 + 2, y4 + 2, x1 - 2, y1 - 2);
}
}
- EFreeGC(gc);
+ EXFreeGC(gc);
EUngrabServer();
}
===================================================================
RCS file: /cvs/e/e16/e/src/menus.c,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -3 -r1.236 -r1.237
--- menus.c 16 Apr 2006 22:27:06 -0000 1.236
+++ menus.c 17 Apr 2006 21:55:34 -0000 1.237
@@ -927,7 +927,7 @@
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 @@
XCopyArea(disp, pmm.pmap, mi_pmm->pmap, gc, 0, 0, w, h, 0, 0);
FreePmapMask(&pmm);
}
- EFreeGC(gc);
+ EXFreeGC(gc);
}
else
{
===================================================================
RCS file: /cvs/e/e16/e/src/pager.c,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -3 -r1.204 -r1.205
--- pager.c 16 Apr 2006 22:27:06 -0000 1.204
+++ pager.c 17 Apr 2006 21:55:34 -0000 1.205
@@ -329,7 +329,7 @@
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 @@
p->x1 = p->y1 = 99999;
p->x2 = p->y2 = -99999;
- EFreeGC(gc);
+ EXFreeGC(gc);
}
static void
@@ -555,7 +555,7 @@
return;
}
- gc = ECreateGC(pmap, 0, NULL);
+ gc = EXCreateGC(pmap, 0, NULL);
if (gc == None)
return;
@@ -564,7 +564,7 @@
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 @@
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. */
===================================================================
RCS file: /cvs/e/e16/e/src/text.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -3 -r1.64 -r1.65
--- text.c 30 Mar 2006 20:56:05 -0000 1.64
+++ text.c 17 Apr 2006 21:55:34 -0000 1.65
@@ -294,7 +294,7 @@
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)
===================================================================
RCS file: /cvs/e/e16/e/src/x.c,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -3 -r1.122 -r1.123
--- x.c 17 Apr 2006 08:43:09 -0000 1.122
+++ x.c 17 Apr 2006 21:55:34 -0000 1.123
@@ -1008,10 +1008,10 @@
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 @@
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 @@
{
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 @@
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);
}
===================================================================
RCS file: /cvs/e/e16/e/src/xwin.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- xwin.h 17 Apr 2006 08:43:09 -0000 1.11
+++ xwin.h 17 Apr 2006 21:55:34 -0000 1.12
@@ -115,8 +115,9 @@
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)
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
