static int
_ecore_config_struct_append(Ecore_Config_Prop *sct, Ecore_Config_Prop *add)
{
- Evas_List *l;
+ Eina_List *l;
if (!sct || !add || sct->type != ECORE_CONFIG_SCT)
return ECORE_CONFIG_ERR_IGNORED;
l = sct->data;
- sct->data = evas_list_append(l, add);
+ sct->data = eina_list_append(l, add);
add->parent = sct;
return ECORE_CONFIG_ERR_SUCC;
ecore_config_struct_get(const char *key, void *data)
{
Ecore_Config_Prop *e, *f;
- Evas_List *l;
+ Eina_List *l;
unsigned char *ptr;
long argb;
default:
printf("ARGH - STRUCT coding not implemented yet\n");
}
- l = evas_list_next(l);
+ l = eina_list_next(l);
}
return ECORE_CONFIG_ERR_SUCC;
}
EAPI int ecore_evas_init(void);
EAPI int ecore_evas_shutdown(void);
-EAPI Evas_List *ecore_evas_engines_get(void);
-EAPI void ecore_evas_engines_free(Evas_List *engines);
+EAPI Eina_List *ecore_evas_engines_get(void);
+EAPI void ecore_evas_engines_free(Eina_List *engines);
EAPI Ecore_Evas *ecore_evas_new(const char *engine_name, int x, int y, int w, int h, const char *extra_options);
* strings are internal and should be considered constants, do not
* free them, to avoid problems use ecore_evas_engines_free()
*/
-EAPI Evas_List *
+EAPI Eina_List *
ecore_evas_engines_get(void)
{
const struct ecore_evas_engine *itr;
- Evas_List *lst = NULL;
+ Eina_List *lst = NULL;
for (itr = _engines; itr->name != NULL; itr++)
- lst = evas_list_append(lst, itr->name);
+ lst = eina_list_append(lst, itr->name);
return lst;
}
* Free list returned by ecore_evas_engines_get()
*/
EAPI void
-ecore_evas_engines_free(Evas_List *engines)
+ecore_evas_engines_free(Eina_List *engines)
{
- evas_list_free(engines);
+ eina_list_free(engines);
}
static Ecore_Evas *
ee2 = evas_object_data_get(ee->engine.buffer.image, "Ecore_Evas_Parent");
evas_object_del(ee->engine.buffer.image);
- ee2->sub_ecore_evas = evas_list_remove(ee2->sub_ecore_evas, ee);
+ ee2->sub_ecore_evas = eina_list_remove(ee2->sub_ecore_evas, ee);
}
else
free(ee->engine.buffer.pixels);
void
_ecore_evas_buffer_render(Ecore_Evas *ee)
{
- Evas_List *updates, *l, *ll;
+ Eina_List *updates, *l, *ll;
+ Ecore_Evas *ee2;
- for (ll = ee->sub_ecore_evas; ll; ll = ll->next)
+ EINA_LIST_FOREACH(ee->sub_ecore_evas, ll, ee2)
{
- Ecore_Evas *ee2;
-
- ee2 = ll->data;
if (ee2->func.fn_pre_render) ee2->func.fn_pre_render(ee2);
_ecore_evas_buffer_render(ee2);
if (ee2->func.fn_post_render) ee2->func.fn_post_render(ee2);
updates = evas_render_updates(ee->evas);
if (ee->engine.buffer.image)
{
- for (l = updates; l; l = l->next)
- {
- Evas_Rectangle *r;
+ Evas_Rectangle *r;
- r = l->data;
- if (ee->engine.buffer.image)
- evas_object_image_data_update_add(ee->engine.buffer.image,
- r->x, r->y, r->w, r->h);
- }
+ EINA_LIST_FOREACH(updates, l, r)
+ if (ee->engine.buffer.image)
+ evas_object_image_data_update_add(ee->engine.buffer.image,
+ r->x, r->y, r->w, r->h);
}
if (updates)
{
evas_key_lock_add(ee->evas, "Num_Lock");
evas_key_lock_add(ee->evas, "Scroll_Lock");
- ee_target->sub_ecore_evas = evas_list_append(ee_target->sub_ecore_evas, ee);
+ ee_target->sub_ecore_evas = eina_list_append(ee_target->sub_ecore_evas, ee);
return o;
#else
return NULL;
static void
_ecore_evas_directfb_render(Ecore_Evas *ee)
{
- Evas_List *updates, *ll;
-
+ Eina_List *updates, *ll;
+ Ecore_Evas *ee2;
+
#ifdef BUILD_ECORE_EVAS_BUFFER
- for (ll = ee->sub_ecore_evas; ll; ll = ll->next)
+ EINA_LIST_FOREACH(ee->sub_ecore_evas, ll, ee2)
{
- Ecore_Evas *ee2;
-
- ee2 = ll->data;
if (ee2->func.fn_pre_render) ee2->func.fn_pre_render(ee2);
_ecore_evas_buffer_render(ee2);
if (ee2->func.fn_post_render) ee2->func.fn_post_render(ee2);
ee = (Ecore_Evas *)l;
if (ee->visible)
{
- Evas_List *updates;
+ Eina_List *updates;
#ifdef BUILD_ECORE_EVAS_BUFFER
- Evas_List *ll;
+ Eina_List *ll;
+ Ecore_Evas *ee2;
#endif
-
if (ee->func.fn_pre_render) ee->func.fn_pre_render(ee);
#ifdef BUILD_ECORE_EVAS_BUFFER
- for (ll = ee->sub_ecore_evas; ll; ll = ll->next)
+ EINA_LIST_FOREACH(ee->sub_ecore_evas, ll, ee2)
{
- Ecore_Evas *ee2;
-
- ee2 = ll->data;
if (ee2->func.fn_pre_render) ee2->func.fn_pre_render(ee2);
_ecore_evas_buffer_render(ee2);
if (ee2->func.fn_post_render) ee2->func.fn_post_render(ee2);
struct {
Ecore_X_Window win_root;
Ecore_X_Window win;
- Evas_List *win_extra;
+ Eina_List *win_extra;
Ecore_X_Pixmap pmap;
Ecore_X_Pixmap mask;
Ecore_X_GC gc;
} func;
Ecore_Evas_Engine engine;
- Evas_List *sub_ecore_evas;
+ Eina_List *sub_ecore_evas;
unsigned char ignore_events : 1;
};
static void
_ecore_evas_render(Ecore_Evas *ee)
{
- Evas_List *updates;
+ Eina_List *updates;
updates = evas_render_updates(ee->evas);
if (updates)
static void
_ecore_evas_win32_render(Ecore_Evas *ee)
{
+ Eina_List *updates;
#ifdef BUILD_ECORE_EVAS_BUFFER
- Evas_List *ll;
+ Eina_List *ll;
+ Ecore_Evas *ee2;²
#endif
#ifdef BUILD_ECORE_EVAS_BUFFER
- for (ll = ee->sub_ecore_evas; ll; ll = ll->next)
+ EINA_LIST_FOREACH(ee->sub_ecore_evas, ll, ee2)
{
- Ecore_Evas *ee2;
-
- ee2 = ll->data;
if (ee2->func.fn_pre_render) ee2->func.fn_pre_render(ee2);
_ecore_evas_buffer_render(ee2);
if (ee2->func.fn_post_render) ee2->func.fn_post_render(ee2);
if (ee->func.fn_pre_render) ee->func.fn_pre_render(ee);
if (ee->prop.avoid_damage)
{
- Evas_List *updates;
-
updates = evas_render_updates(ee->evas);
if (updates) evas_render_updates_free(updates);
}
{
if (ee->shaped)
{
- Evas_List *updates;
-
updates = evas_render_updates(ee->evas);
if (updates) evas_render_updates_free(updates);
}
else
{
- Evas_List *updates;
-
updates = evas_render_updates(ee->evas);
if (updates) evas_render_updates_free(updates);
}
static void
_ecore_evas_wince_render(Ecore_Evas *ee)
{
+ Eina_List *updates = NULL;
#ifdef BUILD_ECORE_EVAS_BUFFER
- Evas_List *ll;
+ Eina_List *ll;
+ Ecore_Evas *ee2;
#endif
#ifdef BUILD_ECORE_EVAS_BUFFER
- for (ll = ee->sub_ecore_evas; ll; ll = ll->next)
+ EINA_LIST_FOREACH(ee->sub_ecore_evas, ll, ee2)
{
- Ecore_Evas *ee2;
-
- ee2 = ll->data;
if (ee2->func.fn_pre_render) ee2->func.fn_pre_render(ee2);
_ecore_evas_buffer_render(ee2);
if (ee2->func.fn_post_render) ee2->func.fn_post_render(ee2);
if (ee->func.fn_pre_render) ee->func.fn_pre_render(ee);
if (ee->prop.avoid_damage)
{
- Evas_List *updates;
-
updates = evas_render_updates(ee->evas);
if (updates) evas_render_updates_free(updates);
}
{
if (ee->shaped)
{
- Evas_List *updates;
-
updates = evas_render_updates(ee->evas);
if (updates) evas_render_updates_free(updates);
}
else
{
- Evas_List *updates;
-
updates = evas_render_updates(ee->evas);
if (updates) evas_render_updates_free(updates);
}
static void
_ecore_evas_x_render(Ecore_Evas *ee)
{
+ Evas_Rectangle *r;
+ Eina_List *updates, *l;
#ifdef BUILD_ECORE_EVAS_BUFFER
- Evas_List *ll;
+ Eina_List *ll;
+ Ecore_Evas *ee2;
#endif
#ifdef BUILD_ECORE_EVAS_BUFFER
- for (ll = ee->sub_ecore_evas; ll; ll = ll->next)
+ EINA_LIST_FOREACH(ee->sub_ecore_evas, ll, ee2)
{
- Ecore_Evas *ee2;
-
- ee2 = ll->data;
if (ee2->func.fn_pre_render) ee2->func.fn_pre_render(ee2);
_ecore_evas_buffer_render(ee2);
if (ee2->func.fn_post_render) ee2->func.fn_post_render(ee2);
if (ee->func.fn_pre_render) ee->func.fn_pre_render(ee);
if (ee->prop.avoid_damage)
{
- Evas_List *updates, *l;
-
updates = evas_render_updates(ee->evas);
#if 0
// if (ee->w == 640)
{
- for (l = updates; l; l = l->next)
- {
- Evas_Rectangle *r;
-
- r = l->data;
- printf(" UP render [%p] %ix%i, [%i %i %ix%i]\n",
- ee, ee->w, ee->h, r->x, r->y, r->w, r->h);
- }
+ EINA_LIST_FOREACH(updates, l, r)
+ printf(" UP render [%p] %ix%i, [%i %i %ix%i]\n",
+ ee, ee->w, ee->h, r->x, r->y, r->w, r->h);
}
#endif
if (ee->engine.x.using_bg_pixmap)
{
if (updates)
{
- for (l = updates; l; l = l->next)
- {
- Evas_Rectangle *r;
-
- r = l->data;
- ecore_x_window_area_clear(ee->engine.x.win, r->x, r->y, r->w, r->h);
- }
+ EINA_LIST_FOREACH(updates, l, r)
+ ecore_x_window_area_clear(ee->engine.x.win, r->x, r->y, r->w, r->h);
if ((ee->shaped) && (updates))
ecore_x_window_shape_mask_set(ee->engine.x.win, ee->engine.x.mask);
if ((ee->alpha) && (updates))
#ifdef HAVE_ECORE_X_XCB
#warning [XCB] No Region code
#else
- for (l = updates; l; l = l->next)
+ EINA_LIST_FOREACH(updates, l, r)
{
- Evas_Rectangle *r;
XRectangle xr;
Region tmpr;
if (!ee->engine.x.damages)
ee->engine.x.damages = XCreateRegion();
- r = l->data;
tmpr = XCreateRegion();
if (ee->rotation == 0)
{
{
if (ee->shaped)
{
- Evas_List *updates;
-
updates = evas_render_updates(ee->evas);
if (updates)
{
}
else
{
- Evas_List *updates;
-
updates = evas_render_updates(ee->evas);
if (updates)
{
#if 0
// if (ee->w == 640)
{
- Evas_List *l;
-
printf("RENDER [%p] [%i] %ix%i\n",
ee, ee->visible, ee->w, ee->h);
- for (l = updates; l; l = l->next)
- {
- Evas_Rectangle *r;
-
- r = l->data;
- printf(" render [%i %i %ix%i]\n",
- r->x, r->y, r->w, r->h);
- }
+ EINA_LIST_FOREACH(updates, l, r)
+ printf(" render [%i %i %ix%i]\n",
+ r->x, r->y, r->w, r->h);
}
#endif
evas_render_updates_free(updates);
Ecore_X_Window *winp;
winp = ee->engine.x.win_extra->data;
- ee->engine.x.win_extra = evas_list_remove_list(ee->engine.x.win_extra, ee->engine.x.win_extra);
+ ee->engine.x.win_extra = eina_list_remove_list(ee->engine.x.win_extra, ee->engine.x.win_extra);
ecore_evases_hash = evas_hash_del(ecore_evases_hash, _ecore_evas_x_winid_str_get(*winp), ee);
free(winp);
}
if (winp)
{
*winp = win;
- ee->engine.x.win_extra = evas_list_append(ee->engine.x.win_extra, winp);
+ ee->engine.x.win_extra = eina_list_append(ee->engine.x.win_extra, winp);
ecore_evases_hash = evas_hash_add(ecore_evases_hash, _ecore_evas_x_winid_str_get(win), ee);
}
#else
if (winp)
{
*winp = win;
- ee->engine.x.win_extra = evas_list_append(ee->engine.x.win_extra, winp);
+ ee->engine.x.win_extra = eina_list_append(ee->engine.x.win_extra, winp);
ecore_evases_hash = evas_hash_add(ecore_evases_hash, _ecore_evas_x_winid_str_get(win), ee);
}
#else
/* saves typing function headers */
#define ECORE_IPC_DEC_STRUCT_PROTO(x) static int x(void *d, int s, void *pp)
#define ECORE_IPC_ENC_STRUCT_PROTO(x) static void *x(void *pp, int *s)
-#define ECORE_IPC_DEC_EVAS_LIST_PROTO(x) static Evas_List *x(void *d, int s)
-#define ECORE_IPC_ENC_EVAS_LIST_PROTO(x) static void *x(Evas_List *lp, int *s)
+#define ECORE_IPC_DEC_EINA_LIST_PROTO(x) static Eina_List *x(void *d, int s)
+#define ECORE_IPC_ENC_EINA_LIST_PROTO(x) static void *x(Eina_List *lp, int *s)
/* decoder setup - saves typing. requires data packet of exact size, or fail */
/* footer for the hell of it */
#define ECORE_IPC_ENC_STRUCT_FOOT() return d
-#define ECORE_IPC_DEC_EVAS_LIST_HEAD(typ) \
+#define ECORE_IPC_DEC_EINA_LIST_HEAD(typ) \
unsigned char *ptr; \
- Evas_List *l; \
+ Eina_List *l; \
typ *p; \
l = NULL; \
ptr = d; \
{ \
p = malloc(sizeof(typ));
-#define ECORE_IPC_DEC_EVAS_LIST_FOOT() \
- l = evas_list_append(l, p); \
+#define ECORE_IPC_DEC_EINA_LIST_FOOT() \
+ l = eina_list_append(l, p); \
} \
return l
-#define ECORE_IPC_ENC_EVAS_LIST_HEAD_START(typ) \
- Evas_List *l; \
+#define ECORE_IPC_ENC_EINA_LIST_HEAD_START(typ) \
+ Eina_List *l; \
typ *p; \
unsigned char *d, *ptr; \
int len; \
for (l = lp; l; l = l->next) \
{ \
p = l->data;
-#define ECORE_IPC_ENC_EVAS_LIST_HEAD_FINISH() \
+#define ECORE_IPC_ENC_EINA_LIST_HEAD_FINISH() \
} \
d = malloc(len); \
if(!d) return NULL; \
{ \
p = l->data;
-#define ECORE_IPC_ENC_EVAS_LIST_FOOT() \
+#define ECORE_IPC_ENC_EINA_LIST_FOOT() \
} \
return d