Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h actions.c borders.c buttons.c comms.c config.c cursors.c
desktops.c dialog.c draw.c fx.c globals.c iclass.c iconify.c
ipc.c menus.c pager.c scursor.c settings.c setup.c startup.c
text.c tooltips.c ttfont.c
Log Message:
No global var should be named "id".
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -3 -r1.129 -r1.130
--- E.h 12 Jul 2003 14:34:14 -0000 1.129
+++ E.h 12 Jul 2003 15:04:30 -0000 1.130
@@ -3030,8 +3030,8 @@
extern int display_screens;
extern int single_screen_mode;
extern Display *disp;
-extern ImlibData *id;
-extern ImlibData *ird;
+extern ImlibData *pImlibData;
+extern ImlibData *prImlibData;
#if USE_FNLIB
extern FnlibData *pFnlibData;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/actions.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -3 -r1.105 -r1.106
--- actions.c 12 Jul 2003 08:52:14 -0000 1.105
+++ actions.c 12 Jul 2003 15:04:30 -0000 1.106
@@ -2044,7 +2044,7 @@
if (mode.movemode > 5)
mode.movemode = 0;
}
- if ((ird) && (mode.movemode == 5))
+ if ((prImlibData) && (mode.movemode == 5))
mode.movemode = 3;
autosave();
EDBUG_RETURN(0);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/borders.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -3 -r1.96 -r1.97
--- borders.c 12 Jul 2003 08:22:58 -0000 1.96
+++ borders.c 12 Jul 2003 15:04:30 -0000 1.97
@@ -1624,9 +1624,9 @@
if (ewin->mini_mask)
EFreePixmap(disp, ewin->mini_mask);
if (ewin->icon_pmap)
- Imlib_free_pixmap(id, ewin->icon_pmap);
+ Imlib_free_pixmap(pImlibData, ewin->icon_pmap);
if (ewin->icon_mask)
- Imlib_free_pixmap(id, ewin->icon_mask);
+ Imlib_free_pixmap(pImlibData, ewin->icon_mask);
if (ewin->groups)
{
num_groups = ewin->num_groups;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/buttons.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- buttons.c 30 May 2003 20:26:52 -0000 1.19
+++ buttons.c 12 Jul 2003 15:04:30 -0000 1.20
@@ -174,7 +174,7 @@
{
w = im->rgb_width;
h = im->rgb_height;
- Imlib_destroy_image(id, im);
+ Imlib_destroy_image(pImlibData, im);
}
else
{
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/comms.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- comms.c 11 Jul 2003 17:58:18 -0000 1.30
+++ comms.c 12 Jul 2003 15:04:30 -0000 1.31
@@ -505,7 +505,7 @@
if (bg->top.file)
Efree(bg->top.file);
if (bg->pmap)
- Imlib_free_pixmap(id, bg->pmap);
+ Imlib_free_pixmap(pImlibData, bg->pmap);
Efree(bg);
}
}
@@ -829,7 +829,7 @@
bg->cmclass = cm;
}
if (bg->pmap)
- Imlib_free_pixmap(id, bg->pmap);
+ Imlib_free_pixmap(pImlibData, bg->pmap);
bg->pmap = 0;
for (i = 0; i < ENLIGHTENMENT_CONF_NUM_DESKTOPS; i++)
{
@@ -1128,7 +1128,7 @@
if (updated)
{
if (bg->pmap)
- Imlib_free_pixmap(id, bg->pmap);
+ Imlib_free_pixmap(pImlibData, bg->pmap);
bg->pmap = 0;
for (i = 0; i < ENLIGHTENMENT_CONF_NUM_DESKTOPS; i++)
{
@@ -1177,7 +1177,7 @@
bg = (Background *) FindItem(w, 0, LIST_FINDBY_NAME,
LIST_TYPE_BACKGROUND);
if (bg)
- SetBackgroundTo(id, win, bg, 0);
+ SetBackgroundTo(pImlibData, win, bg, 0);
CommsSend(c, "done");
}
else if (!strcmp(w, "set_controls"))
@@ -1217,7 +1217,7 @@
{
word(s, wd, w);
mode.movemode = atoi(w);
- if ((ird) && (mode.movemode == 5))
+ if ((prImlibData) && (mode.movemode == 5))
mode.movemode = 3;
}
else if (!strcmp(w, "RESIZEMODE:"))
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/config.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -3 -r1.63 -r1.64
--- config.c 12 Jul 2003 14:34:14 -0000 1.63
+++ config.c 12 Jul 2003 15:04:31 -0000 1.64
@@ -1782,7 +1782,7 @@
{
if ((desks.desk[atoi(s2)].bg == NULL) || (mode.user_bg))
{
- if ((ird) && (atoi(s2) == 0))
+ if ((prImlibData) && (atoi(s2) == 0))
bg = NULL;
if (!bg)
{
@@ -1799,7 +1799,7 @@
{
SetDesktopBg(atoi(s2), bg);
}
- if ((ird) && (atoi(s2) == 0))
+ if ((prImlibData) && (atoi(s2) == 0))
bg = NULL;
}
}
@@ -1821,7 +1821,7 @@
{
SetDesktopBg(atoi(s2), bg);
}
- if ((ird) && (atoi(s2) == 0))
+ if ((prImlibData) && (atoi(s2) == 0))
bg = NULL;
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/cursors.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- cursors.c 22 May 2003 19:14:59 -0000 1.10
+++ cursors.c 12 Jul 2003 15:04:31 -0000 1.11
@@ -65,14 +65,14 @@
xfg.red = (fg->r << 8) | (fg->r);
xfg.green = (fg->g << 8) | (fg->g);
xfg.blue = (fg->b << 8) | (fg->b);
- xfg.pixel = Imlib_best_color_match(id, &r, &g, &b);
+ xfg.pixel = Imlib_best_color_match(pImlibData, &r, &g, &b);
r = bg->r;
g = bg->g;
b = bg->b;
xbg.red = (bg->r << 8) | (bg->r);
xbg.green = (bg->g << 8) | (bg->g);
xbg.blue = (bg->b << 8) | (bg->b);
- xbg.pixel = Imlib_best_color_match(id, &r, &g, &b);
+ xbg.pixel = Imlib_best_color_match(pImlibData, &r, &g, &b);
curs = 0;
curs = XCreatePixmapCursor(disp, pmap, mask, &xfg, &xbg, xh, yh);
EFreePixmap(disp, pmap);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/desktops.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- desktops.c 11 Jun 2003 20:05:58 -0000 1.41
+++ desktops.c 12 Jul 2003 15:04:31 -0000 1.42
@@ -331,13 +331,13 @@
{
bg->keepim = 0;
if (bg->bg.im)
- Imlib_destroy_image(id, bg->bg.im);
+ Imlib_destroy_image(pImlibData, bg->bg.im);
bg->bg.im = NULL;
if (bg->top.im)
- Imlib_destroy_image(id, bg->top.im);
+ Imlib_destroy_image(pImlibData, bg->top.im);
bg->top.im = NULL;
if (bg->pmap)
- Imlib_free_pixmap(id, bg->pmap);
+ Imlib_free_pixmap(pImlibData, bg->pmap);
bg->pmap = 0;
}
}
@@ -352,14 +352,14 @@
bg->bg.file = NULL;
bg->bg.real_file = NULL;
if (bg->bg.im)
- Imlib_destroy_image(id, bg->bg.im);
+ Imlib_destroy_image(pImlibData, bg->bg.im);
bg->bg.im = NULL;
if (bg->top.im)
- Imlib_destroy_image(id, bg->top.im);
+ Imlib_destroy_image(pImlibData, bg->top.im);
bg->top.im = NULL;
bg->keepim = 0;
if (bg->pmap)
- Imlib_free_pixmap(id, bg->pmap);
+ Imlib_free_pixmap(pImlibData, bg->pmap);
bg->pmap = 0;
}
@@ -388,15 +388,15 @@
if (bg->bg.real_file)
Efree(bg->bg.real_file);
if (bg->bg.im)
- Imlib_destroy_image(id, bg->bg.im);
+ Imlib_destroy_image(pImlibData, bg->bg.im);
if (bg->top.file)
Efree(bg->top.file);
if (bg->top.real_file)
Efree(bg->top.real_file);
if (bg->top.im)
- Imlib_destroy_image(id, bg->top.im);
+ Imlib_destroy_image(pImlibData, bg->top.im);
if (bg->pmap)
- Imlib_free_pixmap(id, bg->pmap);
+ Imlib_free_pixmap(pImlibData, bg->pmap);
if (bg->name)
Efree(bg->name);
Efree(bg);
@@ -415,13 +415,13 @@
EDBUG(6, "CreateDesktopBG");
- if (ird)
+ if (prImlibData)
{
- imd = ird;
+ imd = prImlibData;
}
else
{
- imd = id;
+ imd = pImlibData;
}
d = Emalloc(sizeof(Background));
@@ -501,10 +501,10 @@
dsk = desks.desk[num].bg;
if (!dsk)
EDBUG_RETURN_;
- if ((ird) && (num == 0))
- imd = ird;
+ if ((prImlibData) && (num == 0))
+ imd = prImlibData;
else
- imd = id;
+ imd = pImlibData;
SetBackgroundTo(imd, desks.desk[num].win, dsk, 1);
EDBUG_RETURN_;
@@ -528,8 +528,9 @@
EDBUG_RETURN_;
GetWinWH(win, &rw, &rh);
depth = GetWinDepth(win);
- if ((depth != imd->x.depth) && (ird) && (depth == ird->x.depth))
- imd = ird;
+ if ((depth != imd->x.depth) && (prImlibData)
+ && (depth == prImlibData->x.depth))
+ imd = prImlibData;
r = dsk->bg.solid.r;
g = dsk->bg.solid.g;
b = dsk->bg.solid.b;
@@ -540,7 +541,7 @@
h = 0;
hasbg = 0;
hasfg = 0;
- rt = Imlib_get_render_type(id);
+ rt = Imlib_get_render_type(pImlibData);
if (desks.hiqualitybg)
Imlib_set_render_type(imd, RT_DITHER_TRUECOL);
@@ -585,15 +586,21 @@
cm->ref_count++;
if (dsk->top.im)
{
- Imlib_set_image_red_curve(id, dsk->top.im, cm->red.map);
- Imlib_set_image_green_curve(id, dsk->top.im, cm->green.map);
- Imlib_set_image_blue_curve(id, dsk->top.im, cm->blue.map);
+ Imlib_set_image_red_curve(pImlibData, dsk->top.im,
+ cm->red.map);
+ Imlib_set_image_green_curve(pImlibData, dsk->top.im,
+ cm->green.map);
+ Imlib_set_image_blue_curve(pImlibData, dsk->top.im,
+ cm->blue.map);
}
if (dsk->bg.im)
{
- Imlib_set_image_red_curve(id, dsk->bg.im, cm->red.map);
- Imlib_set_image_green_curve(id, dsk->bg.im, cm->green.map);
- Imlib_set_image_blue_curve(id, dsk->bg.im, cm->blue.map);
+ Imlib_set_image_red_curve(pImlibData, dsk->bg.im,
+ cm->red.map);
+ Imlib_set_image_green_curve(pImlibData, dsk->bg.im,
+ cm->green.map);
+ Imlib_set_image_blue_curve(pImlibData, dsk->bg.im,
+ cm->blue.map);
}
}
}
@@ -2197,15 +2204,15 @@
{
if ((now - lst[i]->last_viewed) > mode.desktop_bg_timeout)
{
- imd = id;
+ imd = pImlibData;
for (j = 0; j < ENLIGHTENMENT_CONF_NUM_DESKTOPS; j++)
{
if (desks.desk[j].bg == lst[i])
{
- if ((ird) && (j == 0))
- imd = ird;
+ if ((prImlibData) && (j == 0))
+ imd = prImlibData;
else
- imd = id;
+ imd = pImlibData;
j = ENLIGHTENMENT_CONF_NUM_DESKTOPS;
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/dialog.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -3 -r1.61 -r1.62
--- dialog.c 8 Jul 2003 02:32:39 -0000 1.61
+++ dialog.c 12 Jul 2003 15:04:31 -0000 1.62
@@ -1000,7 +1000,7 @@
{
di->item.slider.base_orig_w = im->rgb_width;
di->item.slider.base_orig_h = im->rgb_height;
- Imlib_destroy_image(id, im);
+ Imlib_destroy_image(pImlibData, im);
}
}
if (di->item.slider.ic_base)
@@ -1038,7 +1038,7 @@
{
di->item.slider.knob_orig_w = im->rgb_width;
di->item.slider.knob_orig_h = im->rgb_height;
- Imlib_destroy_image(id, im);
+ Imlib_destroy_image(pImlibData, im);
}
}
if (!di->item.slider.ic_border)
@@ -1068,7 +1068,7 @@
{
di->item.slider.border_orig_w = im->rgb_width;
di->item.slider.border_orig_h = im->rgb_height;
- Imlib_destroy_image(id, im);
+ Imlib_destroy_image(pImlibData, im);
di->item.slider.border_win =
ECreateWindow(d->win, -20, -20, 2, 2, 0);
EMapWindow(disp, di->item.slider.border_win);
@@ -1132,7 +1132,7 @@
{
di->item.check_button.check_orig_w = im->rgb_width;
di->item.check_button.check_orig_h = im->rgb_height;
- Imlib_destroy_image(id, im);
+ Imlib_destroy_image(pImlibData, im);
}
}
TextSize(di->tclass, 0, 0, STATE_NORMAL, di->item.check_button.text,
@@ -1168,8 +1168,8 @@
ih = im->rgb_height;
di->win = ECreateWindow(d->win, 0, 0, iw, ih, 0);
EMapWindow(disp, di->win);
- Imlib_apply_image(id, im, di->win);
- Imlib_destroy_image(id, im);
+ Imlib_apply_image(pImlibData, im, di->win);
+ Imlib_destroy_image(pImlibData, im);
}
}
di->w = iw;
@@ -1193,7 +1193,7 @@
{
di->item.radio_button.radio_orig_w = im->rgb_width;
di->item.radio_button.radio_orig_h = im->rgb_height;
- Imlib_destroy_image(id, im);
+ Imlib_destroy_image(pImlibData, im);
}
}
TextSize(di->tclass, 0, 0, STATE_NORMAL, di->item.radio_button.text,
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/draw.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- draw.c 22 May 2003 19:14:59 -0000 1.31
+++ draw.c 12 Jul 2003 15:04:31 -0000 1.32
@@ -281,17 +281,17 @@
int bpp;
PixImg *pi;
- if (id->x.depth <= 8)
+ if (pImlibData->x.depth <= 8)
bpp = 1;
- else if (id->x.depth <= 16)
+ else if (pImlibData->x.depth <= 16)
bpp = 2;
- else if (id->x.depth <= 24)
+ else if (pImlibData->x.depth <= 24)
bpp = 3;
else
bpp = 4;
- if ((id->max_shm) && ((bpp * w * h) > id->max_shm))
+ if ((pImlibData->max_shm) && ((bpp * w * h) > pImlibData->max_shm))
return NULL;
- if ((!id->x.shm) || (!id->x.shmp))
+ if ((!pImlibData->x.shm) || (!pImlibData->x.shmp))
return NULL;
pi = Emalloc(sizeof(PixImg));
@@ -556,7 +556,7 @@
}
break;
case 16:
- if (id->x.render_depth != 15)
+ if (pImlibData->x.render_depth != 15)
{
for (j = 0; j < h; j++)
{
@@ -918,16 +918,17 @@
md = 0;
if (md == 5)
{
- if (id->x.depth <= 8)
+ if (pImlibData->x.depth <= 8)
bpp = 1;
- else if (id->x.depth <= 16)
+ else if (pImlibData->x.depth <= 16)
bpp = 2;
- else if (id->x.depth <= 24)
+ else if (pImlibData->x.depth <= 24)
bpp = 3;
else
bpp = 4;
- if ((ird) || ((id->max_shm) && ((bpp * w * h) > id->max_shm))
- || ((!id->x.shm) || (!id->x.shmp)))
+ if ((prImlibData)
+ || ((pImlibData->max_shm) && ((bpp * w * h) > pImlibData->max_shm))
+ || ((!pImlibData->x.shm) || (!pImlibData->x.shmp)))
md = 0;
}
pw = w;
@@ -1353,7 +1354,7 @@
ELoadImage(char *file)
{
EDBUG(5, "ELoadImage");
- EDBUG_RETURN(ELoadImageImlibData(id, file));
+ EDBUG_RETURN(ELoadImageImlibData(pImlibData, file));
}
ImlibImage *
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/fx.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- fx.c 22 May 2003 19:15:00 -0000 1.27
+++ fx.c 12 Jul 2003 15:04:31 -0000 1.28
@@ -237,14 +237,14 @@
XGCValues gcv;
fx_ripple_win = desks.desk[desks.current].win;
- if ((desks.current == 0) && (ird))
+ if ((desks.current == 0) && (prImlibData))
fx_ripple_above =
ECreatePixmap(disp, fx_ripple_win, root.w, fx_ripple_waterh * 2,
- ird->x.depth);
+ prImlibData->x.depth);
else
fx_ripple_above =
ECreatePixmap(disp, fx_ripple_win, root.w, fx_ripple_waterh * 2,
- id->x.depth);
+ pImlibData->x.depth);
if (gc)
XFreeGC(disp, gc);
if (gc1)
@@ -382,7 +382,7 @@
{
XGCValues gcv;
- if (!id->x.shm)
+ if (!pImlibData->x.shm)
{
DIALOG_OK(_("Unable to display raindrops"),
_("\n"
@@ -398,7 +398,7 @@
"and editing it, enabling shared memory.\n" "\n"));
return;
}
- if (!id->x.shmp)
+ if (!pImlibData->x.shmp)
{
DIALOG_OK(_("Unable to display raindrops"),
_("\n"
@@ -693,14 +693,14 @@
XGCValues gcv;
fx_wave_win = desks.desk[desks.current].win;
- if ((desks.current == 0) && (ird))
+ if ((desks.current == 0) && (prImlibData))
fx_wave_above =
XCreatePixmap(disp, fx_wave_win, root.w, FX_WAVE_WATERH * 2,
- ird->x.depth);
+ prImlibData->x.depth);
else
fx_wave_above =
XCreatePixmap(disp, fx_wave_win, root.w, FX_WAVE_WATERH * 2,
- id->x.depth);
+ pImlibData->x.depth);
if (gc)
XFreeGC(disp, gc);
if (gc1)
@@ -868,10 +868,10 @@
if (!fx_imagespinner_win)
{
fx_imagespinner_win = desks.desk[desks.current].win;
- if ((desks.current == 0) && (ird))
- fx_imagespinner_imd = ird;
+ if ((desks.current == 0) && (prImlibData))
+ fx_imagespinner_imd = prImlibData;
else
- fx_imagespinner_imd = id;
+ fx_imagespinner_imd = pImlibData;
if (!before)
DIALOG_OK(_("Starting up imagespinners FX..."),
_("\n" "You have just started the imagespinners Effect.\n"
@@ -927,10 +927,10 @@
FX_ImageSpinner_Desk(void)
{
fx_imagespinner_win = desks.desk[desks.current].win;
- if ((desks.current == 0) && (ird))
- fx_imagespinner_imd = ird;
+ if ((desks.current == 0) && (prImlibData))
+ fx_imagespinner_imd = prImlibData;
else
- fx_imagespinner_imd = id;
+ fx_imagespinner_imd = pImlibData;
}
void
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/globals.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- globals.c 12 Jul 2003 14:34:14 -0000 1.15
+++ globals.c 12 Jul 2003 15:04:31 -0000 1.16
@@ -34,8 +34,8 @@
int display_screens;
int single_screen_mode;
Display *disp;
-ImlibData *id;
-ImlibData *ird;
+ImlibData *pImlibData;
+ImlibData *prImlibData;
#if USE_FNLIB
FnlibData *pFnlibData;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/iclass.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- iclass.c 22 May 2003 19:15:01 -0000 1.17
+++ iclass.c 12 Jul 2003 15:04:31 -0000 1.18
@@ -63,7 +63,7 @@
Efree(i->real_file);
if (i->im)
- Imlib_destroy_image(id, i->im);
+ Imlib_destroy_image(pImlibData, i->im);
if (i->transp)
Efree(i->transp);
if (i->border)
@@ -183,27 +183,27 @@
r = is->bg.r;
g = is->bg.g;
b = is->bg.b;
- is->bg.pixel = Imlib_best_color_match(id, &r, &g, &b);
+ is->bg.pixel = Imlib_best_color_match(pImlibData, &r, &g, &b);
r = is->hi.r;
g = is->hi.g;
b = is->hi.b;
- is->hi.pixel = Imlib_best_color_match(id, &r, &g, &b);
+ is->hi.pixel = Imlib_best_color_match(pImlibData, &r, &g, &b);
r = is->lo.r;
g = is->lo.g;
b = is->lo.b;
- is->lo.pixel = Imlib_best_color_match(id, &r, &g, &b);
+ is->lo.pixel = Imlib_best_color_match(pImlibData, &r, &g, &b);
r = is->hihi.r;
g = is->hihi.g;
b = is->hihi.b;
- is->hihi.pixel = Imlib_best_color_match(id, &r, &g, &b);
+ is->hihi.pixel = Imlib_best_color_match(pImlibData, &r, &g, &b);
r = is->lolo.r;
g = is->lolo.g;
b = is->lolo.b;
- is->lolo.pixel = Imlib_best_color_match(id, &r, &g, &b);
+ is->lolo.pixel = Imlib_best_color_match(pImlibData, &r, &g, &b);
EDBUG_RETURN_;
@@ -652,18 +652,19 @@
is->real_file = FindFile(is->im_file);
is->im = ELoadImage(is->real_file);
if (is->border)
- Imlib_set_image_border(id, is->im, is->border);
+ Imlib_set_image_border(pImlibData, is->im,
+ is->border);
if (is->transp)
- Imlib_set_image_shape(id, is->im, is->transp);
+ Imlib_set_image_shape(pImlibData, is->im, is->transp);
/* disabled - no idea what causes this but it causes a memory leak somewhere */
/* and thus will be disabled - there is no time to debug this any further */
/* if (is->colmod)
* {
- * Imlib_set_image_red_curve(id, is->im,
+ * Imlib_set_image_red_curve(pImlibData, is->im,
* is->colmod->red.map);
- * Imlib_set_image_green_curve(id, is->im,
+ * Imlib_set_image_green_curve(pImlibData, is->im,
* is->colmod->green.map);
- * Imlib_set_image_blue_curve(id, is->im,
+ * Imlib_set_image_blue_curve(pImlibData, is->im,
* is->colmod->blue.map);
* }
*/
@@ -673,15 +674,15 @@
/* if image, render */
if (is->pixmapfillstyle == FILL_STRETCH)
{
- Imlib_render(id, is->im, w, h);
- pmap = Imlib_move_image(id, is->im);
- mask = Imlib_move_mask(id, is->im);
+ Imlib_render(pImlibData, is->im, w, h);
+ pmap = Imlib_move_image(pImlibData, is->im);
+ mask = Imlib_move_mask(pImlibData, is->im);
if (pmap)
{
ESetWindowBackgroundPixmap(disp, win, pmap);
EShapeCombineMask(disp, win, ShapeBounding, 0,
0, mask, ShapeSet);
- Imlib_free_pixmap(id, pmap);
+ Imlib_free_pixmap(pImlibData, pmap);
}
}
else
@@ -715,9 +716,9 @@
ch = 1;
ph = h / ch;
}
- Imlib_render(id, is->im, pw, ph);
- pmap = Imlib_move_image(id, is->im);
- mask = Imlib_move_mask(id, is->im);
+ Imlib_render(pImlibData, is->im, pw, ph);
+ pmap = Imlib_move_image(pImlibData, is->im);
+ mask = Imlib_move_mask(pImlibData, is->im);
if (mask)
{
gcv.fill_style = FillTiled;
@@ -736,7 +737,7 @@
EFreePixmap(disp, tm);
}
ESetWindowBackgroundPixmap(disp, win, pmap);
- Imlib_free_pixmap(id, pmap);
+ Imlib_free_pixmap(pImlibData, pmap);
}
}
}
@@ -748,7 +749,7 @@
/* if unloadable - then unload */
if ((is->unloadable) || (mode.memory_paranoia))
{
- Imlib_destroy_image(id, is->im);
+ Imlib_destroy_image(pImlibData, is->im);
is->im = NULL;
}
}
@@ -973,14 +974,14 @@
/* if image, render */
if (is->pixmapfillstyle == FILL_STRETCH)
{
- Imlib_render(id, is->im, w, h);
- *pret = Imlib_copy_image(id, is->im);
+ Imlib_render(pImlibData, is->im, w, h);
+ *pret = Imlib_copy_image(pImlibData, is->im);
if (mret)
- *mret = Imlib_copy_mask(id, is->im);
+ *mret = Imlib_copy_mask(pImlibData, is->im);
/* if unloadable - then unload */
if ((is->unloadable) || (mode.memory_paranoia))
{
- Imlib_destroy_image(id, is->im);
+ Imlib_destroy_image(pImlibData, is->im);
is->im = NULL;
}
EDBUG_RETURN_;
@@ -1016,10 +1017,10 @@
ch = 1;
ph = h / ch;
}
- Imlib_render(id, is->im, pw, ph);
- pmap = Imlib_move_image(id, is->im);
- mask = Imlib_move_mask(id, is->im);
- tp = ECreatePixmap(disp, win, w, h, id->x.depth);
+ Imlib_render(pImlibData, is->im, pw, ph);
+ pmap = Imlib_move_image(pImlibData, is->im);
+ mask = Imlib_move_mask(pImlibData, is->im);
+ tp = ECreatePixmap(disp, win, w, h, pImlibData->x.depth);
if ((mret) && (mask))
tm = ECreatePixmap(disp, win, w, h, 1);
gcv.fill_style = FillTiled;
@@ -1047,11 +1048,11 @@
*pret = tp;
if (mret)
*mret = tm;
- Imlib_free_pixmap(id, pmap);
+ Imlib_free_pixmap(pImlibData, pmap);
/* if unloadable - then unload */
if ((is->unloadable) || (mode.memory_paranoia))
{
- Imlib_destroy_image(id, is->im);
+ Imlib_destroy_image(pImlibData, is->im);
is->im = NULL;
}
EDBUG_RETURN_;
@@ -1061,7 +1062,7 @@
/* if there is a bevel to draw, draw it */
if (is->bevelstyle != BEVEL_NONE)
{
- *pret = ECreatePixmap(disp, win, w, h, id->x.depth);
+ *pret = ECreatePixmap(disp, win, w, h, pImlibData->x.depth);
gc = XCreateGC(disp, *pret, 0, &gcv);
/* bg color */
XSetForeground(disp, gc, is->bg.pixel);
@@ -1178,16 +1179,16 @@
is->real_file = FindFile(is->im_file);
is->im = ELoadImage(is->real_file);
if (is->border)
- Imlib_set_image_border(id, is->im, is->border);
+ Imlib_set_image_border(pImlibData, is->im, is->border);
if (is->transp)
- Imlib_set_image_shape(id, is->im, is->transp);
+ Imlib_set_image_shape(pImlibData, is->im, is->transp);
if (is->colmod)
{
- Imlib_set_image_red_curve(id, is->im,
+ Imlib_set_image_red_curve(pImlibData, is->im,
is->colmod->red.map);
- Imlib_set_image_green_curve(id, is->im,
+ Imlib_set_image_green_curve(pImlibData, is->im,
is->colmod->green.map);
- Imlib_set_image_blue_curve(id, is->im,
+ Imlib_set_image_blue_curve(pImlibData, is->im,
is->colmod->blue.map);
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/iconify.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -3 -r1.66 -r1.67
--- iconify.c 11 Jul 2003 17:58:19 -0000 1.66
+++ iconify.c 12 Jul 2003 15:04:31 -0000 1.67
@@ -411,7 +411,7 @@
ib->arrow2_win = ECreateWindow(ib->win, 122, 26, 6, 6, 0);
ib->scrollbar_win = ECreateWindow(ib->scroll_win, 122, 26, 6, 6, 0);
ib->scrollbarknob_win = ECreateWindow(ib->scrollbar_win, -20, -20, 4, 4, 0);
- ib->pmap = ECreatePixmap(disp, ib->icon_win, 128, 32, id->x.depth);
+ ib->pmap = ECreatePixmap(disp, ib->icon_win, 128, 32, pImlibData->x.depth);
XSelectInput(disp, ib->icon_win,
EnterWindowMask | LeaveWindowMask | ButtonPressMask |
ButtonReleaseMask | PointerMotionMask);
@@ -634,7 +634,7 @@
h = 4;
ewin->icon_pmap_w = w;
ewin->icon_pmap_h = h;
- ewin->icon_pmap = ECreatePixmap(disp, ewin->win, w, h, id->x.depth);
+ ewin->icon_pmap = ECreatePixmap(disp, ewin->win, w, h, pImlibData->x.depth);
PagerScaleRect(ewin->icon_pmap, ewin->win, 0, 0, 0, 0, ewin->w, ewin->h, w,
h);
r = EShapeGetRectangles(disp, ewin->win, ShapeBounding, &rn, &ord);
@@ -670,9 +670,9 @@
if ((ewin->icon_pmap_w < 1) || (ewin->icon_pmap_h < 1))
{
if (ewin->icon_pmap)
- Imlib_free_pixmap(id, ewin->icon_pmap);
+ Imlib_free_pixmap(pImlibData, ewin->icon_pmap);
if (ewin->icon_mask)
- Imlib_free_pixmap(id, ewin->icon_mask);
+ Imlib_free_pixmap(pImlibData, ewin->icon_mask);
ewin->icon_pmap = 0;
ewin->icon_mask = 0;
}
@@ -706,14 +706,16 @@
r = 255;
g = 255;
b = 255;
- XSetForeground(disp, gc, Imlib_best_color_match(id, &r, &g, &b));
+ XSetForeground(disp, gc,
+ Imlib_best_color_match(pImlibData, &r, &g, &b));
XFillRectangle(disp, ewin->icon_pmap, gc, 0, 0, w, h);
r = 0;
g = 0;
b = 0;
XSetClipOrigin(disp, gc, 0, 0);
XSetClipMask(disp, gc, ewin->client.icon_pmap);
- XSetForeground(disp, gc, Imlib_best_color_match(id, &r, &g, &b));
+ XSetForeground(disp, gc,
+ Imlib_best_color_match(pImlibData, &r, &g, &b));
XFillRectangle(disp, ewin->icon_pmap, gc, 0, 0, w, h);
XFreeGC(disp, gc);
}
@@ -724,9 +726,9 @@
if ((ewin->icon_pmap_w < 1) || (ewin->icon_pmap_h < 1))
{
if (ewin->icon_pmap)
- Imlib_free_pixmap(id, ewin->icon_pmap);
+ Imlib_free_pixmap(pImlibData, ewin->icon_pmap);
if (ewin->icon_mask)
- Imlib_free_pixmap(id, ewin->icon_mask);
+ Imlib_free_pixmap(pImlibData, ewin->icon_mask);
ewin->icon_pmap = 0;
ewin->icon_mask = 0;
}
@@ -744,8 +746,8 @@
return;
IclassApplyCopy(ic, d, w, h, 0, 0, STATE_NORMAL, &p, &m);
PastePixmap(disp, d, p, m, x, y);
- Imlib_free_pixmap(id, p);
- Imlib_free_pixmap(id, m);
+ Imlib_free_pixmap(pImlibData, p);
+ Imlib_free_pixmap(pImlibData, m);
}
void
@@ -764,7 +766,7 @@
if (m)
{
PasteMask(disp, d, m, x, y, w, h);
- Imlib_free_pixmap(id, m);
+ Imlib_free_pixmap(pImlibData, m);
}
else
{
@@ -773,7 +775,7 @@
XFillRectangle(disp, d, gc, x, y, w, h);
XFreeGC(disp, gc);
}
- Imlib_free_pixmap(id, p);
+ Imlib_free_pixmap(pImlibData, p);
}
void
@@ -826,12 +828,12 @@
h = mh;
}
}
- Imlib_render(id, im, w, h);
- ewin->icon_pmap = Imlib_copy_image(id, im);
- ewin->icon_mask = Imlib_copy_mask(id, im);
+ Imlib_render(pImlibData, im, w, h);
+ ewin->icon_pmap = Imlib_copy_image(pImlibData, im);
+ ewin->icon_mask = Imlib_copy_mask(pImlibData, im);
ewin->icon_pmap_w = w;
ewin->icon_pmap_h = h;
- Imlib_destroy_image(id, im);
+ Imlib_destroy_image(pImlibData, im);
}
}
}
@@ -1151,9 +1153,9 @@
{
/* free whatever we had before */
if (ewin->icon_pmap)
- Imlib_free_pixmap(id, ewin->icon_pmap);
+ Imlib_free_pixmap(pImlibData, ewin->icon_pmap);
if (ewin->icon_mask)
- Imlib_free_pixmap(id, ewin->icon_mask);
+ Imlib_free_pixmap(pImlibData, ewin->icon_mask);
ewin->icon_pmap = 0;
ewin->icon_mask = 0;
@@ -2041,7 +2043,8 @@
EResizeWindow(disp, ib->win, w, h);
ICCCM_Configure(ib->ewin);
EFreePixmap(disp, ib->pmap);
- ib->pmap = ECreatePixmap(disp, ib->icon_win, w, h, id->x.depth);
+ ib->pmap =
+ ECreatePixmap(disp, ib->icon_win, w, h, pImlibData->x.depth);
}
ib->w = w;
ib->h = h;
@@ -2118,8 +2121,8 @@
EShapeCombineMask(disp, ib->icon_win, ShapeBounding, 0, 0,
mask, ShapeSet);
PastePixmap(disp, ib->pmap, pmap, mask, 0, 0);
- Imlib_free_pixmap(id, pmap);
- Imlib_free_pixmap(id, mask);
+ Imlib_free_pixmap(pImlibData, pmap);
+ Imlib_free_pixmap(pImlibData, mask);
}
}
else
@@ -2246,8 +2249,8 @@
EShapeCombineMask(disp, ib->icon_win, ShapeBounding, 0, 0,
mask, ShapeSet);
PastePixmap(disp, ib->pmap, pmap, mask, 0, 0);
- Imlib_free_pixmap(id, pmap);
- Imlib_free_pixmap(id, mask);
+ Imlib_free_pixmap(pImlibData, pmap);
+ Imlib_free_pixmap(pImlibData, mask);
}
}
else
@@ -2336,7 +2339,7 @@
return;
EResizeWindow(disp, ib->win, w, h);
EFreePixmap(disp, ib->pmap);
- ib->pmap = ECreatePixmap(disp, ib->icon_win, w, h, id->x.depth);
+ ib->pmap = ECreatePixmap(disp, ib->icon_win, w, h, pImlibData->x.depth);
ib->w = w;
ib->h = h;
RedrawIconbox(ib);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ipc.c,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -3 -r1.108 -r1.109
--- ipc.c 12 Jul 2003 08:52:14 -0000 1.108
+++ ipc.c 12 Jul 2003 15:04:31 -0000 1.109
@@ -1809,7 +1809,7 @@
word(params, 3, param3);
p = (Pixmap) strtol(param3, (char **)NULL, 0);
- Imlib_free_pixmap(id, p);
+ Imlib_free_pixmap(pImlibData, p);
}
else if (!strcmp(param2, "get_padding"))
{
@@ -1843,14 +1843,14 @@
iclass->norm.normal->real_file =
FindFile(iclass->norm.normal->im_file);
if (iclass->norm.normal->real_file)
- im = Imlib_load_image(id,
+ im = Imlib_load_image(pImlibData,
iclass->norm.
normal->real_file);
if (im)
{
Esnprintf(buf, sizeof(buf), "%i %i",
im->rgb_width, im->rgb_height);
- Imlib_destroy_image(id, im);
+ Imlib_destroy_image(pImlibData, im);
}
else
Esnprintf(buf, sizeof(buf),
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/menus.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -3 -r1.85 -r1.86
--- menus.c 8 Jul 2003 02:32:40 -0000 1.85
+++ menus.c 12 Jul 2003 15:04:32 -0000 1.86
@@ -588,9 +588,9 @@
for (j = 0; j < 3; j++)
{
if (m->items[i]->pmap[j])
- Imlib_free_pixmap(id, m->items[i]->pmap[j]);
+ Imlib_free_pixmap(pImlibData, m->items[i]->pmap[j]);
if (m->items[i]->mask[j])
- Imlib_free_pixmap(id, m->items[i]->mask[j]);
+ Imlib_free_pixmap(pImlibData, m->items[i]->mask[j]);
}
if (m->items[i]->icon_iclass)
m->items[i]->icon_iclass->ref_count--;
@@ -634,9 +634,9 @@
for (j = 0; j < 3; j++)
{
if (m->items[i]->pmap[j])
- Imlib_free_pixmap(id, m->items[i]->pmap[j]);
+ Imlib_free_pixmap(pImlibData, m->items[i]->pmap[j]);
if (m->items[i]->mask[j])
- Imlib_free_pixmap(id, m->items[i]->mask[j]);
+ Imlib_free_pixmap(pImlibData, m->items[i]->mask[j]);
}
if (m->items[i]->win)
EDestroyWindow(disp, m->items[i]->win);
@@ -764,7 +764,7 @@
maxh = im->rgb_height;
if (im->rgb_width > maxx2)
maxx2 = im->rgb_width;
- Imlib_destroy_image(id, im);
+ Imlib_destroy_image(pImlibData, im);
}
else
m->items[i]->icon_iclass = NULL;
@@ -933,7 +933,7 @@
if (!m->style->use_item_bg)
{
mi->pmap[(int)(mi->state)] =
- ECreatePixmap(disp, mi->win, w, h, id->x.depth);
+ ECreatePixmap(disp, mi->win, w, h, pImlibData->x.depth);
gc = XCreateGC(disp, m->pmap, 0, &gcv);
XCopyArea(disp, m->pmap, mi->pmap[(int)(mi->state)], gc, x, y,
w, h, 0, 0);
@@ -955,9 +955,9 @@
}
XCopyArea(disp, pmap, mi->pmap[(int)(mi->state)], gc, 0,
0, w, h, 0, 0);
- Imlib_free_pixmap(id, pmap);
+ Imlib_free_pixmap(pImlibData, pmap);
if (mask)
- Imlib_free_pixmap(id, mask);
+ Imlib_free_pixmap(pImlibData, mask);
}
XFreeGC(disp, gc);
}
@@ -1099,7 +1099,7 @@
word(s, 2, s2);
Esnprintf(ss, sizeof(ss), "%s/%s", dir, s2);
- im = Imlib_load_image(id, ss);
+ im = Imlib_load_image(pImlibData, ss);
if (im)
{
ImlibImage *im2;
@@ -1124,12 +1124,14 @@
h2 = (im->rgb_height * w2) /
im->rgb_width;
}
- im2 = Imlib_clone_scaled_image(id, im, w2, h2);
- Imlib_save_image_to_ppm(id, im2, s2);
- Imlib_changed_image(id, im2);
- Imlib_changed_image(id, im);
- Imlib_kill_image(id, im2);
- Imlib_kill_image(id, im);
+ im2 =
+ Imlib_clone_scaled_image(pImlibData, im, w2,
+ h2);
+ Imlib_save_image_to_ppm(pImlibData, im2, s2);
+ Imlib_changed_image(pImlibData, im2);
+ Imlib_changed_image(pImlibData, im);
+ Imlib_kill_image(pImlibData, im2);
+ Imlib_kill_image(pImlibData, im);
scr_asp = (root.w << 16) / root.h;
im_asp = (width << 16) / height;
if (width == height)
@@ -1323,7 +1325,7 @@
{
ImlibImage *im;
- im = Imlib_load_image(id, ss);
+ im = Imlib_load_image(pImlibData, ss);
if (im)
{
ImlibImage *im2;
@@ -1345,12 +1347,13 @@
w2 = maxw;
h2 = (im->rgb_height * w2) / im->rgb_width;
}
- im2 = Imlib_clone_scaled_image(id, im, w2, h2);
- Imlib_save_image_to_ppm(id, im2, s2);
- Imlib_changed_image(id, im2);
- Imlib_changed_image(id, im);
- Imlib_kill_image(id, im2);
- Imlib_kill_image(id, im);
+ im2 =
+ Imlib_clone_scaled_image(pImlibData, im, w2, h2);
+ Imlib_save_image_to_ppm(pImlibData, im2, s2);
+ Imlib_changed_image(pImlibData, im2);
+ Imlib_changed_image(pImlibData, im);
+ Imlib_kill_image(pImlibData, im2);
+ Imlib_kill_image(pImlibData, im);
scr_asp = (root.w << 16) / root.h;
im_asp = (width << 16) / height;
if (width == height)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/pager.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- pager.c 22 May 2003 19:15:02 -0000 1.41
+++ pager.c 12 Jul 2003 15:04:32 -0000 1.42
@@ -124,7 +124,7 @@
xim3 = px_buf;
}
difx = (sw / pw) / 2;
- switch (id->x.render_depth)
+ switch (pImlibData->x.render_depth)
{
case 24:
case 32:
@@ -518,9 +518,9 @@
return NULL;
if ((!did_dialog) && (SNAP))
{
- if (id->x.shm)
+ if (pImlibData->x.shm)
{
- if (!id->x.shmp)
+ if (!pImlibData->x.shmp)
{
if (XShmPixmapFormat(disp) != ZPixmap)
{
@@ -579,8 +579,9 @@
p->dw = ((48 * root.w) / root.h);
p->dh = 48;
p->win = ECreateWindow(root.win, 0, 0, p->w, p->h, 0);
- p->pmap = ECreatePixmap(disp, p->win, p->w, p->h, id->x.depth);
- p->bgpmap = ECreatePixmap(disp, p->win, p->w / ax, p->h / ay, id->x.depth);
+ p->pmap = ECreatePixmap(disp, p->win, p->w, p->h, pImlibData->x.depth);
+ p->bgpmap =
+ ECreatePixmap(disp, p->win, p->w / ax, p->h / ay, pImlibData->x.depth);
ESetWindowBackgroundPixmap(disp, p->win, p->pmap);
XSelectInput(disp, p->win,
ButtonPressMask | ButtonReleaseMask | PointerMotionMask);
@@ -623,8 +624,9 @@
p->h = h;
p->dw = w / ax;
p->dh = h / ay;
- p->pmap = ECreatePixmap(disp, p->win, p->w, p->h, id->x.depth);
- p->bgpmap = ECreatePixmap(disp, p->win, p->w / ax, p->h / ay, id->x.depth);
+ p->pmap = ECreatePixmap(disp, p->win, p->w, p->h, pImlibData->x.depth);
+ p->bgpmap =
+ ECreatePixmap(disp, p->win, p->w / ax, p->h / ay, pImlibData->x.depth);
if (p->visible)
PagerRedraw(p, 1);
ESetWindowBackgroundPixmap(disp, p->win, p->pmap);
@@ -874,10 +876,11 @@
{
ImlibImage *im;
- im = Imlib_create_image_from_drawable(id, ewin->mini_pmap, 0, 0, 0,
- ewin->mini_w, ewin->mini_h);
- Imlib_apply_image(id, im, p->hi_win);
- Imlib_kill_image(id, im);
+ im =
+ Imlib_create_image_from_drawable(pImlibData, ewin->mini_pmap, 0, 0,
+ 0, ewin->mini_w, ewin->mini_h);
+ Imlib_apply_image(pImlibData, im, p->hi_win);
+ Imlib_kill_image(pImlibData, im);
}
}
@@ -924,10 +927,11 @@
{
ImlibImage *im;
- im = Imlib_create_image_from_drawable(id, ewin->mini_pmap, 0, 0, 0,
- ewin->mini_w, ewin->mini_h);
- Imlib_apply_image(id, im, p->hi_win);
- Imlib_kill_image(id, im);
+ im =
+ Imlib_create_image_from_drawable(pImlibData, ewin->mini_pmap, 0, 0,
+ 0, ewin->mini_w, ewin->mini_h);
+ Imlib_apply_image(pImlibData, im, p->hi_win);
+ Imlib_kill_image(pImlibData, im);
}
}
@@ -974,11 +978,11 @@
r = 0;
g = 0;
b = 0;
- c1 = Imlib_best_color_match(id, &r, &g, &b);
+ c1 = Imlib_best_color_match(pImlibData, &r, &g, &b);
r = 255;
g = 255;
b = 255;
- c2 = Imlib_best_color_match(id, &r, &g, &b);
+ c2 = Imlib_best_color_match(pImlibData, &r, &g, &b);
gc = XCreateGC(disp, p->pmap, 0, &gcv);
if (gc)
{
@@ -1010,25 +1014,27 @@
(p->h / ay), uniq);
Efree(uniq);
- im = Imlib_load_image(id, s);
+ im = Imlib_load_image(pImlibData, s);
if (im)
{
EFreePixmap(disp, p->bgpmap);
- Imlib_render(id, im, (p->w / ax), (p->h / ay));
- p->bgpmap = Imlib_copy_image(id, im);
- Imlib_destroy_image(id, im);
+ Imlib_render(pImlibData, im, (p->w / ax),
+ (p->h / ay));
+ p->bgpmap = Imlib_copy_image(pImlibData, im);
+ Imlib_destroy_image(pImlibData, im);
}
else
{
- SetBackgroundTo(id, p->bgpmap,
+ SetBackgroundTo(pImlibData, p->bgpmap,
desks.desk[p->desktop].bg, 0);
- im = Imlib_create_image_from_drawable(id, p->bgpmap,
- 0, 0, 0,
- (p->w / ax),
- (p->h / ay));
- Imlib_save_image_to_ppm(id, im, s);
- Imlib_changed_image(id, im);
- Imlib_kill_image(id, im);
+ im =
+ Imlib_create_image_from_drawable(pImlibData,
+ p->bgpmap, 0, 0,
+ 0, (p->w / ax),
+ (p->h / ay));
+ Imlib_save_image_to_ppm(pImlibData, im, s);
+ Imlib_changed_image(pImlibData, im);
+ Imlib_kill_image(pImlibData, im);
}
}
else
@@ -1425,8 +1431,10 @@
ImlibImage *im;
int xx, yy, ww, hh, i;
- im = Imlib_create_image_from_drawable(id, ewin->mini_pmap, 0, 0, 0,
- ewin->mini_w, ewin->mini_h);
+ im =
+ Imlib_create_image_from_drawable(pImlibData, ewin->mini_pmap, 0,
+ 0, 0, ewin->mini_w,
+ ewin->mini_h);
if (w > h)
{
for (i = w; i < (w * 2); i++)
@@ -1437,10 +1445,10 @@
hh = (i * h) / w;
xx = x + ((w - ww) / 2);
yy = y + ((h - hh) / 2);
- Imlib_render(id, im, ww, hh);
- pmap = Imlib_move_image(id, im);
+ Imlib_render(pImlibData, im, ww, hh);
+ pmap = Imlib_move_image(pImlibData, im);
ESetWindowBackgroundPixmap(disp, p->hi_win, pmap);
- Imlib_free_pixmap(id, pmap);
+ Imlib_free_pixmap(pImlibData, pmap);
EMoveResizeWindow(disp, p->hi_win, xx, yy, ww, hh);
XClearWindow(disp, p->hi_win);
{
@@ -1450,7 +1458,7 @@
if ((px < x) || (py < y) || (px >= (x + w))
|| (py >= (y + h)))
{
- Imlib_kill_image(id, im);
+ Imlib_kill_image(pImlibData, im);
EUnmapWindow(disp, p->hi_win);
return;
}
@@ -1467,10 +1475,10 @@
hh = i;
xx = x + ((w - ww) / 2);
yy = y + ((h - hh) / 2);
- Imlib_render(id, im, ww, hh);
- pmap = Imlib_move_image(id, im);
+ Imlib_render(pImlibData, im, ww, hh);
+ pmap = Imlib_move_image(pImlibData, im);
ESetWindowBackgroundPixmap(disp, p->hi_win, pmap);
- Imlib_free_pixmap(id, pmap);
+ Imlib_free_pixmap(pImlibData, pmap);
EMoveResizeWindow(disp, p->hi_win, xx, yy, ww, hh);
XClearWindow(disp, p->hi_win);
{
@@ -1480,7 +1488,7 @@
if ((px < x) || (py < y) || (px >= (x + w))
|| (py >= (y + h)))
{
- Imlib_kill_image(id, im);
+ Imlib_kill_image(pImlibData, im);
EUnmapWindow(disp, p->hi_win);
return;
}
@@ -1489,8 +1497,8 @@
}
EMoveResizeWindow(disp, p->hi_win, x - (w / 2), y - (h / 2), w * 2,
h * 2);
- Imlib_apply_image(id, im, p->hi_win);
- Imlib_kill_image(id, im);
+ Imlib_apply_image(pImlibData, im, p->hi_win);
+ Imlib_kill_image(pImlibData, im);
}
else if (ic)
{
@@ -1564,11 +1572,11 @@
r = 0;
g = 0;
b = 0;
- c1 = Imlib_best_color_match(id, &r, &g, &b);
+ c1 = Imlib_best_color_match(pImlibData, &r, &g, &b);
r = 255;
g = 255;
b = 255;
- c2 = Imlib_best_color_match(id, &r, &g, &b);
+ c2 = Imlib_best_color_match(pImlibData, &r, &g, &b);
pmap = ECreatePixmap(disp, p->hi_win, w * 2, h * 2, root.depth);
ESetWindowBackgroundPixmap(disp, p->hi_win, pmap);
if (!gc)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/scursor.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- scursor.c 22 May 2003 19:15:02 -0000 1.41
+++ scursor.c 12 Jul 2003 15:04:32 -0000 1.42
@@ -338,17 +338,17 @@
im = ELoadImage(file);
if (im)
{
- Imlib_render(id, im, im->rgb_width, im->rgb_height);
- pmap = Imlib_move_image(id, im);
- mask = Imlib_move_mask(id, im);
+ Imlib_render(pImlibData, im, im->rgb_width, im->rgb_height);
+ pmap = Imlib_move_image(pImlibData, im);
+ mask = Imlib_move_mask(pImlibData, im);
if (pmap)
{
ESetWindowBackgroundPixmap(disp, sc_window, pmap);
EShapeCombineMask(disp, sc_window, ShapeBounding, 0, 0, mask,
ShapeSet);
}
- Imlib_free_pixmap(id, pmap);
- Imlib_destroy_image(id, im);
+ Imlib_free_pixmap(pImlibData, pmap);
+ Imlib_destroy_image(pImlibData, im);
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/settings.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -3 -r1.71 -r1.72
--- settings.c 22 May 2003 19:15:02 -0000 1.71
+++ settings.c 12 Jul 2003 15:04:32 -0000 1.72
@@ -1066,7 +1066,7 @@
pmap = ECreatePixmap(disp, wins[i], 64, 48, root.depth);
ESetWindowBackgroundPixmap(disp, wins[i], pmap);
- SetBackgroundTo(id, pmap, desks.desk[i].bg, 0);
+ SetBackgroundTo(pImlibData, pmap, desks.desk[i].bg, 0);
EFreePixmap(disp, pmap);
}
}
@@ -1254,7 +1254,7 @@
{
IclassApplyCopy(ic, awin, 18, 14, 0, 0, STATE_NORMAL, &pmap, NULL);
ESetWindowBackgroundPixmap(disp, awin, pmap);
- Imlib_free_pixmap(id, pmap);
+ Imlib_free_pixmap(pImlibData, pmap);
}
XClearWindow(disp, awin);
called = 1;
@@ -2491,7 +2491,7 @@
if (!tmp_bg_image)
RemoveImagesFromBG(tmp_bg);
if (tmp_bg->pmap)
- Imlib_free_pixmap(id, tmp_bg->pmap);
+ Imlib_free_pixmap(pImlibData, tmp_bg->pmap);
tmp_bg->pmap = 0;
for (i = 0; i < ENLIGHTENMENT_CONF_NUM_DESKTOPS; i++)
{
@@ -2516,10 +2516,11 @@
Esnprintf(s, sizeof(s), "%s/cached/bgsel/%s", UserCacheDir(),
tmp_bg->name);
p2 = ECreatePixmap(disp, root.win, 64, 48, root.depth);
- SetBackgroundTo(id, p2, tmp_bg, 0);
- im = Imlib_create_image_from_drawable(id, p2, 0, 0, 0, 64, 48);
- Imlib_save_image_to_ppm(id, im, s);
- Imlib_kill_image(id, im);
+ SetBackgroundTo(pImlibData, p2, tmp_bg, 0);
+ im =
+ Imlib_create_image_from_drawable(pImlibData, p2, 0, 0, 0, 64, 48);
+ Imlib_save_image_to_ppm(pImlibData, im, s);
+ Imlib_kill_image(pImlibData, im);
EFreePixmap(disp, p2);
BG_RedrawView(1);
}
@@ -2587,7 +2588,7 @@
else
{
if (tbg->pmap)
- Imlib_free_pixmap(id, tbg->pmap);
+ Imlib_free_pixmap(pImlibData, tbg->pmap);
tbg->bg.solid.r = tmp_bg_r;
tbg->bg.solid.g = tmp_bg_g;
tbg->bg.solid.b = tmp_bg_b;
@@ -2599,7 +2600,7 @@
else
{
if (tbg->bg.im)
- Imlib_destroy_image(id, tbg->bg.im);
+ Imlib_destroy_image(pImlibData, tbg->bg.im);
tbg->bg.im = NULL;
}
if (tbg->bg.real_file)
@@ -2615,7 +2616,7 @@
KeepBGimages(tbg, 1);
pmap = ECreatePixmap(disp, win, w, h, root.depth);
ESetWindowBackgroundPixmap(disp, win, pmap);
- SetBackgroundTo(id, pmap, tbg, 0);
+ SetBackgroundTo(pImlibData, pmap, tbg, 0);
XClearWindow(disp, win);
EFreePixmap(disp, pmap);
val = 0;
@@ -2941,7 +2942,7 @@
STATE_NORMAL, &pbg, NULL);
XCopyArea(disp, pbg, pmap, gc, 0, 0, 64 + 8, 48 + 8, x,
0);
- Imlib_free_pixmap(id, pbg);
+ Imlib_free_pixmap(pImlibData, pbg);
}
if (!strcmp(bglist[i]->name, "NONE"))
{
@@ -2969,29 +2970,33 @@
{
Esnprintf(s, sizeof(s), "%s/cached/bgsel/%s",
UserCacheDir(), bglist[i]->name);
- p2 = ECreatePixmap(disp, pmap, 64, 48, id->x.depth);
- SetBackgroundTo(id, p2, bglist[i], 0);
+ p2 =
+ ECreatePixmap(disp, pmap, 64, 48,
+ pImlibData->x.depth);
+ SetBackgroundTo(pImlibData, p2, bglist[i], 0);
XCopyArea(disp, p2, pmap, gc, 0, 0, 64, 48, x + 4,
4);
- im = Imlib_create_image_from_drawable(id, p2, 0, 0,
- 0, 64, 48);
- Imlib_save_image_to_ppm(id, im, s);
- Imlib_kill_image(id, im);
+ im =
+ Imlib_create_image_from_drawable(pImlibData, p2,
+ 0, 0, 0, 64,
+ 48);
+ Imlib_save_image_to_ppm(pImlibData, im, s);
+ Imlib_kill_image(pImlibData, im);
EFreePixmap(disp, p2);
}
else
{
if (nuke_old)
{
- Imlib_changed_image(id, im);
- Imlib_kill_image(id, im);
+ Imlib_changed_image(pImlibData, im);
+ Imlib_kill_image(pImlibData, im);
im = ELoadImage(s);
}
if (im)
{
- Imlib_paste_image(id, im, pmap, x + 4, 4, 64,
- 48);
- Imlib_destroy_image(id, im);
+ Imlib_paste_image(pImlibData, im, pmap, x + 4,
+ 4, 64, 48);
+ Imlib_destroy_image(pImlibData, im);
}
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/setup.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -3 -r1.88 -r1.89
--- setup.c 12 Jul 2003 14:34:14 -0000 1.88
+++ setup.c 12 Jul 2003 15:04:32 -0000 1.89
@@ -319,8 +319,8 @@
/* record the event base for shape change events */
event_base_shape = shape_event_base;
/* initialise imlib */
- id = Imlib_init(disp);
- if (!id)
+ pImlibData = Imlib_init(disp);
+ if (!pImlibData)
{
ASSIGN_ALERT(_("Imlib initialisation error"), "", "",
_("Quit Enlightenment"));
@@ -332,7 +332,7 @@
EExit((void *)1);
}
#if USE_FNLIB
- pFnlibData = Fnlib_init(id);
+ pFnlibData = Fnlib_init(pImlibData);
if (!pFnlibData)
{
ASSIGN_ALERT(_("X server setup error"), "", "",
@@ -345,10 +345,10 @@
EExit((void *)1);
}
#endif
- root.win = id->x.root;
- root.vis = Imlib_get_visual(id);
- root.depth = id->x.depth;
- root.cmap = Imlib_get_colormap(id);
+ root.win = pImlibData->x.root;
+ root.vis = Imlib_get_visual(pImlibData);
+ root.depth = pImlibData->x.depth;
+ root.cmap = Imlib_get_colormap(pImlibData);
root.w = DisplayWidth(disp, root.scr);
root.h = DisplayHeight(disp, root.scr);
root.focuswin = ECreateFocusWindow(root.win, -100, -100, 5, 5);
@@ -359,10 +359,12 @@
p.flags = PARAMS_VISUALID;
p.visualid = XVisualIDFromVisual(DefaultVisual(disp, root.scr));
- ird = Imlib_init_with_params(disp, &p);
+ prImlibData = Imlib_init_with_params(disp, &p);
}
else
- ird = NULL;
+ {
+ prImlibData = NULL;
+ }
/* just in case - set them up again */
/* set up an error handler for then E would normally have fatal X errors */
XSetErrorHandler((XErrorHandler) EHandleXError);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/startup.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- startup.c 12 Jul 2003 09:28:56 -0000 1.25
+++ startup.c 12 Jul 2003 15:04:32 -0000 1.26
@@ -219,10 +219,10 @@
IclassApply(ic, b1, root.w, desks.dragbar_width, 0, 0, 0, 0);
IclassApply(ic, b2, root.w, desks.dragbar_width, 0, 0, 0, 0);
queue_up = pq;
- SetBackgroundTo(id, win1, bg, 1);
- SetBackgroundTo(id, win2, bg, 1);
+ SetBackgroundTo(pImlibData, win1, bg, 1);
+ SetBackgroundTo(pImlibData, win2, bg, 1);
if (bg->pmap)
- Imlib_free_pixmap(id, bg->pmap);
+ Imlib_free_pixmap(pImlibData, bg->pmap);
bg->pmap = 0;
init_win1 = w1;
init_win2 = w2;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/text.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- text.c 12 Jul 2003 14:34:14 -0000 1.21
+++ text.c 12 Jul 2003 15:04:32 -0000 1.22
@@ -429,11 +429,12 @@
g = ts->bg_col.g;
b = ts->bg_col.b;
XSetForeground(disp, gc,
- Imlib_best_color_match(id, &r, &g, &b));
+ Imlib_best_color_match(pImlibData, &r, &g,
+ &b));
EFont_draw_string(disp, drawable, gc, offset_x + 1,
offset_y + 1, lines[i], ts->efont,
- Imlib_get_visual(id),
- Imlib_get_colormap(id));
+ Imlib_get_visual(pImlibData),
+ Imlib_get_colormap(pImlibData));
}
else if (ts->effect == 2)
{
@@ -441,27 +442,33 @@
g = ts->bg_col.g;
b = ts->bg_col.b;
XSetForeground(disp, gc,
- Imlib_best_color_match(id, &r, &g, &b));
+ Imlib_best_color_match(pImlibData, &r, &g,
+ &b));
EFont_draw_string(disp, drawable, gc, offset_x - 1, offset_y,
- lines[i], ts->efont, Imlib_get_visual(id),
- Imlib_get_colormap(id));
+ lines[i], ts->efont,
+ Imlib_get_visual(pImlibData),
+ Imlib_get_colormap(pImlibData));
EFont_draw_string(disp, drawable, gc, offset_x + 1, offset_y,
- lines[i], ts->efont, Imlib_get_visual(id),
- Imlib_get_colormap(id));
+ lines[i], ts->efont,
+ Imlib_get_visual(pImlibData),
+ Imlib_get_colormap(pImlibData));
EFont_draw_string(disp, drawable, gc, offset_x, offset_y - 1,
- lines[i], ts->efont, Imlib_get_visual(id),
- Imlib_get_colormap(id));
+ lines[i], ts->efont,
+ Imlib_get_visual(pImlibData),
+ Imlib_get_colormap(pImlibData));
EFont_draw_string(disp, drawable, gc, offset_x, offset_y + 1,
- lines[i], ts->efont, Imlib_get_visual(id),
- Imlib_get_colormap(id));
+ lines[i], ts->efont,
+ Imlib_get_visual(pImlibData),
+ Imlib_get_colormap(pImlibData));
}
r = ts->fg_col.r;
g = ts->fg_col.g;
b = ts->fg_col.b;
- XSetForeground(disp, gc, Imlib_best_color_match(id, &r, &g, &b));
+ XSetForeground(disp, gc,
+ Imlib_best_color_match(pImlibData, &r, &g, &b));
EFont_draw_string(disp, drawable, gc, offset_x, offset_y, lines[i],
- ts->efont, Imlib_get_visual(id),
- Imlib_get_colormap(id));
+ ts->efont, Imlib_get_visual(pImlibData),
+ Imlib_get_colormap(pImlibData));
TextDrawRotBack(win, drawable, xx - 1, yy - 1 - ascent, wid + 2,
ascent + descent + 2, ts);
@@ -586,7 +593,8 @@
g = ts->bg_col.g;
b = ts->bg_col.b;
XSetForeground(disp, gc,
- Imlib_best_color_match(id, &r, &g, &b));
+ Imlib_best_color_match(pImlibData, &r, &g,
+ &b));
XmbDrawString(disp, drawable, ts->xfontset, gc, offset_x + 1,
offset_y + 1, lines[i], strlen(lines[i]));
}
@@ -596,7 +604,8 @@
g = ts->bg_col.g;
b = ts->bg_col.b;
XSetForeground(disp, gc,
- Imlib_best_color_match(id, &r, &g, &b));
+ Imlib_best_color_match(pImlibData, &r, &g,
+ &b));
XmbDrawString(disp, drawable, ts->xfontset, gc, offset_x - 1,
offset_y, lines[i], strlen(lines[i]));
XmbDrawString(disp, drawable, ts->xfontset, gc, offset_x + 1,
@@ -609,7 +618,8 @@
r = ts->fg_col.r;
g = ts->fg_col.g;
b = ts->fg_col.b;
- XSetForeground(disp, gc, Imlib_best_color_match(id, &r, &g, &b));
+ XSetForeground(disp, gc,
+ Imlib_best_color_match(pImlibData, &r, &g, &b));
XmbDrawString(disp, drawable, ts->xfontset, gc, offset_x, offset_y,
lines[i], strlen(lines[i]));
@@ -689,7 +699,8 @@
g = ts->bg_col.g;
b = ts->bg_col.b;
XSetForeground(disp, gc,
- Imlib_best_color_match(id, &r, &g, &b));
+ Imlib_best_color_match(pImlibData, &r, &g,
+ &b));
XDrawString(disp, drawable, gc, offset_x + 1, offset_y + 1,
lines[i], strlen(lines[i]));
}
@@ -699,7 +710,8 @@
g = ts->bg_col.g;
b = ts->bg_col.b;
XSetForeground(disp, gc,
- Imlib_best_color_match(id, &r, &g, &b));
+ Imlib_best_color_match(pImlibData, &r, &g,
+ &b));
XDrawString(disp, drawable, gc, offset_x - 1, offset_y,
lines[i], strlen(lines[i]));
XDrawString(disp, drawable, gc, offset_x + 1, offset_y,
@@ -712,7 +724,8 @@
r = ts->fg_col.r;
g = ts->fg_col.g;
b = ts->fg_col.b;
- XSetForeground(disp, gc, Imlib_best_color_match(id, &r, &g, &b));
+ XSetForeground(disp, gc,
+ Imlib_best_color_match(pImlibData, &r, &g, &b));
XDrawString(disp, drawable, gc, offset_x, offset_y, lines[i],
strlen(lines[i]));
@@ -794,7 +807,8 @@
g = ts->bg_col.g;
b = ts->bg_col.b;
XSetForeground(disp, gc,
- Imlib_best_color_match(id, &r, &g, &b));
+ Imlib_best_color_match(pImlibData, &r, &g,
+ &b));
XDrawString16(disp, drawable, gc, offset_x + 1, offset_y + 1,
(XChar2b *) lines[i], strlen(lines[i]) / 2);
}
@@ -804,7 +818,8 @@
g = ts->bg_col.g;
b = ts->bg_col.b;
XSetForeground(disp, gc,
- Imlib_best_color_match(id, &r, &g, &b));
+ Imlib_best_color_match(pImlibData, &r, &g,
+ &b));
XDrawString16(disp, drawable, gc, offset_x - 1, offset_y,
(XChar2b *) lines[i], strlen(lines[i]) / 2);
XDrawString16(disp, drawable, gc, offset_y + 1, offset_y,
@@ -817,7 +832,8 @@
r = ts->fg_col.r;
g = ts->fg_col.g;
b = ts->fg_col.b;
- XSetForeground(disp, gc, Imlib_best_color_match(id, &r, &g, &b));
+ XSetForeground(disp, gc,
+ Imlib_best_color_match(pImlibData, &r, &g, &b));
XDrawString16(disp, drawable, gc, offset_x, offset_y,
(XChar2b *) lines[i], strlen(lines[i]) / 2);
@@ -843,31 +859,32 @@
switch (ts->style.orientation)
{
case FONT_TO_UP:
- ii = Imlib_create_image_from_drawable(id, win, 0, y, x, h, w);
- Imlib_rotate_image(id, ii, 1);
- Imlib_flip_image_horizontal(id, ii);
- Imlib_paste_image(id, ii, *drawable, 0, 0, w, h);
+ ii = Imlib_create_image_from_drawable(pImlibData, win, 0, y, x, h, w);
+ Imlib_rotate_image(pImlibData, ii, 1);
+ Imlib_flip_image_horizontal(pImlibData, ii);
+ Imlib_paste_image(pImlibData, ii, *drawable, 0, 0, w, h);
break;
case FONT_TO_DOWN:
EGetGeometry(disp, win, &(root.win), &win_x, &win_y, &win_w, &win_h,
&win_b, &win_d);
- ii = Imlib_create_image_from_drawable(id, win, 0, win_w - y - h, x, h,
- w);
- Imlib_rotate_image(id, ii, -1);
- Imlib_flip_image_vertical(id, ii);
- Imlib_paste_image(id, ii, *drawable, 0, 0, w, h);
+ ii =
+ Imlib_create_image_from_drawable(pImlibData, win, 0, win_w - y - h,
+ x, h, w);
+ Imlib_rotate_image(pImlibData, ii, -1);
+ Imlib_flip_image_vertical(pImlibData, ii);
+ Imlib_paste_image(pImlibData, ii, *drawable, 0, 0, w, h);
break;
case FONT_TO_LEFT: /* Holy carumba! That's for yoga addicts, maybe .... */
- ii = Imlib_create_image_from_drawable(id, win, 0, x, y, w, h);
- Imlib_flip_image_vertical(id, ii);
- Imlib_flip_image_horizontal(id, ii);
- Imlib_paste_image(id, ii, *drawable, 0, 0, w, h);
+ ii = Imlib_create_image_from_drawable(pImlibData, win, 0, x, y, w, h);
+ Imlib_flip_image_vertical(pImlibData, ii);
+ Imlib_flip_image_horizontal(pImlibData, ii);
+ Imlib_paste_image(pImlibData, ii, *drawable, 0, 0, w, h);
break;
default:
break;
}
if (ii)
- Imlib_destroy_image(id, ii);
+ Imlib_destroy_image(pImlibData, ii);
}
void
@@ -881,28 +898,34 @@
switch (ts->style.orientation)
{
case FONT_TO_UP:
- ii = Imlib_create_image_from_drawable(id, drawable, 0, 0, 0, w, h);
- Imlib_rotate_image(id, ii, -1);
- Imlib_flip_image_vertical(id, ii);
- Imlib_paste_image(id, ii, win, y, x, h, w);
+ ii =
+ Imlib_create_image_from_drawable(pImlibData, drawable, 0, 0, 0, w,
+ h);
+ Imlib_rotate_image(pImlibData, ii, -1);
+ Imlib_flip_image_vertical(pImlibData, ii);
+ Imlib_paste_image(pImlibData, ii, win, y, x, h, w);
break;
case FONT_TO_DOWN:
EGetGeometry(disp, win, &(root.win), &win_x, &win_y, &win_w, &win_h,
&win_b, &win_d);
- ii = Imlib_create_image_from_drawable(id, drawable, 0, 0, 0, w, h);
- Imlib_rotate_image(id, ii, 1);
- Imlib_flip_image_horizontal(id, ii);
- Imlib_paste_image(id, ii, win, win_w - y - h, x, h, w);
+ ii =
+ Imlib_create_image_from_drawable(pImlibData, drawable, 0, 0, 0, w,
+ h);
+ Imlib_rotate_image(pImlibData, ii, 1);
+ Imlib_flip_image_horizontal(pImlibData, ii);
+ Imlib_paste_image(pImlibData, ii, win, win_w - y - h, x, h, w);
break;
case FONT_TO_LEFT: /* Holy carumba! That's for yoga addicts, maybe .... */
- ii = Imlib_create_image_from_drawable(id, drawable, 0, 0, 0, w, h);
- Imlib_flip_image_vertical(id, ii);
- Imlib_flip_image_horizontal(id, ii);
- Imlib_paste_image(id, ii, win, x, y, w, h);
+ ii =
+ Imlib_create_image_from_drawable(pImlibData, drawable, 0, 0, 0, w,
+ h);
+ Imlib_flip_image_vertical(pImlibData, ii);
+ Imlib_flip_image_horizontal(pImlibData, ii);
+ Imlib_paste_image(pImlibData, ii, win, x, y, w, h);
break;
default:
break;
}
if (ii)
- Imlib_destroy_image(id, ii);
+ Imlib_destroy_image(pImlibData, ii);
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/tooltips.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -3 -r1.49 -r1.50
--- tooltips.c 11 Jul 2003 17:44:15 -0000 1.49
+++ tooltips.c 12 Jul 2003 15:04:32 -0000 1.50
@@ -450,7 +450,7 @@
{
iw = im->rgb_width;
ih = im->rgb_height;
- Imlib_destroy_image(id, im);
+ Imlib_destroy_image(pImlibData, im);
}
w += iw;
if (h < ih)
@@ -609,14 +609,14 @@
if (ic)
if (ic->norm.normal->im)
{
- Imlib_render(id, ic->norm.normal->im,
+ Imlib_render(pImlibData, ic->norm.normal->im,
ic->norm.normal->im->rgb_width,
ic->norm.normal->im->rgb_height);
PastePixmap(disp, tt->win,
- Imlib_copy_image(id,
+ Imlib_copy_image(pImlibData,
ic->norm.
normal->im),
- Imlib_copy_mask(id,
+ Imlib_copy_mask(pImlibData,
ic->norm.normal->im),
x, y);
x += ic->norm.normal->im->rgb_width;
@@ -631,14 +631,14 @@
if (ic)
if (ic->norm.normal->im)
{
- Imlib_render(id, ic->norm.normal->im,
+ Imlib_render(pImlibData, ic->norm.normal->im,
ic->norm.normal->im->rgb_width,
ic->norm.normal->im->rgb_height);
PastePixmap(disp, tt->win,
- Imlib_copy_image(id,
+ Imlib_copy_image(pImlibData,
ic->norm.
normal->im),
- Imlib_copy_mask(id,
+ Imlib_copy_mask(pImlibData,
ic->norm.
normal->im), x,
y);
@@ -651,14 +651,14 @@
if (ic)
if (ic->norm.normal->im)
{
- Imlib_render(id, ic->norm.normal->im,
+ Imlib_render(pImlibData, ic->norm.normal->im,
ic->norm.normal->im->rgb_width,
ic->norm.normal->im->rgb_height);
PastePixmap(disp, tt->win,
- Imlib_copy_image(id,
+ Imlib_copy_image(pImlibData,
ic->norm.
normal->im),
- Imlib_copy_mask(id,
+ Imlib_copy_mask(pImlibData,
ic->norm.
normal->im), x,
y);
@@ -671,14 +671,14 @@
if (ic)
if (ic->norm.normal->im)
{
- Imlib_render(id, ic->norm.normal->im,
+ Imlib_render(pImlibData, ic->norm.normal->im,
ic->norm.normal->im->rgb_width,
ic->norm.normal->im->rgb_height);
PastePixmap(disp, tt->win,
- Imlib_copy_image(id,
+ Imlib_copy_image(pImlibData,
ic->norm.
normal->im),
- Imlib_copy_mask(id,
+ Imlib_copy_mask(pImlibData,
ic->norm.
normal->im), x,
y);
@@ -691,14 +691,14 @@
if (ic)
if (ic->norm.normal->im)
{
- Imlib_render(id, ic->norm.normal->im,
+ Imlib_render(pImlibData, ic->norm.normal->im,
ic->norm.normal->im->rgb_width,
ic->norm.normal->im->rgb_height);
PastePixmap(disp, tt->win,
- Imlib_copy_image(id,
+ Imlib_copy_image(pImlibData,
ic->norm.
normal->im),
- Imlib_copy_mask(id,
+ Imlib_copy_mask(pImlibData,
ic->norm.
normal->im), x,
y);
@@ -711,14 +711,14 @@
if (ic)
if (ic->norm.normal->im)
{
- Imlib_render(id, ic->norm.normal->im,
+ Imlib_render(pImlibData, ic->norm.normal->im,
ic->norm.normal->im->rgb_width,
ic->norm.normal->im->rgb_height);
PastePixmap(disp, tt->win,
- Imlib_copy_image(id,
+ Imlib_copy_image(pImlibData,
ic->norm.
normal->im),
- Imlib_copy_mask(id,
+ Imlib_copy_mask(pImlibData,
ic->norm.
normal->im), x,
y);
@@ -738,19 +738,19 @@
if (ic)
if (ic->norm.normal->im)
{
- Imlib_render(id, ic->norm.normal->im,
+ Imlib_render(pImlibData,
+ ic->norm.normal->im,
ic->norm.normal->im->rgb_width,
- ic->norm.normal->
- im->rgb_height);
+ ic->norm.normal->im->
+ rgb_height);
PastePixmap(disp, tt->win,
- Imlib_copy_image(id,
- ic->
- norm.normal->
- im),
- Imlib_copy_mask(id,
- ic->
- norm.normal->
- im), x, y);
+ Imlib_copy_image(pImlibData,
+ ic->norm.
+ normal->im),
+ Imlib_copy_mask(pImlibData,
+ ic->norm.
+ normal->im), x,
+ y);
x += ic->norm.normal->im->rgb_width;
}
}
@@ -761,19 +761,19 @@
if (ic)
if (ic->norm.normal->im)
{
- Imlib_render(id, ic->norm.normal->im,
+ Imlib_render(pImlibData,
+ ic->norm.normal->im,
ic->norm.normal->im->rgb_width,
- ic->norm.normal->
- im->rgb_height);
+ ic->norm.normal->im->
+ rgb_height);
PastePixmap(disp, tt->win,
- Imlib_copy_image(id,
- ic->
- norm.normal->
- im),
- Imlib_copy_mask(id,
- ic->
- norm.normal->
- im), x, y);
+ Imlib_copy_image(pImlibData,
+ ic->norm.
+ normal->im),
+ Imlib_copy_mask(pImlibData,
+ ic->norm.
+ normal->im), x,
+ y);
x += ic->norm.normal->im->rgb_width;
}
}
@@ -784,19 +784,19 @@
if (ic)
if (ic->norm.normal->im)
{
- Imlib_render(id, ic->norm.normal->im,
+ Imlib_render(pImlibData,
+ ic->norm.normal->im,
ic->norm.normal->im->rgb_width,
- ic->norm.normal->
- im->rgb_height);
+ ic->norm.normal->im->
+ rgb_height);
PastePixmap(disp, tt->win,
- Imlib_copy_image(id,
- ic->
- norm.normal->
- im),
- Imlib_copy_mask(id,
- ic->
- norm.normal->
- im), x, y);
+ Imlib_copy_image(pImlibData,
+ ic->norm.
+ normal->im),
+ Imlib_copy_mask(pImlibData,
+ ic->norm.
+ normal->im), x,
+ y);
x += ic->norm.normal->im->rgb_width;
}
}
@@ -807,19 +807,19 @@
if (ic)
if (ic->norm.normal->im)
{
- Imlib_render(id, ic->norm.normal->im,
+ Imlib_render(pImlibData,
+ ic->norm.normal->im,
ic->norm.normal->im->rgb_width,
- ic->norm.normal->
- im->rgb_height);
+ ic->norm.normal->im->
+ rgb_height);
PastePixmap(disp, tt->win,
- Imlib_copy_image(id,
- ic->
- norm.normal->
- im),
- Imlib_copy_mask(id,
- ic->
- norm.normal->
- im), x, y);
+ Imlib_copy_image(pImlibData,
+ ic->norm.
+ normal->im),
+ Imlib_copy_mask(pImlibData,
+ ic->norm.
+ normal->im), x,
+ y);
x += ic->norm.normal->im->rgb_width;
}
}
@@ -830,19 +830,19 @@
if (ic)
if (ic->norm.normal->im)
{
- Imlib_render(id, ic->norm.normal->im,
+ Imlib_render(pImlibData,
+ ic->norm.normal->im,
ic->norm.normal->im->rgb_width,
- ic->norm.normal->
- im->rgb_height);
+ ic->norm.normal->im->
+ rgb_height);
PastePixmap(disp, tt->win,
- Imlib_copy_image(id,
- ic->
- norm.normal->
- im),
- Imlib_copy_mask(id,
- ic->
- norm.normal->
- im), x, y);
+ Imlib_copy_image(pImlibData,
+ ic->norm.
+ normal->im),
+ Imlib_copy_mask(pImlibData,
+ ic->norm.
+ normal->im), x,
+ y);
x += ic->norm.normal->im->rgb_width;
}
}
@@ -853,19 +853,19 @@
if (ic)
if (ic->norm.normal->im)
{
- Imlib_render(id, ic->norm.normal->im,
+ Imlib_render(pImlibData,
+ ic->norm.normal->im,
ic->norm.normal->im->rgb_width,
- ic->norm.normal->
- im->rgb_height);
+ ic->norm.normal->im->
+ rgb_height);
PastePixmap(disp, tt->win,
- Imlib_copy_image(id,
- ic->
- norm.normal->
- im),
- Imlib_copy_mask(id,
- ic->
- norm.normal->
- im), x, y);
+ Imlib_copy_image(pImlibData,
+ ic->norm.
+ normal->im),
+ Imlib_copy_mask(pImlibData,
+ ic->norm.
+ normal->im), x,
+ y);
x += ic->norm.normal->im->rgb_width;
}
}
@@ -876,19 +876,19 @@
if (ic)
if (ic->norm.normal->im)
{
- Imlib_render(id, ic->norm.normal->im,
+ Imlib_render(pImlibData,
+ ic->norm.normal->im,
ic->norm.normal->im->rgb_width,
- ic->norm.normal->
- im->rgb_height);
+ ic->norm.normal->im->
+ rgb_height);
PastePixmap(disp, tt->win,
- Imlib_copy_image(id,
- ic->
- norm.normal->
- im),
- Imlib_copy_mask(id,
- ic->
- norm.normal->
- im), x, y);
+ Imlib_copy_image(pImlibData,
+ ic->norm.
+ normal->im),
+ Imlib_copy_mask(pImlibData,
+ ic->norm.
+ normal->im), x,
+ y);
x += ic->norm.normal->im->rgb_width;
}
}
@@ -899,19 +899,19 @@
if (ic)
if (ic->norm.normal->im)
{
- Imlib_render(id, ic->norm.normal->im,
+ Imlib_render(pImlibData,
+ ic->norm.normal->im,
ic->norm.normal->im->rgb_width,
- ic->norm.normal->
- im->rgb_height);
+ ic->norm.normal->im->
+ rgb_height);
PastePixmap(disp, tt->win,
- Imlib_copy_image(id,
- ic->
- norm.normal->
- im),
- Imlib_copy_mask(id,
- ic->
- norm.normal->
- im), x, y);
+ Imlib_copy_image(pImlibData,
+ ic->norm.
+ normal->im),
+ Imlib_copy_mask(pImlibData,
+ ic->norm.
+ normal->im), x,
+ y);
x += ic->norm.normal->im->rgb_width;
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ttfont.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- ttfont.c 22 May 2003 19:15:03 -0000 1.23
+++ ttfont.c 12 Jul 2003 15:04:32 -0000 1.24
@@ -849,7 +849,7 @@
{
if (xatt.depth == 16)
{
- if (id->x.render_depth == 15)
+ if (pImlibData->x.render_depth == 15)
merge_text_15(xim, rmap, clipx, clipy, col);
else
merge_text_16(xim, rmap, clipx, clipy, col);
-------------------------------------------------------
This SF.Net email sponsored by: Parasoft
Error proof Web apps, automate testing & more.
Download & eval WebKing and get a free book.
www.parasoft.com/bulletproofapps1
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
