styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove Evas list and replace them with Eina list. 

No change for ->next and ->data access right now, as the patch is already
big enough.



SVN revision: 36962
This commit is contained in:
Cedric BAIL 2008-10-22 11:49:33 +00:00
parent b170c9ffe0
commit 1087de2397
173 changed files with 2856 additions and 2856 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bin/e.h
View File

@ -123,13 +123,13 @@ typedef struct _E_Rect E_Rect;
{ \
if (list) \
{ \
Evas_List *tmp; \
Eina_List *tmp; \
tmp = list; \
list = NULL; \
while (tmp) \
{ \
free(tmp->data); \
tmp = evas_list_remove_list(tmp, tmp); \
tmp = eina_list_remove_list(tmp, tmp); \
} \
} \
} \

80
src/bin/e_actions.c
View File

@ -1136,7 +1136,7 @@ ACT_FN_GO(desk_linear_flip_to)
#define DESK_ACTION_ALL(zone, act) \
E_Zone *zone; \
Evas_List *lm, *lc, *lz; \
Eina_List *lm, *lc, *lz; \
E_Container *con; \
E_Manager *man; \
\
@ -1227,16 +1227,16 @@ ACT_FN_GO(screen_send_to)
{
E_Zone *zone2 = NULL;
if (evas_list_count(e_manager_list()) > 1)
if (eina_list_count(e_manager_list()) > 1)
{
scr = scr % evas_list_count(e_manager_list());
if (scr < 0) scr += evas_list_count(e_manager_list());
scr = scr % eina_list_count(e_manager_list());
if (scr < 0) scr += eina_list_count(e_manager_list());
zone2 = e_util_container_zone_number_get(scr, 0);
}
else
{
scr = scr % evas_list_count(zone->container->zones);
if (scr < 0) scr += evas_list_count(zone->container->zones);
scr = scr % eina_list_count(zone->container->zones);
if (scr < 0) scr += eina_list_count(zone->container->zones);
zone2 = e_util_container_zone_number_get(0, scr);
}
if ((zone2) && (zone != zone2))
@ -1264,18 +1264,18 @@ ACT_FN_GO(screen_send_by)
{
E_Zone *zone2 = NULL;
if (evas_list_count(e_manager_list()) > 1)
if (eina_list_count(e_manager_list()) > 1)
{
scr += zone->container->num;
scr = scr % evas_list_count(e_manager_list());
if (scr < 0) scr += evas_list_count(e_manager_list());
scr = scr % eina_list_count(e_manager_list());
if (scr < 0) scr += eina_list_count(e_manager_list());
zone2 = e_util_container_zone_number_get(scr, 0);
}
else
{
scr += zone->num;
scr = scr % evas_list_count(zone->container->zones);
if (scr < 0) scr += evas_list_count(zone->container->zones);
scr = scr % eina_list_count(zone->container->zones);
if (scr < 0) scr += eina_list_count(zone->container->zones);
zone2 = e_util_container_zone_number_get(0, scr);
}
if ((zone2) && (zone != zone2))
@ -1290,7 +1290,7 @@ ACT_FN_GO(screen_send_by)
#define ZONE_DESK_ACTION(con_num, zone_num, zone, act) \
E_Zone *zone; \
if ((con_num < 0) || (zone_num < 0)) { \
Evas_List *l, *ll, *lll; \
Eina_List *l, *ll, *lll; \
E_Container *con; \
E_Manager *man; \
if ((con_num >= 0) && (zone_num < 0)) /* con=1 zone=all */ { \
@ -2043,7 +2043,7 @@ struct _Delayed_Action
} def, delayed;
};
static Evas_List *_delayed_actions = NULL;
static Eina_List *_delayed_actions = NULL;
static void
_delayed_action_free(Delayed_Action *da)
@ -2071,7 +2071,7 @@ _delayed_action_cb_timer(void *data)
{
if (act->func.go) act->func.go(da->obj, da->delayed.params);
}
_delayed_actions = evas_list_remove(_delayed_actions, da);
_delayed_actions = eina_list_remove(_delayed_actions, da);
_delayed_action_free(da);
return 0;
}
@ -2177,13 +2177,13 @@ _delayed_action_key_add(E_Object *obj, const char *params, Ecore_X_Event_Key_Dow
da->mouse = 0;
da->keyname = eina_stringshare_add(ev->keyname);
if (params) _delayed_action_list_parse(da, params);
_delayed_actions = evas_list_append(_delayed_actions, da);
_delayed_actions = eina_list_append(_delayed_actions, da);
}
static void
_delayed_action_key_del(E_Object *obj, const char *params, Ecore_X_Event_Key_Up *ev)
{
Evas_List *l;
Eina_List *l;
for (l = _delayed_actions; l; l = l->next)
{
@ -2195,7 +2195,7 @@ _delayed_action_key_del(E_Object *obj, const char *params, Ecore_X_Event_Key_Up
{
_delayed_action_do(da);
_delayed_action_free(da);
_delayed_actions = evas_list_remove_list(_delayed_actions, l);
_delayed_actions = eina_list_remove_list(_delayed_actions, l);
return;
}
}
@ -2216,13 +2216,13 @@ _delayed_action_mouse_add(E_Object *obj, const char *params, Ecore_X_Event_Mouse
da->mouse = 1;
da->button = ev->button;
if (params) _delayed_action_list_parse(da, params);
_delayed_actions = evas_list_append(_delayed_actions, da);
_delayed_actions = eina_list_append(_delayed_actions, da);
}
static void
_delayed_action_mouse_del(E_Object *obj, const char *params, Ecore_X_Event_Mouse_Button_Up *ev)
{
Evas_List *l;
Eina_List *l;
for (l = _delayed_actions; l; l = l->next)
{
@ -2234,7 +2234,7 @@ _delayed_action_mouse_del(E_Object *obj, const char *params, Ecore_X_Event_Mouse
{
_delayed_action_do(da);
_delayed_action_free(da);
_delayed_actions = evas_list_remove_list(_delayed_actions, l);
_delayed_actions = eina_list_remove_list(_delayed_actions, l);
return;
}
}
@ -2260,9 +2260,9 @@ ACT_FN_END_MOUSE(delayed_action)
/* local subsystem globals */
static Evas_Hash *actions = NULL;
static Evas_List *action_list = NULL;
static Evas_List *action_names = NULL;
static Evas_List *action_groups = NULL;
static Eina_List *action_list = NULL;
static Eina_List *action_names = NULL;
static Eina_List *action_groups = NULL;
/* externally accessible functions */
@ -2657,7 +2657,7 @@ EAPI int
e_actions_shutdown(void)
{
e_action_predef_name_all_del();
action_names = evas_list_free(action_names);
action_names = eina_list_free(action_names);
evas_hash_free(actions);
actions = NULL;
@ -2665,7 +2665,7 @@ e_actions_shutdown(void)
return 1;
}
EAPI Evas_List *
EAPI Eina_List *
e_action_name_list(void)
{
return action_names;
@ -2683,8 +2683,8 @@ e_action_add(const char *name)
if (!act) return NULL;
act->name = name;
actions = evas_hash_direct_add(actions, act->name, act);
action_names = evas_list_append(action_names, name);
action_list = evas_list_append(action_list, act);
action_names = eina_list_append(action_names, name);
action_list = eina_list_append(action_list, act);
}
return act;
}
@ -2713,7 +2713,7 @@ e_action_predef_name_set(const char *act_grp, const char *act_name, const char *
{
E_Action_Group *actg = NULL;
E_Action_Description *actd = NULL;
Evas_List *l;
Eina_List *l;
if (!act_grp || !act_name) return;
@ -2734,9 +2734,9 @@ e_action_predef_name_set(const char *act_grp, const char *act_name, const char *
actg->act_grp = eina_stringshare_add(act_grp);
actg->acts = NULL;
action_groups = evas_list_append(action_groups, actg);
action_groups = eina_list_append(action_groups, actg);
action_groups =
evas_list_sort(action_groups, evas_list_count(action_groups),
eina_list_sort(action_groups, eina_list_count(action_groups),
_action_groups_sort_cb);
}
@ -2759,7 +2759,7 @@ e_action_predef_name_set(const char *act_grp, const char *act_name, const char *
actd->param_example = param_example == NULL ? NULL : eina_stringshare_add(param_example);
actd->editable = editable;
actg->acts = evas_list_append(actg->acts, actd);
actg->acts = eina_list_append(actg->acts, actd);
}
EAPI void
@ -2767,7 +2767,7 @@ e_action_predef_name_del(const char *act_grp, const char *act_name)
{
E_Action_Group *actg = NULL;
E_Action_Description *actd = NULL;
Evas_List *l;
Eina_List *l;
for (l = action_groups; l; l = l->next)
{
@ -2784,7 +2784,7 @@ e_action_predef_name_del(const char *act_grp, const char *act_name)
actd = l->data;
if (!strcmp(actd->act_name, act_name))
{
actg->acts = evas_list_remove(actg->acts, actd);
actg->acts = eina_list_remove(actg->acts, actd);
if (actd->act_name) eina_stringshare_del(actd->act_name);
if (actd->act_cmd) eina_stringshare_del(actd->act_cmd);
@ -2793,9 +2793,9 @@ e_action_predef_name_del(const char *act_grp, const char *act_name)
E_FREE(actd);
if (!evas_list_count(actg->acts))
if (!eina_list_count(actg->acts))
{
action_groups = evas_list_remove(action_groups, actg);
action_groups = eina_list_remove(action_groups, actg);
if (actg->act_grp) eina_stringshare_del(actg->act_grp);
E_FREE(actg);
}
@ -2825,17 +2825,17 @@ e_action_predef_name_all_del(void)
E_FREE(actd);
actg->acts = evas_list_remove_list(actg->acts, actg->acts);
actg->acts = eina_list_remove_list(actg->acts, actg->acts);
}
if (actg->act_grp) eina_stringshare_del(actg->act_grp);
E_FREE(actg);
action_groups = evas_list_remove_list(action_groups, action_groups);
action_groups = eina_list_remove_list(action_groups, action_groups);
}
action_groups = NULL;
}
EAPI Evas_List *
EAPI Eina_List *
e_action_groups_get(void)
{
return action_groups;
@ -2847,8 +2847,8 @@ static void
_e_action_free(E_Action *act)
{
actions = evas_hash_del(actions, act->name, act);
action_names = evas_list_remove(action_names, act->name);
action_list = evas_list_remove(action_list, act);
action_names = eina_list_remove(action_names, act->name);
action_list = eina_list_remove(action_list, act);
free(act);
}

6
src/bin/e_actions.h
View File

@ -42,13 +42,13 @@ struct _E_Action_Description
struct _E_Action_Group
{
const char *act_grp;
Evas_List *acts;
Eina_List *acts;
};
EAPI int e_actions_init(void);
EAPI int e_actions_shutdown(void);
EAPI Evas_List *e_action_name_list(void);
EAPI Eina_List *e_action_name_list(void);
EAPI E_Action *e_action_add(const char *name);
/* e_action_del allows, for example, modules to define their own actions dynamically. */
EAPI void e_action_del(const char *name);
@ -57,7 +57,7 @@ EAPI E_Action *e_action_find(const char *name);
EAPI void e_action_predef_name_set(const char *act_grp, const char *act_name, const char *act_cmd, const char *act_params, const char *param_example, int editable);
EAPI void e_action_predef_name_del(const char *act_grp, const char *act_name);
EAPI void e_action_predef_name_all_del(void);
EAPI Evas_List *e_action_groups_get(void);
EAPI Eina_List *e_action_groups_get(void);
#endif
#endif

16
src/bin/e_bg.c
View File

@ -15,7 +15,7 @@ static E_Fm2_Mime_Handler *bg_hdl = NULL;
EAPI int
e_bg_init(void)
{
Evas_List *l = NULL;
Eina_List *l = NULL;
/* Register mime handler */
bg_hdl = e_fm2_mime_handler_new(_("Set As Background"),
@ -44,7 +44,7 @@ e_bg_init(void)
EAPI int
e_bg_shutdown(void)
{
Evas_List *l = NULL;
Eina_List *l = NULL;
/* Deregister mime handler */
if (bg_hdl)
@ -77,7 +77,7 @@ e_bg_shutdown(void)
EAPI const E_Config_Desktop_Background *
e_bg_config_get(int container_num, int zone_num, int desk_x, int desk_y)
{
Evas_List *l, *ll, *entries;
Eina_List *l, *ll, *entries;
E_Config_Desktop_Background *bg = NULL;
int current_spec = 0; /* how specific the setting is - we want the least general one that applies */
@ -125,7 +125,7 @@ EAPI const char *
e_bg_file_get(int container_num, int zone_num, int desk_x, int desk_y)
{
const E_Config_Desktop_Background *cfbg;
Evas_List *l, *entries;
Eina_List *l, *entries;
const char *bgfile = "";
int ok = 0;
@ -287,7 +287,7 @@ e_bg_add(int container, int zone, int desk_x, int desk_y, char *file)
cfbg->desk_x = desk_x;
cfbg->desk_y = desk_y;
cfbg->file = eina_stringshare_add(file);
e_config->desktop_backgrounds = evas_list_append(e_config->desktop_backgrounds, cfbg);
e_config->desktop_backgrounds = eina_list_append(e_config->desktop_backgrounds, cfbg);
e_filereg_register(cfbg->file);
@ -302,7 +302,7 @@ e_bg_add(int container, int zone, int desk_x, int desk_y, char *file)
EAPI void
e_bg_del(int container, int zone, int desk_x, int desk_y)
{
Evas_List *l = NULL;
Eina_List *l = NULL;
E_Event_Bg_Update *ev;
for (l = e_config->desktop_backgrounds; l; l = l->next)
@ -314,7 +314,7 @@ e_bg_del(int container, int zone, int desk_x, int desk_y)
if ((cfbg->container == container) && (cfbg->zone == zone) &&
(cfbg->desk_x == desk_x) && (cfbg->desk_y == desk_y))
{
e_config->desktop_backgrounds = evas_list_remove_list(e_config->desktop_backgrounds, l);
e_config->desktop_backgrounds = eina_list_remove_list(e_config->desktop_backgrounds, l);
e_filereg_deregister(cfbg->file);
if (cfbg->file) eina_stringshare_del(cfbg->file);
free(cfbg);
@ -333,7 +333,7 @@ e_bg_del(int container, int zone, int desk_x, int desk_y)
EAPI void
e_bg_update(void)
{
Evas_List *l, *ll, *lll;
Eina_List *l, *ll, *lll;
E_Manager *man;
E_Container *con;
E_Zone *zone;

68
src/bin/e_bindings.c
View File

@ -13,17 +13,17 @@ static int _e_bindings_context_match(E_Binding_Context bctxt, E_Binding_Context
/* local subsystem globals */
static Evas_List *mouse_bindings = NULL;
static Evas_List *key_bindings = NULL;
static Evas_List *signal_bindings = NULL;
static Evas_List *wheel_bindings = NULL;
static Eina_List *mouse_bindings = NULL;
static Eina_List *key_bindings = NULL;
static Eina_List *signal_bindings = NULL;
static Eina_List *wheel_bindings = NULL;
/* externally accessible functions */
EAPI int
e_bindings_init(void)
{
Evas_List *l;
Eina_List *l;
for (l = e_config->mouse_bindings; l; l = l->next)
{
@ -86,7 +86,7 @@ e_bindings_shutdown(void)
E_Binding_Mouse *bind;
bind = mouse_bindings->data;
mouse_bindings = evas_list_remove_list(mouse_bindings, mouse_bindings);
mouse_bindings = eina_list_remove_list(mouse_bindings, mouse_bindings);
_e_bindings_mouse_free(bind);
}
while (key_bindings)
@ -94,7 +94,7 @@ e_bindings_shutdown(void)
E_Binding_Key *bind;
bind = key_bindings->data;
key_bindings = evas_list_remove_list(key_bindings, key_bindings);
key_bindings = eina_list_remove_list(key_bindings, key_bindings);
_e_bindings_key_free(bind);
}
while (signal_bindings)
@ -102,7 +102,7 @@ e_bindings_shutdown(void)
E_Binding_Signal *bind;
bind = signal_bindings->data;
signal_bindings = evas_list_remove_list(signal_bindings, signal_bindings);
signal_bindings = eina_list_remove_list(signal_bindings, signal_bindings);
_e_bindings_signal_free(bind);
}
while (wheel_bindings)
@ -110,7 +110,7 @@ e_bindings_shutdown(void)
E_Binding_Wheel *bind;
bind = wheel_bindings->data;
wheel_bindings = evas_list_remove_list(wheel_bindings, wheel_bindings);
wheel_bindings = eina_list_remove_list(wheel_bindings, wheel_bindings);
_e_bindings_wheel_free(bind);
}
return 1;
@ -128,13 +128,13 @@ e_bindings_mouse_add(E_Binding_Context ctxt, int button, E_Binding_Modifier mod,
bind->any_mod = any_mod;
if (action) bind->action = eina_stringshare_add(action);
if (params) bind->params = eina_stringshare_add(params);
mouse_bindings = evas_list_append(mouse_bindings, bind);
mouse_bindings = eina_list_append(mouse_bindings, bind);
}
EAPI void
e_bindings_mouse_del(E_Binding_Context ctxt, int button, E_Binding_Modifier mod, int any_mod, const char *action, const char *params)
{
Evas_List *l;
Eina_List *l;
for (l = mouse_bindings; l; l = l->next)
{
@ -151,7 +151,7 @@ e_bindings_mouse_del(E_Binding_Context ctxt, int button, E_Binding_Modifier mod,
((!bind->params) && (!params))))
{
_e_bindings_mouse_free(bind);
mouse_bindings = evas_list_remove_list(mouse_bindings, l);
mouse_bindings = eina_list_remove_list(mouse_bindings, l);
break;
}
}
@ -160,7 +160,7 @@ e_bindings_mouse_del(E_Binding_Context ctxt, int button, E_Binding_Modifier mod,
EAPI void
e_bindings_mouse_grab(E_Binding_Context ctxt, Ecore_X_Window win)
{
Evas_List *l;
Eina_List *l;
for (l = mouse_bindings; l; l = l->next)
{
@ -188,7 +188,7 @@ e_bindings_mouse_grab(E_Binding_Context ctxt, Ecore_X_Window win)
EAPI void
e_bindings_mouse_ungrab(E_Binding_Context ctxt, Ecore_X_Window win)
{
Evas_List *l;
Eina_List *l;
for (l = mouse_bindings; l; l = l->next)
{
@ -214,7 +214,7 @@ EAPI E_Action *
e_bindings_mouse_down_find(E_Binding_Context ctxt, E_Object *obj, Ecore_X_Event_Mouse_Button_Down *ev, E_Binding_Mouse **bind_ret)
{
E_Binding_Modifier mod = 0;
Evas_List *l;
Eina_List *l;
if (ev->modifiers & ECORE_X_MODIFIER_SHIFT) mod |= E_BINDING_MODIFIER_SHIFT;
if (ev->modifiers & ECORE_X_MODIFIER_CTRL) mod |= E_BINDING_MODIFIER_CTRL;
@ -263,7 +263,7 @@ EAPI E_Action *
e_bindings_mouse_up_find(E_Binding_Context ctxt, E_Object *obj, Ecore_X_Event_Mouse_Button_Up *ev, E_Binding_Mouse **bind_ret)
{
E_Binding_Modifier mod = 0;
Evas_List *l;
Eina_List *l;
if (ev->modifiers & ECORE_X_MODIFIER_SHIFT) mod |= E_BINDING_MODIFIER_SHIFT;
if (ev->modifiers & ECORE_X_MODIFIER_CTRL) mod |= E_BINDING_MODIFIER_CTRL;
@ -320,13 +320,13 @@ e_bindings_key_add(E_Binding_Context ctxt, const char *key, E_Binding_Modifier m
bind->any_mod = any_mod;
if (action) bind->action = eina_stringshare_add(action);
if (params) bind->params = eina_stringshare_add(params);
key_bindings = evas_list_append(key_bindings, bind);
key_bindings = eina_list_append(key_bindings, bind);
}
EAPI E_Binding_Key *
e_bindings_key_get(const char *action)
{
Evas_List *l;
Eina_List *l;
for (l = key_bindings; l; l = l->next)
{
@ -342,7 +342,7 @@ e_bindings_key_get(const char *action)
EAPI void
e_bindings_key_del(E_Binding_Context ctxt, const char *key, E_Binding_Modifier mod, int any_mod, const char *action, const char *params)
{
Evas_List *l;
Eina_List *l;
for (l = key_bindings; l; l = l->next)
{
@ -359,7 +359,7 @@ e_bindings_key_del(E_Binding_Context ctxt, const char *key, E_Binding_Modifier m
((!bind->params) && (!params))))
{
_e_bindings_key_free(bind);
key_bindings = evas_list_remove_list(key_bindings, l);
key_bindings = eina_list_remove_list(key_bindings, l);
break;
}
}
@ -368,7 +368,7 @@ e_bindings_key_del(E_Binding_Context ctxt, const char *key, E_Binding_Modifier m
EAPI void
e_bindings_key_grab(E_Binding_Context ctxt, Ecore_X_Window win)
{
Evas_List *l;
Eina_List *l;
for (l = key_bindings; l; l = l->next)
{
@ -396,7 +396,7 @@ e_bindings_key_grab(E_Binding_Context ctxt, Ecore_X_Window win)
EAPI void
e_bindings_key_ungrab(E_Binding_Context ctxt, Ecore_X_Window win)
{
Evas_List *l;
Eina_List *l;
for (l = key_bindings; l; l = l->next)
{
@ -425,7 +425,7 @@ EAPI E_Action *
e_bindings_key_down_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_X_Event_Key_Down *ev)
{
E_Binding_Modifier mod = 0;
Evas_List *l;
Eina_List *l;
if (ev->modifiers & ECORE_X_MODIFIER_SHIFT) mod |= E_BINDING_MODIFIER_SHIFT;
if (ev->modifiers & ECORE_X_MODIFIER_CTRL) mod |= E_BINDING_MODIFIER_CTRL;
@ -479,7 +479,7 @@ EAPI E_Action *
e_bindings_key_up_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_X_Event_Key_Up *ev)
{
E_Binding_Modifier mod = 0;
Evas_List *l;
Eina_List *l;
if (ev->modifiers & ECORE_X_MODIFIER_SHIFT) mod |= E_BINDING_MODIFIER_SHIFT;
if (ev->modifiers & ECORE_X_MODIFIER_CTRL) mod |= E_BINDING_MODIFIER_CTRL;
@ -529,13 +529,13 @@ e_bindings_signal_add(E_Binding_Context ctxt, const char *sig, const char *src,
bind->any_mod = any_mod;
if (action) bind->action = eina_stringshare_add(action);
if (params) bind->params = eina_stringshare_add(params);
signal_bindings = evas_list_append(signal_bindings, bind);
signal_bindings = eina_list_append(signal_bindings, bind);
}
EAPI void
e_bindings_signal_del(E_Binding_Context ctxt, const char *sig, const char *src, E_Binding_Modifier mod, int any_mod, const char *action, const char *params)
{
Evas_List *l;
Eina_List *l;
for (l = signal_bindings; l; l = l->next)
{
@ -555,7 +555,7 @@ e_bindings_signal_del(E_Binding_Context ctxt, const char *sig, const char *src,
((!bind->params) && (!params))))
{
_e_bindings_signal_free(bind);
signal_bindings = evas_list_remove_list(signal_bindings, l);
signal_bindings = eina_list_remove_list(signal_bindings, l);
break;
}
}
@ -565,7 +565,7 @@ EAPI E_Action *
e_bindings_signal_find(E_Binding_Context ctxt, E_Object *obj, const char *sig, const char *src, E_Binding_Signal **bind_ret)
{
E_Binding_Modifier mod = 0;
Evas_List *l;
Eina_List *l;
if (strstr(sig, "MOD:Shift")) mod |= E_BINDING_MODIFIER_SHIFT;
if (strstr(sig, "MOD:Control")) mod |= E_BINDING_MODIFIER_CTRL;
@ -626,13 +626,13 @@ e_bindings_wheel_add(E_Binding_Context ctxt, int direction, int z, E_Binding_Mod
bind->any_mod = any_mod;
if (action) bind->action = eina_stringshare_add(action);
if (params) bind->params = eina_stringshare_add(params);
wheel_bindings = evas_list_append(wheel_bindings, bind);
wheel_bindings = eina_list_append(wheel_bindings, bind);
}
EAPI void
e_bindings_wheel_del(E_Binding_Context ctxt, int direction, int z, E_Binding_Modifier mod, int any_mod, const char *action, const char *params)
{
Evas_List *l;
Eina_List *l;
for (l = wheel_bindings; l; l = l->next)
{
@ -650,7 +650,7 @@ e_bindings_wheel_del(E_Binding_Context ctxt, int direction, int z, E_Binding_Mod
((!bind->params) && (!params))))
{
_e_bindings_wheel_free(bind);
wheel_bindings = evas_list_remove_list(wheel_bindings, l);
wheel_bindings = eina_list_remove_list(wheel_bindings, l);
break;
}
}
@ -659,7 +659,7 @@ e_bindings_wheel_del(E_Binding_Context ctxt, int direction, int z, E_Binding_Mod
EAPI void
e_bindings_wheel_grab(E_Binding_Context ctxt, Ecore_X_Window win)
{
Evas_List *l;
Eina_List *l;
for (l = wheel_bindings; l; l = l->next)
{
@ -698,7 +698,7 @@ e_bindings_wheel_grab(E_Binding_Context ctxt, Ecore_X_Window win)
EAPI void
e_bindings_wheel_ungrab(E_Binding_Context ctxt, Ecore_X_Window win)
{
Evas_List *l;
Eina_List *l;
for (l = wheel_bindings; l; l = l->next)
{
@ -736,7 +736,7 @@ EAPI E_Action *
e_bindings_wheel_find(E_Binding_Context ctxt, E_Object *obj, Ecore_X_Event_Mouse_Wheel *ev, E_Binding_Wheel **bind_ret)
{
E_Binding_Modifier mod = 0;
Evas_List *l;
Eina_List *l;
if (ev->modifiers & ECORE_X_MODIFIER_SHIFT) mod |= E_BINDING_MODIFIER_SHIFT;
if (ev->modifiers & ECORE_X_MODIFIER_CTRL) mod |= E_BINDING_MODIFIER_CTRL;

216
src/bin/e_border.c
View File

@ -104,8 +104,8 @@ static void _e_border_pointer_move_end(E_Border *bd);
static void _e_border_hook_call(E_Border_Hook_Point hookpoint, E_Border *bd);
/* local subsystem globals */
static Evas_List *handlers = NULL;
static Evas_List *borders = NULL;
static Eina_List *handlers = NULL;
static Eina_List *borders = NULL;
static Evas_Hash *borders_hash = NULL;
static E_Border *focused = NULL;
@ -114,8 +114,8 @@ static E_Border *move = NULL;
static int grabbed = 0;
static Evas_List *focus_stack = NULL;
static Evas_List *raise_stack = NULL;
static Eina_List *focus_stack = NULL;
static Eina_List *raise_stack = NULL;
static Ecore_X_Screen_Size screen_size = { -1, -1 };
@ -159,33 +159,33 @@ ecore_x_window_pixel_gravity_set(bd->bg_subwin, grav);
EAPI int
e_border_init(void)
{
handlers = evas_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_WINDOW_SHOW_REQUEST, _e_border_cb_window_show_request, NULL));
handlers = evas_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_WINDOW_DESTROY, _e_border_cb_window_destroy, NULL));
handlers = evas_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_WINDOW_HIDE, _e_border_cb_window_hide, NULL));
handlers = evas_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_WINDOW_REPARENT, _e_border_cb_window_reparent, NULL));
handlers = evas_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_WINDOW_CONFIGURE_REQUEST, _e_border_cb_window_configure_request, NULL));
handlers = evas_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_WINDOW_RESIZE_REQUEST, _e_border_cb_window_resize_request, NULL));
handlers = evas_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_WINDOW_GRAVITY, _e_border_cb_window_gravity, NULL));
handlers = evas_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_WINDOW_STACK_REQUEST, _e_border_cb_window_stack_request, NULL));
handlers = evas_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_WINDOW_PROPERTY, _e_border_cb_window_property, NULL));
handlers = evas_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_WINDOW_COLORMAP, _e_border_cb_window_colormap, NULL));
handlers = evas_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_WINDOW_SHAPE, _e_border_cb_window_shape, NULL));
handlers = evas_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_WINDOW_FOCUS_IN, _e_border_cb_window_focus_in, NULL));
handlers = evas_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_WINDOW_FOCUS_OUT, _e_border_cb_window_focus_out, NULL));
handlers = evas_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_CLIENT_MESSAGE, _e_border_cb_client_message, NULL));
handlers = evas_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_WINDOW_STATE_REQUEST, _e_border_cb_window_state_request, NULL));
handlers = evas_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_WINDOW_MOVE_RESIZE_REQUEST, _e_border_cb_window_move_resize_request, NULL));
handlers = evas_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_DESKTOP_CHANGE, _e_border_cb_desktop_change, NULL));
handlers = evas_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_SYNC_ALARM, _e_border_cb_sync_alarm, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_WINDOW_SHOW_REQUEST, _e_border_cb_window_show_request, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_WINDOW_DESTROY, _e_border_cb_window_destroy, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_WINDOW_HIDE, _e_border_cb_window_hide, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_WINDOW_REPARENT, _e_border_cb_window_reparent, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_WINDOW_CONFIGURE_REQUEST, _e_border_cb_window_configure_request, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_WINDOW_RESIZE_REQUEST, _e_border_cb_window_resize_request, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_WINDOW_GRAVITY, _e_border_cb_window_gravity, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_WINDOW_STACK_REQUEST, _e_border_cb_window_stack_request, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_WINDOW_PROPERTY, _e_border_cb_window_property, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_WINDOW_COLORMAP, _e_border_cb_window_colormap, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_WINDOW_SHAPE, _e_border_cb_window_shape, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_WINDOW_FOCUS_IN, _e_border_cb_window_focus_in, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_WINDOW_FOCUS_OUT, _e_border_cb_window_focus_out, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_CLIENT_MESSAGE, _e_border_cb_client_message, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_WINDOW_STATE_REQUEST, _e_border_cb_window_state_request, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_WINDOW_MOVE_RESIZE_REQUEST, _e_border_cb_window_move_resize_request, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_DESKTOP_CHANGE, _e_border_cb_desktop_change, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_SYNC_ALARM, _e_border_cb_sync_alarm, NULL));
ecore_x_passive_grab_replay_func_set(_e_border_cb_grab_replay, NULL);
handlers = evas_list_append(handlers, ecore_event_handler_add(E_EVENT_POINTER_WARP, _e_border_cb_pointer_warp, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(E_EVENT_POINTER_WARP, _e_border_cb_pointer_warp, NULL));
handlers = evas_list_append(handlers, ecore_event_handler_add(EFREET_EVENT_DESKTOP_LIST_CHANGE, _e_border_cb_efreet_desktop_list_change, NULL));
handlers = evas_list_append(handlers, ecore_event_handler_add(EFREET_EVENT_DESKTOP_CHANGE, _e_border_cb_efreet_desktop_change, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(EFREET_EVENT_DESKTOP_LIST_CHANGE, _e_border_cb_efreet_desktop_list_change, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(EFREET_EVENT_DESKTOP_CHANGE, _e_border_cb_efreet_desktop_change, NULL));
handlers = evas_list_append(handlers, ecore_event_handler_add(E_EVENT_CONFIG_ICON_THEME, _e_border_cb_config_icon_theme, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(E_EVENT_CONFIG_ICON_THEME, _e_border_cb_config_icon_theme, NULL));
E_EVENT_BORDER_ADD = ecore_event_type_new();
E_EVENT_BORDER_REMOVE = ecore_event_type_new();
@ -274,12 +274,12 @@ e_border_new(E_Container *con, Ecore_X_Window win, int first_map, int internal)
free(bd);
return NULL;
}
bd->handlers = evas_list_append(bd->handlers, ecore_event_handler_add(ECORE_X_EVENT_MOUSE_IN, _e_border_cb_mouse_in, bd));
bd->handlers = evas_list_append(bd->handlers, ecore_event_handler_add(ECORE_X_EVENT_MOUSE_OUT, _e_border_cb_mouse_out, bd));
bd->handlers = evas_list_append(bd->handlers, ecore_event_handler_add(ECORE_X_EVENT_MOUSE_BUTTON_DOWN, _e_border_cb_mouse_down, bd));
bd->handlers = evas_list_append(bd->handlers, ecore_event_handler_add(ECORE_X_EVENT_MOUSE_BUTTON_UP, _e_border_cb_mouse_up, bd));
bd->handlers = evas_list_append(bd->handlers, ecore_event_handler_add(ECORE_X_EVENT_MOUSE_MOVE, _e_border_cb_mouse_move, bd));
bd->handlers = evas_list_append(bd->handlers, ecore_event_handler_add(ECORE_X_EVENT_MOUSE_WHEEL, _e_border_cb_mouse_wheel, bd));
bd->handlers = eina_list_append(bd->handlers, ecore_event_handler_add(ECORE_X_EVENT_MOUSE_IN, _e_border_cb_mouse_in, bd));
bd->handlers = eina_list_append(bd->handlers, ecore_event_handler_add(ECORE_X_EVENT_MOUSE_OUT, _e_border_cb_mouse_out, bd));
bd->handlers = eina_list_append(bd->handlers, ecore_event_handler_add(ECORE_X_EVENT_MOUSE_BUTTON_DOWN, _e_border_cb_mouse_down, bd));
bd->handlers = eina_list_append(bd->handlers, ecore_event_handler_add(ECORE_X_EVENT_MOUSE_BUTTON_UP, _e_border_cb_mouse_up, bd));
bd->handlers = eina_list_append(bd->handlers, ecore_event_handler_add(ECORE_X_EVENT_MOUSE_MOVE, _e_border_cb_mouse_move, bd));
bd->handlers = eina_list_append(bd->handlers, ecore_event_handler_add(ECORE_X_EVENT_MOUSE_WHEEL, _e_border_cb_mouse_wheel, bd));
bd->client.win = win;
@ -483,7 +483,7 @@ e_border_new(E_Container *con, Ecore_X_Window win, int first_map, int internal)
bd->zone = e_zone_current_get(con);
bd->desk = e_desk_current_get(bd->zone);
e_container_border_add(bd);
borders = evas_list_append(borders, bd);
borders = eina_list_append(borders, bd);
bd2 = evas_hash_find(borders_hash, e_util_winid_str_get(bd->client.win));
if (bd2)
{
@ -509,7 +509,7 @@ e_border_new(E_Container *con, Ecore_X_Window win, int first_map, int internal)
desk[1] = desky;
ecore_x_window_prop_card32_set(win, E_ATOM_DESK, desk, 2);
focus_stack = evas_list_append(focus_stack, bd);
focus_stack = eina_list_append(focus_stack, bd);
bd->pointer = e_pointer_window_new(bd->win, 0);
return bd;
@ -690,7 +690,7 @@ e_border_desk_set(E_Border *bd, E_Desk *desk)
if (e_config->transient.desktop)
{
Evas_List *l;
Eina_List *l;
for (l = bd->transients; l; l = l->next)
{
E_Border *child;
@ -815,7 +815,7 @@ e_border_move(E_Border *bd, int x, int y)
pnd->move = 1;
pnd->x = x;
pnd->y = y;
bd->pending_move_resize = evas_list_append(bd->pending_move_resize, pnd);
bd->pending_move_resize = eina_list_append(bd->pending_move_resize, pnd);
return;
}
if ((x == bd->x) && (y == bd->y)) return;
@ -893,7 +893,7 @@ e_border_resize(E_Border *bd, int w, int h)
pnd->resize = 1;
pnd->w = w - (bd->client_inset.l + bd->client_inset.r);
pnd->h = h - (bd->client_inset.t + bd->client_inset.b);
bd->pending_move_resize = evas_list_append(bd->pending_move_resize, pnd);
bd->pending_move_resize = eina_list_append(bd->pending_move_resize, pnd);
return;
}
if ((w == bd->w) && (h == bd->h)) return;
@ -957,7 +957,7 @@ e_border_move_resize(E_Border *bd, int x, int y, int w, int h)
pnd->y = y;
pnd->w = w - (bd->client_inset.l + bd->client_inset.r);
pnd->h = h - (bd->client_inset.t + bd->client_inset.b);
bd->pending_move_resize = evas_list_append(bd->pending_move_resize, pnd);
bd->pending_move_resize = eina_list_append(bd->pending_move_resize, pnd);
return;
}
if ((x == bd->x) && (y == bd->y) && (w == bd->w) && (h == bd->h)) return;
@ -1021,7 +1021,7 @@ e_border_layer_set(E_Border *bd, int layer)
bd->layer = layer;
if (e_config->transient.layer)
{
Evas_List *l;
Eina_List *l;
/* We need to set raise to one, else the child wont
* follow to the new layer. It should be like this,
@ -1046,7 +1046,7 @@ e_border_raise(E_Border *bd)
{
E_Event_Border_Stack *ev;
E_Border *last = NULL;
Evas_List *l;
Eina_List *l;
E_OBJECT_CHECK(bd);
E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
@ -1055,7 +1055,7 @@ e_border_raise(E_Border *bd)
if (e_config->transient.raise)
{
for (l = evas_list_last(bd->transients); l; l = l->prev)
for (l = eina_list_last(bd->transients); l; l = l->prev)
{
E_Border *child;
@ -1136,7 +1136,7 @@ e_border_lower(E_Border *bd)
{
E_Event_Border_Stack *ev;
E_Border *last = NULL;
Evas_List *l;
Eina_List *l;
E_OBJECT_CHECK(bd);
E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
@ -1145,7 +1145,7 @@ e_border_lower(E_Border *bd)
if (e_config->transient.lower)
{
for (l = evas_list_last(bd->transients); l; l = l->prev)
for (l = eina_list_last(bd->transients); l; l = l->prev)
{
E_Border *child;
@ -1226,7 +1226,7 @@ e_border_stack_above(E_Border *bd, E_Border *above)
/* TODO: Should stack above allow the border to change level */
E_Event_Border_Stack *ev;
E_Border *last = NULL;
Evas_List *l;
Eina_List *l;
E_OBJECT_CHECK(bd);
E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
@ -1235,7 +1235,7 @@ e_border_stack_above(E_Border *bd, E_Border *above)
if (e_config->transient.raise)
{
for (l = evas_list_last(bd->transients); l; l = l->prev)
for (l = eina_list_last(bd->transients); l; l = l->prev)
{
E_Border *child;
@ -1284,7 +1284,7 @@ e_border_stack_below(E_Border *bd, E_Border *below)
/* TODO: Should stack below allow the border to change level */
E_Event_Border_Stack *ev;
E_Border *last = NULL;
Evas_List *l;
Eina_List *l;
E_OBJECT_CHECK(bd);
E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
@ -1293,7 +1293,7 @@ e_border_stack_below(E_Border *bd, E_Border *below)
if (e_config->transient.lower)
{
for (l = evas_list_last(bd->transients); l; l = l->prev)
for (l = eina_list_last(bd->transients); l; l = l->prev)
{
E_Border *child;
@ -1339,15 +1339,15 @@ e_border_stack_below(E_Border *bd, E_Border *below)
EAPI void
e_border_focus_latest_set(E_Border *bd)
{
focus_stack = evas_list_remove(focus_stack, bd);
focus_stack = evas_list_prepend(focus_stack, bd);
focus_stack = eina_list_remove(focus_stack, bd);
focus_stack = eina_list_prepend(focus_stack, bd);
}
EAPI void
e_border_raise_latest_set(E_Border *bd)
{
raise_stack = evas_list_remove(raise_stack, bd);
raise_stack = evas_list_prepend(raise_stack, bd);
raise_stack = eina_list_remove(raise_stack, bd);
raise_stack = eina_list_prepend(raise_stack, bd);
}
/*
@ -2148,7 +2148,7 @@ e_border_fullscreen(E_Border *bd, E_Fullscreen policy)
if (!e_config->allow_above_fullscreen)
e_border_layer_set(bd, 200);
if ((evas_list_count(bd->zone->container->zones) > 1) || (policy == E_FULLSCREEN_RESIZE) || (!ecore_x_randr_query()))
if ((eina_list_count(bd->zone->container->zones) > 1) || (policy == E_FULLSCREEN_RESIZE) || (!ecore_x_randr_query()))
{
e_border_move_resize(bd, bd->zone->x, bd->zone->y, bd->zone->w, bd->zone->h);
}
@ -2268,7 +2268,7 @@ e_border_iconify(E_Border *bd)
if (e_config->transient.iconify)
{
Evas_List *l;
Eina_List *l;
for (l = bd->transients; l; l = l->next)
{
@ -2313,7 +2313,7 @@ e_border_uniconify(E_Border *bd)
if (e_config->transient.iconify)
{
Evas_List *l;
Eina_List *l;
for (l = bd->transients; l; l = l->next)
{
@ -2341,7 +2341,7 @@ e_border_stick(E_Border *bd)
if (e_config->transient.desktop)
{
Evas_List *l;
Eina_List *l;
for (l = bd->transients; l; l = l->next)
{
E_Border *child;
@ -2377,7 +2377,7 @@ e_border_unstick(E_Border *bd)
if (e_config->transient.desktop)
{
Evas_List *l;
Eina_List *l;
for (l = bd->transients; l; l = l->next)
{
E_Border *child;
@ -2479,7 +2479,7 @@ e_border_find_by_window(Ecore_X_Window win)
EAPI E_Border *
e_border_find_by_alarm(Ecore_X_Sync_Alarm alarm)
{
Evas_List *l;
Eina_List *l;
for (l = borders; l; l = l->next)
{
@ -2502,7 +2502,7 @@ e_border_focused_get(void)
EAPI void
e_border_idler_before(void)
{
Evas_List *ml, *cl;
Eina_List *ml, *cl;
if (!borders)
return;
@ -2594,7 +2594,7 @@ e_border_idler_before(void)
}
}
EAPI Evas_List *
EAPI Eina_List *
e_border_client_list()
{
/* FIXME: This should be a somewhat ordered list */
@ -3157,7 +3157,7 @@ e_border_icon_add(E_Border *bd, Evas *evas)
EAPI void
e_border_button_bindings_ungrab_all(void)
{
Evas_List *l;
Eina_List *l;
for (l = borders; l; l = l->next)
{
@ -3173,7 +3173,7 @@ e_border_button_bindings_ungrab_all(void)
EAPI void
e_border_button_bindings_grab_all(void)
{
Evas_List *l;
Eina_List *l;
for (l = borders; l; l = l->next)
{
@ -3186,22 +3186,22 @@ e_border_button_bindings_grab_all(void)
}
}
EAPI Evas_List *
EAPI Eina_List *
e_border_focus_stack_get(void)
{
return focus_stack;
}
EAPI Evas_List *
EAPI Eina_List *
e_border_raise_stack_get(void)
{
return raise_stack;
}
EAPI Evas_List *
EAPI Eina_List *
e_border_lost_windows_get(E_Zone *zone)
{
Evas_List *list = NULL, *l;
Eina_List *list = NULL, *l;
int loss_overlap = 5;
E_OBJECT_CHECK_RETURN(zone, NULL);
@ -3222,7 +3222,7 @@ e_border_lost_windows_get(E_Zone *zone)
bd->zone->h - (2 * loss_overlap),
bd->x, bd->y, bd->w, bd->h))
{
list = evas_list_append(list, bd);
list = eina_list_append(list, bd);
}
else if ((!E_CONTAINS(bd->zone->x, bd->zone->y,
bd->zone->w, bd->zone->h,
@ -3253,7 +3253,7 @@ e_border_lost_windows_get(E_Zone *zone)
}
free(rect);
if (!ok)
list = evas_list_append(list, bd);
list = eina_list_append(list, bd);
}
}
}
@ -3338,10 +3338,10 @@ e_border_frame_recalc(E_Border *bd)
bd->client.h);
}
EAPI Evas_List *
EAPI Eina_List *
e_border_immortal_windows_get(void)
{
Evas_List *list = NULL, *l;
Eina_List *list = NULL, *l;
for (l = borders; l; l = l->next)
{
@ -3349,7 +3349,7 @@ e_border_immortal_windows_get(void)
bd = l->data;
if (bd->lock_life)
list = evas_list_append(list, bd);
list = eina_list_append(list, bd);
}
return list;
}
@ -3606,7 +3606,7 @@ _e_border_free(E_Border *bd)
while (bd->pending_move_resize)
{
free(bd->pending_move_resize->data);
bd->pending_move_resize = evas_list_remove_list(bd->pending_move_resize, bd->pending_move_resize);
bd->pending_move_resize = eina_list_remove_list(bd->pending_move_resize, bd->pending_move_resize);
}
if (bd->shade.anim) ecore_animator_del(bd->shade.anim);
@ -3658,9 +3658,9 @@ _e_border_free(E_Border *bd)
ecore_x_window_save_set_del(bd->client.win);
bd->already_unparented = 1;
}
if (bd->group) evas_list_free(bd->group);
if (bd->transients) evas_list_free(bd->transients);
if (bd->stick_desks) evas_list_free(bd->stick_desks);
if (bd->group) eina_list_free(bd->group);
if (bd->transients) eina_list_free(bd->transients);
if (bd->stick_desks) eina_list_free(bd->stick_desks);
if (bd->client.netwm.icons)
{
int i;
@ -3704,9 +3704,9 @@ _e_border_free(E_Border *bd)
borders_hash = evas_hash_del(borders_hash, e_util_winid_str_get(bd->client.win), bd);
borders_hash = evas_hash_del(borders_hash, e_util_winid_str_get(bd->bg_win), bd);
borders_hash = evas_hash_del(borders_hash, e_util_winid_str_get(bd->win), bd);
borders = evas_list_remove(borders, bd);
focus_stack = evas_list_remove(focus_stack, bd);
raise_stack = evas_list_remove(raise_stack, bd);
borders = eina_list_remove(borders, bd);
focus_stack = eina_list_remove(focus_stack, bd);
raise_stack = eina_list_remove(raise_stack, bd);
e_container_border_remove(bd);
free(bd);
@ -3788,7 +3788,7 @@ _e_border_del(E_Border *bd)
if (bd->parent)
{
bd->parent->transients = evas_list_remove(bd->parent->transients, bd);
bd->parent->transients = eina_list_remove(bd->parent->transients, bd);
if (bd->parent->modal == bd)
{
bd->parent->modal = NULL;
@ -3803,12 +3803,12 @@ _e_border_del(E_Border *bd)
child = bd->transients->data;
child->parent = NULL;
bd->transients = evas_list_remove_list(bd->transients, bd->transients);
bd->transients = eina_list_remove_list(bd->transients, bd->transients);
}
if (bd->leader)
{
bd->leader->group = evas_list_remove(bd->leader->group, bd);
bd->leader->group = eina_list_remove(bd->leader->group, bd);
if (bd->leader->modal == bd)
{
bd->leader->modal = NULL;
@ -3826,7 +3826,7 @@ _e_border_del(E_Border *bd)
child = bd->group->data;
child->leader = NULL;
bd->group = evas_list_remove_list(bd->group, bd->group);
bd->group = eina_list_remove_list(bd->group, bd->group);
}
}
@ -4821,7 +4821,7 @@ _e_border_cb_sync_alarm(void *data, int ev_type, void *ev)
static int
_e_border_cb_efreet_desktop_list_change(void *data, int ev_type, void *ev)
{
Evas_List *l;
Eina_List *l;
/* mark all borders for desktop/icon updates */
for (l = borders; l; l = l->next)
@ -4844,7 +4844,7 @@ static int
_e_border_cb_efreet_desktop_change(void *data, int ev_type, void *ev)
{
Efreet_Event_Desktop_Change *event;
Evas_List *l;
Eina_List *l;
event = ev;
e_init_status_set(_("Desktop file scan"));
@ -4910,7 +4910,7 @@ _e_border_cb_efreet_desktop_change(void *data, int ev_type, void *ev)
static int
_e_border_cb_config_icon_theme(void *data, int ev_type, void *ev)
{
Evas_List *l;
Eina_List *l;
/* mark all borders for desktop/icon updates */
for (l = borders; l; l = l->next)
@ -5260,7 +5260,7 @@ _e_border_cb_mouse_move(void *data, int type, void *event)
{
int x, y, new_x, new_y;
int new_w, new_h;
Evas_List *skiplist = NULL;
Eina_List *skiplist = NULL;
#if 0
if ((ecore_time_get() - bd->client.netwm.sync.time) > 0.5)
@ -5286,12 +5286,12 @@ _e_border_cb_mouse_move(void *data, int type, void *event)
}
new_x = x;
new_y = y;
skiplist = evas_list_append(skiplist, bd);
skiplist = eina_list_append(skiplist, bd);
e_resist_container_border_position(bd->zone->container, skiplist,
bd->x, bd->y, bd->w, bd->h,
x, y, bd->w, bd->h,
&new_x, &new_y, &new_w, &new_h);
evas_list_free(skiplist);
eina_list_free(skiplist);
bd->shelf_fix.x = 0;
bd->shelf_fix.y = 0;
bd->shelf_fix.modified = 0;
@ -5449,7 +5449,7 @@ _e_border_eval(E_Border *bd)
{
if (bd->leader != bd_leader)
{
bd->leader->group = evas_list_remove(bd->leader->group, bd);
bd->leader->group = eina_list_remove(bd->leader->group, bd);
if (bd->leader->modal == bd) bd->leader->modal = NULL;
bd->leader = NULL;
}
@ -5459,7 +5459,7 @@ _e_border_eval(E_Border *bd)
/* If this border is the leader of the group, don't register itself */
if ((bd_leader) && (bd_leader != bd))
{
bd_leader->group = evas_list_append(bd_leader->group, bd);
bd_leader->group = eina_list_append(bd_leader->group, bd);
bd->leader = bd_leader;
/* Only set the window modal to the leader it there is no parent */
if ((e_config->modal_windows) && (bd->client.netwm.state.modal) &&
@ -5470,7 +5470,7 @@ _e_border_eval(E_Border *bd)
e_border_focus_set(bd, 1, 1);
else
{
Evas_List *l;
Eina_List *l;
for (l = bd->leader->group; l; l = l->next)
{
E_Border *child;
@ -5722,7 +5722,7 @@ _e_border_eval(E_Border *bd)
{
if (bd_parent != bd->parent)
{
bd->parent->transients = evas_list_remove(bd->parent->transients, bd);
bd->parent->transients = eina_list_remove(bd->parent->transients, bd);
if (bd->parent->modal == bd) bd->parent->modal = NULL;
bd->parent = NULL;
}
@ -5731,7 +5731,7 @@ _e_border_eval(E_Border *bd)
}
if ((bd_parent) && (bd_parent != bd))
{
bd_parent->transients = evas_list_append(bd_parent->transients, bd);
bd_parent->transients = eina_list_append(bd_parent->transients, bd);
bd->parent = bd_parent;
e_border_layer_set(bd, bd->parent->layer);
if ((e_config->modal_windows) && (bd->client.netwm.state.modal))
@ -5948,7 +5948,7 @@ _e_border_eval(E_Border *bd)
e_border_focus_set(bd, 1, 1);
else
{
Evas_List *l;
Eina_List *l;
for (l = bd->leader->group; l; l = l->next)
{
E_Border *child;
@ -6479,7 +6479,7 @@ _e_border_eval(E_Border *bd)
}
if (!bd->placed)
{
Evas_List *skiplist = NULL;
Eina_List *skiplist = NULL;
int new_x, new_y;
if (bd->zone->w > bd->w)
@ -6493,11 +6493,11 @@ _e_border_eval(E_Border *bd)
if ((e_config->window_placement_policy == E_WINDOW_PLACEMENT_SMART)||(e_config->window_placement_policy == E_WINDOW_PLACEMENT_ANTIGADGET))
{
skiplist = evas_list_append(skiplist, bd);
skiplist = eina_list_append(skiplist, bd);
e_place_zone_region_smart(bd->zone, skiplist,
bd->x, bd->y, bd->w, bd->h,
&new_x, &new_y);
evas_list_free(skiplist);
eina_list_free(skiplist);
}
else if (e_config->window_placement_policy == E_WINDOW_PLACEMENT_MANUAL)
{
@ -6536,7 +6536,7 @@ _e_border_eval(E_Border *bd)
bd->changes.size = 1;
}
free(pnd);
bd->pending_move_resize = evas_list_remove_list(bd->pending_move_resize,
bd->pending_move_resize = eina_list_remove_list(bd->pending_move_resize,
bd->pending_move_resize);
}
@ -7260,7 +7260,7 @@ _e_border_resize_handle(E_Border *bd)
int x, y, w, h;
int new_x, new_y, new_w, new_h;
int tw, th;
Evas_List *skiplist = NULL;
Eina_List *skiplist = NULL;
x = bd->x;
y = bd->y;
@ -7325,12 +7325,12 @@ _e_border_resize_handle(E_Border *bd)
(bd->resize_mode == RESIZE_TR))
y += (th - h);
skiplist = evas_list_append(skiplist, bd);
skiplist = eina_list_append(skiplist, bd);
e_resist_container_border_position(bd->zone->container, skiplist,
bd->x, bd->y, bd->w, bd->h,
x, y, w, h,
&new_x, &new_y, &new_w, &new_h);
evas_list_free(skiplist);
eina_list_free(skiplist);
w = new_w;
h = new_h;
@ -7655,7 +7655,7 @@ static void
_e_border_zone_update(E_Border *bd)
{
E_Container *con;
Evas_List *l;
Eina_List *l;
/* still within old zone - leave it there */
if (E_INTERSECTS(bd->x, bd->y, bd->w, bd->h,
@ -7979,14 +7979,14 @@ _e_border_pointer_move_end(E_Border *bd)
e_pointer_type_pop(bd->pointer, bd, "move");
}
static Evas_List *_e_border_hooks = NULL;
static Eina_List *_e_border_hooks = NULL;
static int _e_border_hooks_delete = 0;
static int _e_border_hooks_walking = 0;
static void
_e_border_hooks_clean(void)
{
Evas_List *l, *pl;
Eina_List *l, *pl;
for (l = _e_border_hooks; l;)
{
@ -7997,7 +7997,7 @@ _e_border_hooks_clean(void)
l = l->next;
if (bh->delete_me)
{
_e_border_hooks = evas_list_remove_list(_e_border_hooks, pl);
_e_border_hooks = eina_list_remove_list(_e_border_hooks, pl);
free(bh);
}
}
@ -8006,7 +8006,7 @@ _e_border_hooks_clean(void)
static void
_e_border_hook_call(E_Border_Hook_Point hookpoint, E_Border *bd)
{
Evas_List *l;
Eina_List *l;
_e_border_hooks_walking++;
for (l = _e_border_hooks; l; l = l->next)
@ -8032,7 +8032,7 @@ e_border_hook_add(E_Border_Hook_Point hookpoint, void (*func) (void *data, E_Bor
bh->hookpoint = hookpoint;
bh->func = func;
bh->data = data;
_e_border_hooks = evas_list_append(_e_border_hooks, bh);
_e_border_hooks = eina_list_append(_e_border_hooks, bh);
return bh;
}
@ -8042,7 +8042,7 @@ e_border_hook_del(E_Border_Hook *bh)
bh->delete_me = 1;
if (_e_border_hooks_walking == 0)
{
_e_border_hooks = evas_list_remove(_e_border_hooks, bh);
_e_border_hooks = eina_list_remove(_e_border_hooks, bh);
free(bh);
}
else
@ -8065,7 +8065,7 @@ EAPI E_Border *
e_border_under_pointer_get(E_Desk *desk, E_Border *exclude)
{
E_Border *bd = NULL;
Evas_List *l;
Eina_List *l;
int x, y;
/* We need to ensure that we can get the container window for the

18
src/bin/e_border.h
View File

@ -142,7 +142,7 @@ struct _E_Border
int ref;
E_Zone *zone;
E_Desk *desk;
Evas_List *handlers;
Eina_List *handlers;
struct {
int x, y;
@ -458,13 +458,13 @@ struct _E_Border
int modified;
} shelf_fix;
Evas_List *stick_desks;
Eina_List *stick_desks;
E_Menu *border_menu;
E_Config_Dialog *border_locks_dialog;
E_Config_Dialog *border_remember_dialog;
E_Config_Dialog *border_border_dialog;
E_Dialog *border_prop_dialog;
Evas_List *pending_move_resize;
Eina_List *pending_move_resize;
struct {
unsigned char visible : 1;
@ -497,10 +497,10 @@ struct _E_Border
E_Border *modal;
E_Border *leader;
Evas_List *group;
Eina_List *group;
E_Border *parent;
Evas_List *transients;
Eina_List *transients;
Efreet_Desktop *desktop;
E_Pointer *pointer;
@ -597,7 +597,7 @@ EAPI E_Border *e_border_focused_get(void);
EAPI void e_border_idler_before(void);
EAPI Evas_List *e_border_client_list(void);
EAPI Eina_List *e_border_client_list(void);
EAPI void e_border_act_move_keyboard(E_Border *bd);
EAPI void e_border_act_resize_keyboard(E_Border *bd);
@ -615,14 +615,14 @@ EAPI Evas_Object *e_border_icon_add(E_Border *bd, Evas *evas);
EAPI void e_border_button_bindings_ungrab_all(void);
EAPI void e_border_button_bindings_grab_all(void);
EAPI Evas_List *e_border_focus_stack_get(void);
EAPI Evas_List *e_border_lost_windows_get(E_Zone *zone);
EAPI Eina_List *e_border_focus_stack_get(void);
EAPI Eina_List *e_border_lost_windows_get(E_Zone *zone);
EAPI void e_border_ping(E_Border *bd);
EAPI void e_border_move_cancel(void);
EAPI void e_border_resize_cancel(void);
EAPI void e_border_frame_recalc(E_Border *bd);
EAPI Evas_List *e_border_immortal_windows_get(void);
EAPI Eina_List *e_border_immortal_windows_get(void);
EAPI const char *e_border_name_get(E_Border *bd);

38
src/bin/e_box.c
View File

@ -15,7 +15,7 @@ struct _E_Smart_Data
unsigned char changed : 1;
unsigned char horizontal : 1;
unsigned char homogenous : 1;
Evas_List *items;
Eina_List *items;
struct {
Evas_Coord w, h;
} min, max;
@ -137,7 +137,7 @@ e_box_pack_start(Evas_Object *obj, Evas_Object *child)
sd = evas_object_smart_data_get(obj);
if (!sd) return 0;
_e_box_smart_adopt(sd, child);
sd->items = evas_list_prepend(sd->items, child);
sd->items = eina_list_prepend(sd->items, child);
sd->changed = 1;
if (sd->frozen <= 0) _e_box_smart_reconfigure(sd);
return 0;
@ -152,10 +152,10 @@ e_box_pack_end(Evas_Object *obj, Evas_Object *child)
sd = evas_object_smart_data_get(obj);
if (!sd) return 0;
_e_box_smart_adopt(sd, child);
sd->items = evas_list_append(sd->items, child);
sd->items = eina_list_append(sd->items, child);
sd->changed = 1;
if (sd->frozen <= 0) _e_box_smart_reconfigure(sd);
return evas_list_count(sd->items) - 1;
return eina_list_count(sd->items) - 1;
}
EAPI int
@ -163,13 +163,13 @@ e_box_pack_before(Evas_Object *obj, Evas_Object *child, Evas_Object *before)
{
E_Smart_Data *sd;
int i = 0;
Evas_List *l;
Eina_List *l;
if (!child) return 0;
sd = evas_object_smart_data_get(obj);
if (!sd) return 0;
_e_box_smart_adopt(sd, child);
sd->items = evas_list_prepend_relative(sd->items, child, before);
sd->items = eina_list_prepend_relative(sd->items, child, before);
for (i = 0, l = sd->items; l; l = l->next, i++)
{
if (l->data == child) break;
@ -184,13 +184,13 @@ e_box_pack_after(Evas_Object *obj, Evas_Object *child, Evas_Object *after)
{
E_Smart_Data *sd;
int i = 0;
Evas_List *l;
Eina_List *l;
if (!child) return 0;
sd = evas_object_smart_data_get(obj);
if (!sd) return 0;
_e_box_smart_adopt(sd, child);
sd->items = evas_list_append_relative(sd->items, child, after);
sd->items = eina_list_append_relative(sd->items, child, after);
for (i = 0, l = sd->items; l; l = l->next, i++)
{
if (l->data == child) break;
@ -207,7 +207,7 @@ e_box_pack_count_get(Evas_Object *obj)
sd = evas_object_smart_data_get(obj);
if (!sd) return 0;
return evas_list_count(sd->items);
return eina_list_count(sd->items);
}
EAPI Evas_Object *
@ -217,7 +217,7 @@ e_box_pack_object_nth(Evas_Object *obj, int n)
sd = evas_object_smart_data_get(obj);
if (!sd) return NULL;
return evas_list_nth(sd->items, n);
return eina_list_nth(sd->items, n);
}
EAPI Evas_Object *
@ -227,7 +227,7 @@ e_box_pack_object_first(Evas_Object *obj)
sd = evas_object_smart_data_get(obj);
if (!sd) return NULL;
return evas_list_data(sd->items);
return eina_list_data_get(sd->items);
}
EAPI Evas_Object *
@ -237,7 +237,7 @@ e_box_pack_object_last(Evas_Object *obj)
sd = evas_object_smart_data_get(obj);
if (!sd) return NULL;
return evas_list_data(evas_list_last(sd->items));
return eina_list_data_get(eina_list_last(sd->items));
}
EAPI void
@ -272,7 +272,7 @@ e_box_unpack(Evas_Object *obj)
if (!bi) return;
sd = bi->sd;
if (!sd) return;
sd->items = evas_list_remove(sd->items, obj);
sd->items = eina_list_remove(sd->items, obj);
_e_box_smart_disown(obj);
sd->changed = 1;
if (sd->frozen <= 0) _e_box_smart_reconfigure(sd);
@ -404,7 +404,7 @@ static void
_e_box_smart_reconfigure(E_Smart_Data *sd)
{
Evas_Coord x, y, w, h, xx, yy;
Evas_List *l;
Eina_List *l;
int minw, minh, wdif, hdif;
int count, expand;
@ -418,7 +418,7 @@ _e_box_smart_reconfigure(E_Smart_Data *sd)
_e_box_smart_extents_calculate(sd);
minw = sd->min.w;
minh = sd->min.h;
count = evas_list_count(sd->items);
count = eina_list_count(sd->items);
expand = 0;
if (w < minw)
{
@ -577,7 +577,7 @@ _e_box_smart_reconfigure(E_Smart_Data *sd)
static void
_e_box_smart_extents_calculate(E_Smart_Data *sd)
{
Evas_List *l;
Eina_List *l;
int minw, minh;
/* FIXME: need to calc max */
@ -602,9 +602,9 @@ _e_box_smart_extents_calculate(E_Smart_Data *sd)
}
}
if (sd->horizontal)
minw *= evas_list_count(sd->items);
minw *= eina_list_count(sd->items);
else
minh *= evas_list_count(sd->items);
minh *= eina_list_count(sd->items);
}
else
{
@ -713,7 +713,7 @@ _e_box_smart_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
if (!sd) return;
if ((x == sd->x) && (y == sd->y)) return;
{
Evas_List *l;
Eina_List *l;
Evas_Coord dx, dy;
dx = x - sd->x;

16
src/bin/e_canvas.c
View File

@ -7,7 +7,7 @@
static int _e_canvas_cb_flush(void *data);
/* local subsystem globals */
static Evas_List *_e_canvases = NULL;
static Eina_List *_e_canvases = NULL;
static Ecore_Poller *_e_canvas_cache_flush_poller = NULL;
/* externally accessible functions */
@ -16,7 +16,7 @@ e_canvas_add(Ecore_Evas *ee)
{
Evas *e;
_e_canvases = evas_list_prepend(_e_canvases, ee);
_e_canvases = eina_list_prepend(_e_canvases, ee);
e = ecore_evas_get(ee);
evas_image_cache_set(e, e_config->image_cache * 1024);
evas_font_cache_set(e, e_config->font_cache * 1024);
@ -44,7 +44,7 @@ e_canvas_add(Ecore_Evas *ee)
EAPI void
e_canvas_del(Ecore_Evas *ee)
{
_e_canvases = evas_list_remove(_e_canvases, ee);
_e_canvases = eina_list_remove(_e_canvases, ee);
}
EAPI int
@ -79,7 +79,7 @@ e_canvas_engine_decide(int engine)
EAPI void
e_canvas_recache(void)
{
Evas_List *l;
Eina_List *l;
for (l = _e_canvases; l; l = l->next)
{
@ -110,7 +110,7 @@ e_canvas_recache(void)
EAPI void
e_canvas_cache_flush(void)
{
Evas_List *l;
Eina_List *l;
for (l = _e_canvases; l; l = l->next)
{
@ -129,7 +129,7 @@ e_canvas_cache_flush(void)
EAPI void
e_canvas_cache_reload(void)
{
Evas_List *l;
Eina_List *l;
for (l = _e_canvases; l; l = l->next)
{
@ -145,7 +145,7 @@ e_canvas_cache_reload(void)
EAPI void
e_canvas_idle_flush(void)
{
Evas_List *l;
Eina_List *l;
for (l = _e_canvases; l; l = l->next)
{
@ -161,7 +161,7 @@ e_canvas_idle_flush(void)
EAPI void
e_canvas_rehint(void)
{
Evas_List *l;
Eina_List *l;
for (l = _e_canvases; l; l = l->next)
{

10
src/bin/e_color_class.c
View File

@ -6,7 +6,7 @@
EAPI int
e_color_class_init(void)
{
Evas_List *l;
Eina_List *l;
for (l = e_config->color_classes; l; l = l->next)
{
@ -40,7 +40,7 @@ e_color_class_set(const char *color_class, int r, int g, int b, int a, int r2, i
if (!cc)
{
cc = E_NEW(E_Color_Class, 1);
e_config->color_classes = evas_list_append(e_config->color_classes, cc);
e_config->color_classes = eina_list_append(e_config->color_classes, cc);
cc->name = eina_stringshare_add(color_class);
cc->r = cc->g = cc->b = cc->a = 255;
cc->r2 = cc->g2 = cc->b2 = cc->a2 = 255;
@ -75,7 +75,7 @@ e_color_class_del(const char *name)
cc = e_color_class_find(name);
if (cc)
{
e_config->color_classes = evas_list_remove(e_config->color_classes, cc);
e_config->color_classes = eina_list_remove(e_config->color_classes, cc);
edje_color_class_del(cc->name);
eina_stringshare_del(cc->name);
E_FREE(cc);
@ -87,7 +87,7 @@ e_color_class_del(const char *name)
EAPI E_Color_Class *
e_color_class_find(const char *name)
{
Evas_List *l;
Eina_List *l;
E_Color_Class *cc = NULL;
for (l = e_config->color_classes; l; l = l->next)
@ -105,7 +105,7 @@ e_color_class_find(const char *name)
}
EAPI Evas_List *
EAPI Eina_List *
e_color_class_list(void)
{
return e_config->color_classes;

2
src/bin/e_color_class.h
View File

@ -27,7 +27,7 @@ EAPI void e_color_class_set(const char *color_class,
EAPI E_Color_Class *e_color_class_find(const char *name);
EAPI void e_color_class_del(const char *name);
EAPI Evas_List *e_color_class_list(void);
EAPI Eina_List *e_color_class_list(void);
#endif
#endif

90
src/bin/e_config.c
View File

@ -830,7 +830,7 @@ e_config_init(void)
em->enabled = _enabled; \
em->delayed = _delayed; \
em->priority = _priority; \
e_config->modules = evas_list_append(e_config->modules, em)
e_config->modules = eina_list_append(e_config->modules, em)
CFG_MODULE("start", 1, 0, 0);
CFG_MODULE("ibar", 1, 0, 0);
@ -890,7 +890,7 @@ e_config_init(void)
#define CFG_FONTFALLBACK(_name) \
eff = E_NEW(E_Font_Fallback, 1); \
eff->name = eina_stringshare_add(_name); \
e_config->font_fallbacks = evas_list_append(e_config->font_fallbacks, eff)
e_config->font_fallbacks = eina_list_append(e_config->font_fallbacks, eff)
CFG_FONTFALLBACK("New-Sung");
CFG_FONTFALLBACK("Kochi-Gothic");
@ -905,7 +905,7 @@ e_config_init(void)
efd->text_class = eina_stringshare_add(_tclass); \
efd->font = eina_stringshare_add(_name); \
efd->size = _size; \
e_config->font_defaults = evas_list_append(e_config->font_defaults, efd)
e_config->font_defaults = eina_list_append(e_config->font_defaults, efd)
CFG_FONTDEFAULT("default", "Vera", 10);
}
@ -915,7 +915,7 @@ e_config_init(void)
et = E_NEW(E_Config_Theme, 1);
et->category = eina_stringshare_add("theme");
et->file = eina_stringshare_add("default.edj");
e_config->themes = evas_list_append(e_config->themes, et);
e_config->themes = eina_list_append(e_config->themes, et);
}
{
E_Config_Binding_Mouse *eb;
@ -928,7 +928,7 @@ e_config_init(void)
eb->any_mod = _anymod; \
eb->action = _action == NULL ? NULL : eina_stringshare_add(_action); \
eb->params = _params == NULL ? NULL : eina_stringshare_add(_params); \
e_config->mouse_bindings = evas_list_append(e_config->mouse_bindings, eb)
e_config->mouse_bindings = eina_list_append(e_config->mouse_bindings, eb)
/*
* FIXME:
@ -958,7 +958,7 @@ e_config_init(void)
eb->any_mod = _anymod; \
eb->action = _action == NULL ? NULL : eina_stringshare_add(_action); \
eb->params = _params == NULL ? NULL : eina_stringshare_add(_params); \
e_config->key_bindings = evas_list_append(e_config->key_bindings, eb)
e_config->key_bindings = eina_list_append(e_config->key_bindings, eb)
/*
* FIXME:
@ -1124,7 +1124,7 @@ e_config_init(void)
eb->any_mod = _anymod; \
eb->action = _action == NULL ? NULL : eina_stringshare_add(_action); \
eb->params = _params == NULL ? NULL : eina_stringshare_add(_params); \
e_config->signal_bindings = evas_list_append(e_config->signal_bindings, eb)
e_config->signal_bindings = eina_list_append(e_config->signal_bindings, eb)
CFG_SIGNALBIND(E_BINDING_CONTEXT_BORDER, "mouse,down,1,double",
"e.event.titlebar",
@ -1251,7 +1251,7 @@ e_config_init(void)
eb->any_mod = _anymod; \
eb->action = _action == NULL ? NULL : eina_stringshare_add(_action); \
eb->params = _params == NULL ? NULL : eina_stringshare_add(_params); \
e_config->wheel_bindings = evas_list_append(e_config->wheel_bindings, eb)
e_config->wheel_bindings = eina_list_append(e_config->wheel_bindings, eb)
/*
* FIXME:
@ -1325,8 +1325,8 @@ e_config_init(void)
cf_es->hide_timeout = _hide_timeout; \
cf_es->hide_duration = _hide_duration; \
cf_es->desk_show_mode = _desk_show_mode; \
cf_es->desk_list = evas_list_append(cf_es->desk_list, cf_es); \
e_config->shelves = evas_list_append(e_config->shelves, cf_es)
cf_es->desk_list = eina_list_append(cf_es->desk_list, cf_es); \
e_config->shelves = eina_list_append(e_config->shelves, cf_es)
CFG_SHELF("shelf", 0, 0,
1, 200, E_GADCON_ORIENT_BOTTOM,
1, 0, "default", 40, 0, 0, 0, 1.0, 1.0, 0, NULL);
@ -1378,7 +1378,7 @@ e_config_init(void)
mi = E_NEW(E_Config_Mime_Icon, 1); \
mi->mime = eina_stringshare_add(_mime); \
mi->icon = eina_stringshare_add(_icon); \
e_config->mime_icons = evas_list_append(e_config->mime_icons, mi)
e_config->mime_icons = eina_list_append(e_config->mime_icons, mi)
CFG_MIME_ICON("image/jpeg", "THUMB");
CFG_MIME_ICON("image/png", "THUMB");
@ -1421,7 +1421,7 @@ e_config_init(void)
cf_gc = E_NEW(E_Config_Gadcon, 1);\
cf_gc->name = eina_stringshare_add(_name); \
cf_gc->id = ++id; \
e_config->gadcons = evas_list_append(e_config->gadcons, cf_gc)
e_config->gadcons = eina_list_append(e_config->gadcons, cf_gc)
#define CFG_GADCON_CLIENT(_name, _res, _size, _pos, _style, _autoscr, _resizable) \
cf_gcc = E_NEW(E_Config_Gadcon_Client, 1); \
cf_gcc->name = eina_stringshare_add(_name); \
@ -1435,7 +1435,7 @@ e_config_init(void)
else cf_gcc->style = NULL; \
cf_gcc->autoscroll = _autoscr; \
cf_gcc->resizable = _resizable; \
cf_gc->clients = evas_list_append(cf_gc->clients, cf_gcc)
cf_gc->clients = eina_list_append(cf_gc->clients, cf_gcc)
/* the default shelf on the default head/zone */
CFG_GADCON("shelf");
@ -1804,13 +1804,13 @@ e_config_profile_set(const char *prof)
e_util_env_set("E_CONF_PROFILE", _e_config_profile);
}
EAPI Evas_List *
EAPI Eina_List *
e_config_profile_list(void)
{
Ecore_List *files;
char buf[4096];
const char *homedir;
Evas_List *flist = NULL;
Eina_List *flist = NULL;
homedir = e_user_homedir_get();
snprintf(buf, sizeof(buf), "%s/.e/e/config/", homedir);
@ -1824,7 +1824,7 @@ e_config_profile_list(void)
{
snprintf(buf, sizeof(buf), "%s/.e/e/config/%s", homedir, file);
if (ecore_file_is_dir(buf))
flist = evas_list_append(flist, strdup(file));
flist = eina_list_append(flist, strdup(file));
ecore_list_next(files);
}
ecore_list_destroy(files);
@ -1871,11 +1871,11 @@ e_config_profile_del(const char *prof)
ecore_file_rmdir(buf);
}
EAPI Evas_List *
EAPI Eina_List *
e_config_engine_list(void)
{
Evas_List *l = NULL;
l = evas_list_append(l, strdup("SOFTWARE"));
Eina_List *l = NULL;
l = eina_list_append(l, strdup("SOFTWARE"));
/*
* DISABLE GL as an accessible engine - it does have problems, ESPECIALLY with
* shaped windows (it can't do them), and multiple gl windows and shared
@ -1883,12 +1883,12 @@ e_config_engine_list(void)
* this regard.
*/
#if 0
l = evas_list_append(l, strdup("GL"));
l = eina_list_append(l, strdup("GL"));
#endif
if (ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_XRENDER_X11))
l = evas_list_append(l, strdup("XRENDER"));
l = eina_list_append(l, strdup("XRENDER"));
if (ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_SOFTWARE_16_X11))
l = evas_list_append(l, strdup("SOFTWARE_16"));
l = eina_list_append(l, strdup("SOFTWARE_16"));
return l;
}
@ -2009,7 +2009,7 @@ e_config_domain_save(const char *domain, E_Config_DD *edd, const void *data)
EAPI E_Config_Binding_Mouse *
e_config_binding_mouse_match(E_Config_Binding_Mouse *eb_in)
{
Evas_List *l;
Eina_List *l;
for (l = e_config->mouse_bindings; l; l = l->next)
{
@ -2032,7 +2032,7 @@ e_config_binding_mouse_match(E_Config_Binding_Mouse *eb_in)
EAPI E_Config_Binding_Key *
e_config_binding_key_match(E_Config_Binding_Key *eb_in)
{
Evas_List *l;
Eina_List *l;
for (l = e_config->key_bindings; l; l = l->next)
{
@ -2056,7 +2056,7 @@ e_config_binding_key_match(E_Config_Binding_Key *eb_in)
EAPI E_Config_Binding_Signal *
e_config_binding_signal_match(E_Config_Binding_Signal *eb_in)
{
Evas_List *l;
Eina_List *l;
for (l = e_config->signal_bindings; l; l = l->next)
{
@ -2082,7 +2082,7 @@ e_config_binding_signal_match(E_Config_Binding_Signal *eb_in)
EAPI E_Config_Binding_Wheel *
e_config_binding_wheel_match(E_Config_Binding_Wheel *eb_in)
{
Evas_List *l;
Eina_List *l;
for (l = e_config->wheel_bindings; l; l = l->next)
{
@ -2123,7 +2123,7 @@ _e_config_free(void)
E_Config_Module *em;
em = e_config->modules->data;
e_config->modules = evas_list_remove_list(e_config->modules, e_config->modules);
e_config->modules = eina_list_remove_list(e_config->modules, e_config->modules);
if (em->name) eina_stringshare_del(em->name);
E_FREE(em);
}
@ -2132,7 +2132,7 @@ _e_config_free(void)
E_Font_Fallback *eff;
eff = e_config->font_fallbacks->data;
e_config->font_fallbacks = evas_list_remove_list(e_config->font_fallbacks, e_config->font_fallbacks);
e_config->font_fallbacks = eina_list_remove_list(e_config->font_fallbacks, e_config->font_fallbacks);
if (eff->name) eina_stringshare_del(eff->name);
E_FREE(eff);
}
@ -2141,7 +2141,7 @@ _e_config_free(void)
E_Font_Default *efd;
efd = e_config->font_defaults->data;
e_config->font_defaults = evas_list_remove_list(e_config->font_defaults, e_config->font_defaults);
e_config->font_defaults = eina_list_remove_list(e_config->font_defaults, e_config->font_defaults);
if (efd->text_class) eina_stringshare_del(efd->text_class);
if (efd->font) eina_stringshare_del(efd->font);
E_FREE(efd);
@ -2151,7 +2151,7 @@ _e_config_free(void)
E_Config_Theme *et;
et = e_config->themes->data;
e_config->themes = evas_list_remove_list(e_config->themes, e_config->themes);
e_config->themes = eina_list_remove_list(e_config->themes, e_config->themes);
if (et->category) eina_stringshare_del(et->category);
if (et->file) eina_stringshare_del(et->file);
E_FREE(et);
@ -2161,7 +2161,7 @@ _e_config_free(void)
E_Config_Binding_Mouse *eb;
eb = e_config->mouse_bindings->data;
e_config->mouse_bindings = evas_list_remove_list(e_config->mouse_bindings, e_config->mouse_bindings);
e_config->mouse_bindings = eina_list_remove_list(e_config->mouse_bindings, e_config->mouse_bindings);
if (eb->action) eina_stringshare_del(eb->action);
if (eb->params) eina_stringshare_del(eb->params);
E_FREE(eb);
@ -2171,7 +2171,7 @@ _e_config_free(void)
E_Config_Binding_Key *eb;
eb = e_config->key_bindings->data;
e_config->key_bindings = evas_list_remove_list(e_config->key_bindings, e_config->key_bindings);
e_config->key_bindings = eina_list_remove_list(e_config->key_bindings, e_config->key_bindings);
if (eb->key) eina_stringshare_del(eb->key);
if (eb->action) eina_stringshare_del(eb->action);
if (eb->params) eina_stringshare_del(eb->params);
@ -2182,7 +2182,7 @@ _e_config_free(void)
E_Config_Binding_Signal *eb;
eb = e_config->signal_bindings->data;
e_config->signal_bindings = evas_list_remove_list(e_config->signal_bindings, e_config->signal_bindings);
e_config->signal_bindings = eina_list_remove_list(e_config->signal_bindings, e_config->signal_bindings);
if (eb->signal) eina_stringshare_del(eb->signal);
if (eb->source) eina_stringshare_del(eb->source);
if (eb->action) eina_stringshare_del(eb->action);
@ -2194,7 +2194,7 @@ _e_config_free(void)
E_Config_Binding_Wheel *eb;
eb = e_config->wheel_bindings->data;
e_config->wheel_bindings = evas_list_remove_list(e_config->wheel_bindings, e_config->wheel_bindings);
e_config->wheel_bindings = eina_list_remove_list(e_config->wheel_bindings, e_config->wheel_bindings);
if (eb->action) eina_stringshare_del(eb->action);
if (eb->params) eina_stringshare_del(eb->params);
E_FREE(eb);
@ -2203,7 +2203,7 @@ _e_config_free(void)
{
E_Path_Dir *epd;
epd = e_config->path_append_data->data;
e_config->path_append_data = evas_list_remove_list(e_config->path_append_data, e_config->path_append_data);
e_config->path_append_data = eina_list_remove_list(e_config->path_append_data, e_config->path_append_data);
if (epd->dir) eina_stringshare_del(epd->dir);
E_FREE(epd);
}
@ -2211,7 +2211,7 @@ _e_config_free(void)
{
E_Path_Dir *epd;
epd = e_config->path_append_images->data;
e_config->path_append_images = evas_list_remove_list(e_config->path_append_images, e_config->path_append_images);
e_config->path_append_images = eina_list_remove_list(e_config->path_append_images, e_config->path_append_images);
if (epd->dir) eina_stringshare_del(epd->dir);
E_FREE(epd);
}
@ -2219,7 +2219,7 @@ _e_config_free(void)
{
E_Path_Dir *epd;
epd = e_config->path_append_fonts->data;
e_config->path_append_fonts = evas_list_remove_list(e_config->path_append_fonts, e_config->path_append_fonts);
e_config->path_append_fonts = eina_list_remove_list(e_config->path_append_fonts, e_config->path_append_fonts);
if (epd->dir) eina_stringshare_del(epd->dir);
E_FREE(epd);
}
@ -2227,7 +2227,7 @@ _e_config_free(void)
{
E_Path_Dir *epd;
epd = e_config->path_append_themes->data;
e_config->path_append_themes = evas_list_remove_list(e_config->path_append_themes, e_config->path_append_themes);
e_config->path_append_themes = eina_list_remove_list(e_config->path_append_themes, e_config->path_append_themes);
if (epd->dir) eina_stringshare_del(epd->dir);
E_FREE(epd);
}
@ -2235,7 +2235,7 @@ _e_config_free(void)
{
E_Path_Dir *epd;
epd = e_config->path_append_init->data;
e_config->path_append_init = evas_list_remove_list(e_config->path_append_init, e_config->path_append_init);
e_config->path_append_init = eina_list_remove_list(e_config->path_append_init, e_config->path_append_init);
if (epd->dir) eina_stringshare_del(epd->dir);
E_FREE(epd);
}
@ -2243,7 +2243,7 @@ _e_config_free(void)
{
E_Path_Dir *epd;
epd = e_config->path_append_icons->data;
e_config->path_append_icons = evas_list_remove_list(e_config->path_append_icons, e_config->path_append_icons);
e_config->path_append_icons = eina_list_remove_list(e_config->path_append_icons, e_config->path_append_icons);
if (epd->dir) eina_stringshare_del(epd->dir);
E_FREE(epd);
}
@ -2251,7 +2251,7 @@ _e_config_free(void)
{
E_Path_Dir *epd;
epd = e_config->path_append_modules->data;
e_config->path_append_modules = evas_list_remove_list(e_config->path_append_modules, e_config->path_append_modules);
e_config->path_append_modules = eina_list_remove_list(e_config->path_append_modules, e_config->path_append_modules);
if (epd->dir) eina_stringshare_del(epd->dir);
E_FREE(epd);
}
@ -2259,7 +2259,7 @@ _e_config_free(void)
{
E_Path_Dir *epd;
epd = e_config->path_append_backgrounds->data;
e_config->path_append_backgrounds = evas_list_remove_list(e_config->path_append_backgrounds, e_config->path_append_backgrounds);
e_config->path_append_backgrounds = eina_list_remove_list(e_config->path_append_backgrounds, e_config->path_append_backgrounds);
if (epd->dir) eina_stringshare_del(epd->dir);
E_FREE(epd);
}
@ -2267,7 +2267,7 @@ _e_config_free(void)
{
E_Path_Dir *epd;
epd = e_config->path_append_messages->data;
e_config->path_append_messages = evas_list_remove_list(e_config->path_append_messages, e_config->path_append_messages);
e_config->path_append_messages = eina_list_remove_list(e_config->path_append_messages, e_config->path_append_messages);
if (epd->dir) eina_stringshare_del(epd->dir);
E_FREE(epd);
}
@ -2275,7 +2275,7 @@ _e_config_free(void)
{
E_Remember *rem;
rem = e_config->remembers->data;
e_config->remembers = evas_list_remove_list(e_config->remembers, e_config->remembers);
e_config->remembers = eina_list_remove_list(e_config->remembers, e_config->remembers);
if (rem->name) eina_stringshare_del(rem->name);
if (rem->class) eina_stringshare_del(rem->class);
@ -2290,7 +2290,7 @@ _e_config_free(void)
{
E_Color_Class *cc;
cc = e_config->color_classes->data;
e_config->color_classes = evas_list_remove_list(e_config->color_classes, e_config->color_classes);
e_config->color_classes = eina_list_remove_list(e_config->color_classes, e_config->color_classes);
if (cc->name) eina_stringshare_del(cc->name);
E_FREE(cc);

56
src/bin/e_config.h
View File

@ -61,9 +61,9 @@ struct _E_Config
int show_splash; // GUI
const char *init_default_theme; // GUI
const char *desktop_default_background; // GUI
Evas_List *desktop_backgrounds; // GUI
Eina_List *desktop_backgrounds; // GUI
const char *desktop_default_name;
Evas_List *desktop_names; // GUI
Eina_List *desktop_names; // GUI
double menus_scroll_speed; // GUI
double menus_fast_mouse_move_threshhold; // GUI
double menus_click_drag_timeout; // GUI
@ -94,23 +94,23 @@ struct _E_Config
int evas_engine_zone; // NO GUI - maybe remove?
int use_composite; // GUI
const char *language; // GUI
Evas_List *modules; // GUI
Evas_List *font_fallbacks; // GUI
Evas_List *font_defaults; // GUI
Evas_List *themes; // GUI
Evas_List *mouse_bindings; // GUI
Evas_List *key_bindings; // GUI
Evas_List *signal_bindings;
Evas_List *wheel_bindings; // GUI
Evas_List *path_append_data; // GUI
Evas_List *path_append_images; // GUI
Evas_List *path_append_fonts; // GUI
Evas_List *path_append_themes; // GUI
Evas_List *path_append_init; // GUI
Evas_List *path_append_icons; // GUI
Evas_List *path_append_modules; // GUI
Evas_List *path_append_backgrounds; // GUI
Evas_List *path_append_messages; // GUI
Eina_List *modules; // GUI
Eina_List *font_fallbacks; // GUI
Eina_List *font_defaults; // GUI
Eina_List *themes; // GUI
Eina_List *mouse_bindings; // GUI
Eina_List *key_bindings; // GUI
Eina_List *signal_bindings;
Eina_List *wheel_bindings; // GUI
Eina_List *path_append_data; // GUI
Eina_List *path_append_images; // GUI
Eina_List *path_append_fonts; // GUI
Eina_List *path_append_themes; // GUI
Eina_List *path_append_init; // GUI
Eina_List *path_append_icons; // GUI
Eina_List *path_append_modules; // GUI
Eina_List *path_append_backgrounds; // GUI
Eina_List *path_append_messages; // GUI
int window_placement_policy; // GUI
int focus_policy; // GUI
int focus_setting; // GUI
@ -157,7 +157,7 @@ struct _E_Config
const char *transition_start; // GUI
const char *transition_desk; // GUI
const char *transition_change; // GUI
Evas_List *remembers;
Eina_List *remembers;
int remember_internal_windows; // GUI
int move_info_follows; // GUI
int resize_info_follows; // GUI
@ -201,13 +201,13 @@ struct _E_Config
int exebuf_pos_max_w; // GUI
int exebuf_pos_max_h; // GUI
const char *exebuf_term_cmd; // GUI
Evas_List *color_classes; // GUI
Eina_List *color_classes; // GUI
int use_app_icon; // GUI
int cnfmdlg_disabled; // GUI
int cfgdlg_auto_apply; // GUI
int cfgdlg_default_mode; // GUI
Evas_List *gadcons; // GUI
Evas_List *shelves; // GUI
Eina_List *gadcons; // GUI
Eina_List *shelves; // GUI
int font_hinting; // GUI
const char *desklock_personal_passwd; // GUI
@ -275,7 +275,7 @@ struct _E_Config
const char *theme_default_border_style; // GUI
Evas_List *mime_icons; // GUI
Eina_List *mime_icons; // GUI
int desk_auto_switch; // GUI;
int thumb_nice;
@ -393,7 +393,7 @@ struct _E_Config_Gadcon
{
const char *name;
int id;
Evas_List *clients;
Eina_List *clients;
};
struct _E_Config_Gadcon_Client
@ -430,7 +430,7 @@ struct _E_Config_Shelf
float hide_timeout;
float hide_duration;
int desk_show_mode;
Evas_List *desk_list;
Eina_List *desk_list;
};
struct _E_Config_Shelf_Desk
@ -458,11 +458,11 @@ EAPI void e_config_save_queue(void);
EAPI const char *e_config_profile_get(void);
EAPI void e_config_profile_set(const char *prof);
EAPI Evas_List *e_config_profile_list(void);
EAPI Eina_List *e_config_profile_list(void);
EAPI void e_config_profile_add(const char *prof);
EAPI void e_config_profile_del(const char *prof);
EAPI Evas_List *e_config_engine_list(void);
EAPI Eina_List *e_config_engine_list(void);
EAPI void e_config_save_block_set(int block);
EAPI int e_config_save_block_get(void);

8
src/bin/e_config_data.c
View File

@ -13,10 +13,10 @@ e_config_descriptor_new(const char *name, int size)
eddc.func.mem_free = NULL;
eddc.func.str_alloc = (char *(*)(const char *)) eina_stringshare_add;
eddc.func.str_free = (void (*)(const char *)) eina_stringshare_del;
eddc.func.list_next = (void *(*)(void *)) evas_list_next;
eddc.func.list_append = (void *(*)(void *l, void *d)) evas_list_append;
eddc.func.list_data = (void *(*)(void *)) evas_list_data;
eddc.func.list_free = (void *(*)(void *)) evas_list_free;
eddc.func.list_next = (void *(*)(void *)) eina_list_next;
eddc.func.list_append = (void *(*)(void *l, void *d)) eina_list_append;
eddc.func.list_data = (void *(*)(void *)) eina_list_data_get;
eddc.func.list_free = (void *(*)(void *)) eina_list_free;
eddc.func.hash_foreach =
(void (*) (void *, int (*) (void *, const char *, void *, void *), void *))
evas_hash_foreach;

10
src/bin/e_config_dialog.c
View File

@ -16,7 +16,7 @@ static void _e_config_dialog_cb_changed(void *data, Evas_Object *obj);
static void _e_config_dialog_cb_close(void *data, E_Dialog *dia);
/* local subsystem globals */
static Evas_List *_e_config_dialog_list = NULL;
static Eina_List *_e_config_dialog_list = NULL;
/* externally accessible functions */
@ -72,7 +72,7 @@ e_config_dialog_new(E_Container *con, const char *title, const char *name, const
_e_config_dialog_go(cfd, E_CONFIG_DIALOG_CFDATA_TYPE_BASIC);
break;
}
_e_config_dialog_list = evas_list_append(_e_config_dialog_list, cfd);
_e_config_dialog_list = eina_list_append(_e_config_dialog_list, cfd);
return cfd;
}
@ -80,7 +80,7 @@ e_config_dialog_new(E_Container *con, const char *title, const char *name, const
EAPI int
e_config_dialog_find(const char *name, const char *class)
{
Evas_List *l;
Eina_List *l;
E_Config_Dialog *cfd;
for (l = _e_config_dialog_list; l; l = l->next)
@ -116,7 +116,7 @@ e_config_dialog_find(const char *name, const char *class)
EAPI E_Config_Dialog *
e_config_dialog_get(const char *name, const char *class)
{
Evas_List *l;
Eina_List *l;
for (l = _e_config_dialog_list; l; l = l->next)
{
@ -138,7 +138,7 @@ e_config_dialog_get(const char *name, const char *class)
static void
_e_config_dialog_free(E_Config_Dialog *cfd)
{
_e_config_dialog_list = evas_list_remove(_e_config_dialog_list, cfd);
_e_config_dialog_list = eina_list_remove(_e_config_dialog_list, cfd);
if (cfd->auto_apply_timer) _e_config_dialog_cb_auto_apply_timer(cfd);
if (cfd->title) eina_stringshare_del(cfd->title);
if (cfd->name) eina_stringshare_del(cfd->name);

50
src/bin/e_configure.c
View File

@ -5,9 +5,9 @@ static int _e_configure_cb_efreet_desktop_list_change(void *data, int type, void
static int _e_configure_cb_efreet_desktop_change(void *data, int type, void *event);
static void _e_configure_registry_item_full_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon, E_Config_Dialog *(*func) (E_Container *con, const char *params), void (*generic_func) (E_Container *con, const char *params), Efreet_Desktop *desktop);
Evas_List *e_configure_registry = NULL;
Eina_List *e_configure_registry = NULL;
static Evas_List *handlers = NULL;
static Eina_List *handlers = NULL;
EAPI void
e_configure_init(void)
@ -15,10 +15,10 @@ e_configure_init(void)
e_configure_registry_category_add("extensions", 90, _("Extensions"), NULL, "enlightenment/extensions");
e_configure_registry_item_add("extensions/modules", 10, _("Modules"), NULL, "enlightenment/modules", e_int_config_modules);
handlers = evas_list_append
handlers = eina_list_append
(handlers, ecore_event_handler_add
(EFREET_EVENT_DESKTOP_LIST_CHANGE, _e_configure_cb_efreet_desktop_list_change, NULL));
handlers = evas_list_append
handlers = eina_list_append
(handlers, ecore_event_handler_add
(EFREET_EVENT_DESKTOP_CHANGE, _e_configure_cb_efreet_desktop_change, NULL));
// _e_configure_efreet_desktop_update();
@ -29,7 +29,7 @@ _e_configure_efreet_desktop_update(void)
{
Ecore_List *settings_desktops, *system_desktops;
Efreet_Desktop *desktop;
Evas_List *l, *ll, *remove_items = NULL, *remove_cats = NULL;
Eina_List *l, *ll, *remove_items = NULL, *remove_cats = NULL;
char buf[1024];
/* remove anything with a desktop entry */
@ -46,8 +46,8 @@ _e_configure_efreet_desktop_update(void)
if (eci->desktop)
{
snprintf(buf, sizeof(buf), "%s/%s", ecat->cat, eci->item);
remove_items = evas_list_append(remove_items, strdup(buf));
remove_cats = evas_list_append(remove_cats, strdup(ecat->cat));
remove_items = eina_list_append(remove_items, strdup(buf));
remove_cats = eina_list_append(remove_cats, strdup(ecat->cat));
}
}
}
@ -55,13 +55,13 @@ _e_configure_efreet_desktop_update(void)
{
e_configure_registry_item_del(remove_items->data);
free(remove_items->data);
remove_items = evas_list_remove_list(remove_items, remove_items);
remove_items = eina_list_remove_list(remove_items, remove_items);
}
while (remove_cats)
{
e_configure_registry_category_del(remove_cats->data);
free(remove_cats->data);
remove_cats = evas_list_remove_list(remove_cats, remove_cats);
remove_cats = eina_list_remove_list(remove_cats, remove_cats);
}
/* get desktops */
@ -172,7 +172,7 @@ _e_configure_cb_efreet_desktop_change(void *data, int type, void *event)
static void
_e_configure_registry_item_full_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon, E_Config_Dialog *(*func) (E_Container *con, const char *params), void (*generic_func) (E_Container *con, const char *params), Efreet_Desktop *desktop)
{
Evas_List *l;
Eina_List *l;
char *cat;
const char *item;
E_Configure_It *eci;
@ -201,7 +201,7 @@ _e_configure_registry_item_full_add(const char *path, int pri, const char *label
ecat = l->data;
if (!strcmp(cat, ecat->cat))
{
Evas_List *ll;
Eina_List *ll;
for (ll = ecat->items; ll; ll = ll->next)
{
@ -210,11 +210,11 @@ _e_configure_registry_item_full_add(const char *path, int pri, const char *label
eci2 = ll->data;
if (eci2->pri > eci->pri)
{
ecat->items = evas_list_prepend_relative_list(ecat->items, eci, ll);
ecat->items = eina_list_prepend_relative_list(ecat->items, eci, ll);
goto done;
}
}
ecat->items = evas_list_append(ecat->items, eci);
ecat->items = eina_list_append(ecat->items, eci);
goto done;
}
}
@ -237,7 +237,7 @@ e_configure_registry_generic_item_add(const char *path, int pri, const char *lab
EAPI void
e_configure_registry_item_del(const char *path)
{
Evas_List *l;
Eina_List *l;
char *cat;
const char *item;
@ -252,7 +252,7 @@ e_configure_registry_item_del(const char *path)
ecat = l->data;
if (!strcmp(cat, ecat->cat))
{
Evas_List *ll;
Eina_List *ll;
for (ll = ecat->items; ll; ll = ll->next)
{
@ -261,7 +261,7 @@ e_configure_registry_item_del(const char *path)
eci = ll->data;
if (!strcmp(item, eci->item))
{
ecat->items = evas_list_remove_list(ecat->items, ll);
ecat->items = eina_list_remove_list(ecat->items, ll);
eina_stringshare_del(eci->item);
eina_stringshare_del(eci->label);
eina_stringshare_del(eci->icon);
@ -282,7 +282,7 @@ EAPI void
e_configure_registry_category_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon)
{
E_Configure_Cat *ecat;
Evas_List *l;
Eina_List *l;
/* if it exists - ignore this */
for (l = e_configure_registry; l; l = l->next)
@ -308,17 +308,17 @@ e_configure_registry_category_add(const char *path, int pri, const char *label,
ecat2 = l->data;
if (ecat2->pri > ecat->pri)
{
e_configure_registry = evas_list_prepend_relative_list(e_configure_registry, ecat, l);
e_configure_registry = eina_list_prepend_relative_list(e_configure_registry, ecat, l);
return;
}
}
e_configure_registry = evas_list_append(e_configure_registry, ecat);
e_configure_registry = eina_list_append(e_configure_registry, ecat);
}
EAPI void
e_configure_registry_category_del(const char *path)
{
Evas_List *l;
Eina_List *l;
char *cat;
cat = ecore_file_dir_get(path);
@ -331,7 +331,7 @@ e_configure_registry_category_del(const char *path)
if (!strcmp(cat, ecat->cat))
{
if (ecat->items) goto done;
e_configure_registry = evas_list_remove_list(e_configure_registry, l);
e_configure_registry = eina_list_remove_list(e_configure_registry, l);
eina_stringshare_del(ecat->cat);
eina_stringshare_del(ecat->label);
if (ecat->icon) eina_stringshare_del(ecat->icon);
@ -352,7 +352,7 @@ static struct {
EAPI void
e_configure_registry_call(const char *path, E_Container *con, const char *params)
{
Evas_List *l;
Eina_List *l;
char *cat;
const char *item;
@ -367,7 +367,7 @@ e_configure_registry_call(const char *path, E_Container *con, const char *params
ecat = l->data;
if (!strcmp(cat, ecat->cat))
{
Evas_List *ll;
Eina_List *ll;
for (ll = ecat->items; ll; ll = ll->next)
{
@ -410,7 +410,7 @@ e_configure_registry_custom_desktop_exec_callback_set(void (*func) (const void *
EAPI int
e_configure_registry_exists(const char *path)
{
Evas_List *l;
Eina_List *l;
char *cat;
const char *item;
int ret = 0;
@ -426,7 +426,7 @@ e_configure_registry_exists(const char *path)
ecat = l->data;
if (!strcmp(cat, ecat->cat))
{
Evas_List *ll;
Eina_List *ll;
if (!item)
{

4
src/bin/e_configure.h
View File

@ -14,7 +14,7 @@ struct _E_Configure_Cat
const char *label;
const char *icon_file;
const char *icon;
Evas_List *items;
Eina_List *items;
};
struct _E_Configure_It
@ -39,7 +39,7 @@ EAPI int e_configure_registry_exists(const char *path);
EAPI void e_configure_registry_custom_desktop_exec_callback_set(void (*func) (const void *data, E_Container *con, const char *params, Efreet_Desktop *desktop), const void *data);
EAPI void e_configure_init(void);
EAPI Evas_List *e_configure_registry;
EAPI Eina_List *e_configure_registry;
#endif
#endif

140
src/bin/e_container.c
View File

@ -31,7 +31,7 @@ static void _e_container_event_container_resize_free(void *data, void *ev);
EAPI int E_EVENT_CONTAINER_RESIZE = 0;
static int container_count;
static Evas_List *handlers = NULL;
static Eina_List *handlers = NULL;
/* externally accessible functions */
EAPI int
@ -40,12 +40,12 @@ e_container_init(void)
E_EVENT_CONTAINER_RESIZE = ecore_event_type_new();
container_count = 0;
handlers = evas_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_MOUSE_IN, _e_container_cb_mouse_in, NULL));
handlers = evas_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_MOUSE_OUT, _e_container_cb_mouse_out, NULL));
handlers = evas_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_MOUSE_BUTTON_DOWN, _e_container_cb_mouse_down, NULL));
handlers = evas_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_MOUSE_BUTTON_UP, _e_container_cb_mouse_up, NULL));
handlers = evas_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_MOUSE_MOVE, _e_container_cb_mouse_move, NULL));
handlers = evas_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_MOUSE_WHEEL, _e_container_cb_mouse_wheel, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_MOUSE_IN, _e_container_cb_mouse_in, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_MOUSE_OUT, _e_container_cb_mouse_out, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_MOUSE_BUTTON_DOWN, _e_container_cb_mouse_down, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_MOUSE_BUTTON_UP, _e_container_cb_mouse_up, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_MOUSE_MOVE, _e_container_cb_mouse_move, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_MOUSE_WHEEL, _e_container_cb_mouse_wheel, NULL));
return 1;
}
@ -55,7 +55,7 @@ e_container_shutdown(void)
while (handlers)
{
ecore_event_handler_del(handlers->data);
handlers = evas_list_remove_list(handlers, handlers);
handlers = eina_list_remove_list(handlers, handlers);
}
return 1;
}
@ -67,7 +67,7 @@ e_container_new(E_Manager *man)
E_Zone *zone;
Evas_Object *o;
char name[40];
Evas_List *l, *screens;
Eina_List *l, *screens;
int i;
Ecore_X_Window mwin;
static int container_num = 0;
@ -75,7 +75,7 @@ e_container_new(E_Manager *man)
con = E_OBJECT_ALLOC(E_Container, E_CONTAINER_TYPE, _e_container_free);
if (!con) return NULL;
con->manager = man;
con->manager->containers = evas_list_append(con->manager->containers, con);
con->manager->containers = eina_list_append(con->manager->containers, con);
con->w = con->manager->w;
con->h = con->manager->h;
if (e_config->use_virtual_roots)
@ -157,7 +157,7 @@ e_container_new(E_Manager *man)
0, 0, 0, 0, 0,
con->layers[0].win, ECORE_X_WINDOW_STACK_BELOW);
screens = (Evas_List *)e_xinerama_screens_get();
screens = (Eina_List *)e_xinerama_screens_get();
if (screens)
{
for (l = screens; l; l = l->next)
@ -208,7 +208,7 @@ e_container_hide(E_Container *con)
EAPI E_Container *
e_container_current_get(E_Manager *man)
{
Evas_List *l;
Eina_List *l;
E_OBJECT_CHECK_RETURN(man, NULL);
E_OBJECT_TYPE_CHECK_RETURN(man, E_MANAGER_TYPE, NULL);
@ -229,7 +229,7 @@ e_container_current_get(E_Manager *man)
EAPI E_Container *
e_container_number_get(E_Manager *man, int num)
{
Evas_List *l;
Eina_List *l;
E_OBJECT_CHECK_RETURN(man, NULL);
E_OBJECT_TYPE_CHECK_RETURN(man, E_MANAGER_TYPE, NULL);
@ -306,7 +306,7 @@ e_container_lower(E_Container *con)
EAPI E_Zone *
e_container_zone_at_point_get(E_Container *con, int x, int y)
{
Evas_List *l = NULL;
Eina_List *l = NULL;
E_OBJECT_CHECK_RETURN(con, NULL);
E_OBJECT_TYPE_CHECK_RETURN(con, E_CONTAINER_TYPE, NULL);
@ -324,7 +324,7 @@ e_container_zone_at_point_get(E_Container *con, int x, int y)
EAPI E_Zone *
e_container_zone_number_get(E_Container *con, int num)
{
Evas_List *l = NULL;
Eina_List *l = NULL;
E_OBJECT_CHECK_RETURN(con, NULL);
E_OBJECT_TYPE_CHECK_RETURN(con, E_CONTAINER_TYPE, NULL);
@ -341,7 +341,7 @@ e_container_zone_number_get(E_Container *con, int num)
EAPI E_Zone *
e_container_zone_id_get(E_Container *con, int id)
{
Evas_List *l = NULL;
Eina_List *l = NULL;
E_OBJECT_CHECK_RETURN(con, NULL);
E_OBJECT_TYPE_CHECK_RETURN(con, E_CONTAINER_TYPE, NULL);
@ -366,7 +366,7 @@ e_container_shape_add(E_Container *con)
es = E_OBJECT_ALLOC(E_Container_Shape, E_CONTAINER_SHAPE_TYPE, _e_container_shape_free);
E_OBJECT_DEL_SET(es, _e_container_shape_del);
es->con = con;
con->shapes = evas_list_append(con->shapes, es);
con->shapes = eina_list_append(con->shapes, es);
_e_container_shape_change_call(es, E_CONTAINER_SHAPE_ADD);
return es;
}
@ -415,7 +415,7 @@ e_container_shape_resize(E_Container_Shape *es, int w, int h)
_e_container_shape_change_call(es, E_CONTAINER_SHAPE_RESIZE);
}
EAPI Evas_List *
EAPI Eina_List *
e_container_shape_list_get(E_Container *con)
{
E_OBJECT_CHECK_RETURN(con, NULL);
@ -453,13 +453,13 @@ e_container_shape_change_callback_add(E_Container *con, void (*func) (void *data
if (!cb) return;
cb->func = func;
cb->data = data;
con->shape_change_cb = evas_list_append(con->shape_change_cb, cb);
con->shape_change_cb = eina_list_append(con->shape_change_cb, cb);
}
EAPI void
e_container_shape_change_callback_del(E_Container *con, void (*func) (void *data, E_Container_Shape *es, E_Container_Shape_Change ch), void *data)
{
Evas_List *l = NULL;
Eina_List *l = NULL;
/* FIXME: if we call this from within a callback we are in trouble */
E_OBJECT_CHECK(con);
@ -471,14 +471,14 @@ e_container_shape_change_callback_del(E_Container *con, void (*func) (void *data
cb = l->data;
if ((cb->func == func) && (cb->data == data))
{
con->shape_change_cb = evas_list_remove_list(con->shape_change_cb, l);
con->shape_change_cb = eina_list_remove_list(con->shape_change_cb, l);
free(cb);
return;
}
}
}
EAPI Evas_List *
EAPI Eina_List *
e_container_shape_rects_get(E_Container_Shape *es)
{
E_OBJECT_CHECK_RETURN(es, NULL);
@ -489,7 +489,7 @@ e_container_shape_rects_get(E_Container_Shape *es)
EAPI void
e_container_shape_rects_set(E_Container_Shape *es, Ecore_X_Rectangle *rects, int num)
{
Evas_List *l = NULL;
Eina_List *l = NULL;
int i;
E_Rect *r;
@ -499,7 +499,7 @@ e_container_shape_rects_set(E_Container_Shape *es, Ecore_X_Rectangle *rects, int
{
for (l = es->shape; l; l = l->next)
free(l->data);
evas_list_free(es->shape);
eina_list_free(es->shape);
es->shape = NULL;
}
if ((rects) && (num == 1) &&
@ -521,7 +521,7 @@ e_container_shape_rects_set(E_Container_Shape *es, Ecore_X_Rectangle *rects, int
r->y = rects[i].y;
r->w = rects[i].width;
r->h = rects[i].height;
es->shape = evas_list_append(es->shape, r);
es->shape = eina_list_append(es->shape, r);
}
}
}
@ -575,7 +575,7 @@ e_container_border_add(E_Border *bd)
bd->zone->container->clients++;
bd->zone->container->layers[pos].clients =
evas_list_append(bd->zone->container->layers[pos].clients, bd);
eina_list_append(bd->zone->container->layers[pos].clients, bd);
e_hints_client_list_set();
}
@ -590,7 +590,7 @@ e_container_border_remove(E_Border *bd)
for (i = 0; i < 7; i++)
{
bd->zone->container->layers[i].clients =
evas_list_remove(bd->zone->container->layers[i].clients, bd);
eina_list_remove(bd->zone->container->layers[i].clients, bd);
}
bd->zone->container->clients--;
bd->zone = NULL;
@ -639,7 +639,7 @@ EAPI E_Border *
e_container_border_raise(E_Border *bd)
{
E_Border *above = NULL;
Evas_List *l;
Eina_List *l;
int pos = 0, i;
if (!bd->zone) return NULL;
@ -647,7 +647,7 @@ e_container_border_raise(E_Border *bd)
for (i = 0; i < 7; i++)
{
bd->zone->container->layers[i].clients =
evas_list_remove(bd->zone->container->layers[i].clients, bd);
eina_list_remove(bd->zone->container->layers[i].clients, bd);
}
/* Add to new layer */
@ -665,10 +665,10 @@ e_container_border_raise(E_Border *bd)
bd->zone->container->layers[pos + 1].win, ECORE_X_WINDOW_STACK_BELOW);
bd->zone->container->layers[pos].clients =
evas_list_append(bd->zone->container->layers[pos].clients, bd);
eina_list_append(bd->zone->container->layers[pos].clients, bd);
/* Find the window below this one */
l = evas_list_find_list(bd->zone->container->layers[pos].clients, bd);
l = eina_list_data_find_list(bd->zone->container->layers[pos].clients, bd);
if (l->prev)
above = l->prev->data;
else
@ -677,7 +677,7 @@ e_container_border_raise(E_Border *bd)
for (i = pos - 2; i >= 0; i--)
{
if ((bd->zone->container->layers[i].clients) &&
(l = evas_list_last(bd->zone->container->layers[i].clients)))
(l = eina_list_last(bd->zone->container->layers[i].clients)))
{
above = l->data;
break;
@ -693,7 +693,7 @@ EAPI E_Border *
e_container_border_lower(E_Border *bd)
{
E_Border *below = NULL;
Evas_List *l;
Eina_List *l;
int pos = 0, i;
if (!bd->zone) return NULL;
@ -701,7 +701,7 @@ e_container_border_lower(E_Border *bd)
for (i = 0; i < 7; i++)
{
bd->zone->container->layers[i].clients =
evas_list_remove(bd->zone->container->layers[i].clients, bd);
eina_list_remove(bd->zone->container->layers[i].clients, bd);
}
/* Add to new layer */
@ -719,10 +719,10 @@ e_container_border_lower(E_Border *bd)
bd->zone->container->layers[pos].win, ECORE_X_WINDOW_STACK_ABOVE);
bd->zone->container->layers[pos].clients =
evas_list_prepend(bd->zone->container->layers[pos].clients, bd);
eina_list_prepend(bd->zone->container->layers[pos].clients, bd);
/* Find the window above this one */
l = evas_list_find_list(bd->zone->container->layers[pos].clients, bd);
l = eina_list_data_find_list(bd->zone->container->layers[pos].clients, bd);
if (l->next)
below = l->next->data;
else
@ -752,7 +752,7 @@ e_container_border_stack_above(E_Border *bd, E_Border *above)
for (i = 0; i < 7; i++)
{
bd->zone->container->layers[i].clients =
evas_list_remove(bd->zone->container->layers[i].clients, bd);
eina_list_remove(bd->zone->container->layers[i].clients, bd);
}
/* Add to new layer */
@ -772,7 +772,7 @@ e_container_border_stack_above(E_Border *bd, E_Border *above)
above->win, ECORE_X_WINDOW_STACK_ABOVE);
bd->zone->container->layers[pos].clients =
evas_list_append_relative(bd->zone->container->layers[pos].clients, bd, above);
eina_list_append_relative(bd->zone->container->layers[pos].clients, bd, above);
}
EAPI void
@ -785,7 +785,7 @@ e_container_border_stack_below(E_Border *bd, E_Border *below)
for (i = 0; i < 7; i++)
{
bd->zone->container->layers[i].clients =
evas_list_remove(bd->zone->container->layers[i].clients, bd);
eina_list_remove(bd->zone->container->layers[i].clients, bd);
}
/* Add to new layer */
@ -805,7 +805,7 @@ e_container_border_stack_below(E_Border *bd, E_Border *below)
below->win, ECORE_X_WINDOW_STACK_BELOW);
bd->zone->container->layers[pos].clients =
evas_list_prepend_relative(bd->zone->container->layers[pos].clients, bd, below);
eina_list_prepend_relative(bd->zone->container->layers[pos].clients, bd, below);
}
EAPI E_Border_List *
@ -833,12 +833,12 @@ e_container_border_list_last(E_Container *con)
e_object_ref(E_OBJECT(con));
list->layer = 6;
if (list->container->layers[list->layer].clients)
list->clients = evas_list_last(list->container->layers[list->layer].clients);
list->clients = eina_list_last(list->container->layers[list->layer].clients);
while ((list->layer > 0) && (!list->clients))
{
list->layer--;
if (list->container->layers[list->layer].clients)
list->clients = evas_list_last(list->container->layers[list->layer].clients);
list->clients = eina_list_last(list->container->layers[list->layer].clients);
}
return list;
}
@ -872,7 +872,7 @@ e_container_border_list_prev(E_Border_List *list)
{
list->layer--;
if (list->container->layers[list->layer].clients)
list->clients = evas_list_last(list->container->layers[list->layer].clients);
list->clients = eina_list_last(list->container->layers[list->layer].clients);
}
return bd;
}
@ -887,12 +887,12 @@ e_container_border_list_free(E_Border_List *list)
EAPI void
e_container_all_freeze(void)
{
Evas_List *managers, *l;
Eina_List *managers, *l;
managers = e_manager_list();
for (l = managers; l; l = l->next)
{
Evas_List *ll;
Eina_List *ll;
E_Manager *man;
man = l->data;
@ -909,12 +909,12 @@ e_container_all_freeze(void)
EAPI void
e_container_all_thaw(void)
{
Evas_List *managers, *l;
Eina_List *managers, *l;
managers = e_manager_list();
for (l = managers; l; l = l->next)
{
Evas_List *ll;
Eina_List *ll;
E_Manager *man;
man = l->data;
@ -932,7 +932,7 @@ e_container_all_thaw(void)
static void
_e_container_free(E_Container *con)
{
Evas_List *l;
Eina_List *l;
ecore_x_window_del(con->event_win);
/* We can't use e_object_del here, because border adds a ref to itself
@ -958,9 +958,9 @@ _e_container_free(E_Container *con)
while (l)
{
e_object_del(E_OBJECT(l->data));
l = evas_list_remove_list(l, l);
l = eina_list_remove_list(l, l);
}
con->manager->containers = evas_list_remove(con->manager->containers, con);
con->manager->containers = eina_list_remove(con->manager->containers, con);
e_canvas_del(con->bg_ecore_evas);
ecore_evas_free(con->bg_ecore_evas);
if (con->manager->win != con->win)
@ -974,12 +974,12 @@ _e_container_free(E_Container *con)
static E_Container *
_e_container_find_by_event_window(Ecore_X_Window win)
{
Evas_List *managers, *l;
Eina_List *managers, *l;
managers = e_manager_list();
for (l = managers; l; l = l->next)
{
Evas_List *ll;
Eina_List *ll;
E_Manager *man;
man = l->data;
@ -1155,19 +1155,19 @@ _e_container_shape_del(E_Container_Shape *es)
static void
_e_container_shape_free(E_Container_Shape *es)
{
Evas_List *l = NULL;
Eina_List *l = NULL;
es->con->shapes = evas_list_remove(es->con->shapes, es);
es->con->shapes = eina_list_remove(es->con->shapes, es);
for (l = es->shape; l; l = l->next)
free(l->data);
evas_list_free(es->shape);
eina_list_free(es->shape);
free(es);
}
static void
_e_container_shape_change_call(E_Container_Shape *es, E_Container_Shape_Change ch)
{
Evas_List *l = NULL;
Eina_List *l = NULL;
if ((!es) || (!es->con) || (!es->con->shape_change_cb)) return;
for (l = es->con->shape_change_cb; l; l = l->next)
@ -1183,7 +1183,7 @@ static void
_e_container_resize_handle(E_Container *con)
{
E_Event_Container_Resize *ev;
Evas_List *l, *screens, *zones = NULL;
Eina_List *l, *screens, *zones = NULL;
int i;
ev = calloc(1, sizeof(E_Event_Container_Resize));
@ -1191,12 +1191,12 @@ _e_container_resize_handle(E_Container *con)
e_object_ref(E_OBJECT(con));
e_xinerama_update();
screens = (Evas_List *)e_xinerama_screens_get();
screens = (Eina_List *)e_xinerama_screens_get();
if (screens)
{
for (l = con->zones; l; l = l->next)
zones = evas_list_append(zones, l->data);
zones = eina_list_append(zones, l->data);
for (l = screens; l; l = l->next)
{
E_Screen *scr;
@ -1208,11 +1208,11 @@ _e_container_resize_handle(E_Container *con)
{
e_zone_move_resize(zone, scr->x, scr->y, scr->w, scr->h);
e_shelf_zone_move_resize_handle(zone);
zones = evas_list_remove(zones, zone);
zones = eina_list_remove(zones, zone);
}
else
{
Evas_List *ll;
Eina_List *ll;
zone = e_zone_new(con, scr->screen, scr->escreen, scr->x, scr->y, scr->w, scr->h);
/* find any shelves configured for this zone and add them in */
@ -1229,19 +1229,19 @@ _e_container_resize_handle(E_Container *con)
if (zones)
{
E_Zone *spare_zone = NULL;
Evas_List *ll;
Eina_List *ll;
for (ll = con->zones; ll; ll = ll->next)
{
spare_zone = ll->data;
if (evas_list_find(zones, spare_zone))
if (eina_list_data_find(zones, spare_zone))
spare_zone = NULL;
else break;
}
while (zones)
{
E_Zone *zone;
Evas_List *shelves, *ll, *del_shelves;
Eina_List *shelves, *ll, *del_shelves;
E_Border_List *bl;
E_Border *bd;
@ -1255,12 +1255,12 @@ _e_container_resize_handle(E_Container *con)
es = ll->data;
if (es->zone == zone)
del_shelves = evas_list_append(del_shelves, es);
del_shelves = eina_list_append(del_shelves, es);
}
while (del_shelves)
{
e_object_del(E_OBJECT(del_shelves->data));
del_shelves = evas_list_remove_list(del_shelves, del_shelves);
del_shelves = eina_list_remove_list(del_shelves, del_shelves);
}
bl = e_container_border_list_first(zone->container);
while ((bd = e_container_border_list_next(bl)))
@ -1276,7 +1276,7 @@ _e_container_resize_handle(E_Container *con)
}
e_container_border_list_free(bl);
e_object_del(E_OBJECT(zone));
zones = evas_list_remove_list(zones, zones);
zones = eina_list_remove_list(zones, zones);
}
}
}
@ -1293,12 +1293,12 @@ _e_container_resize_handle(E_Container *con)
for (i = 0; i < 7; i++)
{
Evas_List *tmp = NULL;
Eina_List *tmp = NULL;
/* Make temporary list as e_border_res_change_geometry_restore
* rearranges the order. */
for (l = con->layers[i].clients; l; l = l->next)
tmp = evas_list_append(tmp, l->data);
tmp = eina_list_append(tmp, l->data);
for (l = tmp; l; l = l->next)
{
@ -1309,7 +1309,7 @@ _e_container_resize_handle(E_Container *con)
e_border_res_change_geometry_restore(bd);
}
tmp = evas_list_free(tmp);
tmp = eina_list_free(tmp);
}
}

16
src/bin/e_container.h
View File

@ -45,14 +45,14 @@ struct _E_Container
Ecore_X_Window bg_win;
Ecore_X_Window event_win;
Evas_List *shapes;
Evas_List *shape_change_cb;
Evas_List *zones;
Eina_List *shapes;
Eina_List *shape_change_cb;
Eina_List *zones;
unsigned int clients;
struct {
Ecore_X_Window win;
Evas_List *clients;
Eina_List *clients;
} layers[7];
};
@ -60,7 +60,7 @@ struct _E_Border_List
{
E_Container *container;
int layer;
Evas_List *clients;
Eina_List *clients;
};
struct _E_Container_Shape
@ -73,7 +73,7 @@ struct _E_Container_Shape
struct {
int x, y, w, h;
} solid_rect;
Evas_List *shape;
Eina_List *shape;
};
struct _E_Container_Shape_Callback
@ -116,12 +116,12 @@ EAPI void e_container_shape_show(E_Container_Shape *es);
EAPI void e_container_shape_hide(E_Container_Shape *es);
EAPI void e_container_shape_move(E_Container_Shape *es, int x, int y);
EAPI void e_container_shape_resize(E_Container_Shape *es, int w, int h);
EAPI Evas_List *e_container_shape_list_get(E_Container *con);
EAPI Eina_List *e_container_shape_list_get(E_Container *con);
EAPI void e_container_shape_geometry_get(E_Container_Shape *es, int *x, int *y, int *w, int *h);
EAPI E_Container *e_container_shape_container_get(E_Container_Shape *es);
EAPI void e_container_shape_change_callback_add(E_Container *con, void (*func) (void *data, E_Container_Shape *es, E_Container_Shape_Change ch), void *data);
EAPI void e_container_shape_change_callback_del(E_Container *con, void (*func) (void *data, E_Container_Shape *es, E_Container_Shape_Change ch), void *data);
EAPI Evas_List *e_container_shape_rects_get(E_Container_Shape *es);
EAPI Eina_List *e_container_shape_rects_get(E_Container_Shape *es);
EAPI void e_container_shape_rects_set(E_Container_Shape *es, Ecore_X_Rectangle *rects, int num);
EAPI void e_container_shape_solid_rect_set(E_Container_Shape *es, int x, int y, int w, int h);
EAPI void e_container_shape_solid_rect_get(E_Container_Shape *es, int *x, int *y, int *w, int *h);

16
src/bin/e_desk.c
View File

@ -45,7 +45,7 @@ EAPI E_Desk *
e_desk_new(E_Zone *zone, int x, int y)
{
E_Desk *desk;
Evas_List *l;
Eina_List *l;
char name[40];
int ok;
@ -115,13 +115,13 @@ e_desk_name_add(int container, int zone, int desk_x, int desk_y, const char *nam
cfname->desk_x = desk_x;
cfname->desk_y = desk_y;
if (name) cfname->name = eina_stringshare_add(name);
e_config->desktop_names = evas_list_append(e_config->desktop_names, cfname);
e_config->desktop_names = eina_list_append(e_config->desktop_names, cfname);
}
EAPI void
e_desk_name_del(int container, int zone, int desk_x, int desk_y)
{
Evas_List *l = NULL;
Eina_List *l = NULL;
for (l = e_config->desktop_names; l; l = l->next)
{
@ -132,7 +132,7 @@ e_desk_name_del(int container, int zone, int desk_x, int desk_y)
(cfname->desk_x == desk_x) && (cfname->desk_y == desk_y))
{
e_config->desktop_names =
evas_list_remove_list(e_config->desktop_names, l);
eina_list_remove_list(e_config->desktop_names, l);
if (cfname->name) eina_stringshare_del(cfname->name);
free(cfname);
break;
@ -143,7 +143,7 @@ e_desk_name_del(int container, int zone, int desk_x, int desk_y)
EAPI void
e_desk_name_update(void)
{
Evas_List *m, *c, *z, *l;
Eina_List *m, *c, *z, *l;
E_Manager *man;
E_Container *con;
E_Zone *zone;
@ -204,7 +204,7 @@ e_desk_show(E_Desk *desk)
E_Border *bd;
E_Event_Desk_Show *ev;
E_Event_Desk_Before_Show *eev;
Evas_List *l;
Eina_List *l;
int was_zone = 0, x, y, dx = 0, dy = 0;
E_OBJECT_CHECK(desk);
@ -279,7 +279,7 @@ e_desk_show(E_Desk *desk)
for (l = e_shelf_list(); l; l = l->next)
{
Evas_List *ll;
Eina_List *ll;
E_Shelf *es;
E_Config_Shelf *cf_es;
E_Zone *zone;
@ -358,7 +358,7 @@ e_desk_deskshow(E_Zone *zone)
EAPI void
e_desk_last_focused_focus(E_Desk *desk)
{
Evas_List *l = NULL;
Eina_List *l = NULL;
E_Border *bd;
for (l = e_border_focus_stack_get(); l; l = l->next)

32
src/bin/e_desklock.c
View File

@ -31,9 +31,9 @@ struct _E_Desklock_Popup_Data
struct _E_Desklock_Data
{
Evas_List *elock_wnd_list;
Eina_List *elock_wnd_list;
Ecore_X_Window elock_wnd;
Evas_List *handlers;
Eina_List *handlers;
Ecore_X_Window elock_grab_break_wnd;
char passwd[PASSWD_LEN];
int state;
@ -119,7 +119,7 @@ e_desklock_shutdown(void)
EAPI int
e_desklock_show(void)
{
Evas_List *managers, *l, *l2, *l3;
Eina_List *managers, *l, *l2, *l3;
E_Desklock_Popup_Data *edp;
Evas_Coord mw, mh;
E_Zone *current_zone;
@ -328,7 +328,7 @@ e_desklock_show(void)
e_popup_show(edp->popup_wnd);
edd->elock_wnd_list = evas_list_append(edd->elock_wnd_list, edp);
edd->elock_wnd_list = eina_list_append(edd->elock_wnd_list, edp);
}
zone_counter++;
}
@ -336,21 +336,21 @@ e_desklock_show(void)
}
/* handlers */
edd->handlers = evas_list_append(edd->handlers,
edd->handlers = eina_list_append(edd->handlers,
ecore_event_handler_add(ECORE_X_EVENT_KEY_DOWN,
_e_desklock_cb_key_down, NULL));
edd->handlers = evas_list_append(edd->handlers,
edd->handlers = eina_list_append(edd->handlers,
ecore_event_handler_add(ECORE_X_EVENT_MOUSE_BUTTON_DOWN,
_e_desklock_cb_mouse_down, NULL));
edd->handlers = evas_list_append(edd->handlers,
edd->handlers = eina_list_append(edd->handlers,
ecore_event_handler_add(ECORE_X_EVENT_MOUSE_BUTTON_UP,
_e_desklock_cb_mouse_up, NULL));
edd->handlers = evas_list_append(edd->handlers,
edd->handlers = eina_list_append(edd->handlers,
ecore_event_handler_add(ECORE_X_EVENT_MOUSE_WHEEL,
_e_desklock_cb_mouse_wheel,
NULL));
if ((total_zone_num > 1) && (e_config->desklock_login_box_zone == -2))
edd->handlers = evas_list_append(edd->handlers,
edd->handlers = eina_list_append(edd->handlers,
ecore_event_handler_add(ECORE_X_EVENT_MOUSE_MOVE,
_e_desklock_cb_mouse_move,
NULL));
@ -394,13 +394,13 @@ e_desklock_hide(void)
e_util_defer_object_del(E_OBJECT(edp->popup_wnd));
E_FREE(edp);
}
edd->elock_wnd_list = evas_list_remove_list(edd->elock_wnd_list, edd->elock_wnd_list);
edd->elock_wnd_list = eina_list_remove_list(edd->elock_wnd_list, edd->elock_wnd_list);
}
while (edd->handlers)
{
ecore_event_handler_del(edd->handlers->data);
edd->handlers = evas_list_remove_list(edd->handlers, edd->handlers);
edd->handlers = eina_list_remove_list(edd->handlers, edd->handlers);
}
e_grabinput_release(edd->elock_wnd, edd->elock_wnd);
@ -473,7 +473,7 @@ _e_desklock_cb_mouse_move(void *data, int type, void *event)
{
E_Desklock_Popup_Data *edp;
E_Zone *current_zone;
Evas_List *l;
Eina_List *l;
current_zone = e_zone_current_get(e_container_current_get(e_manager_current_get()));
@ -500,7 +500,7 @@ _e_desklock_passwd_update(void)
{
char passwd_hidden[PASSWD_LEN] = "", *p, *pp;
E_Desklock_Popup_Data *edp;
Evas_List *l;
Eina_List *l;
if (!edd) return;
@ -552,7 +552,7 @@ static int
_e_desklock_zone_num_get(void)
{
int num;
Evas_List *l, *l2;
Eina_List *l, *l2;
num = 0;
for (l = e_manager_list(); l; l = l->next)
@ -563,7 +563,7 @@ _e_desklock_zone_num_get(void)
{
E_Container *con = l2->data;
num += evas_list_count(con->zones);
num += eina_list_count(con->zones);
}
}
@ -603,7 +603,7 @@ _e_desklock_check_auth(void)
static void
_e_desklock_state_set(int state)
{
Evas_List *l;
Eina_List *l;
const char *signal, *text;
if (!edd) return;

10
src/bin/e_dialog.c
View File

@ -82,7 +82,7 @@ e_dialog_button_add(E_Dialog *dia, const char *label, const char *icon, void (*f
if (!func) func = _e_dialog_del_func_cb;
o = e_widget_button_add(e_win_evas_get(dia->win), label, icon, (void (*) (void*, void*)) func, data, dia);
e_widget_list_object_append(dia->box_object, o, 1, 0, 0.5);
dia->buttons = evas_list_append(dia->buttons, o);
dia->buttons = eina_list_append(dia->buttons, o);
}
EAPI int
@ -90,7 +90,7 @@ e_dialog_button_focus_num(E_Dialog *dia, int button)
{
Evas_Object *o;
o = evas_list_nth(dia->buttons, button);
o = eina_list_nth(dia->buttons, button);
if (o) e_widget_focus_steal(o);
return 1;
}
@ -100,7 +100,7 @@ e_dialog_button_disable_num_set(E_Dialog *dia, int button, int disabled)
{
Evas_Object *o;
o = evas_list_nth(dia->buttons, button);
o = eina_list_nth(dia->buttons, button);
if (o) e_widget_disabled_set(o, disabled);
return 1;
}
@ -111,7 +111,7 @@ e_dialog_button_disable_num_get(E_Dialog *dia, int button)
Evas_Object *o;
int ret = 0;
o = evas_list_nth(dia->buttons, button);
o = eina_list_nth(dia->buttons, button);
if (o) ret = e_widget_disabled_get(o);
return ret;
}
@ -232,7 +232,7 @@ e_dialog_show(E_Dialog *dia)
static void
_e_dialog_free(E_Dialog *dia)
{
if (dia->buttons) evas_list_free(dia->buttons);
if (dia->buttons) eina_list_free(dia->buttons);
if (dia->text_object) evas_object_del(dia->text_object);
if (dia->icon_object) evas_object_del(dia->icon_object);
if (dia->box_object) evas_object_del(dia->box_object);

2
src/bin/e_dialog.h
View File

@ -23,7 +23,7 @@ struct _E_Dialog
Evas_Object *content_object;
Evas_Object *icon_object;
Evas_Object *event_object;
Evas_List *buttons;
Eina_List *buttons;
void *data;
int min_w, min_h;
unsigned char resizable : 1;

74
src/bin/e_dnd.c
View File

@ -53,14 +53,14 @@ struct _XDnd
void *data;
};
static Evas_List *_event_handlers = NULL;
static Evas_List *_drop_handlers = NULL;
static Eina_List *_event_handlers = NULL;
static Eina_List *_drop_handlers = NULL;
static Evas_Hash *_drop_win_hash = NULL;
static Ecore_X_Window _drag_win = 0;
static Ecore_X_Window _drag_win_root = 0;
static Evas_List *_drag_list = NULL;
static Eina_List *_drag_list = NULL;
static E_Drag *_drag_current = NULL;
static XDnd *_xdnd = NULL;
@ -73,41 +73,41 @@ static Ecore_X_Atom _action;
EAPI int
e_dnd_init(void)
{
_event_handlers = evas_list_append(_event_handlers,
_event_handlers = eina_list_append(_event_handlers,
ecore_event_handler_add(ECORE_X_EVENT_MOUSE_BUTTON_UP,
_e_dnd_cb_mouse_up, NULL));
_event_handlers = evas_list_append(_event_handlers,
_event_handlers = eina_list_append(_event_handlers,
ecore_event_handler_add(ECORE_X_EVENT_MOUSE_MOVE,
_e_dnd_cb_mouse_move, NULL));
_event_handlers = evas_list_append(_event_handlers,
_event_handlers = eina_list_append(_event_handlers,
ecore_event_handler_add(ECORE_X_EVENT_WINDOW_SHAPE,
_e_dnd_cb_window_shape, NULL));
_event_handlers = evas_list_append(_event_handlers,
_event_handlers = eina_list_append(_event_handlers,
ecore_event_handler_add(ECORE_X_EVENT_XDND_ENTER,
_e_dnd_cb_event_dnd_enter, NULL));
_event_handlers = evas_list_append(_event_handlers,
_event_handlers = eina_list_append(_event_handlers,
ecore_event_handler_add(ECORE_X_EVENT_XDND_LEAVE,
_e_dnd_cb_event_dnd_leave, NULL));
_event_handlers = evas_list_append(_event_handlers,
_event_handlers = eina_list_append(_event_handlers,
ecore_event_handler_add(ECORE_X_EVENT_XDND_POSITION,
_e_dnd_cb_event_dnd_position, NULL));
_event_handlers = evas_list_append(_event_handlers,
_event_handlers = eina_list_append(_event_handlers,
ecore_event_handler_add(ECORE_X_EVENT_XDND_STATUS,
_e_dnd_cb_event_dnd_status, NULL));
_event_handlers = evas_list_append(_event_handlers,
_event_handlers = eina_list_append(_event_handlers,
ecore_event_handler_add(ECORE_X_EVENT_XDND_FINISHED,
_e_dnd_cb_event_dnd_finished, NULL));
_event_handlers = evas_list_append(_event_handlers,
_event_handlers = eina_list_append(_event_handlers,
ecore_event_handler_add(ECORE_X_EVENT_XDND_DROP,
_e_dnd_cb_event_dnd_drop, NULL));
_event_handlers = evas_list_append(_event_handlers,
_event_handlers = eina_list_append(_event_handlers,
ecore_event_handler_add(ECORE_X_EVENT_SELECTION_NOTIFY,
_e_dnd_cb_event_dnd_selection, NULL));
_event_handlers = evas_list_append(_event_handlers,
_event_handlers = eina_list_append(_event_handlers,
ecore_event_handler_add(ECORE_X_EVENT_KEY_DOWN,
_e_dnd_cb_key_down, NULL));
_event_handlers = evas_list_append(_event_handlers,
_event_handlers = eina_list_append(_event_handlers,
ecore_event_handler_add(ECORE_X_EVENT_KEY_UP,
_e_dnd_cb_key_up, NULL));
@ -118,7 +118,7 @@ e_dnd_init(void)
EAPI int
e_dnd_shutdown(void)
{
Evas_List *l;
Eina_List *l;
while (_drag_list)
{
@ -135,11 +135,11 @@ e_dnd_shutdown(void)
h = l->data;
ecore_event_handler_del(h);
}
evas_list_free(_event_handlers);
eina_list_free(_event_handlers);
_event_handlers = NULL;
evas_hash_free(_drop_win_hash);
evas_list_free(_drop_handlers);
eina_list_free(_drop_handlers);
_drop_handlers = NULL;
evas_hash_free(_drop_handlers_responsives);
@ -208,7 +208,7 @@ e_drag_new(E_Container *container, int x, int y,
drag->cb.convert = convert_cb;
drag->cb.finished = finished_cb;
_drag_list = evas_list_append(_drag_list, drag);
_drag_list = eina_list_append(_drag_list, drag);
ecore_x_window_shadow_tree_flush();
@ -263,7 +263,7 @@ e_dnd_active(void)
EAPI int
e_drag_start(E_Drag *drag, int x, int y)
{
Evas_List *l;
Eina_List *l;
if (_drag_win) return 0;
_drag_win = ecore_x_window_input_new(drag->container->win,
@ -379,7 +379,7 @@ e_drop_handler_add(E_Object *obj,
handler->obj = obj;
handler->entered = 0;
_drop_handlers = evas_list_append(_drop_handlers, handler);
_drop_handlers = eina_list_append(_drop_handlers, handler);
return handler;
}
@ -407,7 +407,7 @@ e_drop_handler_del(E_Drop_Handler *handler)
{
int i;
_drop_handlers = evas_list_remove(_drop_handlers, handler);
_drop_handlers = eina_list_remove(_drop_handlers, handler);
if (handler->types)
{
for (i = 0; i < handler->num_types; i++)
@ -442,7 +442,7 @@ e_drop_xdnd_register_set(Ecore_X_Window win, int reg)
EAPI void
e_drag_idler_before(void)
{
Evas_List *l;
Eina_List *l;
for (l = _drag_list; l; l = l->next)
{
@ -735,7 +735,7 @@ _e_drag_win_hide(E_Drop_Handler *h)
static int
_e_drag_update(Ecore_X_Window root, int x, int y, Ecore_X_Atom action)
{
Evas_List *l;
Eina_List *l;
E_Event_Dnd_Enter enter_ev;
E_Event_Dnd_Move move_ev;
E_Event_Dnd_Leave leave_ev;
@ -879,7 +879,7 @@ static void
_e_drag_end(Ecore_X_Window root, int x, int y)
{
E_Zone *zone;
Evas_List *l;
Eina_List *l;
E_Event_Dnd_Drop ev;
int dx, dy, dw, dh;
Ecore_X_Window win, ignore_win[2];
@ -985,7 +985,7 @@ _e_drag_end(Ecore_X_Window root, int x, int y)
static void
_e_drag_xdnd_end(Ecore_X_Window win, int x, int y)
{
Evas_List *l;
Eina_List *l;
E_Event_Dnd_Drop ev;
int dx, dy, dw, dh;
@ -1048,7 +1048,7 @@ _e_drag_free(E_Drag *drag)
{
int i;
_drag_list = evas_list_remove(_drag_list, drag);
_drag_list = eina_list_remove(_drag_list, drag);
E_FREE(drag->shape_rects);
drag->shape_rects_num = 0;
@ -1068,7 +1068,7 @@ _e_drag_free(E_Drag *drag)
static int
_e_dnd_cb_window_shape(void *data, int ev_type, void *ev)
{
Evas_List *l;
Eina_List *l;
Ecore_X_Event_Window_Shape *e;
e = ev;
@ -1146,7 +1146,7 @@ _e_dnd_cb_event_dnd_enter(void *data, int type, void *event)
{
Ecore_X_Event_Xdnd_Enter *ev;
const char *id;
Evas_List *l;
Eina_List *l;
int i, j;
ev = event;
@ -1218,7 +1218,7 @@ _e_dnd_cb_event_dnd_leave(void *data, int type, void *event)
Ecore_X_Event_Xdnd_Leave *ev;
E_Event_Dnd_Leave leave_ev;
const char *id;
Evas_List *l;
Eina_List *l;
ev = event;
@ -1261,7 +1261,7 @@ _e_dnd_cb_event_dnd_position(void *data, int type, void *event)
Ecore_X_Rectangle rect;
Ecore_X_Action action;
const char *id;
Evas_List *l;
Eina_List *l;
int active;
int responsive;
@ -1383,20 +1383,20 @@ _e_dnd_cb_event_dnd_selection(void *data, int type, void *event)
if (!strcmp("text/uri-list", _xdnd->type))
{
Ecore_X_Selection_Data_Files *files;
Evas_List *l = NULL;
Eina_List *l = NULL;
files = ev->data;
for (i = 0; i < files->num_files; i++)
l = evas_list_append(l, files->files[i]);
l = eina_list_append(l, files->files[i]);
_xdnd->data = l;
_e_drag_xdnd_end(ev->win, _xdnd->x, _xdnd->y);
evas_list_free(l);
eina_list_free(l);
}
else if (!strcmp("text/x-moz-url", _xdnd->type))
{
/* FIXME: Create a ecore x parser for this type */
Ecore_X_Selection_Data *data;
Evas_List *l = NULL;
Eina_List *l = NULL;
char file[PATH_MAX];
char *text;
int i, size;
@ -1425,11 +1425,11 @@ _e_dnd_cb_event_dnd_selection(void *data, int type, void *event)
// printf("\n");
file[i] = '\0';
// printf("file: %d \"%s\"\n", i, file);
l = evas_list_append(l, file);
l = eina_list_append(l, file);
_xdnd->data = l;
_e_drag_xdnd_end(ev->win, _xdnd->x, _xdnd->y);
evas_list_free(l);
eina_list_free(l);
}
else
{

22
src/bin/e_exec.c
View File

@ -59,7 +59,7 @@ static Evas_Object *_dialog_scrolltext_create(Evas *evas, char *title, Ecore_Exe
static void _dialog_save_cb(void *data, void *data2);
/* local subsystem globals */
static Evas_List *e_exec_start_pending = NULL;
static Eina_List *e_exec_start_pending = NULL;
static Evas_Hash *e_exec_instances = NULL;
static int startup_id = 0;
@ -90,7 +90,7 @@ e_exec_shutdown(void)
if (_e_exec_exit_handler) ecore_event_handler_del(_e_exec_exit_handler);
if (_e_exec_border_add_handler) ecore_event_handler_del(_e_exec_border_add_handler);
evas_hash_free(e_exec_instances);
evas_list_free(e_exec_start_pending);
eina_list_free(e_exec_start_pending);
return 1;
}
@ -233,7 +233,7 @@ _e_exec_cb_exec(void *data, Efreet_Desktop *desktop, char *exec, int remaining)
if (desktop)
{
Evas_List *l;
Eina_List *l;
efreet_desktop_ref(desktop);
inst->desktop = desktop;
@ -245,15 +245,15 @@ _e_exec_cb_exec(void *data, Efreet_Desktop *desktop, char *exec, int remaining)
l = evas_hash_find(e_exec_instances, desktop->orig_path);
if (l)
{
l = evas_list_append(l, inst);
l = eina_list_append(l, inst);
evas_hash_modify(e_exec_instances, desktop->orig_path, l);
}
else
{
l = evas_list_append(l, inst);
l = eina_list_append(l, inst);
e_exec_instances = evas_hash_add(e_exec_instances, desktop->orig_path, l);
}
e_exec_start_pending = evas_list_append(e_exec_start_pending, desktop);
e_exec_start_pending = eina_list_append(e_exec_start_pending, desktop);
}
else if (exe)
{
@ -277,7 +277,7 @@ _e_exec_cb_expire_timer(void *data)
E_Exec_Instance *inst;
inst = data;
e_exec_start_pending = evas_list_remove(e_exec_start_pending, inst->desktop);
e_exec_start_pending = eina_list_remove(e_exec_start_pending, inst->desktop);
inst->expire_timer = NULL;
return 0;
}
@ -285,7 +285,7 @@ _e_exec_cb_expire_timer(void *data)
static int
_e_exec_cb_exit(void *data, int type, void *event)
{
Evas_List *instances;
Eina_List *instances;
Ecore_Exe_Event_Del *ev;
E_Exec_Instance *inst;
@ -347,14 +347,14 @@ _e_exec_cb_exit(void *data, int type, void *event)
instances = evas_hash_find(e_exec_instances, inst->desktop->orig_path);
if (instances)
{
instances = evas_list_remove(instances, inst);
instances = eina_list_remove(instances, inst);
if (instances)
evas_hash_modify(e_exec_instances, inst->desktop->orig_path, instances);
else
e_exec_instances = evas_hash_del(e_exec_instances, inst->desktop->orig_path, NULL);
}
}
e_exec_start_pending = evas_list_remove(e_exec_start_pending, inst->desktop);
e_exec_start_pending = eina_list_remove(e_exec_start_pending, inst->desktop);
if (inst->expire_timer) ecore_timer_del(inst->expire_timer);
if (inst->desktop) efreet_desktop_free(inst->desktop);
free(inst);
@ -365,7 +365,7 @@ static Evas_Bool
_e_exec_startup_id_pid_find(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *value, void *data)
{
E_Exec_Search *search;
Evas_List *instances, *l;
Eina_List *instances, *l;
search = data;
instances = value;

40
src/bin/e_exehist.c
View File

@ -9,8 +9,8 @@ typedef struct _E_Exehist_Item E_Exehist_Item;
struct _E_Exehist
{
Evas_List *history;
Evas_List *mimes;
Eina_List *history;
Eina_List *mimes;
};
struct _E_Exehist_Item
@ -87,7 +87,7 @@ e_exehist_add(const char *launch_method, const char *exe)
ei->launch_method = eina_stringshare_add(launch_method);
ei->exe = eina_stringshare_add(exe);
ei->exetime = ecore_time_get();
_e_exehist->history = evas_list_append(_e_exehist->history, ei);
_e_exehist->history = eina_list_append(_e_exehist->history, ei);
_e_exehist_limit();
_e_exehist_changes++;
_e_exehist_unload_queue();
@ -106,7 +106,7 @@ e_exehist_clear(void)
EAPI int
e_exehist_popularity_get(const char *exe)
{
Evas_List *l;
Eina_List *l;
int count = 0;
_e_exehist_load();
@ -125,11 +125,11 @@ e_exehist_popularity_get(const char *exe)
EAPI double
e_exehist_newest_run_get(const char *exe)
{
Evas_List *l;
Eina_List *l;
_e_exehist_load();
if (!_e_exehist) return 0.0;
for (l = evas_list_last(_e_exehist->history); l; l = l->prev)
for (l = eina_list_last(_e_exehist->history); l; l = l->prev)
{
E_Exehist_Item *ei;
@ -144,17 +144,17 @@ e_exehist_newest_run_get(const char *exe)
return 0.0;
}
EAPI Evas_List *
EAPI Eina_List *
e_exehist_list_get(void)
{
Evas_List *list = NULL, *l, *m;
Eina_List *list = NULL, *l, *m;
int count = 1;
int max;
max = e_config->exebuf_max_hist_list;
if (!max) max = 20;
_e_exehist_load();
for (l = evas_list_last(_e_exehist->history); l; l = l->prev)
for (l = eina_list_last(_e_exehist->history); l; l = l->prev)
{
int bad = 0;
E_Exehist_Item *ei;
@ -174,7 +174,7 @@ e_exehist_list_get(void)
}
if (!(bad))
{
list = evas_list_append(list, ei->exe);
list = eina_list_append(list, ei->exe);
count++;
}
if (count > max) break;
@ -188,7 +188,7 @@ e_exehist_mime_desktop_add(const char *mime, Efreet_Desktop *desktop)
{
const char *f;
E_Exehist_Item *ei;
Evas_List *l;
Eina_List *l;
if ((!mime) || (!desktop)) return;
if (!desktop->orig_path) return;
@ -210,7 +210,7 @@ e_exehist_mime_desktop_add(const char *mime, Efreet_Desktop *desktop)
if (ei->exe) eina_stringshare_del(ei->exe);
if (ei->launch_method) eina_stringshare_del(ei->launch_method);
free(ei);
_e_exehist->mimes = evas_list_remove_list(_e_exehist->mimes, l);
_e_exehist->mimes = eina_list_remove_list(_e_exehist->mimes, l);
_e_exehist_changes++;
break;
}
@ -224,7 +224,7 @@ e_exehist_mime_desktop_add(const char *mime, Efreet_Desktop *desktop)
ei->launch_method = eina_stringshare_add(mime);
ei->exe = eina_stringshare_add(f);
ei->exetime = ecore_time_get();
_e_exehist->mimes = evas_list_append(_e_exehist->mimes, ei);
_e_exehist->mimes = eina_list_append(_e_exehist->mimes, ei);
_e_exehist_limit();
_e_exehist_changes++;
_e_exehist_unload_queue();
@ -235,7 +235,7 @@ e_exehist_mime_desktop_get(const char *mime)
{
Efreet_Desktop *desktop;
E_Exehist_Item *ei;
Evas_List *l;
Eina_List *l;
if (!mime) return NULL;
_e_exehist_load();
@ -290,7 +290,7 @@ _e_exehist_clear(void)
if (ei->exe) eina_stringshare_del(ei->exe);
if (ei->launch_method) eina_stringshare_del(ei->launch_method);
free(ei);
_e_exehist->history = evas_list_remove_list(_e_exehist->history, _e_exehist->history);
_e_exehist->history = eina_list_remove_list(_e_exehist->history, _e_exehist->history);
}
while (_e_exehist->mimes)
{
@ -300,7 +300,7 @@ _e_exehist_clear(void)
if (ei->exe) eina_stringshare_del(ei->exe);
if (ei->launch_method) eina_stringshare_del(ei->launch_method);
free(ei);
_e_exehist->mimes = evas_list_remove_list(_e_exehist->mimes, _e_exehist->mimes);
_e_exehist->mimes = eina_list_remove_list(_e_exehist->mimes, _e_exehist->mimes);
}
}
}
@ -322,7 +322,7 @@ _e_exehist_limit(void)
*/
if (_e_exehist)
{
while (evas_list_count(_e_exehist->history) > 500)
while (eina_list_count(_e_exehist->history) > 500)
{
E_Exehist_Item *ei;
@ -330,9 +330,9 @@ _e_exehist_limit(void)
if (ei->exe) eina_stringshare_del(ei->exe);
if (ei->launch_method) eina_stringshare_del(ei->launch_method);
free(ei);
_e_exehist->history = evas_list_remove_list(_e_exehist->history, _e_exehist->history);
_e_exehist->history = eina_list_remove_list(_e_exehist->history, _e_exehist->history);
}
while (evas_list_count(_e_exehist->mimes) > 500)
while (eina_list_count(_e_exehist->mimes) > 500)
{
E_Exehist_Item *ei;
@ -340,7 +340,7 @@ _e_exehist_limit(void)
if (ei->exe) eina_stringshare_del(ei->exe);
if (ei->launch_method) eina_stringshare_del(ei->launch_method);
free(ei);
_e_exehist->mimes = evas_list_remove_list(_e_exehist->mimes, _e_exehist->mimes);
_e_exehist->mimes = eina_list_remove_list(_e_exehist->mimes, _e_exehist->mimes);
}
}
}

2
src/bin/e_exehist.h
View File

@ -14,7 +14,7 @@ EAPI void e_exehist_add(const char *launch_method, const char *exe);
EAPI void e_exehist_clear(void);
EAPI int e_exehist_popularity_get(const char *exe);
EAPI double e_exehist_newest_run_get(const char *exe);
EAPI Evas_List *e_exehist_list_get(void);
EAPI Eina_List *e_exehist_list_get(void);
EAPI void e_exehist_mime_desktop_add(const char *mime, Efreet_Desktop *desktop);
EAPI Efreet_Desktop *e_exehist_mime_desktop_get(const char *mime);

38
src/bin/e_flowlayout.c
View File

@ -18,7 +18,7 @@ struct _E_Smart_Data
unsigned char fill : 1;
unsigned char flowright : 1;
unsigned char flowbottom : 1;
Evas_List *items;
Eina_List *items;
struct {
Evas_Coord w, h;
} min, max;
@ -204,7 +204,7 @@ e_flowlayout_pack_start(Evas_Object *obj, Evas_Object *child)
sd = evas_object_smart_data_get(obj);
if (!sd) return 0;
_e_flowlayout_smart_adopt(sd, child);
sd->items = evas_list_prepend(sd->items, child);
sd->items = eina_list_prepend(sd->items, child);
sd->changed = 1;
if (sd->frozen <= 0) _e_flowlayout_smart_reconfigure(sd);
return 0;
@ -218,10 +218,10 @@ e_flowlayout_pack_end(Evas_Object *obj, Evas_Object *child)
sd = evas_object_smart_data_get(obj);
if (!sd) return 0;
_e_flowlayout_smart_adopt(sd, child);
sd->items = evas_list_append(sd->items, child);
sd->items = eina_list_append(sd->items, child);
sd->changed = 1;
if (sd->frozen <= 0) _e_flowlayout_smart_reconfigure(sd);
return evas_list_count(sd->items) - 1;
return eina_list_count(sd->items) - 1;
}
EAPI int
@ -229,12 +229,12 @@ e_flowlayout_pack_before(Evas_Object *obj, Evas_Object *child, Evas_Object *befo
{
E_Smart_Data *sd;
int i = 0;
Evas_List *l;
Eina_List *l;
sd = evas_object_smart_data_get(obj);
if (!sd) return 0;
_e_flowlayout_smart_adopt(sd, child);
sd->items = evas_list_prepend_relative(sd->items, child, before);
sd->items = eina_list_prepend_relative(sd->items, child, before);
for (i = 0, l = sd->items; l; l = l->next, i++)
{
if (l->data == child) break;
@ -249,12 +249,12 @@ e_flowlayout_pack_after(Evas_Object *obj, Evas_Object *child, Evas_Object *after
{
E_Smart_Data *sd;
int i = 0;
Evas_List *l;
Eina_List *l;
sd = evas_object_smart_data_get(obj);
if (!sd) return 0;
_e_flowlayout_smart_adopt(sd, child);
sd->items = evas_list_append_relative(sd->items, child, after);
sd->items = eina_list_append_relative(sd->items, child, after);
for (i = 0, l = sd->items; l; l = l->next, i++)
{
if (l->data == child) break;
@ -271,7 +271,7 @@ e_flowlayout_pack_count_get(Evas_Object *obj)
sd = evas_object_smart_data_get(obj);
if (!sd) return 0;
return evas_list_count(sd->items);
return eina_list_count(sd->items);
}
EAPI Evas_Object *
@ -281,7 +281,7 @@ e_flowlayout_pack_object_nth(Evas_Object *obj, int n)
sd = evas_object_smart_data_get(obj);
if (!sd) return NULL;
return evas_list_nth(sd->items, n);
return eina_list_nth(sd->items, n);
}
EAPI Evas_Object *
@ -291,7 +291,7 @@ e_flowlayout_pack_object_first(Evas_Object *obj)
sd = evas_object_smart_data_get(obj);
if (!sd) return NULL;
return evas_list_data(sd->items);
return eina_list_data_get(sd->items);
}
EAPI Evas_Object *
@ -301,7 +301,7 @@ e_flowlayout_pack_object_last(Evas_Object *obj)
sd = evas_object_smart_data_get(obj);
if (!sd) return NULL;
return evas_list_data(evas_list_last(sd->items));
return eina_list_data_get(eina_list_last(sd->items));
}
EAPI void
@ -335,7 +335,7 @@ e_flowlayout_unpack(Evas_Object *obj)
if (!bi) return;
sd = bi->sd;
if (!sd) return;
sd->items = evas_list_remove(sd->items, obj);
sd->items = eina_list_remove(sd->items, obj);
_e_flowlayout_smart_disown(obj);
sd->changed = 1;
if (sd->frozen <= 0) _e_flowlayout_smart_reconfigure(sd);
@ -463,7 +463,7 @@ static void
_e_flowlayout_smart_reconfigure(E_Smart_Data *sd)
{
Evas_Coord x, y, w, h, xx, yy, cr, cc;
Evas_List *l;
Eina_List *l;
int minw, minh, wdif, hdif;
int count, expand;
@ -480,7 +480,7 @@ _e_flowlayout_smart_reconfigure(E_Smart_Data *sd)
_e_flowlayout_smart_extents_calcuate(sd);
minw = sd->min.w;
minh = sd->min.h;
count = evas_list_count(sd->items);
count = eina_list_count(sd->items);
expand = 0;
/* Too small? move a little */
@ -719,7 +719,7 @@ _e_flowlayout_smart_reconfigure(E_Smart_Data *sd)
static void
_e_flowlayout_smart_extents_calcuate(E_Smart_Data *sd)
{
Evas_List *l;
Eina_List *l;
int minw, minh, count;
/* FIXME: need to calc max */
@ -756,7 +756,7 @@ _e_flowlayout_smart_extents_calcuate(E_Smart_Data *sd)
sd->rows = sd->h/minh;
if (sd->rows<1)
sd->rows = 1;
count = evas_list_count(sd->items);
count = eina_list_count(sd->items);
sd->cols = sd->w/minw;
}
else
@ -764,7 +764,7 @@ _e_flowlayout_smart_extents_calcuate(E_Smart_Data *sd)
sd->cols = sd->w/minw;
if (sd->cols<1)
sd->cols = 1;
count = evas_list_count(sd->items);
count = eina_list_count(sd->items);
sd->rows = sd->h/minh;
}
@ -895,7 +895,7 @@ _e_flowlayout_smart_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
if (!sd) return;
if ((x == sd->x) && (y == sd->y)) return;
{
Evas_List *l;
Eina_List *l;
Evas_Coord dx, dy;
dx = x - sd->x;

326
src/bin/e_fm.c
View File

File diff suppressed because it is too large Load Diff

4
src/bin/e_fm.h
View File

@ -132,8 +132,8 @@ EAPI int e_fm2_has_parent_get(Evas_Object *obj);
EAPI void e_fm2_parent_go(Evas_Object *obj);
EAPI void e_fm2_config_set(Evas_Object *obj, E_Fm2_Config *cfg);
EAPI E_Fm2_Config *e_fm2_config_get(Evas_Object *obj);
EAPI Evas_List *e_fm2_selected_list_get(Evas_Object *obj);
EAPI Evas_List *e_fm2_all_list_get(Evas_Object *obj);
EAPI Eina_List *e_fm2_selected_list_get(Evas_Object *obj);
EAPI Eina_List *e_fm2_all_list_get(Evas_Object *obj);
EAPI void e_fm2_select_set(Evas_Object *obj, const char *file, int select);
EAPI void e_fm2_file_show(Evas_Object *obj, const char *file);
EAPI void e_fm2_icon_menu_replace_callback_set(Evas_Object *obj, void (*func) (void *data, Evas_Object *obj, E_Menu *m, E_Fm2_Icon_Info *info), void *data);

30
src/bin/e_fm_custom.c
View File

@ -4,9 +4,9 @@
#include "e.h"
static Evas_Bool _e_fm2_custom_file_hash_foreach_list(const Evas_Hash *hash, const char *key, void *data, void *fdata);
static Evas_List *_e_fm2_custom_hash_key_base_list(Evas_Hash *hash, const char *str);
static Eina_List *_e_fm2_custom_hash_key_base_list(Evas_Hash *hash, const char *str);
//static Evas_Bool _e_fm2_custom_file_hash_foreach_sub_list(Evas_Hash *hash, const char *key, void *data, void *fdata);
//static Evas_List *_e_fm2_custom_hash_key_sub_list(Evas_Hash *hash, const char *str);
//static Eina_List *_e_fm2_custom_hash_key_sub_list(Evas_Hash *hash, const char *str);
static Evas_Bool _e_fm2_custom_file_hash_foreach(const Evas_Hash *hash, const char *key, void *data, void *fdata);
static Evas_Bool _e_fm2_custom_file_hash_foreach_save(const Evas_Hash *hash, const char *key, void *data, void *fdata);
static void _e_fm2_custom_file_info_load(void);
@ -38,10 +38,10 @@ e_fm2_custom_file_init(void)
eddc.func.mem_free = NULL;
eddc.func.str_alloc = (char *(*)(const char *)) eina_stringshare_add;
eddc.func.str_free = (void (*)(const char *)) eina_stringshare_del;
eddc.func.list_next = (void *(*)(void *)) evas_list_next;
eddc.func.list_append = (void *(*)(void *l, void *d)) evas_list_append;
eddc.func.list_data = (void *(*)(void *)) evas_list_data;
eddc.func.list_free = (void *(*)(void *)) evas_list_free;
eddc.func.list_next = (void *(*)(void *)) eina_list_next;
eddc.func.list_append = (void *(*)(void *l, void *d)) eina_list_append;
eddc.func.list_data = (void *(*)(void *)) eina_list_data_get;
eddc.func.list_free = (void *(*)(void *)) eina_list_free;
eddc.func.hash_foreach =
(void (*) (void *, int (*) (void *, const char *, void *, void *), void *))
evas_hash_foreach;
@ -120,7 +120,7 @@ e_fm2_custom_file_set(const char *path, E_Fm2_Custom_File *cf)
EAPI void
e_fm2_custom_file_del(const char *path)
{
Evas_List *list, *l;
Eina_List *list, *l;
E_Fm2_Custom_File *cf2;
_e_fm2_custom_file_info_load();
@ -142,7 +142,7 @@ e_fm2_custom_file_del(const char *path)
free(cf2);
}
}
evas_list_free(list);
eina_list_free(list);
}
_e_fm2_custom_writes = 1;
}
@ -151,7 +151,7 @@ EAPI void
e_fm2_custom_file_rename(const char *path, const char *new_path)
{
E_Fm2_Custom_File *cf, *cf2;
Evas_List *list, *l;
Eina_List *list, *l;
_e_fm2_custom_file_info_load();
if (!_e_fm2_custom_file) return;
@ -194,7 +194,7 @@ e_fm2_custom_file_rename(const char *path, const char *new_path)
buf, cf2);
}
}
evas_list_free(list);
eina_list_free(list);
}
_e_fm2_custom_writes = 1;
}
@ -214,7 +214,7 @@ e_fm2_custom_file_flush(void)
struct _E_Custom_List
{
Evas_List *l;
Eina_List *l;
const char *base;
int base_len;
};
@ -226,11 +226,11 @@ _e_fm2_custom_file_hash_foreach_list(const Evas_Hash *hash, const char *key, voi
cl = fdata;
if (!strncmp(cl->base, key, cl->base_len))
cl->l = evas_list_append(cl->l, key);
cl->l = eina_list_append(cl->l, key);
return 1;
}
static Evas_List *
static Eina_List *
_e_fm2_custom_hash_key_base_list(Evas_Hash *hash, const char *str)
{
struct _E_Custom_List cl;
@ -251,13 +251,13 @@ _e_fm2_custom_file_hash_foreach_sub_list(const Evas_Hash *hash, const char *key,
cl = fdata;
if (!strncmp(cl->base, key, strlen(key)))
cl->l = evas_list_append(cl->l, key);
cl->l = eina_list_append(cl->l, key);
return 1;
}
*/
/*
static Evas_List *
static Eina_List *
_e_fm2_custom_hash_key_sub_list(const Evas_Hash *hash, const char *str)
{
struct _E_Custom_List cl;

42
src/bin/e_fm_hal.c
View File

@ -12,8 +12,8 @@ static void _e_fm2_volume_erase(E_Volume *v);
static void _e_fm2_hal_mount_ok(E_Fm2_Mount *m);
static int _e_fm2_hal_mount_timeout(E_Fm2_Mount *m);
static Evas_List *_e_stores = NULL;
static Evas_List *_e_vols = NULL;
static Eina_List *_e_stores = NULL;
static Eina_List *_e_vols = NULL;
EAPI void
e_fm2_hal_storage_add(E_Storage *s)
@ -21,7 +21,7 @@ e_fm2_hal_storage_add(E_Storage *s)
if (e_fm2_hal_storage_find(s->udi)) return;
s->validated = 1;
_e_stores = evas_list_append(_e_stores, s);
_e_stores = eina_list_append(_e_stores, s);
/*
printf("STO+\n"
" udi: %s\n"
@ -73,14 +73,14 @@ EAPI void
e_fm2_hal_storage_del(E_Storage *s)
{
// printf("STO- %s\n", s->udi);
_e_stores = evas_list_remove(_e_stores, s);
_e_stores = eina_list_remove(_e_stores, s);
_e_storage_free(s);
}
EAPI E_Storage *
e_fm2_hal_storage_find(const char *udi)
{
Evas_List *l;
Eina_List *l;
if (!udi) return NULL;
@ -102,7 +102,7 @@ e_fm2_hal_volume_add(E_Volume *v)
if (e_fm2_hal_volume_find(v->udi)) return;
v->validated = 1;
_e_vols = evas_list_append(_e_vols, v);
_e_vols = eina_list_append(_e_vols, v);
/*
printf("VOL+\n"
" udi: %s\n"
@ -158,7 +158,7 @@ e_fm2_hal_volume_add(E_Volume *v)
if ((s = e_fm2_hal_storage_find(v->parent)))
{
v->storage = s;
s->volumes = evas_list_append(s->volumes, v);
s->volumes = eina_list_append(s->volumes, v);
}
if ((v->storage) &&
@ -176,8 +176,8 @@ e_fm2_hal_volume_del(E_Volume *v)
{
// printf("VOL- %s\n", v->udi);
if (v->storage)
v->storage->volumes = evas_list_remove(v->storage->volumes, v);
_e_vols = evas_list_remove(_e_vols, v);
v->storage->volumes = eina_list_remove(v->storage->volumes, v);
_e_vols = eina_list_remove(_e_vols, v);
_e_fm2_volume_erase(v);
_e_volume_free(v);
}
@ -338,7 +338,7 @@ _e_fm2_volume_erase(E_Volume *v)
EAPI E_Volume *
e_fm2_hal_volume_find(const char *udi)
{
Evas_List *l;
Eina_List *l;
if (!udi) return NULL;
@ -382,7 +382,7 @@ e_fm2_hal_volume_mountpoint_get(E_Volume *v)
EAPI void
e_fm2_hal_mount_add(E_Volume *v, const char *mountpoint)
{
Evas_List *l;
Eina_List *l;
v->mounted = 1;
v->mount_point = strdup(mountpoint);
@ -412,7 +412,7 @@ e_fm2_hal_mount_del(E_Fm2_Mount *m)
EAPI E_Fm2_Mount *
e_fm2_hal_mount_find(const char *path)
{
Evas_List *l;
Eina_List *l;
for (l = _e_vols; l; l = l->next)
{
@ -448,7 +448,7 @@ e_fm2_hal_mount(E_Volume *v,
m->volume = v;
m->mounted = v->mounted;
v->mounts = evas_list_prepend(v->mounts, m);
v->mounts = eina_list_prepend(v->mounts, m);
// printf("BEGIN MOUNT %p '%s'\n", m, v->mount_point);
@ -467,10 +467,10 @@ e_fm2_hal_unmount(E_Fm2_Mount *m)
E_Volume *v;
if (!(v = m->volume)) return;
v->mounts = evas_list_remove(v->mounts, m);
v->mounts = eina_list_remove(v->mounts, m);
e_fm2_hal_mount_del(m);
if (!evas_list_count(v->mounts))
if (!eina_list_count(v->mounts))
_e_fm2_client_unmount(v->udi);
}
@ -501,15 +501,15 @@ _e_fm2_hal_mount_timeout(E_Fm2_Mount *m)
EAPI void
e_fm2_hal_show_desktop_icons(void)
{
Evas_List *l;
Eina_List *l;
E_Volume *v;
char buf[PATH_MAX] = {0};
char buf2[PATH_MAX] = {0};
const char *id;
for(l = _e_vols; l; l = evas_list_next(l))
for(l = _e_vols; l; l = eina_list_next(l))
{
v = evas_list_data(l);
v = eina_list_data_get(l);
if(!v) continue;
if (!v->storage) continue;
@ -533,14 +533,14 @@ e_fm2_hal_show_desktop_icons(void)
EAPI void
e_fm2_hal_hide_desktop_icons(void)
{
Evas_List *l;
Eina_List *l;
E_Volume *v;
char buf[PATH_MAX] = {0};
const char *id;
for(l = _e_vols; l; l = evas_list_next(l))
for(l = _e_vols; l; l = eina_list_next(l))
{
v = evas_list_data(l);
v = eina_list_data_get(l);
if(!v) continue;
if (!v->storage) continue;

126
src/bin/e_fm_main.c
View File

@ -75,13 +75,13 @@ struct _E_Dir
Ecore_File_Monitor *mon;
int mon_ref;
E_Dir *mon_real;
Evas_List *fq;
Eina_List *fq;
Ecore_Idler *idler;
int dot_order;
int sync;
double sync_time;
int sync_num;
Evas_List *recent_mods;
Eina_List *recent_mods;
Ecore_Timer *recent_clean;
unsigned char cleaning : 1;
};
@ -138,7 +138,7 @@ static void _e_fm_monitor_start(int id, const char *path);
static void _e_fm_monitor_start_try(E_Fm_Task *task);
static void _e_fm_monitor_end(int id, const char *path);
static E_Fm_Task *_e_fm_task_get(int id);
static Evas_List *_e_fm_task_node_get(int id);
static Eina_List *_e_fm_task_node_get(int id);
static void _e_fm_task_remove(E_Fm_Task *task);
static void _e_fm_mkdir_try(E_Fm_Task *task);
static void _e_fm_mkdir(int id, const char *src, const char *rel, int rel_to, int x, int y);
@ -165,7 +165,7 @@ static void _e_file_mon_list_sync(E_Dir *ed);
static int _e_cb_file_mon_list_idler(void *data);
static int _e_cb_fop_trash_idler(void *data);
static char *_e_str_list_remove(Evas_List **list, char *str);
static char *_e_str_list_remove(Eina_List **list, char *str);
static void _e_fm_reorder(const char *file, const char *dst, const char *relative, int after);
static void _e_dir_del(E_Dir *ed);
@ -211,12 +211,12 @@ EAPI void e_volume_unmount(E_Volume *v);
/* local subsystem globals */
static Ecore_Ipc_Server *_e_ipc_server = NULL;
static Evas_List *_e_dirs = NULL;
static Evas_List *_e_fops = NULL;
static Eina_List *_e_dirs = NULL;
static Eina_List *_e_fops = NULL;
static int _e_sync_num = 0;
static Evas_List *_e_fm_slaves = NULL;
static Evas_List *_e_fm_tasks = NULL;
static Eina_List *_e_fm_slaves = NULL;
static Eina_List *_e_fm_tasks = NULL;
#ifdef HAVE_EDBUS
static E_DBus_Connection *_e_dbus_conn = NULL;
@ -610,7 +610,7 @@ _e_dbus_cb_store_prop(void *data, void *reply_data, DBusError *error)
e_storage_del(s->udi);
}
static Evas_List *_e_stores = NULL;
static Eina_List *_e_stores = NULL;
EAPI E_Storage *
e_storage_add(const char *udi)
@ -622,7 +622,7 @@ e_storage_add(const char *udi)
s = calloc(1, sizeof(E_Storage));
if (!s) return NULL;
s->udi = strdup(udi);
_e_stores = evas_list_append(_e_stores, s);
_e_stores = eina_list_append(_e_stores, s);
e_hal_device_get_all_properties(_e_dbus_conn, s->udi,
_e_dbus_cb_store_prop, s);
return s;
@ -643,14 +643,14 @@ e_storage_del(const char *udi)
E_FM_OP_STORAGE_DEL,
0, 0, 0, s->udi, strlen(s->udi) + 1);
}
_e_stores = evas_list_remove(_e_stores, s);
_e_stores = eina_list_remove(_e_stores, s);
_e_storage_free(s);
}
E_Storage *
e_storage_find(const char *udi)
{
Evas_List *l;
Eina_List *l;
for (l = _e_stores; l; l = l->next)
{
@ -722,7 +722,7 @@ _e_dbus_cb_vol_prop(void *data, void *reply_data, DBusError *error)
if (s)
{
v->storage = s;
s->volumes = evas_list_append(s->volumes, v);
s->volumes = eina_list_append(s->volumes, v);
}
}
@ -795,7 +795,7 @@ _e_dbus_cb_vol_prop_mount_modified(void *data, void *reply_data, DBusError *erro
return;
}
static Evas_List *_e_vols = NULL;
static Eina_List *_e_vols = NULL;
EAPI E_Volume *
e_volume_add(const char *udi)
@ -808,7 +808,7 @@ e_volume_add(const char *udi)
if (!v) return NULL;
// printf("VOL+ %s\n", udi);
v->udi = strdup(udi);
_e_vols = evas_list_append(_e_vols, v);
_e_vols = eina_list_append(_e_vols, v);
e_hal_device_get_all_properties(_e_dbus_conn, v->udi,
_e_dbus_cb_vol_prop, v);
v->prop_handler = e_dbus_signal_handler_add(_e_dbus_conn, "org.freedesktop.Hal",
@ -836,14 +836,14 @@ e_volume_del(const char *udi)
E_FM_OP_VOLUME_DEL,
0, 0, 0, v->udi, strlen(v->udi) + 1);
}
_e_vols = evas_list_remove(_e_vols, v);
_e_vols = eina_list_remove(_e_vols, v);
_e_volume_free(v);
}
EAPI E_Volume *
e_volume_find(const char *udi)
{
Evas_List *l;
Eina_List *l;
for (l = _e_vols; l; l = l->next)
{
@ -1009,7 +1009,7 @@ _e_fm_monitor_start(int id, const char *path)
task->x = 0;
task->y = 0;
_e_fm_tasks = evas_list_append(_e_fm_tasks, task);
_e_fm_tasks = eina_list_append(_e_fm_tasks, task);
_e_fm_monitor_start_try(task);
}
@ -1020,7 +1020,7 @@ _e_fm_monitor_start_try(E_Fm_Task *task)
E_Dir *ed, *ped = NULL;
DIR *dir;
Evas_List *l;
Eina_List *l;
/* look for any previous dir entries monitoring this dir */
for (l = _e_dirs; l; l = l->next)
@ -1047,7 +1047,7 @@ _e_fm_monitor_start_try(E_Fm_Task *task)
}
else
{
Evas_List *files = NULL;
Eina_List *files = NULL;
struct dirent *dp;
int dot_order = 0;
char buf[4096];
@ -1070,7 +1070,7 @@ _e_fm_monitor_start_try(E_Fm_Task *task)
ed->mon_real = ped;
ped->mon_ref++;
}
_e_dirs = evas_list_append(_e_dirs, ed);
_e_dirs = eina_list_append(_e_dirs, ed);
/* read everything except a .order, . and .. */
while ((dp = readdir(dir)))
@ -1082,7 +1082,7 @@ _e_fm_monitor_start_try(E_Fm_Task *task)
dot_order = 1;
continue;
}
files = evas_list_append(files, strdup(dp->d_name));
files = eina_list_append(files, strdup(dp->d_name));
}
closedir(dir);
/* if there was a .order - we need to parse it */
@ -1092,7 +1092,7 @@ _e_fm_monitor_start_try(E_Fm_Task *task)
f = fopen(buf, "r");
if (f)
{
Evas_List *f2 = NULL;
Eina_List *f2 = NULL;
int len;
char *s;
@ -1103,14 +1103,14 @@ _e_fm_monitor_start_try(E_Fm_Task *task)
len = strlen(buf);
if (len > 0) buf[len - 1] = 0;
s = _e_str_list_remove(&files, buf);
if (s) f2 = evas_list_append(f2, s);
if (s) f2 = eina_list_append(f2, s);
}
fclose(f);
/* append whats left */
while (files)
{
f2 = evas_list_append(f2, files->data);
files = evas_list_remove_list(files, files);
f2 = eina_list_append(f2, files->data);
files = eina_list_remove_list(files, files);
}
files = f2;
}
@ -1133,7 +1133,7 @@ _e_fm_monitor_start_try(E_Fm_Task *task)
snprintf(buf, sizeof(buf), "/.order");
else
snprintf(buf, sizeof(buf), "%s/.order", task->src);
if (evas_list_count(files) == 1)
if (eina_list_count(files) == 1)
_e_file_add(ed, buf, 2);
else
_e_file_add(ed, buf, 1);
@ -1149,7 +1149,7 @@ _e_fm_monitor_start_try(E_Fm_Task *task)
static void
_e_fm_monitor_end(int id, const char *path)
{
Evas_List *l;
Eina_List *l;
E_Fm_Task *task;
for (l = _e_dirs; l; l = l->next)
@ -1183,7 +1183,7 @@ _e_fm_monitor_end(int id, const char *path)
if (ed->mon_ref == 0) _e_dir_del(ed);
}
/* remove from dirs list anyway */
_e_dirs = evas_list_remove_list(_e_dirs, l);
_e_dirs = eina_list_remove_list(_e_dirs, l);
break;
}
}
@ -1195,24 +1195,24 @@ _e_fm_monitor_end(int id, const char *path)
static E_Fm_Task *
_e_fm_task_get(int id)
{
Evas_List *l = _e_fm_task_node_get(id);
Eina_List *l = _e_fm_task_node_get(id);
return (E_Fm_Task *)evas_list_data(l);
return (E_Fm_Task *)eina_list_data_get(l);
}
static Evas_List *
static Eina_List *
_e_fm_task_node_get(int id)
{
Evas_List *l = _e_fm_tasks;
Eina_List *l = _e_fm_tasks;
E_Fm_Task *task;
while(l)
{
task = evas_list_data(l);
task = eina_list_data_get(l);
if(task->id == id)
return l;
l = evas_list_next(l);
l = eina_list_next(l);
}
return NULL;
@ -1221,7 +1221,7 @@ _e_fm_task_node_get(int id)
static void
_e_fm_task_remove(E_Fm_Task *task)
{
Evas_List *l = _e_fm_task_node_get(task->id);
Eina_List *l = _e_fm_task_node_get(task->id);
switch(task->type)
{
@ -1240,7 +1240,7 @@ _e_fm_task_remove(E_Fm_Task *task)
break;
}
_e_fm_tasks = evas_list_remove_list(_e_fm_tasks, l);
_e_fm_tasks = eina_list_remove_list(_e_fm_tasks, l);
if(task->src) eina_stringshare_del(task->src);
if(task->dst) eina_stringshare_del(task->dst);
@ -1282,7 +1282,7 @@ _e_fm_mkdir(int id, const char *src, const char *rel, int rel_to, int x, int y)
task->x = x;
task->y = y;
_e_fm_tasks = evas_list_append(_e_fm_tasks, task);
_e_fm_tasks = eina_list_append(_e_fm_tasks, task);
_e_fm_mkdir_try(task);
}
@ -1355,7 +1355,7 @@ _e_ipc_cb_server_data(void *data, int type, void *event)
{
fop->id = e->ref;
fop->src = eina_stringshare_add(e->data);
_e_fops = evas_list_append(_e_fops, fop);
_e_fops = eina_list_append(_e_fops, fop);
fop->idler = ecore_idler_add(_e_cb_fop_trash_idler, fop);
}
}
@ -1427,7 +1427,7 @@ _e_ipc_cb_server_data(void *data, int type, void *event)
break;
case E_FM_OP_MONITOR_SYNC: /* mon list sync */
{
Evas_List *l;
Eina_List *l;
double stime;
for (l = _e_dirs; l; l = l->next)
@ -1547,24 +1547,24 @@ static int _e_fm_slave_run(E_Fm_Op_Type type, const char *args, int id)
eina_stringshare_del(command);
_e_fm_slaves = evas_list_append(_e_fm_slaves, slave);
_e_fm_slaves = eina_list_append(_e_fm_slaves, slave);
return (slave->exe != NULL);
}
static E_Fm_Slave *_e_fm_slave_get(int id)
{
Evas_List *l = _e_fm_slaves;
Eina_List *l = _e_fm_slaves;
E_Fm_Slave *slave;
while (l)
{
slave = evas_list_data(l);
slave = eina_list_data_get(l);
if (slave->id == id)
return slave;
l = evas_list_next(l);
l = eina_list_next(l);
}
return NULL;
@ -1671,7 +1671,7 @@ static int _e_fm_slave_del_cb(void *data, int type, void *event)
if (!slave) return 1;
_e_fm_slaves = evas_list_remove(_e_fm_slaves, (void *)slave);
_e_fm_slaves = eina_list_remove(_e_fm_slaves, (void *)slave);
free(slave);
return 1;
@ -1683,7 +1683,7 @@ _e_cb_file_monitor(void *data, Ecore_File_Monitor *em, Ecore_File_Event event, c
E_Dir *ed;
char *dir, *rp, *drp;
const char *file;
Evas_List *l;
Eina_List *l;
dir = ecore_file_dir_get(path);
file = ecore_file_file_get(path);
@ -1761,7 +1761,7 @@ static int
_e_cb_recent_clean(void *data)
{
E_Dir *ed;
Evas_List *l, *pl;
Eina_List *l, *pl;
E_Mod *m;
double t_now;
@ -1775,7 +1775,7 @@ _e_cb_recent_clean(void *data)
l = l->next;
if ((m->mod) && ((t_now - m->timestamp) >= DEF_MOD_BACKOFF))
{
ed->recent_mods = evas_list_remove_list(ed->recent_mods, pl);
ed->recent_mods = eina_list_remove_list(ed->recent_mods, pl);
if (!m->done) _e_file_add_mod(ed, m->path, 5, 0);
eina_stringshare_del(m->path);
free(m);
@ -1804,7 +1804,7 @@ _e_file_add_mod(E_Dir *ed, const char *path, E_Fm_Op_Type op, int listing)
/* FIXME: handle BACKOFF */
if ((!listing) && (op == E_FM_OP_FILE_CHANGE) && (!ed->cleaning)) /* 5 == mod */
{
Evas_List *l;
Eina_List *l;
E_Mod *m;
double t_now;
int skip = 0;
@ -1829,7 +1829,7 @@ _e_file_add_mod(E_Dir *ed, const char *path, E_Fm_Op_Type op, int listing)
m->mod = 1;
m->done = 1;
m->timestamp = t_now;
ed->recent_mods = evas_list_append(ed->recent_mods, m);
ed->recent_mods = eina_list_append(ed->recent_mods, m);
}
if ((!ed->recent_clean) && (ed->recent_mods))
ed->recent_clean = ecore_timer_add(DEF_MOD_BACKOFF, _e_cb_recent_clean, ed);
@ -1961,7 +1961,7 @@ _e_cb_file_mon_list_idler(void *data)
_e_file_add(ed, buf, 1);
}
free(file);
ed->fq = evas_list_remove_list(ed->fq, ed->fq);
ed->fq = eina_list_remove_list(ed->fq, ed->fq);
n++;
if (n == ed->sync_num)
{
@ -2058,14 +2058,14 @@ _e_cb_fop_trash_idler(void *data)
eina_stringshare_del(fop->src);
eina_stringshare_del(fop->dst);
free(fop);
_e_fops = evas_list_remove(_e_fops, fop);
_e_fops = eina_list_remove(_e_fops, fop);
return 0;
}
static char *
_e_str_list_remove(Evas_List **list, char *str)
_e_str_list_remove(Eina_List **list, char *str)
{
Evas_List *l;
Eina_List *l;
for (l = *list; l; l = l->next)
{
@ -2074,7 +2074,7 @@ _e_str_list_remove(Evas_List **list, char *str)
s = l->data;
if (!strcmp(s, str))
{
*list = evas_list_remove_list(*list, l);
*list = eina_list_remove_list(*list, l);
return s;
}
}
@ -2095,7 +2095,7 @@ _e_fm_reorder(const char *file, const char *dst, const char *relative, int after
if(ecore_file_exists(order))
{
FILE *forder;
Evas_List *files = NULL, *l;
Eina_List *files = NULL, *l;
forder = fopen(order, "r");
if (forder)
@ -2108,7 +2108,7 @@ _e_fm_reorder(const char *file, const char *dst, const char *relative, int after
{
len = strlen(buffer);
if (len > 0) buffer[len - 1] = 0;
files = evas_list_append(files, strdup(buffer));
files = eina_list_append(files, strdup(buffer));
}
fclose(forder);
}
@ -2118,7 +2118,7 @@ _e_fm_reorder(const char *file, const char *dst, const char *relative, int after
if (!strcmp(l->data, file))
{
free(l->data);
files = evas_list_remove_list(files, l);
files = eina_list_remove_list(files, l);
break;
}
}
@ -2134,11 +2134,11 @@ _e_fm_reorder(const char *file, const char *dst, const char *relative, int after
}
else if (after == 0) /* before */
{
files = evas_list_prepend_relative_list(files, strdup(file), l);
files = eina_list_prepend_relative_list(files, strdup(file), l);
}
else if (after == 1) /* after */
{
files = evas_list_append_relative_list(files, strdup(file), l);
files = eina_list_append_relative_list(files, strdup(file), l);
}
break;
}
@ -2151,7 +2151,7 @@ _e_fm_reorder(const char *file, const char *dst, const char *relative, int after
{
fprintf(forder, "%s\n", (char *)files->data);
free(files->data);
files = evas_list_remove_list(files, files);
files = eina_list_remove_list(files, files);
}
fclose(forder);
}
@ -2172,12 +2172,12 @@ _e_dir_del(E_Dir *ed)
m = ed->recent_mods->data;
eina_stringshare_del(m->path);
free(m);
ed->recent_mods = evas_list_remove_list(ed->recent_mods, ed->recent_mods);
ed->recent_mods = eina_list_remove_list(ed->recent_mods, ed->recent_mods);
}
while (ed->fq)
{
free(ed->fq->data);
ed->fq = evas_list_remove_list(ed->fq, ed->fq);
ed->fq = eina_list_remove_list(ed->fq, ed->fq);
}
free(ed);
}

52
src/bin/e_fm_mime.c
View File

@ -7,7 +7,7 @@
typedef struct _E_Fm2_Mime_Handler_Tuple E_Fm2_Mime_Handler_Tuple;
struct _E_Fm2_Mime_Handler_Tuple
{
Evas_List *list;
Eina_List *list;
const char *str;
};
@ -38,7 +38,7 @@ e_fm_mime_icon_get(const char *mime)
{
char buf[4096], buf2[4096], *val;
const char *homedir = NULL;
Evas_List *l = NULL;
Eina_List *l = NULL;
E_Config_Mime_Icon *mi;
/* 0.0 clean out hash cache once it has mroe than 512 entries in it */
@ -114,13 +114,13 @@ e_fm_mime_icon_get(const char *mime)
EAPI void
e_fm_mime_icon_cache_flush(void)
{
Evas_List *freelist = NULL;
Eina_List *freelist = NULL;
evas_hash_foreach(icon_map, _e_fm_mime_icon_foreach, &freelist);
while (freelist)
{
eina_stringshare_del(freelist->data);
freelist = evas_list_remove_list(freelist, freelist);
freelist = eina_list_remove_list(freelist, freelist);
}
evas_hash_free(icon_map);
icon_map = NULL;
@ -165,20 +165,20 @@ e_fm2_mime_handler_free(E_Fm2_Mime_Handler *handler)
EAPI Evas_Bool
e_fm2_mime_handler_mime_add(E_Fm2_Mime_Handler *handler, const char *mime)
{
Evas_List *handlers = NULL;
Eina_List *handlers = NULL;
if ((!handler) || (!mime)) return 0;
/* if there's an entry for this mime already, then append to its list */
if ((handlers = evas_hash_find(_mime_handlers, mime)))
{
handlers = evas_list_append(handlers, handler);
handlers = eina_list_append(handlers, handler);
evas_hash_modify(_mime_handlers, mime, handlers);
}
else
{
/* no previous entry for this mime, lets add one */
handlers = evas_list_append(handlers, handler);
handlers = eina_list_append(handlers, handler);
_mime_handlers = evas_hash_add(_mime_handlers, mime, handlers);
}
@ -189,20 +189,20 @@ e_fm2_mime_handler_mime_add(E_Fm2_Mime_Handler *handler, const char *mime)
EAPI Evas_Bool
e_fm2_mime_handler_glob_add(E_Fm2_Mime_Handler *handler, const char *glob)
{
Evas_List *handlers = NULL;
Eina_List *handlers = NULL;
if ((!handler) || (!glob)) return 0;
/* if there's an entry for this glob already, then append to its list */
if ((handlers = evas_hash_find(_glob_handlers, glob)))
{
handlers = evas_list_append(handlers, handler);
handlers = eina_list_append(handlers, handler);
evas_hash_modify(_glob_handlers, glob, handlers);
}
else
{
/* no previous entry for this glob, lets add one */
handlers = evas_list_append(handlers, handler);
handlers = eina_list_append(handlers, handler);
_glob_handlers = evas_hash_add(_glob_handlers, glob, handlers);
}
@ -213,14 +213,14 @@ e_fm2_mime_handler_glob_add(E_Fm2_Mime_Handler *handler, const char *glob)
EAPI void
e_fm2_mime_handler_mime_del(E_Fm2_Mime_Handler *handler, const char *mime)
{
Evas_List *handlers = NULL;
Eina_List *handlers = NULL;
if ((!handler) || (!mime)) return;
/* if there's an entry for this mime already, then remove from list */
if ((handlers = evas_hash_find(_mime_handlers, mime)))
{
handlers = evas_list_remove(handlers, handler);
handlers = eina_list_remove(handlers, handler);
if (handlers)
evas_hash_modify(_mime_handlers, mime, handlers);
else
@ -232,14 +232,14 @@ e_fm2_mime_handler_mime_del(E_Fm2_Mime_Handler *handler, const char *mime)
EAPI void
e_fm2_mime_handler_glob_del(E_Fm2_Mime_Handler *handler, const char *glob)
{
Evas_List *handlers = NULL;
Eina_List *handlers = NULL;
if ((!handler) || (!glob)) return;
/* if there's an entry for this glob already, then remove from list */
if ((handlers = evas_hash_find(_glob_handlers, glob)))
{
handlers = evas_list_remove(handlers, handler);
handlers = eina_list_remove(handlers, handler);
if (handlers)
evas_hash_modify(_glob_handlers, glob, handlers);
else
@ -249,7 +249,7 @@ e_fm2_mime_handler_glob_del(E_Fm2_Mime_Handler *handler, const char *glob)
/* get the list of mime handlers for a mime.
NOTE: the list should be free()'ed */
EAPI Evas_List *
EAPI Eina_List *
e_fm2_mime_handler_mime_handlers_get(const char *mime)
{
if ((!mime) || (!_mime_handlers)) return NULL;
@ -258,11 +258,11 @@ e_fm2_mime_handler_mime_handlers_get(const char *mime)
/* get the list of glob handlers for a glob.
NOTE: the list should be free()'ed */
EAPI Evas_List *
EAPI Eina_List *
e_fm2_mime_handler_glob_handlers_get(const char *glob)
{
E_Fm2_Mime_Handler_Tuple *tuple = NULL;
Evas_List *handlers = NULL;
Eina_List *handlers = NULL;
if ((!glob) || (!_glob_handlers)) return NULL;
@ -301,8 +301,8 @@ e_fm2_mime_handler_call(E_Fm2_Mime_Handler *handler, Evas_Object *obj, const cha
EAPI void
e_fm2_mime_handler_mime_handlers_call_all(Evas_Object *obj, const char *path, const char *mime)
{
Evas_List *handlers = NULL;
Evas_List *l = NULL;
Eina_List *handlers = NULL;
Eina_List *l = NULL;
if ((!obj) || (!path) || (!mime)) return;
@ -324,8 +324,8 @@ e_fm2_mime_handler_mime_handlers_call_all(Evas_Object *obj, const char *path, co
EAPI void
e_fm2_mime_handler_glob_handlers_call_all(Evas_Object *obj, const char *path, const char *glob)
{
Evas_List *handlers = NULL;
Evas_List *l = NULL;
Eina_List *handlers = NULL;
Eina_List *l = NULL;
if ((!obj) || (!path) || (!glob)) return;
@ -359,8 +359,8 @@ static Evas_Bool
_e_fm2_mime_handler_glob_match_foreach(const Evas_Hash *hash __UNUSED__, const char *key, void *data, void *fdata)
{
E_Fm2_Mime_Handler_Tuple *tuple;
Evas_List *handlers = NULL;
Evas_List *l = NULL;
Eina_List *handlers = NULL;
Eina_List *l = NULL;
tuple = fdata;
if (e_util_glob_match(tuple->str, key))
@ -369,7 +369,7 @@ _e_fm2_mime_handler_glob_match_foreach(const Evas_Hash *hash __UNUSED__, const c
for (l = handlers; l; l = l->next)
{
if (l->data)
tuple->list = evas_list_append(tuple->list, l->data);
tuple->list = eina_list_append(tuple->list, l->data);
}
}
@ -379,9 +379,9 @@ _e_fm2_mime_handler_glob_match_foreach(const Evas_Hash *hash __UNUSED__, const c
static Evas_Bool
_e_fm_mime_icon_foreach(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *data, void *fdata)
{
Evas_List **freelist;
Eina_List **freelist;
freelist = fdata;
*freelist = evas_list_append(*freelist, data);
*freelist = eina_list_append(*freelist, data);
return 1;
}

4
src/bin/e_fm_mime.h
View File

@ -32,8 +32,8 @@ EAPI void e_fm2_mime_handler_mime_handlers_call_all(Evas_Object *obj, const char
EAPI void e_fm2_mime_handler_glob_handlers_call_all(Evas_Object *obj, const char *path, const char *glob);
EAPI void e_fm2_mime_handler_mime_del(E_Fm2_Mime_Handler *handler, const char *mime);
EAPI void e_fm2_mime_handler_glob_del(E_Fm2_Mime_Handler *handler, const char *glob);
EAPI Evas_List *e_fm2_mime_handler_mime_handlers_get(const char *mime);
EAPI Evas_List *e_fm2_mime_handler_glob_handlers_get(const char *glob);
EAPI Eina_List *e_fm2_mime_handler_mime_handlers_get(const char *mime);
EAPI Eina_List *e_fm2_mime_handler_glob_handlers_get(const char *glob);
#endif
#endif

62
src/bin/e_fm_op.c
View File

@ -46,7 +46,7 @@ static void _e_fm_op_remove_link_task(E_Fm_Op_Task *task);
static int _e_fm_op_stdin_data(void *data, Ecore_Fd_Handler * fd_handler);
static void _e_fm_op_set_up_idlers();
static void _e_fm_op_delete_idler(int *mark);
static int _e_fm_op_idler_handle_error(int *mark, Evas_List **queue, Evas_List **node, E_Fm_Op_Task *task);
static int _e_fm_op_idler_handle_error(int *mark, Eina_List **queue, Eina_List **node, E_Fm_Op_Task *task);
static int _e_fm_op_work_idler(void *data);
static int _e_fm_op_scan_idler(void *data);
@ -70,7 +70,7 @@ static int _e_fm_op_remove_atom(E_Fm_Op_Task * task);
Ecore_Fd_Handler *_e_fm_op_stdin_handler = NULL;
Evas_List *_e_fm_op_work_queue = NULL, *_e_fm_op_scan_queue = NULL;
Eina_List *_e_fm_op_work_queue = NULL, *_e_fm_op_scan_queue = NULL;
Ecore_Idler *_e_fm_op_work_idler_p = NULL, *_e_fm_op_scan_idler_p = NULL;
long long _e_fm_op_done, _e_fm_op_total; /* Type long long should be 64 bits wide everywhere,
@ -87,7 +87,7 @@ int _e_fm_op_overwrite = 0;
int _e_fm_op_error_response = E_FM_OP_NONE;
int _e_fm_op_overwrite_response = E_FM_OP_NONE;
Evas_List *_e_fm_op_separator = NULL;
Eina_List *_e_fm_op_separator = NULL;
void *_e_fm_op_stdin_buffer = NULL;
@ -113,7 +113,7 @@ struct _E_Fm_Op_Task
E_Fm_Op_Type type;
E_Fm_Op_Type overwrite;
Evas_List *link;
Eina_List *link;
};
struct _E_Fm_Op_Copy_Data
@ -171,7 +171,7 @@ main(int argc, char **argv)
if (type == E_FM_OP_MOVE)
{
_e_fm_op_work_queue = evas_list_append(_e_fm_op_work_queue, NULL);
_e_fm_op_work_queue = eina_list_append(_e_fm_op_work_queue, NULL);
_e_fm_op_separator = _e_fm_op_work_queue;
}
@ -192,7 +192,7 @@ main(int argc, char **argv)
if (type == E_FM_OP_MOVE && rename(task->src.name, task->dst.name) == 0)
_e_fm_op_task_free(task);
else
_e_fm_op_scan_queue = evas_list_append(_e_fm_op_scan_queue, task);
_e_fm_op_scan_queue = eina_list_append(_e_fm_op_scan_queue, task);
i++;
}
@ -207,7 +207,7 @@ main(int argc, char **argv)
task->src.name = eina_stringshare_add(argv[2]);
task->dst.name = eina_stringshare_add(argv[3]);
_e_fm_op_scan_queue = evas_list_append(_e_fm_op_scan_queue, task);
_e_fm_op_scan_queue = eina_list_append(_e_fm_op_scan_queue, task);
}
else
{
@ -227,7 +227,7 @@ main(int argc, char **argv)
task->type = type;
task->src.name = eina_stringshare_add(argv[i]);
_e_fm_op_scan_queue = evas_list_append(_e_fm_op_scan_queue, task);
_e_fm_op_scan_queue = eina_list_append(_e_fm_op_scan_queue, task);
i++;
}
@ -322,7 +322,7 @@ static void _e_fm_op_remove_link_task(E_Fm_Op_Task *task)
{
if (task->link)
{
_e_fm_op_work_queue = evas_list_remove_list(_e_fm_op_work_queue, task->link);
_e_fm_op_work_queue = eina_list_remove_list(_e_fm_op_work_queue, task->link);
_e_fm_op_task_free(task->link);
task->link = NULL;
}
@ -495,7 +495,7 @@ static void _e_fm_op_delete_idler(int *mark)
* Returns 1 if we did; otherwise checks it and does what needs to be done.
*/
static int _e_fm_op_idler_handle_error(int *mark, Evas_List **queue, Evas_List **node, E_Fm_Op_Task *task)
static int _e_fm_op_idler_handle_error(int *mark, Eina_List **queue, Eina_List **node, E_Fm_Op_Task *task)
{
if (_e_fm_op_overwrite)
{
@ -542,7 +542,7 @@ static int _e_fm_op_idler_handle_error(int *mark, Evas_List **queue, Evas_List *
{
_e_fm_op_rollback(task);
_e_fm_op_remove_link_task(task);
*queue = evas_list_remove_list(*queue, *node);
*queue = eina_list_remove_list(*queue, *node);
_e_fm_op_error_response = E_FM_OP_NONE;
*mark = 0;
*node = NULL;
@ -554,7 +554,7 @@ static int _e_fm_op_idler_handle_error(int *mark, Evas_List **queue, Evas_List *
task->src.name, task->dst.name);
_e_fm_op_rollback(task);
_e_fm_op_remove_link_task(task);
*queue = evas_list_remove_list(*queue, *node);
*queue = eina_list_remove_list(*queue, *node);
*node = NULL;
*mark = 0;
/* Do not clean out _e_fm_op_error_response. This way when another error occures, it would be handled automatically. */
@ -589,17 +589,17 @@ _e_fm_op_work_idler(void *data)
*
* BTW, the same is propably right for the _e_fm_op_scan_idler().
*/
static Evas_List *node = NULL;
static Eina_List *node = NULL;
E_Fm_Op_Task *task = NULL;
if (!node) node = _e_fm_op_work_queue;
task = evas_list_data(node);
task = eina_list_data_get(node);
if (!task)
{
node = _e_fm_op_work_queue;
task = evas_list_data(node);
task = eina_list_data_get(node);
}
if (!task)
@ -607,7 +607,7 @@ _e_fm_op_work_idler(void *data)
if ( _e_fm_op_separator && _e_fm_op_work_queue == _e_fm_op_separator && _e_fm_op_scan_idler_p == NULL)
{
/* You may want to look at the comment in _e_fm_op_scan_atom() about this separator thing. */
_e_fm_op_work_queue = evas_list_remove_list(_e_fm_op_work_queue, _e_fm_op_separator);
_e_fm_op_work_queue = eina_list_remove_list(_e_fm_op_work_queue, _e_fm_op_separator);
node = NULL;
return 1;
}
@ -639,7 +639,7 @@ _e_fm_op_work_idler(void *data)
if (task->finished)
{
_e_fm_op_work_queue = evas_list_remove_list(_e_fm_op_work_queue, node);
_e_fm_op_work_queue = eina_list_remove_list(_e_fm_op_work_queue, node);
_e_fm_op_task_free(task);
node = NULL;
}
@ -662,7 +662,7 @@ _e_fm_op_work_idler(void *data)
int
_e_fm_op_scan_idler(void *data)
{
static Evas_List *node = NULL;
static Eina_List *node = NULL;
E_Fm_Op_Task *task = NULL;
char buf[PATH_MAX];
static struct dirent *de = NULL;
@ -671,12 +671,12 @@ _e_fm_op_scan_idler(void *data)
if (!node) node = _e_fm_op_scan_queue;
task = evas_list_data(node);
task = eina_list_data_get(node);
if (!task)
{
node = _e_fm_op_scan_queue;
task = evas_list_data(node);
task = eina_list_data_get(node);
}
if (!task)
@ -699,7 +699,7 @@ _e_fm_op_scan_idler(void *data)
_e_fm_op_scan_atom(task);
if (task->finished)
{
_e_fm_op_scan_queue = evas_list_remove_list(_e_fm_op_scan_queue, node);
_e_fm_op_scan_queue = eina_list_remove_list(_e_fm_op_scan_queue, node);
_e_fm_op_task_free(task);
node = NULL;
}
@ -747,9 +747,9 @@ _e_fm_op_scan_idler(void *data)
}
if (task->type == E_FM_OP_REMOVE)
_e_fm_op_scan_queue = evas_list_prepend(_e_fm_op_scan_queue, ntask);
_e_fm_op_scan_queue = eina_list_prepend(_e_fm_op_scan_queue, ntask);
else
_e_fm_op_scan_queue = evas_list_append(_e_fm_op_scan_queue, ntask);
_e_fm_op_scan_queue = eina_list_append(_e_fm_op_scan_queue, ntask);
task->started = 1;
closedir(dir);
@ -783,16 +783,16 @@ _e_fm_op_scan_idler(void *data)
}
if (task->type == E_FM_OP_REMOVE)
_e_fm_op_scan_queue = evas_list_prepend(_e_fm_op_scan_queue, ntask);
_e_fm_op_scan_queue = eina_list_prepend(_e_fm_op_scan_queue, ntask);
else
_e_fm_op_scan_queue = evas_list_append(_e_fm_op_scan_queue, ntask);
_e_fm_op_scan_queue = eina_list_append(_e_fm_op_scan_queue, ntask);
}
else
{
_e_fm_op_scan_atom(task);
if (task->finished)
{
_e_fm_op_scan_queue = evas_list_remove_list(_e_fm_op_scan_queue, node);
_e_fm_op_scan_queue = eina_list_remove_list(_e_fm_op_scan_queue, node);
_e_fm_op_task_free(task);
node = NULL;
}
@ -1329,7 +1329,7 @@ _e_fm_op_scan_atom(E_Fm_Op_Task * task)
ctask->dst.name = eina_stringshare_add(task->dst.name);
ctask->type = E_FM_OP_COPY;
_e_fm_op_work_queue = evas_list_append(_e_fm_op_work_queue, ctask);
_e_fm_op_work_queue = eina_list_append(_e_fm_op_work_queue, ctask);
}
else if (task->type == E_FM_OP_COPY_STAT_INFO)
{
@ -1342,7 +1342,7 @@ _e_fm_op_scan_atom(E_Fm_Op_Task * task)
ctask->dst.name = eina_stringshare_add(task->dst.name);
ctask->type = E_FM_OP_COPY_STAT_INFO;
_e_fm_op_work_queue = evas_list_append(_e_fm_op_work_queue, ctask);
_e_fm_op_work_queue = eina_list_append(_e_fm_op_work_queue, ctask);
}
else if (task->type == E_FM_OP_REMOVE)
{
@ -1355,7 +1355,7 @@ _e_fm_op_scan_atom(E_Fm_Op_Task * task)
rtask->dst.name = eina_stringshare_add(task->dst.name);
rtask->type = E_FM_OP_REMOVE;
_e_fm_op_work_queue = evas_list_prepend(_e_fm_op_work_queue, rtask);
_e_fm_op_work_queue = eina_list_prepend(_e_fm_op_work_queue, rtask);
}
else if (task->type == E_FM_OP_MOVE)
@ -1370,7 +1370,7 @@ _e_fm_op_scan_atom(E_Fm_Op_Task * task)
ctask->dst.name = eina_stringshare_add(task->dst.name);
ctask->type = E_FM_OP_COPY;
_e_fm_op_work_queue = evas_list_prepend(_e_fm_op_work_queue, ctask);
_e_fm_op_work_queue = eina_list_prepend(_e_fm_op_work_queue, ctask);
/* Remove task. */
_e_fm_op_update_progress(NULL, 0, REMOVECHUNKSIZE);
@ -1392,7 +1392,7 @@ _e_fm_op_scan_atom(E_Fm_Op_Task * task)
* copied.
*/
_e_fm_op_work_queue = evas_list_append_relative_list(_e_fm_op_work_queue, rtask, _e_fm_op_separator);
_e_fm_op_work_queue = eina_list_append_relative_list(_e_fm_op_work_queue, rtask, _e_fm_op_separator);
ctask->link = _e_fm_op_separator->next;
}

6
src/bin/e_fm_prop.c
View File

@ -220,7 +220,7 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
if ((cfdata->icon_mime) && (cfdata->mime)) /* modify mimetype */
{
Evas_List *l;
Eina_List *l;
E_Config_Mime_Icon *mi = NULL;
int found = 0;
@ -243,14 +243,14 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
mi = E_NEW(E_Config_Mime_Icon, 1);
mi->mime = eina_stringshare_add(cfdata->mime);
e_config->mime_icons = evas_list_append(e_config->mime_icons, mi);
e_config->mime_icons = eina_list_append(e_config->mime_icons, mi);
}
/* FIXME: modify mime info */
if (cfdata->icon_type == 0)
{
if (found)
{
e_config->mime_icons = evas_list_remove(e_config->mime_icons, mi);
e_config->mime_icons = eina_list_remove(e_config->mime_icons, mi);
if (mi->mime) eina_stringshare_del(mi->mime);
if (mi->icon) eina_stringshare_del(mi->icon);
free(mi);

20
src/bin/e_fm_shared.h
View File

@ -30,7 +30,7 @@ struct _E_Storage
char *volume;
} icon;
Evas_List *volumes;
Eina_List *volumes;
unsigned char validated;
unsigned char trackable;
@ -54,7 +54,7 @@ struct _E_Volume
char *parent;
E_Storage *storage;
void *prop_handler;
Evas_List *mounts;
Eina_List *mounts;
unsigned char validated;
};
@ -87,7 +87,7 @@ _e_volume_free(E_Volume *v)
{
if (v->storage)
{
v->storage->volumes = evas_list_remove(v->storage->volumes, v);
v->storage->volumes = eina_list_remove(v->storage->volumes, v);
v->storage = NULL;
}
if (v->udi) free(v->udi);
@ -109,7 +109,7 @@ _e_storage_free(E_Storage *s)
v = s->volumes->data;
_e_volume_free(v);
s->volumes = evas_list_remove_list(s->volumes, s->volumes);
s->volumes = eina_list_remove_list(s->volumes, s->volumes);
}
if (s->udi) free(s->udi);
if (s->bus) free(s->bus);
@ -134,9 +134,9 @@ _e_volume_edd_new(void)
eddc.func.mem_free = NULL;
eddc.func.str_alloc = (char *(*)(const char *)) strdup;
eddc.func.str_free = (void (*)(const char *)) free;
eddc.func.list_next = (void *(*)(void *)) evas_list_next;
eddc.func.list_append = (void *(*)(void *l, void *d)) evas_list_append;
eddc.func.list_data = (void *(*)(void *)) evas_list_data;
eddc.func.list_next = (void *(*)(void *)) eina_list_next;
eddc.func.list_append = (void *(*)(void *l, void *d)) eina_list_append;
eddc.func.list_data = (void *(*)(void *)) eina_list_data_get;
eddc.func.hash_foreach =
(void (*) (void *, int (*) (void *, const char *, void *, void *), void *))
evas_hash_foreach;
@ -174,9 +174,9 @@ _e_storage_edd_new(void)
eddc.func.mem_free = NULL;
eddc.func.str_alloc = (char *(*)(const char *)) strdup;
eddc.func.str_free = (void (*)(const char *)) free;
eddc.func.list_next = (void *(*)(void *)) evas_list_next;
eddc.func.list_append = (void *(*)(void *l, void *d)) evas_list_append;
eddc.func.list_data = (void *(*)(void *)) evas_list_data;
eddc.func.list_next = (void *(*)(void *)) eina_list_next;
eddc.func.list_append = (void *(*)(void *l, void *d)) eina_list_append;
eddc.func.list_data = (void *(*)(void *)) eina_list_data_get;
eddc.func.hash_foreach =
(void (*) (void *, int (*) (void *, const char *, void *, void *), void *))
evas_hash_foreach;

80
src/bin/e_font.c
View File

@ -28,7 +28,7 @@ EAPI void
e_font_apply(void)
{
char buf[1024];
Evas_List *l;
Eina_List *l;
E_Font_Fallback *eff;
int blen, len;
@ -39,16 +39,16 @@ e_font_apply(void)
l = e_config->font_fallbacks;
if (l)
{
eff = evas_list_data(l);
eff = eina_list_data_get(l);
len = strlen(eff->name);
if (len < blen)
{
strcpy(buf, eff->name);
blen -= len;
}
for (l = evas_list_next(l); l; l = l->next)
for (l = eina_list_next(l); l; l = l->next)
{
eff = evas_list_data(l);
eff = eina_list_data_get(l);
len = 1;
if (len < blen)
{
@ -72,7 +72,7 @@ e_font_apply(void)
{
E_Font_Default *efd;
efd = evas_list_data(l);
efd = eina_list_data_get(l);
edje_text_class_set(efd->text_class, efd->font, efd->size);
}
@ -86,12 +86,12 @@ e_font_apply(void)
}
}
EAPI Evas_List *
EAPI Eina_List *
e_font_available_list(void)
{
Evas_List *evas_fonts;
Evas_List *e_fonts;
Evas_List *l;
Eina_List *evas_fonts;
Eina_List *e_fonts;
Eina_List *l;
E_Manager *man;
E_Container *con;
@ -112,7 +112,7 @@ e_font_available_list(void)
efa = E_NEW(E_Font_Available, 1);
evas_font = l->data;
efa->name = eina_stringshare_add(evas_font);
e_fonts = evas_list_append(e_fonts, efa);
e_fonts = eina_list_append(e_fonts, efa);
}
evas_font_available_list_free(con->bg_evas, evas_fonts);
@ -121,14 +121,14 @@ e_font_available_list(void)
}
EAPI void
e_font_available_list_free(Evas_List *available)
e_font_available_list_free(Eina_List *available)
{
E_Font_Available *efa;
while (available)
{
efa = available->data;
available = evas_list_remove_list(available, available);
available = eina_list_remove_list(available, available);
if (efa->name) eina_stringshare_del(efa->name);
E_FREE(efa);
}
@ -143,7 +143,7 @@ e_font_properties_free(E_Font_Properties *efp)
str = efp->styles->data;
if (str) eina_stringshare_del(str);
efp->styles = evas_list_remove_list(efp->styles, efp->styles);
efp->styles = eina_list_remove_list(efp->styles, efp->styles);
}
if (efp->name) eina_stringshare_del(efp->name);
@ -219,11 +219,11 @@ _e_font_fontconfig_name_parse(Evas_Hash **font_hash, E_Font_Properties *efp, con
style_old = style;
style = calloc(sizeof(char), len + 1);
strncpy(style, style_old, len);
efp->styles = evas_list_append(efp->styles, eina_stringshare_add(style));
efp->styles = eina_list_append(efp->styles, eina_stringshare_add(style));
free(style);
}
else
efp->styles = evas_list_append(efp->styles, eina_stringshare_add(style));
efp->styles = eina_list_append(efp->styles, eina_stringshare_add(style));
}
free(name);
}
@ -249,10 +249,10 @@ _e_font_available_hash_add(Evas_Hash *font_hash, const char *full_name)
}
EAPI Evas_Hash *
e_font_available_list_parse(Evas_List *list)
e_font_available_list_parse(Eina_List *list)
{
Evas_Hash *font_hash;
Evas_List *next;
Eina_List *next;
font_hash = NULL;
@ -299,7 +299,7 @@ e_font_fallback_clear(void)
{
eff = e_config->font_fallbacks->data;
e_config->font_fallbacks =
evas_list_remove_list(e_config->font_fallbacks, e_config->font_fallbacks);
eina_list_remove_list(e_config->font_fallbacks, e_config->font_fallbacks);
if (eff->name) eina_stringshare_del(eff->name);
E_FREE(eff);
}
@ -314,7 +314,7 @@ e_font_fallback_append(const char *font)
eff = E_NEW(E_Font_Fallback, 1);
eff->name = eina_stringshare_add(font);
e_config->font_fallbacks = evas_list_append(e_config->font_fallbacks, eff);
e_config->font_fallbacks = eina_list_append(e_config->font_fallbacks, eff);
}
EAPI void
@ -326,23 +326,23 @@ e_font_fallback_prepend(const char *font)
eff = E_NEW(E_Font_Fallback, 1);
eff->name = eina_stringshare_add(font);
e_config->font_fallbacks = evas_list_prepend(e_config->font_fallbacks, eff);
e_config->font_fallbacks = eina_list_prepend(e_config->font_fallbacks, eff);
}
EAPI void
e_font_fallback_remove(const char *font)
{
Evas_List *next;
Eina_List *next;
for (next = e_config->font_fallbacks; next; next = next->next)
{
E_Font_Fallback *eff;
eff = evas_list_data(next);
eff = eina_list_data_get(next);
if (!strcmp(eff->name, font))
{
e_config->font_fallbacks =
evas_list_remove_list(e_config->font_fallbacks, next);
eina_list_remove_list(e_config->font_fallbacks, next);
if (eff->name) eina_stringshare_del(eff->name);
E_FREE(eff);
break;
@ -350,7 +350,7 @@ e_font_fallback_remove(const char *font)
}
}
EAPI Evas_List *
EAPI Eina_List *
e_font_fallback_list(void)
{
return e_config->font_fallbacks;
@ -360,12 +360,12 @@ EAPI void
e_font_default_set(const char *text_class, const char *font, Evas_Font_Size size)
{
E_Font_Default *efd;
Evas_List *next;
Eina_List *next;
/* search for the text class */
for (next = e_config->font_defaults; next; next = next->next)
{
efd = evas_list_data(next);
efd = eina_list_data_get(next);
if (!strcmp(efd->text_class, text_class))
{
if (efd->font) eina_stringshare_del(efd->font);
@ -373,9 +373,9 @@ e_font_default_set(const char *text_class, const char *font, Evas_Font_Size size
efd->size = size;
/* move to the front of the list */
e_config->font_defaults =
evas_list_remove_list(e_config->font_defaults, next);
eina_list_remove_list(e_config->font_defaults, next);
e_config->font_defaults =
evas_list_prepend(e_config->font_defaults, efd);
eina_list_prepend(e_config->font_defaults, efd);
return;
}
}
@ -386,7 +386,7 @@ e_font_default_set(const char *text_class, const char *font, Evas_Font_Size size
efd->font = eina_stringshare_add(font);
efd->size = size;
e_config->font_defaults = evas_list_prepend(e_config->font_defaults, efd);
e_config->font_defaults = eina_list_prepend(e_config->font_defaults, efd);
}
/*
@ -396,19 +396,19 @@ EAPI E_Font_Default *
e_font_default_get(const char *text_class)
{
E_Font_Default *efd = NULL, *defd = NULL;
Evas_List *next;
Eina_List *next;
/* search for the text class */
for (next = e_config->font_defaults; next; next = next->next)
{
efd = evas_list_data(next);
efd = eina_list_data_get(next);
if (!strcmp(efd->text_class, text_class))
{
/* move to the front of the list */
e_config->font_defaults =
evas_list_remove_list(e_config->font_defaults, next);
eina_list_remove_list(e_config->font_defaults, next);
e_config->font_defaults =
evas_list_prepend(e_config->font_defaults, efd);
eina_list_prepend(e_config->font_defaults, efd);
return efd;
}
if (!strcmp(efd->text_class, "default")) defd = efd;
@ -421,16 +421,16 @@ EAPI void
e_font_default_remove(const char *text_class)
{
E_Font_Default *efd;
Evas_List *next;
Eina_List *next;
/* search for the text class */
for (next = e_config->font_defaults; next; next = next->next)
{
efd = evas_list_data(next);
efd = eina_list_data_get(next);
if (!strcmp(efd->text_class, text_class))
{
e_config->font_defaults =
evas_list_remove_list(e_config->font_defaults, next);
eina_list_remove_list(e_config->font_defaults, next);
if (efd->text_class) eina_stringshare_del(efd->text_class);
if (efd->font) eina_stringshare_del(efd->font);
E_FREE(efd);
@ -440,7 +440,7 @@ e_font_default_remove(const char *text_class)
}
}
EAPI Evas_List *
EAPI Eina_List *
e_font_default_list(void)
{
return e_config->font_defaults;
@ -454,7 +454,7 @@ EAPI const char *
e_font_default_string_get(const char *text_class, Evas_Font_Size *size_ret)
{
E_Font_Default *efd;
Evas_List *next;
Eina_List *next;
E_Font_Fallback *eff;
int blen, len;
@ -477,7 +477,7 @@ e_font_default_string_get(const char *text_class, Evas_Font_Size *size_ret)
next = e_config->font_fallbacks;
while (next)
{
eff = evas_list_data(next);
eff = eina_list_data_get(next);
len = 1;
if (len < blen)
{
@ -490,7 +490,7 @@ e_font_default_string_get(const char *text_class, Evas_Font_Size *size_ret)
strcat(_fn_buf, eff->name);
blen -= len;
}
next = evas_list_next(next);
next = eina_list_next(next);
}
if (size_ret) *size_ret = efd->size;

12
src/bin/e_font.h
View File

@ -32,15 +32,15 @@ struct _E_Font_Available
struct _E_Font_Properties
{
const char *name;
Evas_List *styles;
Eina_List *styles;
};
EAPI int e_font_init(void);
EAPI int e_font_shutdown(void);
EAPI void e_font_apply(void);
EAPI Evas_List *e_font_available_list(void);
EAPI void e_font_available_list_free(Evas_List *available);
EAPI Evas_Hash *e_font_available_list_parse(Evas_List *list);
EAPI Eina_List *e_font_available_list(void);
EAPI void e_font_available_list_free(Eina_List *available);
EAPI Evas_Hash *e_font_available_list_parse(Eina_List *list);
EAPI void e_font_available_hash_free(Evas_Hash *hash);
EAPI E_Font_Properties *e_font_fontconfig_name_parse(const char *font);
EAPI const char *e_font_fontconfig_name_get(const char *name, const char *style);
@ -51,13 +51,13 @@ EAPI void e_font_fallback_clear(void);
EAPI void e_font_fallback_append(const char *font);
EAPI void e_font_fallback_prepend(const char *font);
EAPI void e_font_fallback_remove(const char *font);
EAPI Evas_List *e_font_fallback_list(void);
EAPI Eina_List *e_font_fallback_list(void);
/* setup edje text classes */
EAPI void e_font_default_set(const char *text_class, const char *font, Evas_Font_Size size);
EAPI E_Font_Default *e_font_default_get(const char *text_class);
EAPI void e_font_default_remove(const char *text_class);
EAPI Evas_List *e_font_default_list(void);
EAPI Eina_List *e_font_default_list(void);
EAPI const char *e_font_default_string_get(const char *text_class, Evas_Font_Size *size_ret);
#endif

192
src/bin/e_gadcon.c
View File

@ -88,13 +88,13 @@ static void _e_gadcon_client_current_position_sync(E_Gadcon_Client *gcc);
static void _e_gadcon_layout_smart_sync_clients(E_Gadcon *gc);
static void _e_gadcon_layout_smart_gadcon_position_shrinked_mode(E_Smart_Data *sd);
static void _e_gadcon_layout_smart_gadcons_asked_position_set(E_Smart_Data *sd);
static Evas_List *_e_gadcon_layout_smart_gadcons_wrap(E_Smart_Data *sd);
static void _e_gadcon_layout_smart_gadcons_position(E_Smart_Data *sd, Evas_List **list);
static void _e_gadcon_layout_smart_gadcons_position_static(E_Smart_Data *sd, Evas_List **list);
static Eina_List *_e_gadcon_layout_smart_gadcons_wrap(E_Smart_Data *sd);
static void _e_gadcon_layout_smart_gadcons_position(E_Smart_Data *sd, Eina_List **list);
static void _e_gadcon_layout_smart_gadcons_position_static(E_Smart_Data *sd, Eina_List **list);
static E_Layout_Item_Container * _e_gadcon_layout_smart_containers_position_adjust(E_Smart_Data *sd, E_Layout_Item_Container *lc, E_Layout_Item_Container *lc2);
static void _e_gadcon_layout_smart_position_items_inside_container(E_Smart_Data *sd, E_Layout_Item_Container *lc);
static void _e_gadcon_layout_smart_containers_merge(E_Smart_Data *sd, E_Layout_Item_Container *lc, E_Layout_Item_Container *lc2);
static void _e_gadcon_layout_smart_restore_gadcons_position_before_move(E_Smart_Data *sd, E_Layout_Item_Container **lc_moving, E_Layout_Item_Container *lc_back, Evas_List **con_list);
static void _e_gadcon_layout_smart_restore_gadcons_position_before_move(E_Smart_Data *sd, E_Layout_Item_Container **lc_moving, E_Layout_Item_Container *lc_back, Eina_List **con_list);
typedef enum _E_Gadcon_Layout_Item_State
{
@ -135,14 +135,14 @@ struct _E_Layout_Item_Container
} state_info;
E_Smart_Data *sd;
Evas_List *items;
Eina_List *items;
E_Layout_Item_Container_State state;
};
#define LC_FREE(__lc) \
if (__lc->items) \
evas_list_free(__lc->items); \
eina_list_free(__lc->items); \
E_FREE(__lc)
#define E_LAYOUT_ITEM_CONTAINER_STATE_SET(__con_state, __bi_state) \
@ -183,8 +183,8 @@ struct _E_Layout_Item_Container
/********************/
static Evas_Hash *providers = NULL;
static Evas_List *providers_list = NULL;
static Evas_List *gadcons = NULL;
static Eina_List *providers_list = NULL;
static Eina_List *gadcons = NULL;
/* This is the gadcon client which is currently dragged */
static E_Gadcon_Client *drag_gcc = NULL;
@ -207,11 +207,11 @@ e_gadcon_shutdown(void)
EAPI void
e_gadcon_provider_register(const E_Gadcon_Client_Class *cc)
{
Evas_List *l;
Eina_List *l;
E_Gadcon *gc;
providers = evas_hash_direct_add(providers, cc->name, cc);
providers_list = evas_list_append(providers_list, cc);
providers_list = eina_list_append(providers_list, cc);
for (l = gadcons; l; l = l->next)
{
gc = l->data;
@ -222,7 +222,7 @@ e_gadcon_provider_register(const E_Gadcon_Client_Class *cc)
EAPI void
e_gadcon_provider_unregister(const E_Gadcon_Client_Class *cc)
{
Evas_List *l, *ll, *dlist = NULL;
Eina_List *l, *ll, *dlist = NULL;
E_Gadcon *gc;
E_Gadcon_Client *gcc;
@ -233,20 +233,20 @@ e_gadcon_provider_unregister(const E_Gadcon_Client_Class *cc)
{
gcc = ll->data;
if (gcc->client_class == cc)
dlist = evas_list_append(dlist, gcc);
dlist = eina_list_append(dlist, gcc);
}
}
while (dlist)
{
gcc = dlist->data;
dlist = evas_list_remove_list(dlist, dlist);
dlist = eina_list_remove_list(dlist, dlist);
e_object_del(E_OBJECT(gcc));
}
providers = evas_hash_del(providers, cc->name, cc);
providers_list = evas_list_remove(providers_list, cc);
providers_list = eina_list_remove(providers_list, cc);
}
EAPI Evas_List *
EAPI Eina_List *
e_gadcon_provider_list(void)
{
return providers_list;
@ -256,7 +256,7 @@ EAPI E_Gadcon *
e_gadcon_swallowed_new(const char *name, int id, Evas_Object *obj, char *swallow_name)
{
E_Gadcon *gc;
Evas_List *l;
Eina_List *l;
Evas_Coord x, y, w, h;
const char *drop_types[] = { "enlightenment/gadcon_client" };
@ -290,7 +290,7 @@ e_gadcon_swallowed_new(const char *name, int id, Evas_Object *obj, char *swallow
evas_object_show(gc->o_container);
edje_object_part_swallow(gc->edje.o_parent, gc->edje.swallow_name,
gc->o_container);
gadcons = evas_list_append(gadcons, gc);
gadcons = eina_list_append(gadcons, gc);
for (l = e_config->gadcons; l; l = l->next)
{
@ -309,7 +309,7 @@ e_gadcon_swallowed_new(const char *name, int id, Evas_Object *obj, char *swallow
gc->cf = E_NEW(E_Config_Gadcon, 1);
gc->cf->name = eina_stringshare_add(gc->name);
gc->cf->id = gc->id;
e_config->gadcons = evas_list_append(e_config->gadcons, gc->cf);
e_config->gadcons = eina_list_append(e_config->gadcons, gc->cf);
e_config_save_queue();
}
return gc;
@ -369,7 +369,7 @@ e_gadcon_layout_policy_set(E_Gadcon *gc, E_Gadcon_Layout_Policy layout_policy)
EAPI void
e_gadcon_populate(E_Gadcon *gc)
{
Evas_List *l;
Eina_List *l;
E_OBJECT_CHECK(gc);
E_OBJECT_TYPE_CHECK(gc, E_GADCON_TYPE);
@ -444,7 +444,7 @@ e_gadcon_unpopulate(E_Gadcon *gc)
e_object_del(E_OBJECT(gcc->menu));
gcc->menu = NULL;
}
gc->clients = evas_list_remove_list(gc->clients, gc->clients);
gc->clients = eina_list_remove_list(gc->clients, gc->clients);
e_object_del(E_OBJECT(gcc));
}
}
@ -452,7 +452,7 @@ e_gadcon_unpopulate(E_Gadcon *gc)
EAPI void
e_gadcon_populate_class(E_Gadcon *gc, const E_Gadcon_Client_Class *cc)
{
Evas_List *l;
Eina_List *l;
E_OBJECT_CHECK(gc);
E_OBJECT_TYPE_CHECK(gc, E_GADCON_TYPE);
@ -504,7 +504,7 @@ e_gadcon_populate_class(E_Gadcon *gc, const E_Gadcon_Client_Class *cc)
EAPI void
e_gadcon_orient(E_Gadcon *gc, E_Gadcon_Orient orient)
{
Evas_List *l;
Eina_List *l;
int horiz = 0;
E_OBJECT_CHECK(gc);
@ -552,7 +552,7 @@ e_gadcon_orient(E_Gadcon *gc, E_Gadcon_Orient orient)
EAPI void
e_gadcon_edit_begin(E_Gadcon *gc)
{
Evas_List *l;
Eina_List *l;
E_OBJECT_CHECK(gc);
E_OBJECT_TYPE_CHECK(gc, E_GADCON_TYPE);
@ -572,7 +572,7 @@ e_gadcon_edit_begin(E_Gadcon *gc)
EAPI void
e_gadcon_edit_end(E_Gadcon *gc)
{
Evas_List *l;
Eina_List *l;
E_OBJECT_CHECK(gc);
E_OBJECT_TYPE_CHECK(gc, E_GADCON_TYPE);
@ -592,7 +592,7 @@ e_gadcon_edit_end(E_Gadcon *gc)
EAPI void
e_gadcon_all_edit_begin(void)
{
Evas_List *l;
Eina_List *l;
for (l = gadcons; l; l = l->next)
{
@ -606,7 +606,7 @@ e_gadcon_all_edit_begin(void)
EAPI void
e_gadcon_all_edit_end(void)
{
Evas_List *l;
Eina_List *l;
for (l = gadcons; l; l = l->next)
{
@ -755,7 +755,7 @@ e_gadcon_client_config_new(E_Gadcon *gc, const char *name)
cf_gcc->style = NULL;
cf_gcc->autoscroll = 0;
cf_gcc->resizable = 0;
gc->cf->clients = evas_list_append(gc->cf->clients, cf_gcc);
gc->cf->clients = eina_list_append(gc->cf->clients, cf_gcc);
e_config_save_queue();
return cf_gcc;
}
@ -768,7 +768,7 @@ e_gadcon_client_config_del(E_Config_Gadcon *cf_gc, E_Config_Gadcon_Client *cf_gc
if (cf_gcc->name) eina_stringshare_del(cf_gcc->name);
if (cf_gcc->id) eina_stringshare_del(cf_gcc->id);
if (cf_gcc->style) eina_stringshare_del(cf_gcc->style);
if (cf_gc) cf_gc->clients = evas_list_remove(cf_gc->clients, cf_gcc);
if (cf_gc) cf_gc->clients = eina_list_remove(cf_gc->clients, cf_gcc);
free(cf_gcc);
}
@ -785,8 +785,8 @@ e_gadcon_client_new(E_Gadcon *gc, const char *name, const char *id, const char *
gcc->gadcon = gc;
gcc->o_base = base_obj;
if (gc->clients)
gcc->id = E_GADCON_CLIENT(evas_list_data(evas_list_last(gc->clients)))->id + 1;
gc->clients = evas_list_append(gc->clients, gcc);
gcc->id = E_GADCON_CLIENT(eina_list_data_get(eina_list_last(gc->clients)))->id + 1;
gc->clients = eina_list_append(gc->clients, gcc);
/* This must only be unique during runtime */
if (gcc->o_base)
evas_object_event_callback_add(gcc->o_base, EVAS_CALLBACK_DEL,
@ -950,7 +950,7 @@ e_gadcon_client_edit_begin(E_Gadcon_Client *gcc)
EAPI void
e_gadcon_client_edit_end(E_Gadcon_Client *gcc)
{
Evas_List *l = NULL;
Eina_List *l = NULL;
E_OBJECT_CHECK(gcc);
E_OBJECT_TYPE_CHECK(gcc, E_GADCON_CLIENT_TYPE);
@ -1347,7 +1347,7 @@ static void
_e_gadcon_free(E_Gadcon *gc)
{
e_gadcon_unpopulate(gc);
gadcons = evas_list_remove(gadcons, gc);
gadcons = eina_list_remove(gadcons, gc);
if (gc->o_container) evas_object_del(gc->o_container);
eina_stringshare_del(gc->name);
eina_stringshare_del(gc->edje.swallow_name);
@ -1378,7 +1378,7 @@ _e_gadcon_client_free(E_Gadcon_Client *gcc)
gcc->client_class->func.shutdown(gcc);
if (gcc->client_class->func.id_del)
gcc->client_class->func.id_del(gcc->cf->id);
gcc->gadcon->clients = evas_list_remove(gcc->gadcon->clients, gcc);
gcc->gadcon->clients = eina_list_remove(gcc->gadcon->clients, gcc);
if (gcc->o_box) evas_object_del(gcc->o_box);
if (gcc->o_frame) evas_object_del(gcc->o_frame);
eina_stringshare_del(gcc->name);
@ -1516,7 +1516,7 @@ _e_gadcon_client_drag_begin(E_Gadcon_Client *gcc, int x, int y)
e_object_ref(E_OBJECT(gcc));
/* Remove this config from the current gadcon */
gcc->gadcon->cf->clients =
evas_list_remove(gcc->gadcon->cf->clients, gcc->cf);
eina_list_remove(gcc->gadcon->cf->clients, gcc->cf);
gcc->state_info.state = E_LAYOUT_ITEM_STATE_NONE;
gcc->state_info.resist = 0;
@ -1549,7 +1549,7 @@ _e_gadcon_client_drag_begin(E_Gadcon_Client *gcc, int x, int y)
static void
_e_gadcon_client_inject(E_Gadcon *gc, E_Gadcon_Client *gcc, int x, int y)
{
Evas_List *l;
Eina_List *l;
Evas_Coord cx, cy, cw, ch;
int seq = 1;
@ -2235,7 +2235,7 @@ _e_gadcon_cb_drop(void *data, const char *type, void *event)
if (drag_gcc->gadcon == gc) gcc = drag_gcc;
else if ((new_gcc) && (new_gcc->gadcon == gc)) gcc = new_gcc;
gc->cf->clients = evas_list_append(gc->cf->clients, gcc->cf);
gc->cf->clients = eina_list_append(gc->cf->clients, gcc->cf);
if (gc->editing) e_gadcon_client_edit_begin(gcc);
e_config_save_queue();
@ -2475,7 +2475,7 @@ struct _E_Smart_Data
unsigned char horizontal : 1;
unsigned char doing_config : 1;
unsigned char redo_config : 1;
Evas_List *items;
Eina_List *items;
int frozen;
Evas_Coord minw, minh, req;
};
@ -2589,7 +2589,7 @@ e_gadcon_layout_min_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
{
E_Smart_Data *sd;
/*
Evas_List *l;
Eina_List *l;
Evas_Coord tw = 0, th = 0;
*/
if (!obj) return;
@ -2671,7 +2671,7 @@ e_gadcon_layout_pack(Evas_Object *obj, Evas_Object *child)
sd = evas_object_smart_data_get(obj);
if (!sd) return 0;
_e_gadcon_layout_smart_adopt(sd, child);
sd->items = evas_list_prepend(sd->items, child);
sd->items = eina_list_prepend(sd->items, child);
_e_gadcon_layout_smart_reconfigure(sd);
return 0;
}
@ -2757,7 +2757,7 @@ static void
e_gadcon_layout_pack_options_set(Evas_Object *obj, E_Gadcon_Client *gcc)
{
int ok, seq;
Evas_List *l;
Eina_List *l;
E_Gadcon_Layout_Item *bi, *bi2;
if (!obj) return;
@ -2848,7 +2848,7 @@ e_gadcon_layout_unpack(Evas_Object *obj)
if (!bi) return;
sd = bi->sd;
if (!sd) return;
sd->items = evas_list_remove(sd->items, obj);
sd->items = eina_list_remove(sd->items, obj);
_e_gadcon_layout_smart_disown(obj);
_e_gadcon_layout_smart_reconfigure(sd);
}
@ -2912,9 +2912,9 @@ static void
_e_gadcon_layout_smart_reconfigure(E_Smart_Data *sd)
{
Evas_Coord xx, yy;
Evas_List *l;
Eina_List *l;
int min, mino, cur;
Evas_List *list = NULL;
Eina_List *list = NULL;
E_Gadcon_Layout_Item *bi;
E_Layout_Item_Container *lc;
int i;
@ -2986,12 +2986,12 @@ _e_gadcon_layout_smart_reconfigure(E_Smart_Data *sd)
lc = l->data;
LC_FREE(lc);
}
list = evas_list_free(list);
list = eina_list_free(list);
set_prev_pos = 1;
}
sd->items = evas_list_sort(sd->items, evas_list_count(sd->items),
sd->items = eina_list_sort(sd->items, eina_list_count(sd->items),
_e_gadcon_layout_smart_sort_by_position_cb);
for (l = sd->items, i = 1; l; l = l->next, i++)
{
@ -3171,7 +3171,7 @@ _e_gadcon_layout_smart_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
if (!sd) return;
if ((x == sd->x) && (y == sd->y)) return;
{
Evas_List *l;
Eina_List *l;
Evas_Coord dx, dy;
dx = x - sd->x;
@ -3273,7 +3273,7 @@ static void
_e_gadcon_layout_smart_min_cur_size_calc(E_Smart_Data *sd, int *min, int *mino, int *cur)
{
E_Gadcon_Layout_Item *bi;
Evas_List *l;
Eina_List *l;
for (l = sd->items; l; l = l->next)
{
@ -3448,7 +3448,7 @@ _e_gadcon_layout_smart_gadcons_width_adjust(E_Smart_Data *sd, int min, int cur)
int need, limit, reduce_total, reduce;
int max_size;
int c;
Evas_List *l, *l2;
Eina_List *l, *l2;
E_Gadcon_Layout_Item *bi, *bi2;
if (sd->horizontal)
@ -3479,7 +3479,7 @@ _e_gadcon_layout_smart_gadcons_width_adjust(E_Smart_Data *sd, int min, int cur)
return;
}
sd->items = evas_list_sort(sd->items, evas_list_count(sd->items),
sd->items = eina_list_sort(sd->items, eina_list_count(sd->items),
_e_gadcon_layout_smart_width_smart_sort_reverse_cb);
__adjust_size_again:
@ -3500,7 +3500,7 @@ _e_gadcon_layout_smart_gadcons_width_adjust(E_Smart_Data *sd, int min, int cur)
}
}
if (evas_list_count(sd->items) == 1)
if (eina_list_count(sd->items) == 1)
c = 1;
if (l)
@ -3625,7 +3625,7 @@ static void
_e_gadcon_layout_smart_sync_clients(E_Gadcon *gc)
{
E_Gadcon_Client *gcc;
Evas_List *l;
Eina_List *l;
for (l = gc->clients; l; l = l->next)
{
@ -3658,12 +3658,12 @@ _e_gadcon_client_current_position_sync(E_Gadcon_Client *gcc)
static void
_e_gadcon_layout_smart_gadcon_position_shrinked_mode(E_Smart_Data *sd)
{
Evas_List *l;
Eina_List *l;
E_Gadcon_Layout_Item *bi, *bi2;
void *tp;
int pos = 0;
sd->items = evas_list_sort(sd->items, evas_list_count(sd->items),
sd->items = eina_list_sort(sd->items, eina_list_count(sd->items),
_e_gadcon_layout_smart_sort_by_sequence_number_cb);
for (l = sd->items; l; l = l->next)
{
@ -3772,7 +3772,7 @@ static void
_e_gadcon_layout_smart_gadcons_asked_position_set(E_Smart_Data *sd)
{
E_Gadcon_Layout_Item *bi;
Evas_List *l;
Eina_List *l;
for (l = sd->items; l; l = l->next)
{
@ -3876,10 +3876,10 @@ _e_gadcon_layout_smart_gadcons_asked_position_set(E_Smart_Data *sd)
#endif
}
static Evas_List *
static Eina_List *
_e_gadcon_layout_smart_gadcons_wrap(E_Smart_Data *sd)
{
Evas_List *l, *list = NULL;
Eina_List *l, *list = NULL;
E_Layout_Item_Container *lc;
E_Gadcon_Layout_Item *bi;
@ -3908,17 +3908,17 @@ _e_gadcon_layout_smart_gadcons_wrap(E_Smart_Data *sd)
(lc->state == E_LAYOUT_ITEM_CONTAINER_STATE_NONE))
lc->state = E_LAYOUT_ITEM_CONTAINER_STATE_POS_LOCKED;
lc->items = evas_list_append(lc->items, bi);
list = evas_list_append(list, lc);
lc->items = eina_list_append(lc->items, bi);
list = eina_list_append(list, lc);
}
return list;
}
static void
_e_gadcon_layout_smart_gadcons_position(E_Smart_Data *sd, Evas_List **list)
_e_gadcon_layout_smart_gadcons_position(E_Smart_Data *sd, Eina_List **list)
{
int ok, lc_moving_prev_pos;
Evas_List *l, *l2, *l3;
Eina_List *l, *l2, *l3;
E_Layout_Item_Container *lc_moving = NULL, *lc_back, *lc, *lc3;
E_Gadcon_Layout_Item *bi, *bi_moving;
@ -3944,7 +3944,7 @@ _e_gadcon_layout_smart_gadcons_position(E_Smart_Data *sd, Evas_List **list)
lc_back->state_info.max_seq = lc_moving->state_info.max_seq;
lc_back->sd = lc_moving->sd;
for (l2 = lc_moving->items; l2; l2 = l2->next)
lc_back->items = evas_list_append(lc_back->items, l2->data);
lc_back->items = eina_list_append(lc_back->items, l2->data);
lc_back->state = lc_moving->state;
bi_moving = lc_back->items->data;
break;
@ -3995,7 +3995,7 @@ _e_gadcon_layout_smart_gadcons_position(E_Smart_Data *sd, Evas_List **list)
ok = 1;
l->data = lc3;
*list = evas_list_remove_list(*list, l->prev);
*list = eina_list_remove_list(*list, l->prev);
LC_FREE(lc_moving);
LC_FREE(lc);
lc_moving = lc3;
@ -4098,7 +4098,7 @@ _e_gadcon_layout_smart_gadcons_position(E_Smart_Data *sd, Evas_List **list)
ok = 1;
l->data = lc3;
*list = evas_list_remove_list(*list, l->next);
*list = eina_list_remove_list(*list, l->next);
LC_FREE(lc_moving);
LC_FREE(lc);
lc_moving = lc3;
@ -4125,7 +4125,7 @@ _e_gadcon_layout_smart_gadcons_position(E_Smart_Data *sd, Evas_List **list)
if ((lc->pos + lc->size) == prev_pos) break;
prev_pos = lc->pos;
for (l3 = evas_list_last(lc->items); l3; l3 = l3->prev)
for (l3 = eina_list_last(lc->items); l3; l3 = l3->prev)
{
bi = l3->data;
@ -4251,7 +4251,7 @@ _e_gadcon_layout_smart_gadcons_position(E_Smart_Data *sd, Evas_List **list)
if ((l) && (l->next))
{
Evas_List *stop;
Eina_List *stop;
int new_pos = 0;
ok = 0;
@ -4352,13 +4352,13 @@ _e_gadcon_layout_smart_gadcons_position(E_Smart_Data *sd, Evas_List **list)
}
static void
_e_gadcon_layout_smart_gadcons_position_static(E_Smart_Data *sd, Evas_List **list)
_e_gadcon_layout_smart_gadcons_position_static(E_Smart_Data *sd, Eina_List **list)
{
int ok;
Evas_List *l;
Eina_List *l;
E_Layout_Item_Container *lc, *lc2, *lc3;
*list = evas_list_sort(*list, evas_list_count(*list), _e_gadcon_layout_smart_containers_sort_cb);
*list = eina_list_sort(*list, eina_list_count(*list), _e_gadcon_layout_smart_containers_sort_cb);
__reposition_again:
for (l = *list; l; l = l->next)
@ -4374,7 +4374,7 @@ _e_gadcon_layout_smart_gadcons_position_static(E_Smart_Data *sd, Evas_List **lis
if (lc3)
{
l->data = lc3;
*list = evas_list_remove_list(*list, l->next);
*list = eina_list_remove_list(*list, l->next);
LC_FREE(lc);
LC_FREE(lc2);
goto __reposition_again;
@ -4421,7 +4421,7 @@ static E_Layout_Item_Container *
_e_gadcon_layout_smart_containers_position_adjust(E_Smart_Data *sd, E_Layout_Item_Container *lc, E_Layout_Item_Container *lc2)
{
int create_new;
Evas_List *l;
Eina_List *l;
E_Layout_Item_Container *lc3 = NULL;
E_Layout_Item_Container_State new_state;
E_Gadcon_Layout_Item *bi, *bi2;
@ -4584,7 +4584,7 @@ _e_gadcon_layout_smart_containers_position_adjust(E_Smart_Data *sd, E_Layout_Ite
{
int t;
bi = (evas_list_last(lc->items))->data;
bi = (eina_list_last(lc->items))->data;
bi2 = lc2->items->data;
if (sd->horizontal)
@ -4604,10 +4604,10 @@ _e_gadcon_layout_smart_containers_position_adjust(E_Smart_Data *sd, E_Layout_Ite
bi->gcc->state_info.seq = bi2->gcc->state_info.seq;
bi2->gcc->state_info.seq = t;
lc->items = evas_list_remove_list(lc->items, evas_list_last(lc->items));
lc->items = evas_list_append(lc->items, bi2);
lc->items = evas_list_append(lc->items, bi);
lc2->items = evas_list_free(lc2->items);
lc->items = eina_list_remove_list(lc->items, eina_list_last(lc->items));
lc->items = eina_list_append(lc->items, bi2);
lc->items = eina_list_append(lc->items, bi);
lc2->items = eina_list_free(lc2->items);
E_LAYOUT_ITEM_CONTAINER_SIZE_CHANGE_BY(lc, bi2, 1);
lc2->pos = lc->pos + lc->size;
lc2->size = 0;
@ -4743,9 +4743,9 @@ _e_gadcon_layout_smart_containers_position_adjust(E_Smart_Data *sd, E_Layout_Ite
{
lc3->pos = lc->pos;
for (l = lc->items; l; l = l->next)
lc3->items = evas_list_append(lc3->items, l->data);
lc3->items = eina_list_append(lc3->items, l->data);
for (l = lc2->items; l; l = l->next)
lc3->items = evas_list_append(lc3->items, l->data);
lc3->items = eina_list_append(lc3->items, l->data);
lc3->state_info.min_seq = lc->state_info.min_seq;
if (lc2->items)
@ -4757,9 +4757,9 @@ _e_gadcon_layout_smart_containers_position_adjust(E_Smart_Data *sd, E_Layout_Ite
{
lc3->pos = lc2->pos;
for (l = lc2->items; l; l = l->next)
lc3->items = evas_list_append(lc3->items, l->data);
lc3->items = eina_list_append(lc3->items, l->data);
for (l = lc->items; l; l = l->next)
lc3->items = evas_list_append(lc3->items, l->data);
lc3->items = eina_list_append(lc3->items, l->data);
lc3->state_info.min_seq = lc2->state_info.min_seq;
if (lc->items)
@ -4778,7 +4778,7 @@ static void
_e_gadcon_layout_smart_position_items_inside_container(E_Smart_Data *sd, E_Layout_Item_Container *lc)
{
int shift;
Evas_List *l;
Eina_List *l;
E_Gadcon_Layout_Item *bi;
if (!lc->items) return;
@ -4813,15 +4813,15 @@ static void
_e_gadcon_layout_smart_containers_merge(E_Smart_Data *sd, E_Layout_Item_Container *lc, E_Layout_Item_Container *lc2)
{
int start = 0, size = 0, next = 0, min_seq = 0, max_seq = 0;
Evas_List *l, *nl = NULL;
Eina_List *l, *nl = NULL;
E_Gadcon_Layout_Item *bi;
for (l = lc->items; l; l = l->next)
nl = evas_list_append(nl, l->data);
nl = eina_list_append(nl, l->data);
for (l = lc2->items; l; l = l->next)
nl = evas_list_append(nl, l->data);
nl = eina_list_append(nl, l->data);
nl = evas_list_sort(nl, evas_list_count(nl), _e_gadcon_layout_smart_seq_sort_cb);
nl = eina_list_sort(nl, eina_list_count(nl), _e_gadcon_layout_smart_seq_sort_cb);
for (l = nl; l; l = l->next)
{
@ -4859,8 +4859,8 @@ _e_gadcon_layout_smart_containers_merge(E_Smart_Data *sd, E_Layout_Item_Containe
}
}
lc->items = evas_list_free(lc->items);
lc2->items = evas_list_free(lc->items);
lc->items = eina_list_free(lc->items);
lc2->items = eina_list_free(lc->items);
lc->items = nl;
lc->pos = start;
lc->size = size;
@ -4871,10 +4871,10 @@ _e_gadcon_layout_smart_containers_merge(E_Smart_Data *sd, E_Layout_Item_Containe
}
static void
_e_gadcon_layout_smart_restore_gadcons_position_before_move(E_Smart_Data *sd, E_Layout_Item_Container **lc_moving, E_Layout_Item_Container *lc_back, Evas_List **con_list)
_e_gadcon_layout_smart_restore_gadcons_position_before_move(E_Smart_Data *sd, E_Layout_Item_Container **lc_moving, E_Layout_Item_Container *lc_back, Eina_List **con_list)
{
int ok;
Evas_List *l, *l2, *l3;
Eina_List *l, *l2, *l3;
E_Gadcon_Layout_Item *bi, *bi2;
E_Layout_Item_Container *lc, *lc2, *lc3;
@ -4904,7 +4904,7 @@ _e_gadcon_layout_smart_restore_gadcons_position_before_move(E_Smart_Data *sd, E_
lc = l->data;
if (lc->state == E_LAYOUT_ITEM_CONTAINER_STATE_NONE) continue;
if (evas_list_count(lc->items) == 1)
if (eina_list_count(lc->items) == 1)
{
bi = lc->items->data;
if ((bi->gcc->state_info.state == E_LAYOUT_ITEM_STATE_POS_INC) ||
@ -4950,7 +4950,7 @@ _e_gadcon_layout_smart_restore_gadcons_position_before_move(E_Smart_Data *sd, E_
for (l3 = lc->items; l3 != l2; l3 = l3->next)
{
bi2 = l3->data;
lc2->items = evas_list_append(lc2->items, bi2);
lc2->items = eina_list_append(lc2->items, bi2);
if (l3 == lc->items)
{
lc2->state_info.min_seq = bi2->gcc->state_info.seq;
@ -4972,7 +4972,7 @@ _e_gadcon_layout_smart_restore_gadcons_position_before_move(E_Smart_Data *sd, E_
for (l3 = l2->next; l3; l3 = l3->next)
{
bi2 = l3->data;
lc3->items = evas_list_append(lc3->items, bi2);
lc3->items = eina_list_append(lc3->items, bi2);
if (l3 == l2->next)
{
lc3->state_info.min_seq = bi2->gcc->state_info.seq;
@ -5006,10 +5006,10 @@ _e_gadcon_layout_smart_restore_gadcons_position_before_move(E_Smart_Data *sd, E_
if (lc2)
{
l->data = lc2;
*con_list = evas_list_append(*con_list, *lc_moving);
*con_list = eina_list_append(*con_list, *lc_moving);
if (lc3)
*con_list = evas_list_append(*con_list, lc3);
*con_list = evas_list_sort(*con_list, evas_list_count(*con_list),
*con_list = eina_list_append(*con_list, lc3);
*con_list = eina_list_sort(*con_list, eina_list_count(*con_list),
_e_gadcon_layout_smart_containers_sort_cb);
}
else
@ -5017,8 +5017,8 @@ _e_gadcon_layout_smart_restore_gadcons_position_before_move(E_Smart_Data *sd, E_
l->data = *lc_moving;
if (lc3)
{
*con_list = evas_list_append(*con_list, lc3);
*con_list = evas_list_sort(*con_list, evas_list_count(*con_list),
*con_list = eina_list_append(*con_list, lc3);
*con_list = eina_list_sort(*con_list, eina_list_count(*con_list),
_e_gadcon_layout_smart_containers_sort_cb);
}
}

4
src/bin/e_gadcon.h
View File

@ -66,7 +66,7 @@ struct _E_Gadcon
Evas *evas;
Evas_Object *o_container;
Evas_List *clients;
Eina_List *clients;
struct
{
@ -186,7 +186,7 @@ EAPI int e_gadcon_init(void);
EAPI int e_gadcon_shutdown(void);
EAPI void e_gadcon_provider_register(const E_Gadcon_Client_Class *cc);
EAPI void e_gadcon_provider_unregister(const E_Gadcon_Client_Class *cc);
EAPI Evas_List *e_gadcon_provider_list(void);
EAPI Eina_List *e_gadcon_provider_list(void);
EAPI E_Gadcon *e_gadcon_swallowed_new(const char *name, int id, Evas_Object *obj, char *swallow_name);
EAPI void e_gadcon_swallowed_min_size_set(E_Gadcon *gc, Evas_Coord w, Evas_Coord h);
EAPI void e_gadcon_min_size_request_callback_set(E_Gadcon *gc, void (*func) (void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord h), void *data);

8
src/bin/e_hints.c
View File

@ -215,14 +215,14 @@ e_hints_manager_init(E_Manager *man)
/* Set desktop count, desktop names and workarea */
int i = 0, num = 0;
unsigned int *areas = NULL;
Evas_List *cl;
Eina_List *cl;
Ecore_X_Window *vroots = NULL;
/* FIXME: Desktop names not yet implemented */
/* char **names; */
e_hints_e16_comms_pretend(man);
num = evas_list_count(man->containers);
num = eina_list_count(man->containers);
vroots = calloc(num, sizeof(Ecore_X_Window));
if (!vroots) return;
@ -268,7 +268,7 @@ e_hints_manager_init(E_Manager *man)
EAPI void
e_hints_client_list_set(void)
{
Evas_List *ml = NULL, *cl = NULL;
Eina_List *ml = NULL, *cl = NULL;
unsigned int i = 0, num = 0;
E_Manager *m;
E_Container *c;
@ -335,7 +335,7 @@ e_hints_client_list_set(void)
EAPI void
e_hints_client_stacking_set(void)
{
Evas_List *ml = NULL, *cl = NULL;
Eina_List *ml = NULL, *cl = NULL;
unsigned int i = 0, num = 0;
E_Manager *m;
E_Container *c;

106
src/bin/e_ilist.c
View File

@ -12,7 +12,7 @@ struct _E_Smart_Data
{
Evas_Coord x, y, w, h, iw, ih;
Evas_Object *o_smart, *o_box;
Evas_List *items;
Eina_List *items;
int selected;
unsigned char selector : 1;
unsigned char multi_select : 1;
@ -71,7 +71,7 @@ e_ilist_append(Evas_Object *obj, Evas_Object *icon, const char *label, int heade
si->sd = sd;
si->o_base = edje_object_add(evas_object_evas_get(sd->o_smart));
isodd = evas_list_count(sd->items) & 0x1;
isodd = eina_list_count(sd->items) & 0x1;
if (header)
{
if (isodd)
@ -108,7 +108,7 @@ e_ilist_append(Evas_Object *obj, Evas_Object *icon, const char *label, int heade
si->data = data;
si->data2 = data2;
si->header = header;
sd->items = evas_list_append(sd->items, si);
sd->items = eina_list_append(sd->items, si);
edje_object_size_min_calc(si->o_base, &mw, &mh);
e_box_freeze(sd->o_box);
@ -144,7 +144,7 @@ e_ilist_append_relative(Evas_Object *obj, Evas_Object *icon, const char *label,
si->sd = sd;
si->o_base = edje_object_add(evas_object_evas_get(sd->o_smart));
isodd = evas_list_count(sd->items) & 0x1;
isodd = eina_list_count(sd->items) & 0x1;
if (header)
{
if (isodd)
@ -182,11 +182,11 @@ e_ilist_append_relative(Evas_Object *obj, Evas_Object *icon, const char *label,
si->data2 = data2;
si->header = header;
ri = evas_list_nth(sd->items, relative);
ri = eina_list_nth(sd->items, relative);
if (ri)
sd->items = evas_list_append_relative(sd->items, si, ri);
sd->items = eina_list_append_relative(sd->items, si, ri);
else
sd->items = evas_list_append(sd->items, si);
sd->items = eina_list_append(sd->items, si);
edje_object_size_min_calc(si->o_base, &mw, &mh);
e_box_freeze(sd->o_box);
@ -226,7 +226,7 @@ e_ilist_prepend(Evas_Object *obj, Evas_Object *icon, const char *label, int head
if (header)
e_theme_edje_object_set(si->o_base, "base/theme/widgets",
"e/widgets/ilist_header");
else if (evas_list_count(sd->items) & 0x1)
else if (eina_list_count(sd->items) & 0x1)
e_theme_edje_object_set(si->o_base, "base/theme/widgets",
"e/widgets/ilist_odd");
else
@ -246,7 +246,7 @@ e_ilist_prepend(Evas_Object *obj, Evas_Object *icon, const char *label, int head
si->data = data;
si->data2 = data2;
si->header = header;
sd->items = evas_list_prepend(sd->items, si);
sd->items = eina_list_prepend(sd->items, si);
edje_object_size_min_calc(si->o_base, &mw, &mh);
e_box_freeze(sd->o_box);
@ -277,7 +277,7 @@ e_ilist_prepend_relative(Evas_Object *obj, Evas_Object *icon, const char *label,
if (header)
e_theme_edje_object_set(si->o_base, "base/theme/widgets",
"e/widgets/ilist_header");
else if (evas_list_count(sd->items) & 0x1)
else if (eina_list_count(sd->items) & 0x1)
e_theme_edje_object_set(si->o_base, "base/theme/widgets",
"e/widgets/ilist_odd");
else
@ -298,11 +298,11 @@ e_ilist_prepend_relative(Evas_Object *obj, Evas_Object *icon, const char *label,
si->data2 = data2;
si->header = header;
ri = evas_list_nth(sd->items, relative);
ri = eina_list_nth(sd->items, relative);
if (ri)
sd->items = evas_list_prepend_relative(sd->items, si, ri);
sd->items = eina_list_prepend_relative(sd->items, si, ri);
else
sd->items = evas_list_prepend(sd->items, si);
sd->items = eina_list_prepend(sd->items, si);
edje_object_size_min_calc(si->o_base, &mw, &mh);
e_box_freeze(sd->o_box);
@ -333,7 +333,7 @@ e_ilist_clear(Evas_Object *obj)
E_Ilist_Item *si = NULL;
if (!(si = sd->items->data)) continue;
sd->items = evas_list_remove_list(sd->items, sd->items);
sd->items = eina_list_remove_list(sd->items, sd->items);
if (si->o_icon) evas_object_del(si->o_icon);
evas_object_del(si->o_base);
E_FREE(si);
@ -360,7 +360,7 @@ EAPI int
e_ilist_count(Evas_Object *obj)
{
API_ENTRY return 0;
return evas_list_count(sd->items);
return eina_list_count(sd->items);
}
EAPI int
@ -401,7 +401,7 @@ e_ilist_min_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
EAPI void
e_ilist_unselect(Evas_Object *obj)
{
Evas_List *l = NULL;
Eina_List *l = NULL;
const char *stacking, *selectraise;
API_ENTRY return;
@ -431,14 +431,14 @@ EAPI void
e_ilist_selected_set(Evas_Object *obj, int n)
{
E_Ilist_Item *si = NULL;
Evas_List *l = NULL;
Eina_List *l = NULL;
int i;
const char *stacking, *selectraise;
API_ENTRY return;
if (!sd->items) return;
i = evas_list_count(sd->items);
i = eina_list_count(sd->items);
if (n >= i) n = i - 1;
else if (n < 0) n = 0;
@ -457,13 +457,13 @@ e_ilist_selected_set(Evas_Object *obj, int n)
}
}
sd->selected = -1;
if (!(si = evas_list_nth(sd->items, n))) return;
if (!(si = eina_list_nth(sd->items, n))) return;
/* NB: Remove this if headers ever become selectable */
while (si->header && ((++ n) < i))
if (!(si = evas_list_nth(sd->items, n))) return;
if (!(si = eina_list_nth(sd->items, n))) return;
while (si->header && ((-- n) >= 0))
if (!(si = evas_list_nth(sd->items, n))) return;
if (!(si = eina_list_nth(sd->items, n))) return;
if (si->header) return;
si->selected = 1;
@ -483,7 +483,7 @@ e_ilist_selected_set(Evas_Object *obj, int n)
EAPI int
e_ilist_selected_get(Evas_Object *obj)
{
Evas_List *l = NULL;
Eina_List *l = NULL;
int i, j;
API_ENTRY return -1;
@ -513,7 +513,7 @@ e_ilist_selected_label_get(Evas_Object *obj)
if (!sd->items) return NULL;
if (sd->multi_select) return NULL;
if (sd->selected < 0) return NULL;
si = evas_list_nth(sd->items, sd->selected);
si = eina_list_nth(sd->items, sd->selected);
if (si) return edje_object_part_text_get(si->o_base, "e.text.label");
return NULL;
}
@ -527,7 +527,7 @@ e_ilist_selected_data_get(Evas_Object *obj)
if (!sd->items) return NULL;
if (sd->multi_select) return NULL;
if (sd->selected < 0) return NULL;
si = evas_list_nth(sd->items, sd->selected);
si = eina_list_nth(sd->items, sd->selected);
if (si) return si->data;
return NULL;
}
@ -541,7 +541,7 @@ e_ilist_selected_data2_get(Evas_Object *obj)
if (!sd->items) return NULL;
if (sd->multi_select) return NULL;
if (sd->selected < 0) return NULL;
si = evas_list_nth(sd->items, sd->selected);
si = eina_list_nth(sd->items, sd->selected);
if (si) return si->data2;
return NULL;
}
@ -555,7 +555,7 @@ e_ilist_selected_icon_get(Evas_Object *obj)
if (!sd->items) return NULL;
if (sd->multi_select) return NULL;
if (sd->selected < 0) return NULL;
si = evas_list_nth(sd->items, sd->selected);
si = eina_list_nth(sd->items, sd->selected);
if (si) return si->o_icon;
return NULL;
}
@ -568,7 +568,7 @@ e_ilist_selected_geometry_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Ev
API_ENTRY return;
if (!sd->items) return;
if (sd->selected < 0) return;
if (!(si = evas_list_nth(sd->items, sd->selected))) return;
if (!(si = eina_list_nth(sd->items, sd->selected))) return;
evas_object_geometry_get(si->o_base, x, y, w, h);
*x -= sd->x;
*y -= sd->y;
@ -577,7 +577,7 @@ e_ilist_selected_geometry_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Ev
EAPI int
e_ilist_selected_count_get(Evas_Object *obj)
{
Evas_List *l = NULL;
Eina_List *l = NULL;
int count = 0;
API_ENTRY return 0;
@ -599,8 +599,8 @@ e_ilist_remove_num(Evas_Object *obj, int n)
API_ENTRY return;
if (!sd->items) return;
if (!(si = evas_list_nth(sd->items, n))) return;
sd->items = evas_list_remove(sd->items, si);
if (!(si = eina_list_nth(sd->items, n))) return;
sd->items = eina_list_remove(sd->items, si);
if (sd->selected == n) sd->selected = -1;
if (si->o_icon) evas_object_del(si->o_icon);
evas_object_del(si->o_base);
@ -614,7 +614,7 @@ e_ilist_nth_label_get(Evas_Object *obj, int n)
API_ENTRY return NULL;
if (!sd->items) return NULL;
si = evas_list_nth(sd->items, n);
si = eina_list_nth(sd->items, n);
if (si) return edje_object_part_text_get(si->o_base, "e.text.label");
return NULL;
}
@ -629,7 +629,7 @@ e_ilist_nth_label_set(Evas_Object *obj, int n, const char *label)
if (!label) return;
API_ENTRY return;
if (!sd->items) return;
si = evas_list_nth(sd->items, n);
si = eina_list_nth(sd->items, n);
if (si) edje_object_part_text_set(si->o_base, "e.text.label", label);
}
@ -640,7 +640,7 @@ e_ilist_nth_icon_get(Evas_Object *obj, int n)
API_ENTRY return NULL;
if (!sd->items) return NULL;
si = evas_list_nth(sd->items, n);
si = eina_list_nth(sd->items, n);
if (si) return si->o_icon;
return NULL;
}
@ -652,7 +652,7 @@ e_ilist_nth_icon_set(Evas_Object *obj, int n, Evas_Object *icon)
API_ENTRY return;
if (!sd->items) return;
if (!(si = evas_list_nth(sd->items, n))) return;
if (!(si = eina_list_nth(sd->items, n))) return;
if (si->o_icon)
{
edje_object_part_unswallow(si->o_base, si->o_icon);
@ -674,7 +674,7 @@ e_ilist_nth_is_header(Evas_Object *obj, int n)
API_ENTRY return 0;
if (!sd->items) return 0;
si = evas_list_nth(sd->items, n);
si = eina_list_nth(sd->items, n);
if (si) return si->header;
return 0;
}
@ -686,7 +686,7 @@ e_ilist_nth_geometry_get(Evas_Object *obj, int n, Evas_Coord *x, Evas_Coord *y,
API_ENTRY return;
if (!sd->items) return;
if (!(si = evas_list_nth(sd->items, n))) return;
if (!(si = eina_list_nth(sd->items, n))) return;
evas_object_geometry_get(si->o_base, x, y, w, h);
*x -= sd->x;
*y -= sd->y;
@ -695,7 +695,7 @@ e_ilist_nth_geometry_get(Evas_Object *obj, int n, Evas_Coord *x, Evas_Coord *y,
EAPI void
e_ilist_icon_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
{
Evas_List *l = NULL;
Eina_List *l = NULL;
API_ENTRY return;
if ((sd->iw == w) && (sd->ih == h)) return;
@ -716,7 +716,7 @@ e_ilist_icon_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
}
}
EAPI Evas_List *
EAPI Eina_List *
e_ilist_items_get(Evas_Object *obj)
{
API_ENTRY return NULL;
@ -733,11 +733,11 @@ e_ilist_multi_select(Evas_Object *obj, int n)
API_ENTRY return;
if ((!sd->items) || (!sd->multi_select)) return;
i = evas_list_count(sd->items);
i = eina_list_count(sd->items);
if (n >= i) n = i - 1;
else if (n < 0) n = 0;
if (!(si = evas_list_nth(sd->items, n))) return;
if (!(si = eina_list_nth(sd->items, n))) return;
sd->selected = n;
selectraise = edje_object_data_get(si->o_base, "selectraise");
if (si->selected)
@ -779,14 +779,14 @@ e_ilist_range_select(Evas_Object *obj, int n)
API_ENTRY return;
if ((!sd->items) || (!sd->multi_select)) return;
i = evas_list_count(sd->items);
i = eina_list_count(sd->items);
if (n >= i) n = i - 1;
else if (n < 0) n = 0;
if (n < sd->selected) dir = 0;
else dir = 1;
if (!(si = evas_list_nth(sd->items, n))) return;
if (!(si = eina_list_nth(sd->items, n))) return;
if (dir == 1)
{
for (j = (sd->selected + 1); ((j < i) && (j <= n)); j++)
@ -933,7 +933,7 @@ _e_smart_event_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_
E_Smart_Data *sd;
Evas_Event_Mouse_Down *ev;
E_Ilist_Item *si;
Evas_List *l = NULL;
Eina_List *l = NULL;
int i;
ev = event_info;
@ -988,7 +988,7 @@ _e_smart_event_mouse_up(void *data, Evas *evas, Evas_Object *obj, void *event_in
if (si->header) return;
if ((!sd->items) || (!sd->selector)) return;
if (!(si = evas_list_nth(sd->items, sd->selected))) return;
if (!(si = eina_list_nth(sd->items, sd->selected))) return;
if (sd->on_hold)
{
sd->on_hold = 0;
@ -1023,7 +1023,7 @@ _e_smart_event_key_down(void *data, Evas *evas, Evas_Object *obj, void *event_in
break;
}
--n;
si = evas_list_nth(sd->items, n);
si = eina_list_nth(sd->items, n);
}
while ((si) && (si->header));
if (n != ns)
@ -1043,13 +1043,13 @@ _e_smart_event_key_down(void *data, Evas *evas, Evas_Object *obj, void *event_in
n = ns;
do
{
if (n == (evas_list_count(sd->items) - 1))
if (n == (eina_list_count(sd->items) - 1))
{
n = ns;
break;
}
++n;
si = evas_list_nth(sd->items, n);
si = eina_list_nth(sd->items, n);
}
while ((si) && (si->header));
if (n != ns)
@ -1069,13 +1069,13 @@ _e_smart_event_key_down(void *data, Evas *evas, Evas_Object *obj, void *event_in
n = -1;
do
{
if (n == (evas_list_count(sd->items) - 1))
if (n == (eina_list_count(sd->items) - 1))
{
n = ns;
break;
}
++n;
si = evas_list_nth(sd->items, n);
si = eina_list_nth(sd->items, n);
}
while ((si) && (si->header));
if (n != ns)
@ -1092,7 +1092,7 @@ _e_smart_event_key_down(void *data, Evas *evas, Evas_Object *obj, void *event_in
}
else if ((!strcmp(ev->keyname, "End")) || (!strcmp(ev->keyname, "KP_End")))
{
n = evas_list_count(sd->items);
n = eina_list_count(sd->items);
do
{
if (n == 0)
@ -1101,7 +1101,7 @@ _e_smart_event_key_down(void *data, Evas *evas, Evas_Object *obj, void *event_in
break;
}
--n;
si = evas_list_nth(sd->items, n);
si = eina_list_nth(sd->items, n);
}
while ((si) && (si->header));
if (n != ns)
@ -1122,7 +1122,7 @@ _e_smart_event_key_down(void *data, Evas *evas, Evas_Object *obj, void *event_in
{
if (!sd->on_hold)
{
si = evas_list_nth(sd->items, sd->selected);
si = eina_list_nth(sd->items, sd->selected);
if (si)
{
if (si->func) si->func(si->data, si->data2);
@ -1188,7 +1188,7 @@ static void
_e_typebuf_match(Evas_Object *obj)
{
char *match;
Evas_List *l;
Eina_List *l;
int n;
E_Ilist_Item *si = NULL;

2
src/bin/e_ilist.h
View File

@ -50,7 +50,7 @@ EAPI void e_ilist_nth_icon_set (Evas_Object *obj, int n, Evas_O
EAPI int e_ilist_nth_is_header (Evas_Object *obj, int n);
EAPI void e_ilist_nth_geometry_get (Evas_Object *obj, int n, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
EAPI void e_ilist_icon_size_set (Evas_Object *obj, Evas_Coord w, Evas_Coord h);
EAPI Evas_List *e_ilist_items_get (Evas_Object *obj);
EAPI Eina_List *e_ilist_items_get (Evas_Object *obj);
EAPI void e_ilist_multi_select (Evas_Object *obj, int n);
EAPI void e_ilist_range_select (Evas_Object *obj, int n);

20
src/bin/e_init.c
View File

@ -12,7 +12,7 @@ static Ecore_Event_Handler *exe_del_handler = NULL;
static Ecore_Ipc_Client *client = NULL;
static int done = 0;
static int undone = 0;
static Evas_List *stats = NULL;
static Eina_List *stats = NULL;
static int
_e_init_cb_exe_event_del(void *data, int type, void *event)
@ -120,7 +120,7 @@ e_init_status_set(const char *str)
// printf("---STAT %p %s\n", client, str);
if (!client)
{
stats = evas_list_append(stats, eina_stringshare_add(str));
stats = eina_list_append(stats, eina_stringshare_add(str));
return;
}
// printf("---SEND\n");
@ -164,7 +164,7 @@ e_init_client_data(Ecore_Ipc_Event_Client_Data *e)
initwins = e->data;
for (i = 0; i < num; i+= 2)
{
Evas_List *l;
Eina_List *l;
for (l = e_manager_list(); l; l = l->next)
{
@ -184,7 +184,7 @@ e_init_client_data(Ecore_Ipc_Event_Client_Data *e)
const char *s;
s = stats->data;
stats = evas_list_remove_list(stats, stats);
stats = eina_list_remove_list(stats, stats);
// printf("---SPOOL %s\n", s);
e_init_status_set(s);
eina_stringshare_del(s);
@ -204,7 +204,7 @@ e_init_client_del(Ecore_Ipc_Event_Client_Del *e)
// printf("---del init client\n");
if (e->client == client)
{
Evas_List *l;
Eina_List *l;
client = NULL;
for (l = e_manager_list(); l; l = l->next)
@ -273,7 +273,7 @@ static Ecore_Timer *_e_init_timeout_timer = NULL;
/* startup icons */
static Evas_Coord _e_init_icon_size = 0;
static Evas_List *_e_init_icon_list = NULL;
static Eina_List *_e_init_icon_list = NULL;
/* externally accessible functions */
EAPI int
@ -284,7 +284,7 @@ e_init_init(void)
Ecore_X_Window *roots;
int num;
Evas_Object *o;
Evas_List *l, *screens;
Eina_List *l, *screens;
const char *s;
_e_init_configure_handler =
@ -323,7 +323,7 @@ e_init_init(void)
else
s = e_path_find(path_init, e_config->init_default_theme);
screens = (Evas_List *)e_xinerama_screens_get();
screens = (Eina_List *)e_xinerama_screens_get();
if (screens)
{
for (l = screens; l; l = l->next)
@ -492,7 +492,7 @@ e_init_icons_desktop_add(Efreet_Desktop *desktop)
_e_init_icon_size, _e_init_icon_size,
_e_init_icon_size, _e_init_icon_size);
evas_object_show(o);
_e_init_icon_list = evas_list_append(_e_init_icon_list, o);
_e_init_icon_list = eina_list_append(_e_init_icon_list, o);
}
}
@ -505,7 +505,7 @@ _e_init_icons_del(void)
{
next = _e_init_icon_list->data;
evas_object_del(next);
_e_init_icon_list = evas_list_remove(_e_init_icon_list, next);
_e_init_icon_list = eina_list_remove(_e_init_icon_list, next);
}
if (_e_init_icon_box)
evas_object_del(_e_init_icon_box);

10
src/bin/e_init_main.c
View File

@ -43,7 +43,7 @@ static int font_hinting = -1;
static int engine = -1;
static const char *title = NULL;
static const char *verstr = NULL;
static Evas_List *fpath = NULL;
static Eina_List *fpath = NULL;
static Ecore_X_Window *initwins = NULL;
static int initwins_num = 0;
static Ecore_Ipc_Server *server = NULL;
@ -80,7 +80,7 @@ main(int argc, char **argv)
else if (font_hinting < 0) font_hinting = atoi(argv[i]);
else if (!title) title = argv[i];
else if (!verstr) verstr = argv[i];
else fpath = evas_list_append(fpath, argv[i]);
else fpath = eina_list_append(fpath, argv[i]);
}
ecore_init();
@ -226,7 +226,7 @@ e_init_init(void)
Ecore_X_Window *roots;
int i, num;
Evas_Object *o;
Evas_List *l, *screens;
Eina_List *l, *screens;
const char *s;
e_xinerama_init();
@ -273,7 +273,7 @@ e_init_init(void)
initwins[1] = _e_init_win;
/* look at xinerama asto how to slice this up */
screens = (Evas_List *)e_xinerama_screens_get();
screens = (Eina_List *)e_xinerama_screens_get();
if (screens)
{
for (l = screens; l; l = l->next)
@ -443,7 +443,7 @@ _e_init_evas_new(Ecore_X_Window root, int w, int h, Ecore_X_Window *winret)
{
Ecore_Evas *ee;
Evas *e;
Evas_List *l;
Eina_List *l;
if ((engine == 0) || (engine == 1))
{

2
src/bin/e_int_border_remember.c
View File

@ -153,7 +153,7 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
static int
_check_matches(E_Border *bd, int matchflags)
{
Evas_List *l;
Eina_List *l;
int n = 0;
const char *title;

26
src/bin/e_int_config_modules.c
View File

@ -77,7 +77,7 @@ static Evas_Bool _mod_hash_load_list (const Evas_Hash *hash __UNUSED__,
const char *key __UNUSED__,
void *data, void *fdata);
static int _mod_list_sort (void *data1, void *data2);
static void _list_widget_load (Evas_Object *obj, Evas_List *list);
static void _list_widget_load (Evas_Object *obj, Eina_List *list);
static void _avail_list_cb_change (void *data, Evas_Object *obj);
static void _load_list_cb_change (void *data, Evas_Object *obj);
static void _unselect_all_modules (void);
@ -142,7 +142,7 @@ _create_data(E_Config_Dialog *cfd)
static void
_fill_data(E_Config_Dialog_Data *cfdata)
{
Evas_List *mdirs = NULL, *l = NULL;
Eina_List *mdirs = NULL, *l = NULL;
if (!cfdata) return;
@ -372,7 +372,7 @@ static Evas_Bool
_fill_list_types(Evas_Object *obj, CFType *cft, int enabled)
{
Evas *evas;
Evas_List *l = NULL;
Eina_List *l = NULL;
Evas_Object *ic = NULL;
int count;
@ -386,7 +386,7 @@ _fill_list_types(Evas_Object *obj, CFType *cft, int enabled)
evas_hash_foreach(cft->modules, _mod_hash_load_list, &l);
}
if (l) count = evas_list_count(l);
if (l) count = eina_list_count(l);
else return 1;
/* We have at least one, append header */
@ -399,13 +399,13 @@ _fill_list_types(Evas_Object *obj, CFType *cft, int enabled)
/* sort the list if we have more than one */
if (count > 1)
l = evas_list_sort(l, -1, _mod_list_sort);
l = eina_list_sort(l, -1, _mod_list_sort);
_list_widget_load(obj, l);
if (l)
{
evas_list_free(l);
eina_list_free(l);
l = NULL;
}
@ -452,13 +452,13 @@ static Evas_Bool
_mod_hash_avail_list(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__,
void *data, void *fdata)
{
Evas_List **l;
Eina_List **l;
CFModule *mod = NULL;
mod = data;
if ((!mod) || (mod->enabled)) return 1;
l = fdata;
*l = evas_list_append(*l, mod);
*l = eina_list_append(*l, mod);
return 1;
}
@ -466,13 +466,13 @@ static Evas_Bool
_mod_hash_load_list(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__,
void *data, void *fdata)
{
Evas_List **l;
Eina_List **l;
CFModule *mod = NULL;
mod = data;
if ((!mod) || (!mod->enabled)) return 1;
l = fdata;
*l = evas_list_append(*l, mod);
*l = eina_list_append(*l, mod);
return 1;
}
@ -488,10 +488,10 @@ _mod_list_sort(void *data1, void *data2)
/* nice generic function to load an ilist with items */
static void
_list_widget_load(Evas_Object *obj, Evas_List *list)
_list_widget_load(Evas_Object *obj, Eina_List *list)
{
Evas *evas;
Evas_List *ml = NULL;
Eina_List *ml = NULL;
if ((!obj) || (!list)) return;
evas = evas_object_evas_get(obj);
@ -600,7 +600,7 @@ _mod_hash_unselect(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__,
static void
_select_all_modules(Evas_Object *obj, void *data)
{
Evas_List *l = NULL;
Eina_List *l = NULL;
E_Config_Dialog_Data *cfdata = NULL;
int i = 0;

10
src/bin/e_int_gadcon_config.c
View File

@ -188,7 +188,7 @@ static void
_load_avail_gadgets(void *data)
{
E_Config_Dialog_Data *cfdata = NULL;
Evas_List *l = NULL;
Eina_List *l = NULL;
Evas *evas;
int w;
@ -199,7 +199,7 @@ _load_avail_gadgets(void *data)
e_widget_ilist_freeze(cfdata->o_avail);
e_widget_ilist_clear(cfdata->o_avail);
// l = e_gadcon_provider_list();
// if (l) l = evas_list_sort(l, -1, _gad_list_sort);
// if (l) l = eina_list_sort(l, -1, _gad_list_sort);
for (l = e_gadcon_provider_list(); l; l = l->next)
{
E_Gadcon_Client_Class *cc;
@ -226,7 +226,7 @@ static void
_load_sel_gadgets(void *data)
{
E_Config_Dialog_Data *cfdata = NULL;
Evas_List *l = NULL, *l2 = NULL;
Eina_List *l = NULL, *l2 = NULL;
Evas *evas;
int w;
@ -272,7 +272,7 @@ static void
_cb_add(void *data, void *data2)
{
E_Config_Dialog_Data *cfdata = NULL;
Evas_List *l = NULL;
Eina_List *l = NULL;
int i = 0, update = 0;
if (!(cfdata = data)) return;
@ -303,7 +303,7 @@ static void
_cb_del(void *data, void *data2)
{
E_Config_Dialog_Data *cfdata = NULL;
Evas_List *l = NULL, *g = NULL;
Eina_List *l = NULL, *g = NULL;
int i = 0, update = 0;
if (!(cfdata = data)) return;

90
src/bin/e_int_menus.c
View File

@ -49,10 +49,10 @@ static int _e_int_menus_clients_group_desk_cb (void *d1, void *d2);
static int _e_int_menus_clients_group_class_cb (void *d1, void *d2);
static int _e_int_menus_clients_sort_alpha_cb (void *d1, void *d2);
static int _e_int_menus_clients_sort_z_order_cb (void *d1, void *d2);
static void _e_int_menus_clients_add_by_class (Evas_List *borders, E_Menu *m);
static void _e_int_menus_clients_add_by_desk (E_Desk *curr_desk, Evas_List *borders, E_Menu *m);
static void _e_int_menus_clients_add_by_none (Evas_List *borders, E_Menu *m);
static void _e_int_menus_clients_menu_add_iconified (Evas_List *borders, E_Menu *m);
static void _e_int_menus_clients_add_by_class (Eina_List *borders, E_Menu *m);
static void _e_int_menus_clients_add_by_desk (E_Desk *curr_desk, Eina_List *borders, E_Menu *m);
static void _e_int_menus_clients_add_by_none (Eina_List *borders, E_Menu *m);
static void _e_int_menus_clients_menu_add_iconified (Eina_List *borders, E_Menu *m);
static const char *_e_int_menus_clients_title_abbrv (const char *title);
static void _e_int_menus_virtuals_pre_cb (void *data, E_Menu *m);
static void _e_int_menus_virtuals_item_cb (void *data, E_Menu *m, E_Menu_Item *mi);
@ -63,8 +63,8 @@ static void _e_int_menus_lost_clients_free_hook (void *obj);
static void _e_int_menus_lost_clients_item_cb (void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_int_menus_sys_pre_cb (void *data, E_Menu *m);
static void _e_int_menus_sys_free_hook (void *obj);
static void _e_int_menus_augmentation_add (E_Menu *m, Evas_List *augmentation);
static void _e_int_menus_augmentation_del (E_Menu *m, Evas_List *augmentation);
static void _e_int_menus_augmentation_add (E_Menu *m, Eina_List *augmentation);
static void _e_int_menus_augmentation_del (E_Menu *m, Eina_List *augmentation);
static void _e_int_menus_shelves_pre_cb (void *data, E_Menu *m);
static void _e_int_menus_shelves_item_cb (void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_int_menus_shelves_add_cb (void *data, E_Menu *m, E_Menu_Item *mi);
@ -84,7 +84,7 @@ e_int_menus_main_new(void)
E_Menu *m, *subm;
E_Menu_Item *mi;
Main_Data *dat;
Evas_List *l = NULL;
Eina_List *l = NULL;
dat = calloc(1, sizeof(Main_Data));
m = e_menu_new();
@ -359,7 +359,7 @@ e_int_menus_menu_augmentation_add(const char *menu,
void *data_del)
{
E_Int_Menu_Augmentation *maug;
Evas_List *l = NULL;
Eina_List *l = NULL;
maug = E_NEW(E_Int_Menu_Augmentation, 1);
if (!maug) return NULL;
@ -377,7 +377,7 @@ e_int_menus_menu_augmentation_add(const char *menu,
evas_hash_del(_e_int_menus_augmentation, menu, l);
}
l = evas_list_append(l, maug);
l = eina_list_append(l, maug);
_e_int_menus_augmentation =
evas_hash_add(_e_int_menus_augmentation, menu, l);
@ -387,7 +387,7 @@ e_int_menus_menu_augmentation_add(const char *menu,
EAPI void
e_int_menus_menu_augmentation_del(const char *menu, E_Int_Menu_Augmentation *maug)
{
Evas_List *l = NULL;
Eina_List *l = NULL;
l = evas_hash_find(_e_int_menus_augmentation, menu);
if (l)
@ -399,7 +399,7 @@ e_int_menus_menu_augmentation_del(const char *menu, E_Int_Menu_Augmentation *mau
_e_int_menus_augmentation =
evas_hash_del(_e_int_menus_augmentation, menu, l);
l = evas_list_remove(l, maug);
l = eina_list_remove(l, maug);
if (l)
{
_e_int_menus_augmentation =
@ -652,7 +652,7 @@ static void
_e_int_menus_items_del_hook(void *obj)
{
E_Menu *m;
Evas_List *l = NULL;
Eina_List *l = NULL;
m = obj;
for (l = m->items; l; l = l->next)
@ -812,7 +812,7 @@ static void
_e_int_menus_config_pre_cb(void *data, E_Menu *m)
{
E_Menu_Item *mi;
Evas_List *l = NULL;
Eina_List *l = NULL;
e_menu_pre_activate_callback_set(m, NULL, NULL);
@ -862,7 +862,7 @@ static void
_e_int_menus_sys_pre_cb(void *data, E_Menu *m)
{
E_Menu_Item *mi;
Evas_List *l = NULL;
Eina_List *l = NULL;
e_menu_pre_activate_callback_set(m, NULL, NULL);
@ -1029,12 +1029,12 @@ _e_int_menus_clients_sort_z_order_cb(void *d1, void *d2)
}
static void
_e_int_menus_clients_menu_add_iconified(Evas_List *borders, E_Menu *m)
_e_int_menus_clients_menu_add_iconified(Eina_List *borders, E_Menu *m)
{
Evas_List *l = NULL;
Eina_List *l = NULL;
E_Menu_Item *mi;
if (evas_list_count(borders) > 0)
if (eina_list_count(borders) > 0)
{
mi = e_menu_item_new(m);
e_menu_item_separator_set(mi, 1);
@ -1050,9 +1050,9 @@ _e_int_menus_clients_menu_add_iconified(Evas_List *borders, E_Menu *m)
}
static void
_e_int_menus_clients_add_by_class(Evas_List *borders, E_Menu *m)
_e_int_menus_clients_add_by_class(Eina_List *borders, E_Menu *m)
{
Evas_List *l = NULL, *ico = NULL;
Eina_List *l = NULL, *ico = NULL;
E_Menu *subm = NULL;
E_Menu_Item *mi;
char *class = NULL;
@ -1066,7 +1066,7 @@ _e_int_menus_clients_add_by_class(Evas_List *borders, E_Menu *m)
if ((bd->iconic) &&
(e_config->clientlist_separate_iconified_apps == E_CLIENTLIST_GROUPICONS_SEP))
{
ico = evas_list_append(ico, bd);
ico = eina_list_append(ico, bd);
continue;
}
@ -1102,10 +1102,10 @@ _e_int_menus_clients_add_by_class(Evas_List *borders, E_Menu *m)
}
static void
_e_int_menus_clients_add_by_desk(E_Desk *curr_desk, Evas_List *borders, E_Menu *m)
_e_int_menus_clients_add_by_desk(E_Desk *curr_desk, Eina_List *borders, E_Menu *m)
{
E_Desk *desk = NULL;
Evas_List *l = NULL, *alt = NULL, *ico = NULL;
Eina_List *l = NULL, *alt = NULL, *ico = NULL;
E_Menu *subm;
E_Menu_Item *mi;
@ -1117,7 +1117,7 @@ _e_int_menus_clients_add_by_desk(E_Desk *curr_desk, Evas_List *borders, E_Menu *
bd = l->data;
if (bd->iconic && e_config->clientlist_separate_iconified_apps && E_CLIENTLIST_GROUPICONS_SEP)
{
ico = evas_list_append(ico, bd);
ico = eina_list_append(ico, bd);
continue;
}
@ -1127,7 +1127,7 @@ _e_int_menus_clients_add_by_desk(E_Desk *curr_desk, Evas_List *borders, E_Menu *
(bd->iconic && e_config->clientlist_separate_iconified_apps ==
E_CLIENTLIST_GROUPICONS_OWNER))
{
alt = evas_list_append(alt, bd);
alt = eina_list_append(alt, bd);
continue;
}
}
@ -1137,7 +1137,7 @@ _e_int_menus_clients_add_by_desk(E_Desk *curr_desk, Evas_List *borders, E_Menu *
desk = NULL;
subm = NULL;
if (evas_list_count(alt) > 0)
if (eina_list_count(alt) > 0)
{
if (e_config->clientlist_separate_with == E_CLIENTLIST_GROUP_SEP_MENU)
{
@ -1182,9 +1182,9 @@ _e_int_menus_clients_add_by_desk(E_Desk *curr_desk, Evas_List *borders, E_Menu *
}
static void
_e_int_menus_clients_add_by_none(Evas_List *borders, E_Menu *m)
_e_int_menus_clients_add_by_none(Eina_List *borders, E_Menu *m)
{
Evas_List *l = NULL, *ico = NULL;
Eina_List *l = NULL, *ico = NULL;
for (l = borders; l; l = l->next)
{
@ -1194,7 +1194,7 @@ _e_int_menus_clients_add_by_none(Evas_List *borders, E_Menu *m)
if ((bd->iconic) && (e_config->clientlist_separate_iconified_apps) &&
(E_CLIENTLIST_GROUPICONS_SEP))
{
ico = evas_list_append(ico, bd);
ico = eina_list_append(ico, bd);
continue;
}
_e_int_menus_clients_item_create(bd, m);
@ -1208,7 +1208,7 @@ _e_int_menus_clients_pre_cb(void *data, E_Menu *m)
{
E_Menu *subm;
E_Menu_Item *mi;
Evas_List *l = NULL, *borders = NULL;
Eina_List *l = NULL, *borders = NULL;
E_Zone *zone = NULL;
E_Desk *desk = NULL;
Main_Data *dat;
@ -1231,7 +1231,7 @@ _e_int_menus_clients_pre_cb(void *data, E_Menu *m)
if (border->user_skip_winlist) continue;
if ((border->zone == zone) || (border->iconic) ||
(border->zone != zone && e_config->clientlist_include_all_zones))
borders = evas_list_append(borders, border);
borders = eina_list_append(borders, border);
}
dat = (Main_Data *)e_object_data_get(E_OBJECT(m));
@ -1248,23 +1248,23 @@ _e_int_menus_clients_pre_cb(void *data, E_Menu *m)
{
/* Sort the borders */
if (e_config->clientlist_sort_by == E_CLIENTLIST_SORT_ALPHA)
borders = evas_list_sort(borders, evas_list_count(borders),
borders = eina_list_sort(borders, eina_list_count(borders),
_e_int_menus_clients_sort_alpha_cb);
if (e_config->clientlist_sort_by == E_CLIENTLIST_SORT_ZORDER)
borders = evas_list_sort(borders, evas_list_count(borders),
borders = eina_list_sort(borders, eina_list_count(borders),
_e_int_menus_clients_sort_z_order_cb);
/* Group the borders */
if (e_config->clientlist_group_by == E_CLIENTLIST_GROUP_DESK)
{
borders = evas_list_sort(borders, evas_list_count(borders),
borders = eina_list_sort(borders, eina_list_count(borders),
_e_int_menus_clients_group_desk_cb);
_e_int_menus_clients_add_by_desk(desk, borders, m);
}
if (e_config->clientlist_group_by == E_CLIENTLIST_GROUP_CLASS)
{
borders = evas_list_sort(borders, evas_list_count(borders),
borders = eina_list_sort(borders, eina_list_count(borders),
_e_int_menus_clients_group_class_cb);
_e_int_menus_clients_add_by_class(borders, m);
}
@ -1348,7 +1348,7 @@ static void
_e_int_menus_clients_free_hook(void *obj)
{
E_Menu *m;
Evas_List *borders = NULL;
Eina_List *borders = NULL;
m = obj;
borders = e_object_data_get(E_OBJECT(m));
@ -1357,7 +1357,7 @@ _e_int_menus_clients_free_hook(void *obj)
E_Border *bd;
bd = borders->data;
borders = evas_list_remove_list(borders, borders);
borders = eina_list_remove_list(borders, borders);
e_object_unref(E_OBJECT(bd));
}
}
@ -1417,7 +1417,7 @@ static void
_e_int_menus_lost_clients_pre_cb(void *data, E_Menu *m)
{
E_Menu_Item *mi;
Evas_List *l, *borders = NULL;
Eina_List *l, *borders = NULL;
E_Menu *root;
E_Zone *zone = NULL;
@ -1461,7 +1461,7 @@ static void
_e_int_menus_lost_clients_free_hook(void *obj)
{
E_Menu *m;
Evas_List *borders = NULL;
Eina_List *borders = NULL;
m = obj;
borders = e_object_data_get(E_OBJECT(m));
@ -1470,7 +1470,7 @@ _e_int_menus_lost_clients_free_hook(void *obj)
E_Border *bd;
bd = borders->data;
borders = evas_list_remove_list(borders, borders);
borders = eina_list_remove_list(borders, borders);
e_object_unref(E_OBJECT(bd));
}
}
@ -1491,9 +1491,9 @@ _e_int_menus_lost_clients_item_cb(void *data, E_Menu *m, E_Menu_Item *mi)
}
static void
_e_int_menus_augmentation_add(E_Menu *m, Evas_List *augmentation)
_e_int_menus_augmentation_add(E_Menu *m, Eina_List *augmentation)
{
Evas_List *l = NULL;
Eina_List *l = NULL;
for (l = augmentation; l; l = l->next)
{
@ -1505,9 +1505,9 @@ _e_int_menus_augmentation_add(E_Menu *m, Evas_List *augmentation)
}
static void
_e_int_menus_augmentation_del(E_Menu *m, Evas_List *augmentation)
_e_int_menus_augmentation_del(E_Menu *m, Eina_List *augmentation)
{
Evas_List *l = NULL;
Eina_List *l = NULL;
for (l = augmentation; l; l = l->next)
{
@ -1522,7 +1522,7 @@ static void
_e_int_menus_shelves_pre_cb(void *data, E_Menu *m)
{
E_Menu_Item *mi;
Evas_List *l, *shelves = NULL;
Eina_List *l, *shelves = NULL;
E_Container *con;
E_Zone *zone;
@ -1646,7 +1646,7 @@ _e_int_menus_shelves_add_cb(void *data, E_Menu *m, E_Menu_Item *mi)
cs->style = eina_stringshare_add("default");
cs->size = 40;
cs->overlap = 0;
e_config->shelves = evas_list_append(e_config->shelves, cs);
e_config->shelves = eina_list_append(e_config->shelves, cs);
e_config_save_queue();
e_shelf_config_init();

14
src/bin/e_int_shelf_config.c
View File

@ -41,7 +41,7 @@ struct _E_Config_Dialog_Data
double hide_duration;
int desk_show_mode;
Evas_List *desk_list;
Eina_List *desk_list;
Evas_Object *desk_sel_list;
};
@ -171,7 +171,7 @@ _desk_sel_list_load(E_Config_Dialog_Data *cfdata)
for (x = 0; x < e_config->zone_desks_x_count; x++)
{
E_Desk *desk;
Evas_List *l = NULL;
Eina_List *l = NULL;
desk = e_desk_at_xy_get(cfdata->es->zone, x, y);
e_widget_ilist_append(cfdata->desk_sel_list, NULL, desk->name, NULL, NULL, NULL);
@ -405,8 +405,8 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
cfdata->escfg->desk_list = NULL;
if (cfdata->desk_show_mode)
{
Evas_List *l;
Evas_List *desk_list = NULL;
Eina_List *l;
Eina_List *desk_list = NULL;
for (idx = 0, l = e_widget_ilist_items_get(cfdata->desk_sel_list); l; l = l->next, idx++)
{
E_Ilist_Item *item;
@ -422,7 +422,7 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
sd = E_NEW(E_Config_Shelf_Desk, 1);
sd->x = desk->x;
sd->y = desk->y;
desk_list = evas_list_append(desk_list, sd);
desk_list = eina_list_append(desk_list, sd);
}
cfdata->escfg->desk_list = desk_list;
}
@ -448,7 +448,7 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
if (cfdata->escfg->desk_show_mode)
{
E_Desk *desk;
Evas_List *l;
Eina_List *l;
int show_shelf=0;
desk = e_desk_current_get(cfdata->es->zone);
@ -542,7 +542,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
Evas_Object *o, *o2, *of, *ob, *oi, *oj;
E_Radio_Group *rg;
Evas_Coord wmw, wmh;
Evas_List *styles, *l;
Eina_List *styles, *l;
int sel, n;
/* FIXME: this is just raw config now - it needs UI improvments */

86
src/bin/e_intl.c
View File

@ -37,21 +37,21 @@ static const char *_e_intl_imc_system_path = NULL;
/* Language Setting and Listing */
static char *_e_intl_language_path_find(char *language);
static Evas_List *_e_intl_language_dir_scan(const char *dir);
static int _e_intl_language_list_find(Evas_List *language_list, char *language);
static Eina_List *_e_intl_language_dir_scan(const char *dir);
static int _e_intl_language_list_find(Eina_List *language_list, char *language);
/* Locale Validation and Discovery */
static Evas_Hash *_e_intl_locale_alias_hash_get(void);
static char *_e_intl_locale_alias_get(const char *language);
static Evas_List *_e_intl_locale_system_locales_get(void);
static Evas_List *_e_intl_locale_search_order_get(const char *locale);
static Eina_List *_e_intl_locale_system_locales_get(void);
static Eina_List *_e_intl_locale_search_order_get(const char *locale);
static int _e_intl_locale_validate(const char *locale);
static void _e_intl_locale_hash_free(Evas_Hash *language_hash);
static Evas_Bool _e_intl_locale_hash_free_cb(const Evas_Hash *hash, const char *key, void *data, void *fdata);
/* Input Method Configuration and Management */
static int _e_intl_cb_exit(void *data, int type, void *event);
static Evas_List *_e_intl_imc_dir_scan(const char *dir);
static Eina_List *_e_intl_imc_dir_scan(const char *dir);
EAPI int
e_intl_init(void)
@ -256,19 +256,19 @@ e_intl_language_alias_get(void)
return _e_intl_language_alias;
}
EAPI Evas_List *
EAPI Eina_List *
e_intl_language_list(void)
{
Evas_List *next;
Evas_List *dir_list;
Evas_List *all_languages;
Eina_List *next;
Eina_List *dir_list;
Eina_List *all_languages;
all_languages = NULL;
dir_list = e_path_dir_list_get(path_messages);
for (next = dir_list ; next ; next = next->next)
{
E_Path_Dir *epd;
Evas_List *dir_languages;
Eina_List *dir_languages;
epd = next->data;
dir_languages = _e_intl_language_dir_scan(epd->dir);
@ -277,7 +277,7 @@ e_intl_language_list(void)
char *language;
language = dir_languages->data;
dir_languages = evas_list_remove_list(dir_languages, dir_languages);
dir_languages = eina_list_remove_list(dir_languages, dir_languages);
if ((_e_intl_language_list_find(all_languages, language)) ||
((strlen(language) > 2) && (!_e_intl_locale_validate(language))))
@ -285,7 +285,7 @@ e_intl_language_list(void)
free(language);
}
else
all_languages = evas_list_append(all_languages, language);
all_languages = eina_list_append(all_languages, language);
}
}
@ -295,9 +295,9 @@ e_intl_language_list(void)
}
static int
_e_intl_language_list_find(Evas_List *language_list, char *language)
_e_intl_language_list_find(Eina_List *language_list, char *language)
{
Evas_List *l;
Eina_List *l;
if (!language_list) return 0;
if (!language) return 0;
@ -366,12 +366,12 @@ e_intl_input_method_set(const char *imc_path)
}
}
EAPI Evas_List *
EAPI Eina_List *
e_intl_input_method_list(void)
{
Evas_List *input_methods;
Evas_List *im_list;
Evas_List *l;
Eina_List *input_methods;
Eina_List *im_list;
Eina_List *l;
char *imc_path;
im_list = NULL;
@ -381,22 +381,22 @@ e_intl_input_method_list(void)
for (l = input_methods; l; l = l->next)
{
imc_path = l->data;
im_list = evas_list_append(im_list, imc_path);
im_list = eina_list_append(im_list, imc_path);
}
while (input_methods)
input_methods = evas_list_remove_list(input_methods, input_methods);
input_methods = eina_list_remove_list(input_methods, input_methods);
/* System Path */
input_methods = _e_intl_imc_dir_scan(e_intl_imc_system_path_get());
for (l = input_methods; l; l = l->next)
{
imc_path = l->data;
im_list = evas_list_append(im_list, imc_path);
im_list = eina_list_append(im_list, imc_path);
}
while (input_methods)
input_methods = evas_list_remove_list(input_methods, input_methods);
input_methods = eina_list_remove_list(input_methods, input_methods);
return im_list;
}
@ -472,10 +472,10 @@ static char *
_e_intl_language_path_find(char *language)
{
char *directory;
Evas_List *dir_list;
Evas_List *search_list;
Evas_List *next_dir;
Evas_List *next_search;
Eina_List *dir_list;
Eina_List *search_list;
Eina_List *next_dir;
Eina_List *next_search;
int found;
search_list = _e_intl_locale_search_order_get(language);
@ -516,16 +516,16 @@ _e_intl_language_path_find(char *language)
char *data;
data = search_list->data;
free(data);
search_list = evas_list_remove_list(search_list, search_list);
search_list = eina_list_remove_list(search_list, search_list);
}
return directory;
}
static Evas_List *
static Eina_List *
_e_intl_language_dir_scan(const char *dir)
{
Evas_List *languages;
Eina_List *languages;
Ecore_List *files;
char *file;
@ -544,7 +544,7 @@ _e_intl_language_dir_scan(const char *dir)
snprintf(file_path, sizeof(file_path),"%s/%s/LC_MESSAGES/%s.mo",
dir, file, PACKAGE);
if (ecore_file_exists(file_path) && !ecore_file_is_dir(file_path))
languages = evas_list_append(languages, strdup(file));
languages = eina_list_append(languages, strdup(file));
}
ecore_list_destroy(files);
}
@ -593,8 +593,8 @@ _e_intl_locale_alias_get(const char *language)
static Evas_Hash *
_e_intl_locale_alias_hash_get(void)
{
Evas_List *next;
Evas_List *dir_list;
Eina_List *next;
Eina_List *dir_list;
Evas_Hash *alias_hash;
dir_list = e_path_dir_list_get(path_messages);
@ -861,10 +861,10 @@ e_intl_locale_charset_canonic_get(const char *charset)
return strdup(charset_canonic);
}
static Evas_List *
static Eina_List *
_e_intl_locale_system_locales_get(void)
{
Evas_List *locales;
Eina_List *locales;
FILE *output;
locales = NULL;
@ -873,7 +873,7 @@ _e_intl_locale_system_locales_get(void)
{
char line[32];
while (fscanf(output, "%[^\n]\n", line) == 1)
locales = evas_list_append(locales, strdup(line));
locales = eina_list_append(locales, strdup(line));
pclose(output);
}
@ -886,7 +886,7 @@ _e_intl_locale_system_locales_get(void)
static int
_e_intl_locale_validate(const char *locale)
{
Evas_List *all_locales;
Eina_List *all_locales;
E_Locale_Parts *locale_parts;
char *locale_lr;
char *locale_cs_canonic;
@ -992,7 +992,7 @@ _e_intl_locale_validate(const char *locale)
E_FREE(locale_lr_next);
}
all_locales = evas_list_remove_list(all_locales, all_locales);
all_locales = eina_list_remove_list(all_locales, all_locales);
free(locale_next);
}
e_intl_locale_parts_free(locale_parts);
@ -1010,10 +1010,10 @@ _e_intl_locale_validate(const char *locale)
* Mask (9) Locale (en.UTF-8)
* Mask (8) Locale (en)
*/
static Evas_List *
static Eina_List *
_e_intl_locale_search_order_get(const char *locale)
{
Evas_List *search_list;
Eina_List *search_list;
E_Locale_Parts *locale_parts;
char *masked_locale;
int mask;
@ -1028,17 +1028,17 @@ _e_intl_locale_search_order_get(const char *locale)
{
/* Only append if the mask we need is available */
masked_locale = e_intl_locale_parts_combine(locale_parts, mask);
search_list = evas_list_append(search_list, masked_locale);
search_list = eina_list_append(search_list, masked_locale);
}
}
e_intl_locale_parts_free(locale_parts);
return search_list;
}
static Evas_List *
static Eina_List *
_e_intl_imc_dir_scan(const char *dir)
{
Evas_List *imcs;
Eina_List *imcs;
Ecore_List *files;
char *file;
@ -1057,7 +1057,7 @@ _e_intl_imc_dir_scan(const char *dir)
char buf[PATH_MAX];
snprintf(buf, sizeof(buf), "%s/%s", dir, file);
imcs = evas_list_append(imcs, strdup(buf));
imcs = eina_list_append(imcs, strdup(buf));
}
}
ecore_list_destroy(files);

4
src/bin/e_intl.h
View File

@ -41,11 +41,11 @@ EAPI int e_intl_post_shutdown(void);
EAPI void e_intl_language_set(const char *lang);
EAPI const char *e_intl_language_get(void);
EAPI const char *e_intl_language_alias_get(void);
EAPI Evas_List *e_intl_language_list(void);
EAPI Eina_List *e_intl_language_list(void);
/* Setting & Getting Input Method */
EAPI void e_intl_input_method_set(const char *method);
EAPI const char *e_intl_input_method_get(void);
EAPI Evas_List *e_intl_input_method_list(void);
EAPI Eina_List *e_intl_input_method_list(void);
EAPI const char *e_intl_imc_personal_path_get(void);
EAPI const char *e_intl_imc_system_path_get(void);

56
src/bin/e_ipc_codec.c
View File

@ -30,10 +30,10 @@ static Eet_Data_Descriptor *_e_ipc_str_4int_list_edd = NULL;
#define E_IPC_DD_NEW(str, typ) \
eet_data_descriptor_new(str, sizeof(typ), \
(void *(*) (void *))evas_list_next, \
(void *(*) (void *, void *))evas_list_append, \
(void *(*) (void *))evas_list_data, \
(void *(*) (void *))evas_list_free, \
(void *(*) (void *))eina_list_next, \
(void *(*) (void *, void *))eina_list_append, \
(void *(*) (void *))eina_list_data_get, \
(void *(*) (void *))eina_list_free, \
(void (*) (void *, int (*) (void *, const char *, void *, void *), void *))evas_hash_foreach, \
(void *(*) (void *, const char *, void *))evas_hash_add, \
(void (*) (void *))evas_hash_free)
@ -278,7 +278,7 @@ e_ipc_codec_2str_enc(const char *str1, const char *str2, int *size_ret)
}
EAPI int
e_ipc_codec_2str_list_dec(char *data, int bytes, Evas_List **dest)
e_ipc_codec_2str_list_dec(char *data, int bytes, Eina_List **dest)
{
E_Ipc_List *dat;
@ -291,7 +291,7 @@ e_ipc_codec_2str_list_dec(char *data, int bytes, Evas_List **dest)
}
EAPI void *
e_ipc_codec_2str_list_enc(Evas_List *list, int *size_ret)
e_ipc_codec_2str_list_enc(Eina_List *list, int *size_ret)
{
E_Ipc_List dat;
dat.list = list;
@ -299,10 +299,10 @@ e_ipc_codec_2str_list_enc(Evas_List *list, int *size_ret)
}
EAPI int
e_ipc_codec_str_list_dec(char *data, int bytes, Evas_List **dest)
e_ipc_codec_str_list_dec(char *data, int bytes, Eina_List **dest)
{
E_Ipc_List *dat;
Evas_List *list = NULL, *l;
Eina_List *list = NULL, *l;
if (!data) return 0;
dat = eet_data_descriptor_decode(_e_ipc_str_list_edd, data, bytes);
@ -312,23 +312,23 @@ e_ipc_codec_str_list_dec(char *data, int bytes, Evas_List **dest)
E_Ipc_Str *str_node;
str_node = l->data;
list = evas_list_append(list, str_node->str);
list = eina_list_append(list, str_node->str);
}
if (dest) *dest = list;
while (dat->list)
{
free(dat->list->data);
dat->list = evas_list_remove_list(dat->list, dat->list);
dat->list = eina_list_remove_list(dat->list, dat->list);
}
free(dat);
return 1;
}
EAPI void *
e_ipc_codec_str_list_enc(Evas_List *list, int *size_ret)
e_ipc_codec_str_list_enc(Eina_List *list, int *size_ret)
{
E_Ipc_List dat;
Evas_List *l;
Eina_List *l;
void *data;
dat.list = NULL;
@ -338,13 +338,13 @@ e_ipc_codec_str_list_enc(Evas_List *list, int *size_ret)
str_node = malloc(sizeof(E_Ipc_Str));
str_node->str = l->data;
dat.list = evas_list_append(dat.list, str_node);
dat.list = eina_list_append(dat.list, str_node);
}
data = eet_data_descriptor_encode(_e_ipc_str_list_edd, &dat, size_ret);
while (dat.list)
{
free(dat.list->data);
dat.list = evas_list_remove_list(dat.list, dat.list);
dat.list = eina_list_remove_list(dat.list, dat.list);
}
return data;
}
@ -372,7 +372,7 @@ e_ipc_codec_str_int_enc(const char *str, int val, int *size_ret)
}
EAPI int
e_ipc_codec_str_int_list_dec(char *data, int bytes, Evas_List **dest)
e_ipc_codec_str_int_list_dec(char *data, int bytes, Eina_List **dest)
{
E_Ipc_List *dat;
@ -385,7 +385,7 @@ e_ipc_codec_str_int_list_dec(char *data, int bytes, Evas_List **dest)
}
EAPI void *
e_ipc_codec_str_int_list_enc(Evas_List *list, int *size_ret)
e_ipc_codec_str_int_list_enc(Eina_List *list, int *size_ret)
{
E_Ipc_List dat;
dat.list = list;
@ -416,7 +416,7 @@ e_ipc_codec_2str_int_enc(const char *str1, const char *str2, int val, int *size_
}
EAPI int
e_ipc_codec_2str_int_list_dec(char *data, int bytes, Evas_List **dest)
e_ipc_codec_2str_int_list_dec(char *data, int bytes, Eina_List **dest)
{
E_Ipc_List *dat;
@ -429,7 +429,7 @@ e_ipc_codec_2str_int_list_dec(char *data, int bytes, Evas_List **dest)
}
EAPI void *
e_ipc_codec_2str_int_list_enc(Evas_List *list, int *size_ret)
e_ipc_codec_2str_int_list_enc(Eina_List *list, int *size_ret)
{
E_Ipc_List dat;
dat.list = list;
@ -463,7 +463,7 @@ e_ipc_codec_4int_2str_enc(int val1, int val2, int val3, int val4, const char *st
}
EAPI int
e_ipc_codec_4int_2str_list_dec(char *data, int bytes, Evas_List **dest)
e_ipc_codec_4int_2str_list_dec(char *data, int bytes, Eina_List **dest)
{
E_Ipc_List *dat;
@ -476,7 +476,7 @@ e_ipc_codec_4int_2str_list_dec(char *data, int bytes, Evas_List **dest)
}
EAPI void *
e_ipc_codec_4int_2str_list_enc(Evas_List *list, int *size_ret)
e_ipc_codec_4int_2str_list_enc(Eina_List *list, int *size_ret)
{
E_Ipc_List dat;
dat.list = list;
@ -511,7 +511,7 @@ e_ipc_codec_5int_2str_enc(int val1, int val2, int val3, int val4, int val5, cons
}
EAPI int
e_ipc_codec_5int_2str_list_dec(char *data, int bytes, Evas_List **dest)
e_ipc_codec_5int_2str_list_dec(char *data, int bytes, Eina_List **dest)
{
E_Ipc_List *dat;
@ -524,7 +524,7 @@ e_ipc_codec_5int_2str_list_dec(char *data, int bytes, Evas_List **dest)
}
EAPI void *
e_ipc_codec_5int_2str_list_enc(Evas_List *list, int *size_ret)
e_ipc_codec_5int_2str_list_enc(Eina_List *list, int *size_ret)
{
E_Ipc_List dat;
dat.list = list;
@ -559,7 +559,7 @@ e_ipc_codec_3int_4str_enc(int val1, int val2, int val3, const char *str1, const
}
EAPI int
e_ipc_codec_3int_4str_list_dec(char *data, int bytes, Evas_List **dest)
e_ipc_codec_3int_4str_list_dec(char *data, int bytes, Eina_List **dest)
{
E_Ipc_List *dat;
@ -572,7 +572,7 @@ e_ipc_codec_3int_4str_list_dec(char *data, int bytes, Evas_List **dest)
}
EAPI void *
e_ipc_codec_3int_4str_list_enc(Evas_List *list, int *size_ret)
e_ipc_codec_3int_4str_list_enc(Eina_List *list, int *size_ret)
{
E_Ipc_List dat;
dat.list = list;
@ -606,7 +606,7 @@ e_ipc_codec_3int_3str_enc(int val1, int val2, int val3, const char *str1, const
}
EAPI int
e_ipc_codec_3int_3str_list_dec(char *data, int bytes, Evas_List **dest)
e_ipc_codec_3int_3str_list_dec(char *data, int bytes, Eina_List **dest)
{
E_Ipc_List *dat;
@ -619,7 +619,7 @@ e_ipc_codec_3int_3str_list_dec(char *data, int bytes, Evas_List **dest)
}
EAPI void *
e_ipc_codec_3int_3str_list_enc(Evas_List *list, int *size_ret)
e_ipc_codec_3int_3str_list_enc(Eina_List *list, int *size_ret)
{
E_Ipc_List dat;
dat.list = list;
@ -653,7 +653,7 @@ e_ipc_codec_str_4int_enc(const char *str1, int val1, int val2, int val3, int val
}
EAPI int
e_ipc_codec_str_4int_list_dec(char *data, int bytes, Evas_List **dest)
e_ipc_codec_str_4int_list_dec(char *data, int bytes, Eina_List **dest)
{
E_Ipc_List *dat;
@ -666,7 +666,7 @@ e_ipc_codec_str_4int_list_dec(char *data, int bytes, Evas_List **dest)
}
EAPI void *
e_ipc_codec_str_4int_list_enc(Evas_List *list, int *size_ret)
e_ipc_codec_str_4int_list_enc(Eina_List *list, int *size_ret)
{
E_Ipc_List dat;
dat.list = list;

38
src/bin/e_ipc_codec.h
View File

@ -43,7 +43,7 @@ struct _E_Ipc_2Int
struct _E_Ipc_List
{
Evas_List *list;
Eina_List *list;
};
struct _E_Ipc_Str
@ -110,48 +110,48 @@ EAPI void *e_ipc_codec_2int_enc(int val1, int val2, int *size_ret);
EAPI int e_ipc_codec_str_dec(char *data, int bytes, char **dest);
EAPI void *e_ipc_codec_str_enc(const char *str, int *size_ret);
EAPI int e_ipc_codec_str_list_dec(char *data, int bytes, Evas_List **dest);
EAPI void *e_ipc_codec_str_list_enc(Evas_List *list, int *size_ret);
EAPI int e_ipc_codec_str_list_dec(char *data, int bytes, Eina_List **dest);
EAPI void *e_ipc_codec_str_list_enc(Eina_List *list, int *size_ret);
EAPI int e_ipc_codec_2str_dec(char *data, int bytes, E_Ipc_2Str **dest);
EAPI void *e_ipc_codec_2str_enc(const char *str1, const char *str2, int *size_ret);
EAPI int e_ipc_codec_2str_list_dec(char *data, int bytes, Evas_List **dest);
EAPI void *e_ipc_codec_2str_list_enc(Evas_List *list, int *size_ret);
EAPI int e_ipc_codec_2str_list_dec(char *data, int bytes, Eina_List **dest);
EAPI void *e_ipc_codec_2str_list_enc(Eina_List *list, int *size_ret);
EAPI int e_ipc_codec_str_int_dec(char *data, int bytes, E_Ipc_Str_Int **dest);
EAPI void *e_ipc_codec_str_int_enc(const char *str, int val, int *size_ret);
EAPI int e_ipc_codec_str_int_list_dec(char *data, int bytes, Evas_List **dest);
EAPI void *e_ipc_codec_str_int_list_enc(Evas_List *list, int *size_ret);
EAPI int e_ipc_codec_str_int_list_dec(char *data, int bytes, Eina_List **dest);
EAPI void *e_ipc_codec_str_int_list_enc(Eina_List *list, int *size_ret);
EAPI int e_ipc_codec_2str_int_dec(char *data, int bytes, E_Ipc_2Str_Int **dest);
EAPI void *e_ipc_codec_2str_int_enc(const char *str1, const char *str2, int val, int *size_ret);
EAPI int e_ipc_codec_2str_int_list_dec(char *data, int bytes, Evas_List **dest);
EAPI void *e_ipc_codec_2str_int_list_enc(Evas_List *list, int *size_ret);
EAPI int e_ipc_codec_2str_int_list_dec(char *data, int bytes, Eina_List **dest);
EAPI void *e_ipc_codec_2str_int_list_enc(Eina_List *list, int *size_ret);
EAPI int e_ipc_codec_4int_2str_dec(char *data, int bytes, E_Ipc_4Int_2Str **dest);
EAPI void *e_ipc_codec_4int_2str_enc(int val1, int val2, int val3, int val4, const char *str1, const char *str2, int *size_ret);
EAPI int e_ipc_codec_4int_2str_list_dec(char *data, int bytes, Evas_List **dest);
EAPI void *e_ipc_codec_4int_2str_list_enc(Evas_List *list, int *size_ret);
EAPI int e_ipc_codec_4int_2str_list_dec(char *data, int bytes, Eina_List **dest);
EAPI void *e_ipc_codec_4int_2str_list_enc(Eina_List *list, int *size_ret);
EAPI int e_ipc_codec_5int_2str_dec(char *data, int bytes, E_Ipc_5Int_2Str **dest);
EAPI void *e_ipc_codec_5int_2str_enc(int val1, int val2, int val3, int val4, int val5, const char *str1, const char *str2, int *size_ret);
EAPI int e_ipc_codec_5int_2str_list_dec(char *data, int bytes, Evas_List **dest);
EAPI void *e_ipc_codec_5int_2str_list_enc(Evas_List *list, int *size_ret);
EAPI int e_ipc_codec_5int_2str_list_dec(char *data, int bytes, Eina_List **dest);
EAPI void *e_ipc_codec_5int_2str_list_enc(Eina_List *list, int *size_ret);
EAPI int e_ipc_codec_3int_4str_dec(char *data, int bytes, E_Ipc_3Int_4Str **dest);
EAPI void *e_ipc_codec_3int_4str_enc(int val1, int val2, int val3, const char *str1, const char *str2, const char *str3, const char *str4, int *size_ret);
EAPI int e_ipc_codec_3int_4str_list_dec(char *data, int bytes, Evas_List **dest);
EAPI void *e_ipc_codec_3int_4str_list_enc(Evas_List *list, int *size_ret);
EAPI int e_ipc_codec_3int_4str_list_dec(char *data, int bytes, Eina_List **dest);
EAPI void *e_ipc_codec_3int_4str_list_enc(Eina_List *list, int *size_ret);
EAPI int e_ipc_codec_3int_3str_dec(char *data, int bytes, E_Ipc_3Int_3Str **dest);
EAPI void *e_ipc_codec_3int_3str_enc(int val1, int val2, int val3, const char *str1, const char *str2, const char *str3, int *size_ret);
EAPI int e_ipc_codec_3int_3str_list_dec(char *data, int bytes, Evas_List **dest);
EAPI void *e_ipc_codec_3int_3str_list_enc(Evas_List *list, int *size_ret);
EAPI int e_ipc_codec_3int_3str_list_dec(char *data, int bytes, Eina_List **dest);
EAPI void *e_ipc_codec_3int_3str_list_enc(Eina_List *list, int *size_ret);
EAPI int e_ipc_codec_str_4int_dec(char *data, int bytes, E_Ipc_Str_4Int **dest);
EAPI void *e_ipc_codec_str_4int_enc(const char *str1, int val1, int val2, int val3, int val4, int *size_ret);
EAPI int e_ipc_codec_str_4int_list_dec(char *data, int bytes, Evas_List **dest);
EAPI void *e_ipc_codec_str_4int_list_enc(Evas_List *list, int *size_ret);
EAPI int e_ipc_codec_str_4int_list_dec(char *data, int bytes, Eina_List **dest);
EAPI void *e_ipc_codec_str_4int_list_enc(Eina_List *list, int *size_ret);
#endif
#endif

138
src/bin/e_ipc_handlers.h
View File

@ -360,7 +360,7 @@ break;
# define FREE_LIST(__list) \
while (__list) { \
free(__list->data); \
__list = evas_list_remove_list(__list, __list); \
__list = eina_list_remove_list(__list, __list); \
}
# define SEND_DATA(__opcode) \
@ -369,7 +369,7 @@ free(data);
# define STRING_INT_LIST(__v, HDL) \
case HDL: { \
Evas_List *dat = NULL, *l; \
Eina_List *dat = NULL, *l; \
if (e_ipc_codec_str_int_list_dec(e->data, e->size, &dat)) { \
for (l = dat; l; l = l->next) { \
E_Ipc_Str_Int *__v; \
@ -378,14 +378,14 @@ free(data);
E_FREE(__v->str); \
free(__v); \
} \
evas_list_free(dat); \
eina_list_free(dat); \
} \
} \
break;
#define SEND_STRING_INT_LIST(__list, __typ1, __v1, __v2, HDL) \
case HDL: { \
Evas_List *dat = NULL, *l; \
Eina_List *dat = NULL, *l; \
void *data; int bytes; \
for (l = __list; l; l = l->next) { \
__typ1 *__v1; \
@ -393,7 +393,7 @@ free(data);
__v1 = l->data; \
__v2 = calloc(1, sizeof(E_Ipc_Str_Int));
#define END_SEND_STRING_INT_LIST(__v1, __op) \
dat = evas_list_append(dat, __v1); \
dat = eina_list_append(dat, __v1); \
} \
data = e_ipc_codec_str_int_list_enc(dat, &bytes); \
SEND_DATA(__op); \
@ -415,7 +415,7 @@ free(data);
#define INT3_STRING3_LIST_START(__v, HDL) \
case HDL: { \
Evas_List *dat = NULL, *l; \
Eina_List *dat = NULL, *l; \
if (e_ipc_codec_3int_3str_list_dec(e->data, e->size, &dat)) {
#define INT3_STRING3_LIST_ITERATE(__v) \
for (l = dat; l; l = l->next) { \
@ -432,7 +432,7 @@ free(data);
free(__v); \
}
#define END_INT3_STRING3_LIST_START() \
evas_list_free(dat); \
eina_list_free(dat); \
} \
} \
break;
@ -448,7 +448,7 @@ free(data);
*/
#define SEND_INT3_STRING3_LIST(__list, __typ1, __v1, __v2, HDL) \
case HDL: { \
Evas_List *dat = NULL, *l; \
Eina_List *dat = NULL, *l; \
void *data; int bytes; \
for (l = __list; l; l = l->next) { \
__typ1 *__v1; \
@ -456,7 +456,7 @@ free(data);
__v1 = l->data; \
__v2 = calloc(1, sizeof(E_Ipc_3Int_3Str));
#define END_SEND_INT3_STRING3_LIST(__v1, __op) \
dat = evas_list_append(dat, __v1); \
dat = eina_list_append(dat, __v1); \
} \
data = e_ipc_codec_3int_3str_list_enc(dat, &bytes); \
SEND_DATA(__op); \
@ -478,7 +478,7 @@ free(data);
#define INT4_STRING2_LIST_START(__v, HDL) \
case HDL: { \
Evas_List *dat = NULL, *l; \
Eina_List *dat = NULL, *l; \
if (e_ipc_codec_4int_2str_list_dec(e->data, e->size, &dat)) {
#define INT4_STRING2_LIST_ITERATE(__v) \
for (l = dat; l; l = l->next) { \
@ -493,7 +493,7 @@ free(data);
E_FREE(__v->str2); \
free(__v); \
} \
evas_list_free(dat);
eina_list_free(dat);
#define END_INT4_STRING2_LIST_START() \
} \
} \
@ -510,7 +510,7 @@ free(data);
*/
#define SEND_INT4_STRING2_LIST(__list, __typ1, __v1, __v2, HDL) \
case HDL: { \
Evas_List *dat = NULL, *l; \
Eina_List *dat = NULL, *l; \
void *data; int bytes; \
for (l = __list; l; l = l->next) { \
__typ1 *__v1; \
@ -518,7 +518,7 @@ free(data);
__v1 = l->data; \
__v2 = calloc(1, sizeof(E_Ipc_4Int_2Str));
#define END_SEND_INT4_STRING2_LIST(__v1, __op) \
dat = evas_list_append(dat, __v1); \
dat = eina_list_append(dat, __v1); \
} \
data = e_ipc_codec_4int_2str_list_enc(dat, &bytes); \
SEND_DATA(__op); \
@ -540,7 +540,7 @@ free(data);
#define INT5_STRING2_LIST_START(__v, HDL) \
case HDL: { \
Evas_List *dat = NULL, *l; \
Eina_List *dat = NULL, *l; \
if (e_ipc_codec_5int_2str_list_dec(e->data, e->size, &dat)) {
#define INT5_STRING2_LIST_ITERATE(__v) \
for (l = dat; l; l = l->next) { \
@ -555,7 +555,7 @@ free(data);
E_FREE(__v->str2); \
free(__v); \
} \
evas_list_free(dat);
eina_list_free(dat);
#define END_INT5_STRING2_LIST_START() \
} \
} \
@ -572,7 +572,7 @@ free(data);
*/
#define SEND_INT5_STRING2_LIST(__list, __typ1, __v1, __v2, HDL) \
case HDL: { \
Evas_List *dat = NULL, *l; \
Eina_List *dat = NULL, *l; \
void *data; int bytes; \
for (l = __list; l; l = l->next) { \
__typ1 *__v1; \
@ -580,7 +580,7 @@ free(data);
__v1 = l->data; \
__v2 = calloc(1, sizeof(E_Ipc_5Int_2Str));
#define END_SEND_INT5_STRING2_LIST(__v1, __op) \
dat = evas_list_append(dat, __v1); \
dat = eina_list_append(dat, __v1); \
} \
data = e_ipc_codec_5int_2str_list_enc(dat, &bytes); \
SEND_DATA(__op); \
@ -602,7 +602,7 @@ free(data);
#define INT3_STRING4_LIST_START(__v, HDL) \
case HDL: { \
Evas_List *dat = NULL, *l; \
Eina_List *dat = NULL, *l; \
if (e_ipc_codec_3int_4str_list_dec(e->data, e->size, &dat)) {
#define INT3_STRING4_LIST_ITERATE(__v) \
for (l = dat; l; l = l->next) { \
@ -619,7 +619,7 @@ free(data);
E_FREE(__v->str4); \
free(__v); \
} \
evas_list_free(dat);
eina_list_free(dat);
#define END_INT3_STRING4_LIST_START() \
} \
} \
@ -636,7 +636,7 @@ free(data);
*/
#define SEND_INT3_STRING4_LIST(__list, __typ1, __v1, __v2, HDL) \
case HDL: { \
Evas_List *dat = NULL, *l; \
Eina_List *dat = NULL, *l; \
void *data; int bytes; \
for (l = __list; l; l = l->next) { \
__typ1 *__v1; \
@ -644,7 +644,7 @@ free(data);
__v1 = l->data; \
__v2 = calloc(1, sizeof(E_Ipc_3Int_4Str));
#define END_SEND_INT3_STRING4_LIST(__v1, __op) \
dat = evas_list_append(dat, __v1); \
dat = eina_list_append(dat, __v1); \
} \
data = e_ipc_codec_3int_4str_list_enc(dat, &bytes); \
SEND_DATA(__op); \
@ -654,7 +654,7 @@ free(data);
# define STRING_INT4_LIST(__v, HDL) \
case HDL: { \
Evas_List *dat = NULL, *l; \
Eina_List *dat = NULL, *l; \
if (e_ipc_codec_str_4int_list_dec(e->data, e->size, &dat)) { \
for (l = dat; l; l = l->next) { \
E_Ipc_Str_4Int *__v; \
@ -663,7 +663,7 @@ free(data);
E_FREE(__v->str); \
free(__v); \
} \
evas_list_free(dat); \
eina_list_free(dat); \
} \
} \
break;
@ -679,7 +679,7 @@ free(data);
*/
#define SEND_STRING_INT4_LIST(__list, __typ1, __v1, __v2, HDL) \
case HDL: { \
Evas_List *dat = NULL, *l; \
Eina_List *dat = NULL, *l; \
void *data; int bytes; \
for (l = __list; l; l = l->next) { \
__typ1 *__v1; \
@ -687,7 +687,7 @@ free(data);
__v1 = l->data; \
__v2 = calloc(1, sizeof(E_Ipc_Str_4Int));
#define END_SEND_STRING_INT4_LIST(__v1, __op) \
dat = evas_list_append(dat, __v1); \
dat = eina_list_append(dat, __v1); \
} \
data = e_ipc_codec_str_4int_list_enc(dat, &bytes); \
SEND_DATA(__op); \
@ -706,7 +706,7 @@ free(data);
*/
#define STRING2_INT_LIST(__v, HDL) \
case HDL: { \
Evas_List *dat = NULL, *l; \
Eina_List *dat = NULL, *l; \
if (e_ipc_codec_2str_int_list_dec(e->data, e->size, &dat)) { \
for (l = dat; l; l = l->next) { \
E_Ipc_2Str_Int *__v; \
@ -716,7 +716,7 @@ free(data);
E_FREE(__v->str2); \
free(__v); \
} \
evas_list_free(dat); \
eina_list_free(dat); \
} \
} \
break;
@ -732,7 +732,7 @@ free(data);
*/
#define SEND_STRING2_INT_LIST(__list, __typ1, __v1, __v2, HDL) \
case HDL: { \
Evas_List *dat = NULL, *l; \
Eina_List *dat = NULL, *l; \
void *data; int bytes; \
for (l = __list; l; l = l->next) { \
__typ1 *__v1; \
@ -740,7 +740,7 @@ free(data);
__v1 = l->data; \
__v2 = calloc(1, sizeof(E_Ipc_2Str_Int));
#define END_SEND_STRING2_INT_LIST(__v1, __op) \
dat = evas_list_append(dat, __v1); \
dat = eina_list_append(dat, __v1); \
} \
data = e_ipc_codec_2str_int_list_enc(dat, &bytes); \
SEND_DATA(__op); \
@ -758,7 +758,7 @@ free(data);
*/
#define STRING2_LIST(__v, HDL) \
case HDL: { \
Evas_List *dat = NULL, *l; \
Eina_List *dat = NULL, *l; \
if (e_ipc_codec_2str_list_dec(e->data, e->size, &dat)) { \
for (l = dat; l; l = l->next) { \
E_Ipc_2Str *__v; \
@ -768,7 +768,7 @@ free(data);
E_FREE(__v->str2); \
free(__v); \
} \
evas_list_free(dat); \
eina_list_free(dat); \
} \
} \
break;
@ -784,7 +784,7 @@ free(data);
*/
#define SEND_STRING2_LIST(__list, __typ1, __v1, __v2, HDL) \
case HDL: { \
Evas_List *dat = NULL, *l; \
Eina_List *dat = NULL, *l; \
void *data; int bytes; \
for (l = __list; l; l = l->next) { \
__typ1 *__v1; \
@ -792,7 +792,7 @@ free(data);
__v1 = l->data; \
__v2 = calloc(1, sizeof(E_Ipc_2Str));
#define END_SEND_STRING2_LIST(__v1, __op) \
dat = evas_list_append(dat, __v1); \
dat = eina_list_append(dat, __v1); \
} \
data = e_ipc_codec_2str_list_enc(dat, &bytes); \
SEND_DATA(__op); \
@ -845,7 +845,7 @@ break;
will be called 'dat' and the list to iterate will be l;
*/
#define LIST_ENCODE_START() \
Evas_List *dat = NULL, *l; \
Eina_List *dat = NULL, *l; \
void *data; int bytes;
/*
@ -859,7 +859,7 @@ break;
data = __enc(__dat, &bytes);
/*
Iterate an evas_list starting with the pointer to __start. l
Iterate an eina_list starting with the pointer to __start. l
is the pointer to the current position in the list.
*/
#define FOR(__start) \
@ -872,7 +872,7 @@ break;
break;
#define LIST() \
Evas_List *dat = NULL, *l;
Eina_List *dat = NULL, *l;
#define DECODE(__dec) \
if (__dec(e->data, e->size, &dat))
@ -1027,14 +1027,14 @@ break;
END_STRING_INT_LIST(v);
#elif (TYPE == E_LIB_IN)
GENERIC(HDL);
Evas_List *dat = NULL;
Eina_List *dat = NULL;
DECODE(e_ipc_codec_str_int_list_dec) {
LIST();
int count;
RESPONSE(r, E_Response_Module_List);
/* FIXME - this is a mess, needs to be merged into macros... */
count = evas_list_count(dat);
count = eina_list_count(dat);
r->modules = malloc(sizeof(E_Response_Module_Data *) * count);
r->count = count;
@ -1117,14 +1117,14 @@ break;
GENERIC(HDL);
LIST_ENCODE_START();
E_Font_Available *fa;
Evas_List *fa_list;
Eina_List *fa_list;
fa_list = e_font_available_list();
FOR(fa_list) { fa = l->data;
dat = evas_list_append(dat, fa->name);
dat = eina_list_append(dat, fa->name);
}
ENCODE(dat, e_ipc_codec_str_list_enc);
SEND_DATA(E_IPC_OP_FONT_AVAILABLE_LIST_REPLY);
evas_list_free(dat);
eina_list_free(dat);
e_font_available_list_free(fa_list);
END_GENERIC();
#elif (TYPE == E_REMOTE_IN)
@ -1215,11 +1215,11 @@ break;
LIST_ENCODE_START();
E_Font_Fallback *ff;
FOR(e_config->font_fallbacks) { ff = l->data;
dat = evas_list_append(dat, ff->name);
dat = eina_list_append(dat, ff->name);
}
ENCODE(dat, e_ipc_codec_str_list_enc);
SEND_DATA(E_IPC_OP_FONT_FALLBACK_LIST_REPLY);
evas_list_free(dat);
eina_list_free(dat);
END_GENERIC();
#elif (TYPE == E_REMOTE_IN)
@ -1410,7 +1410,7 @@ break;
#elif (TYPE == E_WM_IN)
GENERIC(HDL);
ENCODE_START();
Evas_List *languages;
Eina_List *languages;
languages = e_intl_language_list();
ENCODE(languages, e_ipc_codec_str_list_enc);
SEND_DATA(E_IPC_OP_LANG_LIST_REPLY);
@ -1501,16 +1501,16 @@ break;
#elif (TYPE == E_WM_IN)
STRING(s, HDL);
LIST_ENCODE_START()
Evas_List *dir_list = NULL;
Eina_List *dir_list = NULL;
E_PATH_GET(path, s);
if (path)
dir_list = e_path_dir_list_get(path);
E_Path_Dir *p;
if (s) {
dat = evas_list_append(dat, eina_stringshare_add(s));
dat = eina_list_append(dat, eina_stringshare_add(s));
FOR(dir_list) { p = l->data;
dat = evas_list_append(dat, eina_stringshare_add(p->dir));
dat = eina_list_append(dat, eina_stringshare_add(p->dir));
}
}
@ -1522,7 +1522,7 @@ break;
dir = dat->data;
eina_stringshare_del(dir);
dat = evas_list_remove_list(dat, dat);
dat = eina_list_remove_list(dat, dat);
}
e_path_dir_list_free(dir_list);
END_STRING(s)
@ -1561,7 +1561,7 @@ break;
RESPONSE(r, E_Response_Dirs_List);
/* FIXME - this is a mess, needs to be merged into macros... */
count = evas_list_count(dat);
count = eina_list_count(dat);
r->dirs = malloc(sizeof(char *) * count);
r->count = count - 1; /* leave off the "type" */
@ -2292,16 +2292,16 @@ break;
E_CONFIG_LIMIT(e_config->zone_desks_x_count, 1, 64)
E_CONFIG_LIMIT(e_config->zone_desks_y_count, 1, 64)
{
Evas_List *l;
Eina_List *l;
for (l = e_manager_list(); l; l = l->next)
{
E_Manager *man;
Evas_List *l2;
Eina_List *l2;
man = l->data;
for (l2 = man->containers; l2; l2 = l2->next)
{
E_Container *con;
Evas_List *l3;
Eina_List *l3;
con = l2->data;
for (l3 = con->zones; l3; l3 = l3->next)
{
@ -2531,7 +2531,7 @@ break;
{
int count;
RESPONSE(r, E_Response_Binding_Mouse_List);
count = evas_list_count(dat);
count = eina_list_count(dat);
r->bindings = malloc(sizeof(E_Response_Binding_Mouse_Data *) * count);
r->count = count;
@ -2646,7 +2646,7 @@ break;
if (!eb)
{
eb = E_NEW(E_Config_Binding_Mouse, 1);
e_config->mouse_bindings = evas_list_append(e_config->mouse_bindings, eb);
e_config->mouse_bindings = eina_list_append(e_config->mouse_bindings, eb);
eb->context = bind.context;
eb->button = bind.button;
eb->modifiers = bind.modifiers;
@ -2751,7 +2751,7 @@ break;
eb = e_config_binding_mouse_match(&bind);
if (eb)
{
e_config->mouse_bindings = evas_list_remove(e_config->mouse_bindings, eb);
e_config->mouse_bindings = eina_list_remove(e_config->mouse_bindings, eb);
if (eb->action) eina_stringshare_del(eb->action);
if (eb->params) eina_stringshare_del(eb->params);
E_FREE(eb);
@ -2858,7 +2858,7 @@ break;
{
int count = 0;
RESPONSE(r, E_Response_Binding_Key_List);
count = evas_list_count(dat);
count = eina_list_count(dat);
r->bindings = malloc(sizeof(E_Response_Binding_Key_Data *) * count);
r->count = count;
@ -2972,7 +2972,7 @@ break;
if (!eb)
{
eb = E_NEW(E_Config_Binding_Key, 1);
e_config->key_bindings = evas_list_append(e_config->key_bindings, eb);
e_config->key_bindings = eina_list_append(e_config->key_bindings, eb);
eb->context = bind.context;
eb->modifiers = bind.modifiers;
eb->any_mod = bind.any_mod;
@ -3075,7 +3075,7 @@ break;
eb = e_config_binding_key_match(&bind);
if (eb)
{
e_config->key_bindings = evas_list_remove(e_config->key_bindings, eb);
e_config->key_bindings = eina_list_remove(e_config->key_bindings, eb);
if (eb->key) eina_stringshare_del(eb->key);
if (eb->action) eina_stringshare_del(eb->action);
if (eb->params) eina_stringshare_del(eb->params);
@ -4736,7 +4736,7 @@ break;
#elif (TYPE == E_WM_IN)
STRING2(actionName, paramList, e_2str, HDL);
{
Evas_List *m;
Eina_List *m;
E_Manager *man;
E_Action *act;
@ -5156,7 +5156,7 @@ break;
#elif (TYPE == E_WM_IN)
GENERIC(HDL);
ENCODE_START();
Evas_List *profiles;
Eina_List *profiles;
profiles = e_config_profile_list();
ENCODE(profiles, e_ipc_codec_str_list_enc);
SEND_DATA(E_IPC_OP_PROFILE_LIST_REPLY);
@ -5299,7 +5299,7 @@ break;
REQ_INT(atoi(params[0]), HDL);
#elif (TYPE == E_WM_IN)
START_INT(val, HDL);
Evas_List *ml;
Eina_List *ml;
e_config->use_e_cursor = val;
E_CONFIG_LIMIT(e_config->use_e_cursor, 0, 1);
for (ml = e_manager_list(); ml; ml = ml->next)
@ -5740,7 +5740,7 @@ break;
#elif (TYPE == E_WM_IN)
GENERIC(HDL);
ENCODE_START();
Evas_List *iml;
Eina_List *iml;
iml = e_intl_input_method_list();
ENCODE(iml, e_ipc_codec_str_list_enc);
SEND_DATA(E_IPC_OP_IM_LIST_REPLY);
@ -5964,7 +5964,7 @@ break;
{
int count;
RESPONSE(r, E_Response_Binding_Signal_List);
count = evas_list_count(dat);
count = eina_list_count(dat);
r->bindings = malloc(sizeof(E_Response_Binding_Signal_Data *) * count);
r->count = count;
@ -6082,7 +6082,7 @@ break;
if (!eb)
{
eb = E_NEW(E_Config_Binding_Signal, 1);
e_config->signal_bindings = evas_list_append(e_config->signal_bindings, eb);
e_config->signal_bindings = eina_list_append(e_config->signal_bindings, eb);
eb->context = bind.context;
if (bind.signal) eb->signal = eina_stringshare_add(bind.signal);
if (bind.source) eb->source = eina_stringshare_add(bind.source);
@ -6188,7 +6188,7 @@ break;
eb = e_config_binding_signal_match(&bind);
if (eb)
{
e_config->signal_bindings = evas_list_remove(e_config->signal_bindings, eb);
e_config->signal_bindings = eina_list_remove(e_config->signal_bindings, eb);
if (eb->signal) eina_stringshare_del(eb->signal);
if (eb->source) eina_stringshare_del(eb->source);
if (eb->action) eina_stringshare_del(eb->action);
@ -6294,7 +6294,7 @@ break;
{
int count;
RESPONSE(r, E_Response_Binding_Wheel_List);
count = evas_list_count(dat);
count = eina_list_count(dat);
r->bindings = malloc(sizeof(E_Response_Binding_Wheel_Data *) * count);
r->count = count;
@ -6412,7 +6412,7 @@ break;
if (!eb)
{
eb = E_NEW(E_Config_Binding_Wheel, 1);
e_config->wheel_bindings = evas_list_append(e_config->wheel_bindings, eb);
e_config->wheel_bindings = eina_list_append(e_config->wheel_bindings, eb);
eb->context = bind.context;
eb->direction = bind.direction;
eb->z = bind.z;
@ -6518,7 +6518,7 @@ break;
eb = e_config_binding_wheel_match(&bind);
if (eb)
{
e_config->wheel_bindings = evas_list_remove(e_config->wheel_bindings, eb);
e_config->wheel_bindings = eina_list_remove(e_config->wheel_bindings, eb);
if (eb->action) eina_stringshare_del(eb->action);
if (eb->params) eina_stringshare_del(eb->params);
E_FREE(eb);
@ -6820,7 +6820,7 @@ break;
#elif (TYPE == E_WM_IN)
GENERIC(HDL);
ENCODE_START();
Evas_List *engines;
Eina_List *engines;
engines = e_config_engine_list();
ENCODE(engines, e_ipc_codec_str_list_enc);
SEND_DATA(E_IPC_OP_ENGINE_LIST_REPLY);

38
src/bin/e_layout.c
View File

@ -17,7 +17,7 @@ struct _E_Smart_Data
Evas_Object *clip;
int frozen;
unsigned char changed : 1;
Evas_List *items;
Eina_List *items;
};
struct _E_Layout_Item
@ -132,7 +132,7 @@ e_layout_pack(Evas_Object *obj, Evas_Object *child)
sd = evas_object_smart_data_get(obj);
_e_layout_smart_adopt(sd, child);
sd->items = evas_list_append(sd->items, child);
sd->items = eina_list_append(sd->items, child);
li = evas_object_data_get(child, "e_layout_data");
_e_layout_smart_move_resize_item(li);
}
@ -172,12 +172,12 @@ e_layout_child_lower(Evas_Object *obj)
li = evas_object_data_get(obj, "e_layout_data");
if (!li) return;
if (!evas_list_find(li->sd->items, obj)) return;
if (!eina_list_data_find(li->sd->items, obj)) return;
if ((li->sd->items) && (li->sd->items->next))
{
li->sd->items = evas_list_remove(li->sd->items, obj);
li->sd->items = eina_list_remove(li->sd->items, obj);
evas_object_lower(obj);
li->sd->items = evas_list_prepend(li->sd->items, obj);
li->sd->items = eina_list_prepend(li->sd->items, obj);
}
}
@ -188,12 +188,12 @@ e_layout_child_raise(Evas_Object *obj)
li = evas_object_data_get(obj, "e_layout_data");
if (!li) return;
if (!evas_list_find(li->sd->items, obj)) return;
if (!eina_list_data_find(li->sd->items, obj)) return;
if ((li->sd->items) && (li->sd->items->next))
{
li->sd->items = evas_list_remove(li->sd->items, obj);
li->sd->items = eina_list_remove(li->sd->items, obj);
evas_object_raise(obj);
li->sd->items = evas_list_append(li->sd->items, obj);
li->sd->items = eina_list_append(li->sd->items, obj);
}
}
@ -204,13 +204,13 @@ e_layout_child_lower_below(Evas_Object *obj, Evas_Object *below)
li = evas_object_data_get(obj, "e_layout_data");
if (!li) return;
if (!evas_list_find(li->sd->items, below)) return;
if (!evas_list_find(li->sd->items, obj)) return;
if (!eina_list_data_find(li->sd->items, below)) return;
if (!eina_list_data_find(li->sd->items, obj)) return;
if ((li->sd->items) && (li->sd->items->next))
{
li->sd->items = evas_list_remove(li->sd->items, obj);
li->sd->items = eina_list_remove(li->sd->items, obj);
evas_object_stack_below(obj, below);
li->sd->items = evas_list_prepend_relative(li->sd->items, obj, below);
li->sd->items = eina_list_prepend_relative(li->sd->items, obj, below);
}
}
@ -221,13 +221,13 @@ e_layout_child_raise_above(Evas_Object *obj, Evas_Object *above)
li = evas_object_data_get(obj, "e_layout_data");
if (!li) return;
if (!evas_list_find(li->sd->items, above)) return;
if (!evas_list_find(li->sd->items, obj)) return;
if (!eina_list_data_find(li->sd->items, above)) return;
if (!eina_list_data_find(li->sd->items, obj)) return;
if ((li->sd->items) && (li->sd->items->next))
{
li->sd->items = evas_list_remove(li->sd->items, obj);
li->sd->items = eina_list_remove(li->sd->items, obj);
evas_object_stack_above(obj, above);
li->sd->items = evas_list_append_relative(li->sd->items, obj, above);
li->sd->items = eina_list_append_relative(li->sd->items, obj, above);
}
}
@ -254,7 +254,7 @@ e_layout_unpack(Evas_Object *obj)
li = evas_object_data_get(obj, "e_layout_data");
if (!li) return;
sd = li->sd;
sd->items = evas_list_remove(sd->items, obj);
sd->items = eina_list_remove(sd->items, obj);
_e_layout_smart_disown(obj);
}
@ -314,7 +314,7 @@ static void
_e_layout_smart_reconfigure(E_Smart_Data *sd)
{
Evas_Coord x, y, w, h;
Evas_List *l;
Eina_List *l;
if (!sd->changed) return;
@ -421,7 +421,7 @@ _e_layout_smart_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
if ((x == sd->x) && (y == sd->y)) return;
if ((x == sd->x) && (y == sd->y)) return;
{
Evas_List *l;
Eina_List *l;
Evas_Coord dx, dy;
dx = x - sd->x;

16
src/bin/e_main.c
View File

@ -87,7 +87,7 @@ static int (*_e_main_shutdown_func[MAX_LEVEL]) (void);
static int _e_main_level = 0;
static int _e_cacheburst = 0;
static Evas_List *_e_main_idler_before_list = NULL;
static Eina_List *_e_main_idler_before_list = NULL;
static Ecore_Idle_Enterer *_e_main_idle_enterer_before = NULL;
static Ecore_Idle_Enterer *_e_main_idle_enterer_after = NULL;
@ -1033,7 +1033,7 @@ e_main_idler_before_add(int (*func) (void *data), void *data, int once)
eb->func = func;
eb->data = data;
eb->once = once;
_e_main_idler_before_list = evas_list_append(_e_main_idler_before_list, eb);
_e_main_idler_before_list = eina_list_append(_e_main_idler_before_list, eb);
return eb;
}
@ -1493,7 +1493,7 @@ _e_main_cb_x_flusher(void *data __UNUSED__)
static int
_e_main_cb_idler_before(void *data __UNUSED__)
{
Evas_List *l, *pl;
Eina_List *l, *pl;
e_menu_idler_before();
e_focus_idler_before();
@ -1521,7 +1521,7 @@ _e_main_cb_idler_before(void *data __UNUSED__)
if ((eb->once) || (eb->delete_me))
{
_e_main_idler_before_list =
evas_list_remove_list(_e_main_idler_before_list, pl);
eina_list_remove_list(_e_main_idler_before_list, pl);
free(eb);
}
}
@ -1568,21 +1568,21 @@ _e_main_cb_startup_fake_end(void *data __UNUSED__)
static void
_e_main_desk_save(void)
{
Evas_List *ml;
Eina_List *ml;
char env[1024];
char name[1024];
for (ml = e_manager_list(); ml; ml = ml->next)
{
E_Manager *man;
Evas_List *cl;
Eina_List *cl;
man = ml->data;
for (cl = man->containers; cl; cl = cl->next)
{
E_Container *con;
Evas_List *zl;
Eina_List *zl;
con = cl->data;
@ -1603,7 +1603,7 @@ _e_main_desk_save(void)
static void
_e_main_desk_restore(E_Manager *man, E_Container *con)
{
Evas_List *zl;
Eina_List *zl;
char *env;
char name[1024];

52
src/bin/e_manager.c
View File

@ -43,7 +43,7 @@ struct _Frame_Extents
int l, r, t, b;
};
static Evas_List *managers = NULL;
static Eina_List *managers = NULL;
static Evas_Hash *frame_extents = NULL;
/* externally accessible functions */
@ -57,14 +57,14 @@ e_manager_init(void)
EAPI int
e_manager_shutdown(void)
{
Evas_List *l;
Eina_List *l;
l = managers;
managers = NULL;
while (l)
{
e_object_del(E_OBJECT(l->data));
l = evas_list_remove_list(l, l);
l = eina_list_remove_list(l, l);
}
if (frame_extents)
{
@ -75,7 +75,7 @@ e_manager_shutdown(void)
return 1;
}
EAPI Evas_List *
EAPI Eina_List *
e_manager_list(void)
{
return managers;
@ -90,7 +90,7 @@ e_manager_new(Ecore_X_Window root, int num)
if (!ecore_x_window_manage(root)) return NULL;
man = E_OBJECT_ALLOC(E_Manager, E_MANAGER_TYPE, _e_manager_free);
if (!man) return NULL;
managers = evas_list_append(managers, man);
managers = eina_list_append(managers, man);
man->root = root;
man->num = num;
ecore_x_window_size_get(man->root, &(man->w), &(man->h));
@ -130,21 +130,21 @@ e_manager_new(Ecore_X_Window root, int num)
}
h = ecore_event_handler_add(ECORE_X_EVENT_WINDOW_SHOW_REQUEST, _e_manager_cb_window_show_request, man);
if (h) man->handlers = evas_list_append(man->handlers, h);
if (h) man->handlers = eina_list_append(man->handlers, h);
h = ecore_event_handler_add(ECORE_X_EVENT_WINDOW_CONFIGURE, _e_manager_cb_window_configure, man);
if (h) man->handlers = evas_list_append(man->handlers, h);
if (h) man->handlers = eina_list_append(man->handlers, h);
h = ecore_event_handler_add(ECORE_X_EVENT_KEY_DOWN, _e_manager_cb_key_down, man);
if (h) man->handlers = evas_list_append(man->handlers, h);
if (h) man->handlers = eina_list_append(man->handlers, h);
h = ecore_event_handler_add(ECORE_X_EVENT_KEY_UP, _e_manager_cb_key_up, man);
if (h) man->handlers = evas_list_append(man->handlers, h);
if (h) man->handlers = eina_list_append(man->handlers, h);
h = ecore_event_handler_add(ECORE_X_EVENT_FRAME_EXTENTS_REQUEST, _e_manager_cb_frame_extents_request, man);
if (h) man->handlers = evas_list_append(man->handlers, h);
if (h) man->handlers = eina_list_append(man->handlers, h);
h = ecore_event_handler_add(ECORE_X_EVENT_PING, _e_manager_cb_ping, man);
if (h) man->handlers = evas_list_append(man->handlers, h);
if (h) man->handlers = eina_list_append(man->handlers, h);
h = ecore_event_handler_add(ECORE_X_EVENT_SCREENSAVER_NOTIFY, _e_manager_cb_screensaver_notify, man);
if (h) man->handlers = evas_list_append(man->handlers, h);
if (h) man->handlers = eina_list_append(man->handlers, h);
h = ecore_event_handler_add(ECORE_X_EVENT_CLIENT_MESSAGE, _e_manager_cb_client_message, man);
if (h) man->handlers = evas_list_append(man->handlers, h);
if (h) man->handlers = eina_list_append(man->handlers, h);
man->pointer = e_pointer_window_new(man->root, 1);
@ -310,7 +310,7 @@ e_manager_manage_windows(E_Manager *man)
EAPI void
e_manager_show(E_Manager *man)
{
Evas_List *l;
Eina_List *l;
E_OBJECT_CHECK(man);
E_OBJECT_TYPE_CHECK(man, E_MANAGER_TYPE);
@ -344,7 +344,7 @@ e_manager_show(E_Manager *man)
EAPI void
e_manager_hide(E_Manager *man)
{
Evas_List *l;
Eina_List *l;
E_OBJECT_CHECK(man);
E_OBJECT_TYPE_CHECK(man, E_MANAGER_TYPE);
@ -378,7 +378,7 @@ e_manager_move(E_Manager *man, int x, int y)
EAPI void
e_manager_resize(E_Manager *man, int w, int h)
{
Evas_List *l;
Eina_List *l;
E_OBJECT_CHECK(man);
E_OBJECT_TYPE_CHECK(man, E_MANAGER_TYPE);
@ -402,7 +402,7 @@ e_manager_resize(E_Manager *man, int w, int h)
EAPI void
e_manager_move_resize(E_Manager *man, int x, int y, int w, int h)
{
Evas_List *l;
Eina_List *l;
E_OBJECT_CHECK(man);
E_OBJECT_TYPE_CHECK(man, E_MANAGER_TYPE);
@ -459,7 +459,7 @@ e_manager_lower(E_Manager *man)
EAPI E_Manager *
e_manager_current_get(void)
{
Evas_List *l;
Eina_List *l;
E_Manager *man;
int x, y;
@ -479,7 +479,7 @@ e_manager_current_get(void)
EAPI E_Manager *
e_manager_number_get(int num)
{
Evas_List *l;
Eina_List *l;
E_Manager *man;
if (!managers) return NULL;
@ -495,7 +495,7 @@ e_manager_number_get(int num)
EAPI void
e_managers_keys_grab(void)
{
Evas_List *l;
Eina_List *l;
for (l = managers; l; l = l->next)
{
@ -509,7 +509,7 @@ e_managers_keys_grab(void)
EAPI void
e_managers_keys_ungrab(void)
{
Evas_List *l;
Eina_List *l;
for (l = managers; l; l = l->next)
{
@ -524,14 +524,14 @@ e_managers_keys_ungrab(void)
static void
_e_manager_free(E_Manager *man)
{
Evas_List *l;
Eina_List *l;
while (man->handlers)
{
Ecore_Event_Handler *h;
h = man->handlers->data;
man->handlers = evas_list_remove_list(man->handlers, man->handlers);
man->handlers = eina_list_remove_list(man->handlers, man->handlers);
ecore_event_handler_del(h);
}
l = man->containers;
@ -539,14 +539,14 @@ _e_manager_free(E_Manager *man)
while (l)
{
e_object_del(E_OBJECT(l->data));
l = evas_list_remove_list(l, l);
l = eina_list_remove_list(l, l);
}
if (man->root != man->win)
{
ecore_x_window_del(man->win);
}
if (man->pointer) e_object_del(E_OBJECT(man->pointer));
managers = evas_list_remove(managers, man);
managers = eina_list_remove(managers, man);
free(man);
}
@ -866,7 +866,7 @@ _e_manager_frame_extents_free_cb(const Evas_Hash *hash __UNUSED__, const char *k
static E_Manager *
_e_manager_get_for_root(Ecore_X_Window root)
{
Evas_List *l;
Eina_List *l;
E_Manager *man;
if (!managers) return NULL;

6
src/bin/e_manager.h
View File

@ -20,8 +20,8 @@ struct _E_Manager
int x, y, w, h;
char visible : 1;
Ecore_X_Window root;
Evas_List *handlers;
Evas_List *containers;
Eina_List *handlers;
Eina_List *containers;
E_Pointer *pointer;
Ecore_X_Window initwin;
@ -29,7 +29,7 @@ struct _E_Manager
EAPI int e_manager_init(void);
EAPI int e_manager_shutdown(void);
EAPI Evas_List *e_manager_list(void);
EAPI Eina_List *e_manager_list(void);
EAPI E_Manager *e_manager_new(Ecore_X_Window root, int num);
EAPI void e_manager_manage_windows(E_Manager *man);

32
src/bin/e_maximize.c
View File

@ -14,13 +14,13 @@ struct _E_Maximize_Rect
{ \
r = E_NEW(E_Maximize_Rect, 1); \
r->x1 = (_x1); r->y1 = (_y1); r->x2 = (_x2); r->y2 = (_y2); \
rects = evas_list_append(rects, r); \
rects = eina_list_append(rects, r); \
}
static void _e_maximize_border_rects_fill(E_Border *bd, Evas_List *list, int *x1, int *y1, int *x2, int *y2, E_Maximize dir);
static void _e_maximize_border_rects_fill_both(E_Border *bd, Evas_List *rects, int *x1, int *y1, int *x2, int *y2);
static void _e_maximize_border_rects_fill_horiz(E_Border *bd, Evas_List *rects, int *x1, int *x2, int *bx, int *by, int *bw, int *bh);
static void _e_maximize_border_rects_fill_vert(E_Border *bd, Evas_List *rects, int *y1, int *y2, int *bx, int *by, int *bw, int *bh);
static void _e_maximize_border_rects_fill(E_Border *bd, Eina_List *list, int *x1, int *y1, int *x2, int *y2, E_Maximize dir);
static void _e_maximize_border_rects_fill_both(E_Border *bd, Eina_List *rects, int *x1, int *y1, int *x2, int *y2);
static void _e_maximize_border_rects_fill_horiz(E_Border *bd, Eina_List *rects, int *x1, int *x2, int *bx, int *by, int *bw, int *bh);
static void _e_maximize_border_rects_fill_vert(E_Border *bd, Eina_List *rects, int *y1, int *y2, int *bx, int *by, int *bw, int *bh);
EAPI void
e_maximize_border_shelf_fit(E_Border *bd, int *x1, int *y1, int *x2, int *y2, E_Maximize dir)
@ -127,13 +127,13 @@ e_maximize_border_dock_fit(E_Border *bd, int *x1, int *y1, int *x2, int *y2)
EAPI void
e_maximize_border_shelf_fill(E_Border *bd, int *x1, int *y1, int *x2, int *y2, E_Maximize dir)
{
Evas_List *l, *rects = NULL;
Eina_List *l, *rects = NULL;
E_Maximize_Rect *r;
for (l = e_shelf_list(); l; l = l->next)
{
E_Shelf *es;
Evas_List *ll;
Eina_List *ll;
es = l->data;
if (es->cfg->overlap) continue;
@ -165,14 +165,14 @@ e_maximize_border_shelf_fill(E_Border *bd, int *x1, int *y1, int *x2, int *y2, E
_e_maximize_border_rects_fill(bd, rects, x1, y1, x2, y2, dir);
for (l = rects; l; l = l->next)
free(l->data);
evas_list_free(rects);
eina_list_free(rects);
}
}
EAPI void
e_maximize_border_border_fill(E_Border *bd, int *x1, int *y1, int *x2, int *y2, E_Maximize dir)
{
Evas_List *l, *rects = NULL;
Eina_List *l, *rects = NULL;
E_Border_List *bl;
E_Maximize_Rect *r;
E_Border *bd2;
@ -190,12 +190,12 @@ e_maximize_border_border_fill(E_Border *bd, int *x1, int *y1, int *x2, int *y2,
_e_maximize_border_rects_fill(bd, rects, x1, y1, x2, y2, dir);
for (l = rects; l; l = l->next)
free(l->data);
evas_list_free(rects);
eina_list_free(rects);
}
}
static void
_e_maximize_border_rects_fill(E_Border *bd, Evas_List *rects, int *x1, int *y1, int *x2, int *y2, E_Maximize dir)
_e_maximize_border_rects_fill(E_Border *bd, Eina_List *rects, int *x1, int *y1, int *x2, int *y2, E_Maximize dir)
{
if ((dir & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_BOTH)
{
@ -218,7 +218,7 @@ _e_maximize_border_rects_fill(E_Border *bd, Evas_List *rects, int *x1, int *y1,
}
static void
_e_maximize_border_rects_fill_both(E_Border *bd, Evas_List *rects, int *x1, int *y1, int *x2, int *y2)
_e_maximize_border_rects_fill_both(E_Border *bd, Eina_List *rects, int *x1, int *y1, int *x2, int *y2)
{
int hx1, hy1, hx2, hy2;
int vx1, vy1, vx2, vy2;
@ -270,9 +270,9 @@ _e_maximize_border_rects_fill_both(E_Border *bd, Evas_List *rects, int *x1, int
}
static void
_e_maximize_border_rects_fill_horiz(E_Border *bd, Evas_List *rects, int *x1, int *x2, int *bx, int *by, int *bw, int *bh)
_e_maximize_border_rects_fill_horiz(E_Border *bd, Eina_List *rects, int *x1, int *x2, int *bx, int *by, int *bw, int *bh)
{
Evas_List *l;
Eina_List *l;
int cx1, cx2;
cx1 = bd->zone->x;
@ -315,9 +315,9 @@ _e_maximize_border_rects_fill_horiz(E_Border *bd, Evas_List *rects, int *x1, int
}
static void
_e_maximize_border_rects_fill_vert(E_Border *bd, Evas_List *rects, int *y1, int *y2, int *bx, int *by, int *bw, int *bh)
_e_maximize_border_rects_fill_vert(E_Border *bd, Eina_List *rects, int *y1, int *y2, int *bx, int *by, int *bw, int *bh)
{
Evas_List *l;
Eina_List *l;
int cy1, cy2;
cy1 = bd->zone->y;

116
src/bin/e_menu.c
View File

@ -29,7 +29,7 @@ typedef struct _E_Menu_Category E_Menu_Category;
struct _E_Menu_Category
{
void *data;
Evas_List *callbacks;
Eina_List *callbacks;
};
/* local subsystem functions */
@ -63,7 +63,7 @@ static void _e_menu_activate_nth (int n);
#endif
static E_Menu *_e_menu_active_get (void);
static E_Menu_Item *_e_menu_item_active_get (void);
static Evas_List * _e_menu_list_item_active_get (void);
static Eina_List * _e_menu_list_item_active_get (void);
static int _e_menu_outside_bounds_get (int xdir, int ydir);
static void _e_menu_scroll_by (int dx, int dy);
static void _e_menu_mouse_autoscroll_check (void);
@ -90,7 +90,7 @@ static Evas_Bool _e_menu_categories_free_cb(const Evas_Hash *hash, const char *k
/* local subsystem globals */
static Ecore_X_Window _e_menu_win = 0;
static Evas_List *_e_active_menus = NULL;
static Eina_List *_e_active_menus = NULL;
static E_Menu_Item *_e_active_menu_item = NULL;
/*static Evas_Hash *_e_menu_category_items = NULL;*/
static Evas_Hash *_e_menu_categories = NULL;
@ -145,7 +145,7 @@ e_menu_shutdown(void)
m = _e_active_menus->data;
m->active = 0;
_e_menu_unrealize(m);
_e_active_menus = evas_list_remove_list(_e_active_menus, _e_active_menus);
_e_active_menus = eina_list_remove_list(_e_active_menus, _e_active_menus);
m->in_active_list = 0;
e_object_unref(E_OBJECT(m));
@ -471,7 +471,7 @@ e_menu_category_callback_add(char *category, void (*create) (E_Menu *m, void *ca
cb->create = create;
cb->free = free;
cb->category = eina_stringshare_add(category);
cat->callbacks = evas_list_append(cat->callbacks, cb);
cat->callbacks = eina_list_append(cat->callbacks, cb);
}
}
return cb;
@ -486,7 +486,7 @@ e_menu_category_callback_del(E_Menu_Category_Callback *cb)
{
cat = evas_hash_find(_e_menu_categories, cb->category);
if (cat)
cat->callbacks = evas_list_remove(cat->callbacks, cb);
cat->callbacks = eina_list_remove(cat->callbacks, cb);
eina_stringshare_del(cb->category);
free(cb);
}
@ -535,8 +535,8 @@ e_menu_item_new(E_Menu *m)
E_OBJECT_TYPE_CHECK_RETURN(m, E_MENU_TYPE, NULL);
mi = E_OBJECT_ALLOC(E_Menu_Item, E_MENU_ITEM_TYPE, _e_menu_item_free);
mi->menu = m;
mi->menu->items = evas_list_append(mi->menu->items, mi);
mi->list_position = evas_list_last(mi->menu->items);
mi->menu->items = eina_list_append(mi->menu->items, mi);
mi->list_position = eina_list_last(mi->menu->items);
return mi;
}
@ -545,13 +545,13 @@ e_menu_item_nth(E_Menu *m, int n)
{
E_OBJECT_CHECK_RETURN(m, NULL);
E_OBJECT_TYPE_CHECK_RETURN(m, E_MENU_TYPE, NULL);
return (E_Menu_Item *)evas_list_nth(m->items, n);
return (E_Menu_Item *)eina_list_nth(m->items, n);
}
EAPI int
e_menu_item_num_get(E_Menu_Item *mi)
{
Evas_List *l;
Eina_List *l;
int i;
E_OBJECT_CHECK_RETURN(mi, -1);
@ -719,7 +719,7 @@ e_menu_item_toggle_set(E_Menu_Item *mi, int tog)
{
if (mi->radio)
{
Evas_List *l;
Eina_List *l;
for (l = mi->menu->items; l; l = l->next)
{
@ -847,12 +847,12 @@ e_menu_idler_before(void)
/* when e goes "idle" this gets called so leave all our hard work till */
/* idle time to avoid falling behind the user. just evaluate the high */
/* level state machine */
Evas_List *l, *removals = NULL, *tmp = NULL;
Eina_List *l, *removals = NULL, *tmp = NULL;
/* add refcount to all menus we will work with */
for (l = _e_active_menus; l; l = l->next)
{
tmp = evas_list_append(tmp, l->data);
tmp = eina_list_append(tmp, l->data);
e_object_ref(E_OBJECT(l->data));
}
/* phase 1. hide all the menus that want to be hidden */
@ -919,7 +919,7 @@ e_menu_idler_before(void)
if (!m->active)
{
_e_menu_unrealize(m);
removals = evas_list_append(removals, m);
removals = eina_list_append(removals, m);
}
}
while (removals)
@ -927,10 +927,10 @@ e_menu_idler_before(void)
E_Menu *m;
m = removals->data;
removals = evas_list_remove(removals, m);
removals = eina_list_remove(removals, m);
if (m->in_active_list)
{
_e_active_menus = evas_list_remove(_e_active_menus, m);
_e_active_menus = eina_list_remove(_e_active_menus, m);
m->in_active_list = 0;
e_object_unref(E_OBJECT(m));
}
@ -996,7 +996,7 @@ e_menu_idler_before(void)
while (tmp)
{
e_object_unref(E_OBJECT(tmp->data));
tmp = evas_list_remove_list(tmp, tmp);
tmp = eina_list_remove_list(tmp, tmp);
}
if (!_e_active_menus)
{
@ -1019,7 +1019,7 @@ e_menu_grab_window_get(void)
static void
_e_menu_free(E_Menu *m)
{
Evas_List *l, *tmp;
Eina_List *l, *tmp;
E_Menu_Category *cat;
/* the foreign menu items */
@ -1045,7 +1045,7 @@ _e_menu_free(E_Menu *m)
}
if (m->in_active_list)
{
_e_active_menus = evas_list_remove(_e_active_menus, m);
_e_active_menus = eina_list_remove(_e_active_menus, m);
m->in_active_list = 0;
e_object_unref(E_OBJECT(m));
}
@ -1064,7 +1064,7 @@ _e_menu_item_free(E_Menu_Item *mi)
e_object_unref(E_OBJECT(mi->submenu));
}
if (mi->menu->realized) _e_menu_item_unrealize(mi);
mi->menu->items = evas_list_remove(mi->menu->items, mi);
mi->menu->items = eina_list_remove(mi->menu->items, mi);
if (mi->icon) eina_stringshare_del(mi->icon);
if (mi->icon_key) eina_stringshare_del(mi->icon_key);
if (mi->label) eina_stringshare_del(mi->label);
@ -1367,7 +1367,7 @@ static void
_e_menu_realize(E_Menu *m)
{
Evas_Object *o;
Evas_List *l;
Eina_List *l;
int ok;
@ -1459,7 +1459,7 @@ _e_menu_realize(E_Menu *m)
static void
_e_menu_items_layout_update(E_Menu *m)
{
Evas_List *l;
Eina_List *l;
Evas_Coord bw, bh, mw, mh;
int toggles_on = 0;
int icons_on = 0;
@ -1682,7 +1682,7 @@ _e_menu_item_unrealize(E_Menu_Item *mi)
static void
_e_menu_unrealize(E_Menu *m)
{
Evas_List *l;
Eina_List *l;
if (!m->realized) return;
evas_event_freeze(m->evas);
@ -1718,7 +1718,7 @@ _e_menu_unrealize(E_Menu *m)
static void
_e_menu_activate_internal(E_Menu *m, E_Zone *zone)
{
Evas_List *l;
Eina_List *l;
E_Menu_Category *cat;
if (m->pre_activate_cb.func)
@ -1750,11 +1750,11 @@ _e_menu_activate_internal(E_Menu *m, E_Zone *zone)
/* been removed from the list yet */
if (m->in_active_list)
{
_e_active_menus = evas_list_remove(_e_active_menus, m);
_e_active_menus = eina_list_remove(_e_active_menus, m);
m->in_active_list = 0;
e_object_unref(E_OBJECT(m));
}
_e_active_menus = evas_list_append(_e_active_menus, m);
_e_active_menus = eina_list_append(_e_active_menus, m);
m->in_active_list = 1;
m->active = 1;
e_object_ref(E_OBJECT(m));
@ -1777,19 +1777,19 @@ _e_menu_activate_internal(E_Menu *m, E_Zone *zone)
static void
_e_menu_deactivate_all(void)
{
Evas_List *l, *tmp = NULL;
Eina_List *l, *tmp = NULL;
for (l = _e_active_menus; l; l = l->next)
{
e_object_ref(E_OBJECT(l->data));
tmp = evas_list_append(tmp, l->data);
tmp = eina_list_append(tmp, l->data);
}
while (tmp)
{
E_Menu *m;
m = tmp->data;
tmp = evas_list_remove_list(tmp, tmp);
tmp = eina_list_remove_list(tmp, tmp);
e_menu_deactivate(m);
m->parent_item = NULL;
e_object_unref(E_OBJECT(m));
@ -1802,20 +1802,20 @@ _e_menu_deactivate_all(void)
static void
_e_menu_deactivate_above(E_Menu *ma)
{
Evas_List *l, *tmp = NULL;
Eina_List *l, *tmp = NULL;
int above = 0;
for (l = _e_active_menus; l; l = l->next)
{
e_object_ref(E_OBJECT(l->data));
tmp = evas_list_append(tmp, l->data);
tmp = eina_list_append(tmp, l->data);
}
while (tmp)
{
E_Menu *m;
m = tmp->data;
tmp = evas_list_remove_list(tmp, tmp);
tmp = eina_list_remove_list(tmp, tmp);
if (above)
{
e_menu_deactivate(m);
@ -1863,7 +1863,7 @@ _e_menu_submenu_deactivate(E_Menu_Item *mi)
static void
_e_menu_reposition(E_Menu *m)
{
Evas_List *l, *tmp = NULL;
Eina_List *l, *tmp = NULL;
int parent_item_bottom;
if (!m->parent_item) return;
@ -1894,7 +1894,7 @@ _e_menu_reposition(E_Menu *m)
/* FIXME: this will suck for big menus */
for (l = _e_active_menus; l; l = l->next)
{
tmp = evas_list_append(tmp, l->data);
tmp = eina_list_append(tmp, l->data);
e_object_ref(E_OBJECT(l->data));
}
for (l = m->items; l; l = l->next)
@ -1907,7 +1907,7 @@ _e_menu_reposition(E_Menu *m)
while (tmp)
{
e_object_unref(E_OBJECT(tmp->data));
tmp = evas_list_remove_list(tmp, tmp);
tmp = eina_list_remove_list(tmp, tmp);
}
}
@ -1949,7 +1949,7 @@ static void
_e_menu_item_activate_next(void)
{
E_Menu_Item *mi;
Evas_List *ll;
Eina_List *ll;
ll = _e_menu_list_item_active_get();
mi = _e_menu_item_active_get();
@ -1983,7 +1983,7 @@ static void
_e_menu_item_activate_previous(void)
{
E_Menu_Item *mi;
Evas_List *ll;
Eina_List *ll;
ll = _e_menu_list_item_active_get();
mi = _e_menu_item_active_get();
@ -1992,14 +1992,14 @@ _e_menu_item_activate_previous(void)
/* Look at the prev item and then cycle until we're not on
* a separator. */
if (!(ll->prev))
ll = evas_list_last(ll);
ll = eina_list_last(ll);
else
ll = ll->prev;
mi = ll->data;
while (mi->separator)
{
if (!(ll->prev))
ll = evas_list_last(ll);
ll = eina_list_last(ll);
else
ll = ll->prev;
mi = ll->data;
@ -2017,7 +2017,7 @@ static void
_e_menu_item_activate_first(void)
{
E_Menu *m;
Evas_List *ll;
Eina_List *ll;
E_Menu_Item *mi;
m = _e_menu_active_get();
@ -2042,13 +2042,13 @@ static void
_e_menu_item_activate_last(void)
{
E_Menu *m;
Evas_List *ll;
Eina_List *ll;
E_Menu_Item *mi;
m = _e_menu_active_get();
if (m)
{
ll = evas_list_last(m->items);
ll = eina_list_last(m->items);
mi = ll->data;
while ((mi->separator) && (ll->prev))
{
@ -2068,7 +2068,7 @@ _e_menu_item_activate_nth(int n)
{
E_Menu *m;
E_Menu_Item *mi;
Evas_List *ll;
Eina_List *ll;
int i;
mi = _e_menu_item_active_get();
@ -2094,7 +2094,7 @@ _e_menu_item_activate_char(char * key_compose)
{
E_Menu *m;
E_Menu_Item *mi;
Evas_List *ll, *ll_orig;
Eina_List *ll, *ll_orig;
/* Ignore modifiers and such. */
if (!key_compose) return;
@ -2204,7 +2204,7 @@ _e_menu_activate_first(void)
{
E_Menu *m;
E_Menu_Item *mi;
Evas_List *ll;
Eina_List *ll;
if (!_e_active_menus) return;
m = _e_active_menus->data;
@ -2226,12 +2226,12 @@ _e_menu_activate_last(void)
{
E_Menu *m;
E_Menu_Item *mi;
Evas_List *ll;
Eina_List *ll;
if (!_e_active_menus) return;
m = _e_active_menus->data;
if (!m->items) return;
ll = evas_list_last(m->items);
ll = eina_list_last(m->items);
mi = ll->data;
while ((mi->separator) && (ll->prev))
{
@ -2249,7 +2249,7 @@ _e_menu_activate_nth(int n)
{
E_Menu *m;
E_Menu_Item *mi;
Evas_List *ll;
Eina_List *ll;
int i;
mi = _e_menu_item_active_get();
@ -2289,7 +2289,7 @@ _e_menu_item_active_get(void)
return _e_active_menu_item;
}
static Evas_List *
static Eina_List *
_e_menu_list_item_active_get(void)
{
if (_e_active_menu_item)
@ -2301,7 +2301,7 @@ _e_menu_list_item_active_get(void)
static int
_e_menu_outside_bounds_get(int xdir, int ydir)
{
Evas_List *l;
Eina_List *l;
int outl = 0;
int outr = 0;
int outt = 0;
@ -2356,7 +2356,7 @@ _e_menu_outside_bounds_get(int xdir, int ydir)
static void
_e_menu_scroll_by(int dx, int dy)
{
Evas_List *l;
Eina_List *l;
for (l = _e_active_menus; l; l = l->next)
{
@ -2706,7 +2706,7 @@ static int
_e_menu_cb_mouse_move(void *data, int type, void *event)
{
Ecore_X_Event_Mouse_Move *ev;
Evas_List *l, *tmp = NULL;
Eina_List *l, *tmp = NULL;
int dx, dy, d;
double dt;
double fast_move_threshold;
@ -2725,7 +2725,7 @@ _e_menu_cb_mouse_move(void *data, int type, void *event)
for (l = _e_active_menus; l; l = l->next)
{
tmp = evas_list_append(tmp, l->data);
tmp = eina_list_append(tmp, l->data);
e_object_ref(E_OBJECT(l->data));
}
for (l = _e_active_menus; l; l = l->next)
@ -2759,7 +2759,7 @@ _e_menu_cb_mouse_move(void *data, int type, void *event)
while (tmp)
{
e_object_unref(E_OBJECT(tmp->data));
tmp = evas_list_remove_list(tmp, tmp);
tmp = eina_list_remove_list(tmp, tmp);
}
_e_menu_x = ev->x;
@ -2846,7 +2846,7 @@ _e_menu_cb_scroll_animator(void *data)
static int
_e_menu_cb_window_shape(void *data, int ev_type, void *ev)
{
Evas_List *l;
Eina_List *l;
Ecore_X_Event_Window_Shape *e;
e = ev;
@ -2877,15 +2877,15 @@ _e_menu_cb_item_submenu_post_default(void *data, E_Menu *m, E_Menu_Item *mi)
static Evas_Bool
_e_menu_categories_free_cb(const Evas_Hash *hash, const char *key, void *data, void *fdata)
{
Evas_List *l;
Eina_List *l;
E_Menu_Category *cat;
cat = (E_Menu_Category *) data;
l = (Evas_List *) cat->callbacks;
l = (Eina_List *) cat->callbacks;
while (l)
{
free(l->data); /* free the callback struct */
l = evas_list_remove_list(l, l);
l = eina_list_remove_list(l, l);
}
free(cat);
return 1;

4
src/bin/e_menu.h
View File

@ -43,7 +43,7 @@ struct _E_Menu
Evas_Object *icon;
} header;
Evas_List *items;
Eina_List *items;
/* the zone it belongs to */
E_Zone *zone;
@ -101,7 +101,7 @@ struct _E_Menu_Item
Evas_Object *event_object;
Evas_List *list_position;
Eina_List *list_position;
int label_w, label_h;
int icon_w, icon_h;

46
src/bin/e_module.c
View File

@ -19,9 +19,9 @@ static int _e_module_cb_idler(void *data);
static int _e_module_sort_priority(void *d1, void *d2);
/* local subsystem globals */
static Evas_List *_e_modules = NULL;
static Eina_List *_e_modules = NULL;
static Ecore_Idler *_e_module_idler = NULL;
static Evas_List *_e_modules_delayed = NULL;
static Eina_List *_e_modules_delayed = NULL;
EAPI int E_EVENT_MODULE_UPDATE = 0;
@ -36,7 +36,7 @@ e_module_init(void)
EAPI int
e_module_shutdown(void)
{
Evas_List *l;
Eina_List *l;
#ifdef HAVE_VALGRIND
/* do a leak check now before we dlclose() all those plugins, cause
@ -45,7 +45,7 @@ e_module_shutdown(void)
VALGRIND_DO_LEAK_CHECK
#endif
_e_modules = evas_list_reverse(_e_modules);
_e_modules = eina_list_reverse(_e_modules);
for (l = _e_modules; l; l = l->next)
{
E_Module *m;
@ -63,7 +63,7 @@ e_module_shutdown(void)
while (l)
{
e_object_del(E_OBJECT(l->data));
l = evas_list_remove_list(l, l);
l = eina_list_remove_list(l, l);
}
return 1;
}
@ -71,9 +71,9 @@ e_module_shutdown(void)
EAPI void
e_module_all_load(void)
{
Evas_List *l;
e_config->modules = evas_list_sort(e_config->modules,
evas_list_count(e_config->modules),
Eina_List *l;
e_config->modules = eina_list_sort(e_config->modules,
eina_list_count(e_config->modules),
_e_module_sort_priority);
for (l = e_config->modules; l; l = l->next)
{
@ -87,7 +87,7 @@ e_module_all_load(void)
if (!_e_module_idler)
_e_module_idler = ecore_idler_add(_e_module_cb_idler, NULL);
_e_modules_delayed =
evas_list_append(_e_modules_delayed,
eina_list_append(_e_modules_delayed,
eina_stringshare_add(em->name));
}
else if (em->enabled)
@ -107,7 +107,7 @@ e_module_new(const char *name)
char body[4096], title[1024];
const char *modpath;
char *s;
Evas_List *l;
Eina_List *l;
int in_list = 0;
if (!name) return NULL;
@ -192,7 +192,7 @@ e_module_new(const char *name)
init_done:
_e_modules = evas_list_append(_e_modules, m);
_e_modules = eina_list_append(_e_modules, m);
m->name = eina_stringshare_add(name);
if (modpath)
{
@ -229,7 +229,7 @@ init_done:
em = E_NEW(E_Config_Module, 1);
em->name = eina_stringshare_add(m->name);
em->enabled = 0;
e_config->modules = evas_list_append(e_config->modules, em);
e_config->modules = eina_list_append(e_config->modules, em);
e_config_save_queue();
}
if (modpath) eina_stringshare_del(modpath);
@ -256,7 +256,7 @@ e_module_dir_get(E_Module *m)
EAPI int
e_module_enable(E_Module *m)
{
Evas_List *l;
Eina_List *l;
E_Event_Module_Update *ev;
E_OBJECT_CHECK_RETURN(m, 0);
@ -294,7 +294,7 @@ EAPI int
e_module_disable(E_Module *m)
{
E_Event_Module_Update *ev;
Evas_List *l;
Eina_List *l;
int ret;
E_OBJECT_CHECK_RETURN(m, 0);
@ -336,7 +336,7 @@ e_module_enabled_get(E_Module *m)
EAPI int
e_module_save_all(void)
{
Evas_List *l;
Eina_List *l;
int ret = 1;
for (l = _e_modules; l; l = l->next) e_object_ref(E_OBJECT(l->data));
@ -357,7 +357,7 @@ e_module_save_all(void)
EAPI E_Module *
e_module_find(const char *name)
{
Evas_List *l;
Eina_List *l;
if (!name) return NULL;
for (l = _e_modules; l; l = l->next)
@ -370,7 +370,7 @@ e_module_find(const char *name)
return NULL;
}
EAPI Evas_List *
EAPI Eina_List *
e_module_list(void)
{
return _e_modules;
@ -429,7 +429,7 @@ e_module_dialog_show(E_Module *m, const char *title, const char *body)
EAPI void
e_module_delayed_set(E_Module *m, int delayed)
{
Evas_List *l;
Eina_List *l;
for (l = e_config->modules; l; l = l->next)
{
@ -454,7 +454,7 @@ e_module_priority_set(E_Module *m, int priority)
{
/* Set the loading order for a module.
More priority means load earlier */
Evas_List *l;
Eina_List *l;
for (l = e_config->modules; l; l = l->next)
{
@ -479,7 +479,7 @@ e_module_priority_set(E_Module *m, int priority)
static void
_e_module_free(E_Module *m)
{
Evas_List *l;
Eina_List *l;
for (l = e_config->modules; l; l = l->next)
{
@ -489,7 +489,7 @@ _e_module_free(E_Module *m)
if (!em) continue;
if (!e_util_strcmp(em->name, m->name))
{
e_config->modules = evas_list_remove(e_config->modules, em);
e_config->modules = eina_list_remove(e_config->modules, em);
if (em->name) eina_stringshare_del(em->name);
E_FREE(em);
break;
@ -504,7 +504,7 @@ _e_module_free(E_Module *m)
if (m->name) eina_stringshare_del(m->name);
if (m->dir) eina_stringshare_del(m->dir);
if (m->handle) dlclose(m->handle);
_e_modules = evas_list_remove(_e_modules, m);
_e_modules = eina_list_remove(_e_modules, m);
free(m);
}
@ -561,7 +561,7 @@ _e_module_cb_idler(void *data)
E_Module *m;
name = _e_modules_delayed->data;
_e_modules_delayed = evas_list_remove_list(_e_modules_delayed, _e_modules_delayed);
_e_modules_delayed = eina_list_remove_list(_e_modules_delayed, _e_modules_delayed);
m = NULL;
if (name) m = e_module_new(name);
if (m) e_module_enable(m);

2
src/bin/e_module.h
View File

@ -65,7 +65,7 @@ EAPI int e_module_disable(E_Module *m);
EAPI int e_module_enabled_get(E_Module *m);
EAPI int e_module_save_all(void);
EAPI E_Module *e_module_find(const char *name);
EAPI Evas_List *e_module_list(void);
EAPI Eina_List *e_module_list(void);
EAPI void e_module_dialog_show(E_Module *m, const char *title, const char *body);
EAPI void e_module_delayed_set(E_Module *m, int delayed);
EAPI void e_module_priority_set(E_Module *m, int priority);

14
src/bin/e_msg.c
View File

@ -25,8 +25,8 @@ static int _e_msg_event_cb(void *data, int ev_type, void *ev);
static void _e_msg_event_free(void *data, void *ev);
/* local subsystem globals */
static Evas_List *handlers = NULL;
static Evas_List *del_handlers = NULL;
static Eina_List *handlers = NULL;
static Eina_List *del_handlers = NULL;
static int processing_handlers = 0;
static int E_EVENT_MSG = 0;
static Ecore_Event_Handler *hand = NULL;
@ -89,7 +89,7 @@ e_msg_handler_add(void (*func) (void *data, const char *name, const char *info,
if (!emsgh) return NULL;
emsgh->func = func;
emsgh->data = data;
handlers = evas_list_append(handlers, emsgh);
handlers = eina_list_append(handlers, emsgh);
return emsgh;
}
@ -99,11 +99,11 @@ e_msg_handler_del(E_Msg_Handler *emsgh)
if (processing_handlers > 0)
{
emsgh->delete_me = 1;
del_handlers = evas_list_append(del_handlers, emsgh);
del_handlers = eina_list_append(del_handlers, emsgh);
}
else
{
handlers = evas_list_remove(handlers, emsgh);
handlers = eina_list_remove(handlers, emsgh);
free(emsgh);
}
}
@ -114,7 +114,7 @@ static int
_e_msg_event_cb(void *data, int ev_type, void *ev)
{
E_Msg_Event *e;
Evas_List *l;
Eina_List *l;
processing_handlers++;
e = ev;
@ -132,7 +132,7 @@ _e_msg_event_cb(void *data, int ev_type, void *ev)
while (del_handlers)
{
e_msg_handler_del(del_handlers->data);
del_handlers = evas_list_remove_list(del_handlers, del_handlers);
del_handlers = eina_list_remove_list(del_handlers, del_handlers);
}
}
return 1;

8
src/bin/e_msgbus.c
View File

@ -227,8 +227,8 @@ _e_msgbus_module_disable_cb(E_DBus_Object *obj, DBusMessage *msg)
static DBusMessage*
_e_msgbus_module_list_cb(E_DBus_Object *obj, DBusMessage *msg)
{
Evas_List *mod_list;
Evas_List * l;
Eina_List *mod_list;
Eina_List * l;
DBusMessage *reply;
DBusMessageIter iter;
DBusMessageIter arr;
@ -298,8 +298,8 @@ _e_msgbus_profile_get_cb(E_DBus_Object *obj, DBusMessage *msg)
static DBusMessage*
_e_msgbus_profile_list_cb(E_DBus_Object *obj, DBusMessage *msg)
{
Evas_List *profiles;
Evas_List * l;
Eina_List *profiles;
Eina_List * l;
DBusMessage *reply;
DBusMessageIter iter;
DBusMessageIter arr;

8
src/bin/e_object.c
View File

@ -251,13 +251,13 @@ void
e_object_breadcrumb_add(E_Object *obj, char *crumb)
{
E_OBJECT_CHECK(obj);
obj->crumbs = evas_list_append(obj->crumbs, strdup(crumb));
obj->crumbs = eina_list_append(obj->crumbs, strdup(crumb));
}
void
e_object_breadcrumb_del(E_Object *obj, char *crumb)
{
Evas_List *l;
Eina_List *l;
E_OBJECT_CHECK(obj);
for (l = obj->crumbs; l; l = l->next)
@ -265,7 +265,7 @@ e_object_breadcrumb_del(E_Object *obj, char *crumb)
if (!strcmp(crumb, l->data))
{
free(l->data);
obj->crumbs = evas_list_remove_list(obj->crumbs, l);
obj->crumbs = eina_list_remove_list(obj->crumbs, l);
return;
}
}
@ -274,7 +274,7 @@ e_object_breadcrumb_del(E_Object *obj, char *crumb)
void
e_object_breadcrumb_debug(E_Object *obj)
{
Evas_List *l;
Eina_List *l;
E_OBJECT_CHECK(obj);
for (l = obj->crumbs; l; l = l->next)

54
src/bin/e_order.c
View File

@ -13,14 +13,14 @@ static void _e_order_save (E_Order *eo);
static int _e_order_cb_efreet_desktop_change(void *data, int ev_type, void *ev);
static Evas_List *orders = NULL;
static Evas_List *handlers = NULL;
static Eina_List *orders = NULL;
static Eina_List *handlers = NULL;
/* externally accessible functions */
EAPI int
e_order_init(void)
{
handlers = evas_list_append(handlers, ecore_event_handler_add(EFREET_EVENT_DESKTOP_CHANGE, _e_order_cb_efreet_desktop_change, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(EFREET_EVENT_DESKTOP_CHANGE, _e_order_cb_efreet_desktop_change, NULL));
return 1;
}
@ -28,12 +28,12 @@ e_order_init(void)
EAPI int
e_order_shutdown(void)
{
orders = evas_list_free(orders);
orders = eina_list_free(orders);
while (handlers)
{
ecore_event_handler_del(handlers->data);
handlers = evas_list_remove_list(handlers, handlers);
handlers = eina_list_remove_list(handlers, handlers);
}
return 1;
}
@ -50,7 +50,7 @@ e_order_new(const char *path)
_e_order_read(eo);
eo->monitor = ecore_file_monitor_add(path, _e_order_cb_monitor, eo);
orders = evas_list_append(orders, eo);
orders = eina_list_append(orders, eo);
return eo;
}
@ -68,15 +68,15 @@ e_order_update_callback_set(E_Order *eo, void (*cb)(void *data, E_Order *eo), vo
EAPI void
e_order_remove(E_Order *eo, Efreet_Desktop *desktop)
{
Evas_List *tmp;
Eina_List *tmp;
E_OBJECT_CHECK(eo);
E_OBJECT_TYPE_CHECK(eo, E_ORDER_TYPE);
tmp = evas_list_find_list(eo->desktops, desktop);
tmp = eina_list_data_find_list(eo->desktops, desktop);
if (!tmp) return;
efreet_desktop_free(tmp->data);
eo->desktops = evas_list_remove_list(eo->desktops, tmp);
eo->desktops = eina_list_remove_list(eo->desktops, tmp);
_e_order_save(eo);
}
@ -87,7 +87,7 @@ e_order_append(E_Order *eo, Efreet_Desktop *desktop)
E_OBJECT_TYPE_CHECK(eo, E_ORDER_TYPE);
efreet_desktop_ref(desktop);
eo->desktops = evas_list_append(eo->desktops, desktop);
eo->desktops = eina_list_append(eo->desktops, desktop);
_e_order_save(eo);
}
@ -98,14 +98,14 @@ e_order_prepend_relative(E_Order *eo, Efreet_Desktop *desktop, Efreet_Desktop *b
E_OBJECT_TYPE_CHECK(eo, E_ORDER_TYPE);
efreet_desktop_ref(desktop);
eo->desktops = evas_list_prepend_relative(eo->desktops, desktop, before);
eo->desktops = eina_list_prepend_relative(eo->desktops, desktop, before);
_e_order_save(eo);
}
EAPI void
e_order_files_append(E_Order *eo, Evas_List *files)
e_order_files_append(E_Order *eo, Eina_List *files)
{
Evas_List *l;
Eina_List *l;
E_OBJECT_CHECK(eo);
E_OBJECT_TYPE_CHECK(eo, E_ORDER_TYPE);
@ -118,15 +118,15 @@ e_order_files_append(E_Order *eo, Evas_List *files)
file = l->data;
desktop = efreet_desktop_get(file);
if (!desktop) continue;
eo->desktops = evas_list_append(eo->desktops, desktop);
eo->desktops = eina_list_append(eo->desktops, desktop);
}
_e_order_save(eo);
}
EAPI void
e_order_files_prepend_relative(E_Order *eo, Evas_List *files, Efreet_Desktop *before)
e_order_files_prepend_relative(E_Order *eo, Eina_List *files, Efreet_Desktop *before)
{
Evas_List *l;
Eina_List *l;
E_OBJECT_CHECK(eo);
E_OBJECT_TYPE_CHECK(eo, E_ORDER_TYPE);
@ -139,7 +139,7 @@ e_order_files_prepend_relative(E_Order *eo, Evas_List *files, Efreet_Desktop *be
file = l->data;
desktop = efreet_desktop_get(file);
if (!desktop) continue;
eo->desktops = evas_list_prepend_relative(eo->desktops, desktop, before);
eo->desktops = eina_list_prepend_relative(eo->desktops, desktop, before);
}
_e_order_save(eo);
}
@ -153,7 +153,7 @@ e_order_clear(E_Order *eo)
while (eo->desktops)
{
efreet_desktop_free(eo->desktops->data);
eo->desktops = evas_list_remove_list(eo->desktops, eo->desktops);
eo->desktops = eina_list_remove_list(eo->desktops, eo->desktops);
}
_e_order_save(eo);
}
@ -165,11 +165,11 @@ _e_order_free(E_Order *eo)
while (eo->desktops)
{
efreet_desktop_free(eo->desktops->data);
eo->desktops = evas_list_remove_list(eo->desktops, eo->desktops);
eo->desktops = eina_list_remove_list(eo->desktops, eo->desktops);
}
if (eo->path) eina_stringshare_del(eo->path);
if (eo->monitor) ecore_file_monitor_del(eo->monitor);
orders = evas_list_remove(orders, eo);
orders = eina_list_remove(orders, eo);
free(eo);
}
@ -194,7 +194,7 @@ _e_order_read(E_Order *eo)
while (eo->desktops)
{
efreet_desktop_free(eo->desktops->data);
eo->desktops = evas_list_remove_list(eo->desktops, eo->desktops);
eo->desktops = eina_list_remove_list(eo->desktops, eo->desktops);
}
if (!eo->path) return;
@ -231,7 +231,7 @@ _e_order_read(E_Order *eo)
/* Need to ref this as we only get a cache pointer from efreet_util */
if (desktop) efreet_desktop_ref(desktop);
}
if (desktop) eo->desktops = evas_list_append(eo->desktops, desktop);
if (desktop) eo->desktops = eina_list_append(eo->desktops, desktop);
}
}
}
@ -244,7 +244,7 @@ static void
_e_order_save(E_Order *eo)
{
FILE *f;
Evas_List *l;
Eina_List *l;
if (!eo->path) return;
f = fopen(eo->path, "wb");
@ -274,7 +274,7 @@ static int
_e_order_cb_efreet_desktop_change(void *data, int ev_type, void *ev)
{
Efreet_Event_Desktop_Change *event;
Evas_List *l;
Eina_List *l;
event = ev;
switch (event->change)
@ -295,7 +295,7 @@ _e_order_cb_efreet_desktop_change(void *data, int ev_type, void *ev)
for (l = orders; l; l = l->next)
{
E_Order *eo;
Evas_List *l2;
Eina_List *l2;
int changed = 0;
eo = l->data;
@ -304,7 +304,7 @@ _e_order_cb_efreet_desktop_change(void *data, int ev_type, void *ev)
if (l2->data == event->current)
{
efreet_desktop_free(l2->data);
eo->desktops = evas_list_remove_list(eo->desktops, l2);
eo->desktops = eina_list_remove_list(eo->desktops, l2);
changed = 1;
}
}
@ -316,7 +316,7 @@ _e_order_cb_efreet_desktop_change(void *data, int ev_type, void *ev)
for (l = orders; l; l = l->next)
{
E_Order *eo;
Evas_List *l2;
Eina_List *l2;
int changed = 0;
eo = l->data;

6
src/bin/e_order.h
View File

@ -16,7 +16,7 @@ struct _E_Order
E_Object e_obj_inherit;
const char *path;
Evas_List *desktops; /* A list of Efreet_Desktop files this .order contains */
Eina_List *desktops; /* A list of Efreet_Desktop files this .order contains */
Ecore_File_Monitor *monitor; /* Check for changes int the .order file */
struct {
@ -34,8 +34,8 @@ EAPI void e_order_update_callback_set(E_Order *eo, void (*cb)(void *data, E_
EAPI void e_order_remove(E_Order *eo, Efreet_Desktop *desktop);
EAPI void e_order_append(E_Order *eo, Efreet_Desktop *desktop);
EAPI void e_order_prepend_relative(E_Order *eo, Efreet_Desktop *desktop, Efreet_Desktop *before);
EAPI void e_order_files_append(E_Order *eo, Evas_List *files);
EAPI void e_order_files_prepend_relative(E_Order *eo, Evas_List *files, Efreet_Desktop *before);
EAPI void e_order_files_append(E_Order *eo, Eina_List *files);
EAPI void e_order_files_prepend_relative(E_Order *eo, Eina_List *files, Efreet_Desktop *before);
EAPI void e_order_clear(E_Order *eo);
#endif

46
src/bin/e_path.c
View File

@ -47,7 +47,7 @@ e_path_default_path_append(E_Path *ep, const char *path)
strcat(new_path, path + 1);
epd->dir = eina_stringshare_add(new_path);
free(new_path);
ep->default_dir_list = evas_list_append(ep->default_dir_list, epd);
ep->default_dir_list = eina_list_append(ep->default_dir_list, epd);
}
else
{
@ -56,13 +56,13 @@ e_path_default_path_append(E_Path *ep, const char *path)
if (!epd)
return;
epd->dir = eina_stringshare_add(path);
ep->default_dir_list = evas_list_append(ep->default_dir_list, epd);
ep->default_dir_list = eina_list_append(ep->default_dir_list, epd);
}
_e_path_cache_free(ep);
}
EAPI void
e_path_user_path_set(E_Path *ep, Evas_List **user_dir_list)
e_path_user_path_set(E_Path *ep, Eina_List **user_dir_list)
{
E_OBJECT_CHECK(ep);
E_OBJECT_TYPE_CHECK(ep, E_PATH_TYPE);
@ -100,7 +100,7 @@ e_path_user_path_append(E_Path *ep, const char *path)
strcat(new_path, path + 1);
epd->dir = eina_stringshare_add(new_path);
free(new_path);
*(ep->user_dir_list) = evas_list_append(*(ep->user_dir_list), epd);
*(ep->user_dir_list) = eina_list_append(*(ep->user_dir_list), epd);
}
else
{
@ -109,7 +109,7 @@ e_path_user_path_append(E_Path *ep, const char *path)
if (!epd)
return;
epd->dir = eina_stringshare_add(path);
*(ep->user_dir_list) = evas_list_append(*(ep->user_dir_list), epd);
*(ep->user_dir_list) = eina_list_append(*(ep->user_dir_list), epd);
}
_e_path_cache_free(ep);
}
@ -143,7 +143,7 @@ e_path_user_path_prepend(E_Path *ep, const char *path)
strcat(new_path, path + 1);
epd->dir = eina_stringshare_add(new_path);
free(new_path);
*(ep->user_dir_list) = evas_list_prepend(*(ep->user_dir_list), epd);
*(ep->user_dir_list) = eina_list_prepend(*(ep->user_dir_list), epd);
}
else
{
@ -152,7 +152,7 @@ e_path_user_path_prepend(E_Path *ep, const char *path)
if (!epd)
return;
epd->dir = eina_stringshare_add(path);
*(ep->user_dir_list) = evas_list_prepend(*(ep->user_dir_list), epd);
*(ep->user_dir_list) = eina_list_prepend(*(ep->user_dir_list), epd);
}
_e_path_cache_free(ep);
}
@ -160,7 +160,7 @@ e_path_user_path_prepend(E_Path *ep, const char *path)
EAPI void
e_path_user_path_remove(E_Path *ep, const char *path)
{
Evas_List *l;
Eina_List *l;
E_OBJECT_CHECK(ep);
E_OBJECT_TYPE_CHECK(ep, E_PATH_TYPE);
@ -187,7 +187,7 @@ e_path_user_path_remove(E_Path *ep, const char *path)
{
if (!strcmp(epd->dir, new_path))
{
*(ep->user_dir_list) = evas_list_remove_list(
*(ep->user_dir_list) = eina_list_remove_list(
*(ep->user_dir_list), l);
eina_stringshare_del(epd->dir);
free(epd);
@ -209,7 +209,7 @@ e_path_user_path_remove(E_Path *ep, const char *path)
{
if (!strcmp(epd->dir, path))
{
*(ep->user_dir_list) = evas_list_remove_list(
*(ep->user_dir_list) = eina_list_remove_list(
*(ep->user_dir_list), l);
eina_stringshare_del(epd->dir);
free(epd);
@ -228,7 +228,7 @@ e_path_user_path_clear(E_Path *ep)
{
E_Path_Dir *epd;
epd = (*(ep->user_dir_list))->data;
*(ep->user_dir_list) = evas_list_remove_list(*(ep->user_dir_list), *(ep->user_dir_list));
*(ep->user_dir_list) = eina_list_remove_list(*(ep->user_dir_list), *(ep->user_dir_list));
eina_stringshare_del(epd->dir);
free(epd);
}
@ -238,7 +238,7 @@ e_path_user_path_clear(E_Path *ep)
EAPI const char *
e_path_find(E_Path *ep, const char *file)
{
Evas_List *l;
Eina_List *l;
char *str;
char buf[PATH_MAX] = "";
@ -292,8 +292,8 @@ e_path_find(E_Path *ep, const char *file)
EAPI void
e_path_evas_append(E_Path *ep, Evas *evas)
{
Evas_List *l;
Evas_List *dir_list;
Eina_List *l;
Eina_List *dir_list;
E_OBJECT_CHECK(ep);
E_OBJECT_TYPE_CHECK(ep, E_PATH_TYPE);
@ -310,15 +310,15 @@ e_path_evas_append(E_Path *ep, Evas *evas)
eina_stringshare_del(epd->dir);
free(epd);
}
if (dir_list) evas_list_free(dir_list);
if (dir_list) eina_list_free(dir_list);
}
/* combine default_list and and user_list in and easy to use list */
EAPI Evas_List *
EAPI Eina_List *
e_path_dir_list_get(E_Path *ep)
{
Evas_List *dir_list;
Evas_List *l;
Eina_List *dir_list;
Eina_List *l;
E_Path_Dir *new_epd;
E_Path_Dir *epd;
@ -331,7 +331,7 @@ e_path_dir_list_get(E_Path *ep)
epd = l->data;
new_epd = malloc(sizeof(E_Path_Dir));
new_epd->dir = eina_stringshare_add(epd->dir);
dir_list = evas_list_append(dir_list, new_epd);
dir_list = eina_list_append(dir_list, new_epd);
}
}
@ -340,21 +340,21 @@ e_path_dir_list_get(E_Path *ep)
epd = l->data;
new_epd = malloc(sizeof(E_Path_Dir));
new_epd->dir = eina_stringshare_add(epd->dir);
dir_list = evas_list_append(dir_list, new_epd);
dir_list = eina_list_append(dir_list, new_epd);
}
return dir_list;
}
EAPI void
e_path_dir_list_free(Evas_List *dir_list)
e_path_dir_list_free(Eina_List *dir_list)
{
E_Path_Dir *epd;
while (dir_list)
{
epd = dir_list->data;
dir_list = evas_list_remove_list(dir_list, dir_list);
dir_list = eina_list_remove_list(dir_list, dir_list);
eina_stringshare_del(epd->dir);
free(epd);
}
@ -371,7 +371,7 @@ _e_path_free(E_Path *ep)
epd = ep->default_dir_list->data;
eina_stringshare_del(epd->dir);
free(epd);
ep->default_dir_list = evas_list_remove_list(ep->default_dir_list,
ep->default_dir_list = eina_list_remove_list(ep->default_dir_list,
ep->default_dir_list);
}
free(ep);

10
src/bin/e_path.h
View File

@ -23,14 +23,14 @@ struct _E_Path
Evas_Hash *hash;
Evas_List *default_dir_list;
Eina_List *default_dir_list;
/* keep track of the associated e_config path */
Evas_List **user_dir_list;
Eina_List **user_dir_list;
};
/* init and setup */
EAPI E_Path *e_path_new(void);
EAPI void e_path_user_path_set(E_Path *ep, Evas_List **user_dir_list);
EAPI void e_path_user_path_set(E_Path *ep, Eina_List **user_dir_list);
EAPI void e_path_inherit_path_set(E_Path *ep, E_Path *path_inherit);
/* append a hardcoded path */
EAPI void e_path_default_path_append(E_Path *ep, const char *path);
@ -41,8 +41,8 @@ EAPI void e_path_user_path_remove(E_Path *ep, const char *path);
EAPI void e_path_user_path_clear(E_Path *ep);
EAPI const char *e_path_find(E_Path *ep, const char *file);
EAPI void e_path_evas_append(E_Path *ep, Evas *evas);
EAPI Evas_List *e_path_dir_list_get(E_Path *ep);
EAPI void e_path_dir_list_free(Evas_List *dir_list);
EAPI Eina_List *e_path_dir_list_get(E_Path *ep);
EAPI void e_path_dir_list_free(Eina_List *dir_list);
#endif
#endif

22
src/bin/e_place.c
View File

@ -7,7 +7,7 @@ EAPI void
e_place_zone_region_smart_cleanup(E_Zone *zone)
{
E_Desk *desk;
Evas_List *borders = NULL;
Eina_List *borders = NULL;
E_Border_List *bl;
E_Border *border;
@ -21,7 +21,7 @@ e_place_zone_region_smart_cleanup(E_Zone *zone)
(!border->lock_user_location))
{
int area;
Evas_List *ll;
Eina_List *ll;
/* Ordering windows largest to smallest gives better results */
area = border->w * border->h;
@ -35,12 +35,12 @@ e_place_zone_region_smart_cleanup(E_Zone *zone)
/* Insert the border if larger than the current border */
if (area >= testarea)
{
borders = evas_list_prepend_relative(borders, border, bd);
borders = eina_list_prepend_relative(borders, border, bd);
break;
}
}
/* Looped over all borders without placing, so place at end */
if (!ll) borders = evas_list_append(borders, border);
if (!ll) borders = eina_list_append(borders, border);
}
}
e_container_border_list_free(bl);
@ -54,7 +54,7 @@ e_place_zone_region_smart_cleanup(E_Zone *zone)
e_place_zone_region_smart(zone, borders, border->x, border->y,
border->w, border->h, &new_x, &new_y);
e_border_move(border, new_x, new_y);
borders = evas_list_remove(borders, border);
borders = eina_list_remove(borders, border);
}
}
@ -65,9 +65,9 @@ _e_place_cb_sort_cmp(const void *v1, const void *v2)
}
static int
_e_place_coverage_border_add(E_Zone *zone, Evas_List *skiplist, int ar, int x, int y, int w, int h)
_e_place_coverage_border_add(E_Zone *zone, Eina_List *skiplist, int ar, int x, int y, int w, int h)
{
Evas_List *ll;
Eina_List *ll;
E_Border_List *bl;
E_Border *bd;
int x2, y2, w2, h2;
@ -110,7 +110,7 @@ _e_place_coverage_border_add(E_Zone *zone, Evas_List *skiplist, int ar, int x, i
static int
_e_place_coverage_shelf_add(E_Zone *zone, int ar, int x, int y, int w, int h)
{
Evas_List *l;
Eina_List *l;
E_Shelf *es;
int x2, y2, w2, h2;
@ -127,13 +127,13 @@ _e_place_coverage_shelf_add(E_Zone *zone, int ar, int x, int y, int w, int h)
}
EAPI int
e_place_zone_region_smart(E_Zone *zone, Evas_List *skiplist, int x, int y, int w, int h, int *rx, int *ry)
e_place_zone_region_smart(E_Zone *zone, Eina_List *skiplist, int x, int y, int w, int h, int *rx, int *ry)
{
int a_w = 0, a_h = 0, a_alloc_w = 0, a_alloc_h = 0;
int *a_x = NULL, *a_y = NULL;
int zw, zh;
char *u_x = NULL, *u_y = NULL;
Evas_List *ll;
Eina_List *ll;
E_Border_List *bl;
E_Border *bd;
@ -178,7 +178,7 @@ e_place_zone_region_smart(E_Zone *zone, Evas_List *skiplist, int x, int y, int w
if (e_config->window_placement_policy == E_WINDOW_PLACEMENT_SMART)
{
Evas_List *l;
Eina_List *l;
for (l = e_shelf_list(); l; l = l->next)
{

2
src/bin/e_place.h
View File

@ -7,7 +7,7 @@
#define E_PLACE_H
EAPI void e_place_zone_region_smart_cleanup(E_Zone *zone);
EAPI int e_place_zone_region_smart(E_Zone *zone, Evas_List *skiplist, int x, int y, int w, int h, int *rx, int *ry);
EAPI int e_place_zone_region_smart(E_Zone *zone, Eina_List *skiplist, int x, int y, int w, int h, int *rx, int *ry);
EAPI int e_place_zone_cursor(E_Zone *zone, int x, int y, int w, int h, int it, int *rx, int *ry);
EAPI int e_place_zone_manual(E_Zone *zone, int w, int h, int *rx, int *ry);

40
src/bin/e_pointer.c
View File

@ -17,8 +17,8 @@ struct _E_Pointer_Stack
const char *type;
};
static Evas_List *_e_pointers = NULL;
static Evas_List *handlers = NULL;
static Eina_List *_e_pointers = NULL;
static Eina_List *handlers = NULL;
static void _e_pointer_canvas_add(E_Pointer *p);
static void _e_pointer_canvas_del(E_Pointer *p);
@ -40,10 +40,10 @@ static int _e_pointer_cb_idle_poller(void *data);
EAPI int
e_pointer_init(void)
{
handlers = evas_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_MOUSE_BUTTON_DOWN, _e_pointer_cb_mouse_down, NULL));
handlers = evas_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_MOUSE_BUTTON_UP, _e_pointer_cb_mouse_up, NULL));
handlers = evas_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_MOUSE_MOVE, _e_pointer_cb_mouse_move, NULL));
handlers = evas_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_MOUSE_WHEEL, _e_pointer_cb_mouse_wheel, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_MOUSE_BUTTON_DOWN, _e_pointer_cb_mouse_down, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_MOUSE_BUTTON_UP, _e_pointer_cb_mouse_up, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_MOUSE_MOVE, _e_pointer_cb_mouse_move, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(ECORE_X_EVENT_MOUSE_WHEEL, _e_pointer_cb_mouse_wheel, NULL));
return 1;
}
@ -55,7 +55,7 @@ e_pointer_shutdown(void)
Ecore_Event_Handler *h;
h = handlers->data;
handlers = evas_list_remove_list(handlers, handlers);
handlers = eina_list_remove_list(handlers, handlers);
ecore_event_handler_del(h);
}
@ -85,14 +85,14 @@ e_pointer_window_new(Ecore_X_Window win, int filled)
}
ecore_x_cursor_size_set(e_config->cursor_size * 3 / 4);
if (filled) e_pointer_type_push(p, p, "default");
_e_pointers = evas_list_append(_e_pointers, p);
_e_pointers = eina_list_append(_e_pointers, p);
return p;
}
EAPI void
e_pointers_size_set(int size)
{
Evas_List *l;
Eina_List *l;
if (!e_config->show_cursor) return;
@ -160,7 +160,7 @@ e_pointer_type_push(E_Pointer *p, void *obj, const char *type)
{
stack->type = eina_stringshare_add(p->type);
stack->obj = p->obj;
p->stack = evas_list_prepend(p->stack, stack);
p->stack = eina_list_prepend(p->stack, stack);
}
}
@ -168,7 +168,7 @@ e_pointer_type_push(E_Pointer *p, void *obj, const char *type)
EAPI void
e_pointer_type_pop(E_Pointer *p, void *obj, const char *type)
{
Evas_List *l;
Eina_List *l;
E_Pointer_Stack *stack;
for (l = p->stack; l; l = l->next)
@ -179,7 +179,7 @@ e_pointer_type_pop(E_Pointer *p, void *obj, const char *type)
((!type) || (!strcmp(stack->type, type))))
{
_e_pointer_stack_free(stack);
p->stack = evas_list_remove_list(p->stack, l);
p->stack = eina_list_remove_list(p->stack, l);
if (type) break;
}
}
@ -207,13 +207,13 @@ e_pointer_type_pop(E_Pointer *p, void *obj, const char *type)
EAPI void
e_pointer_idler_before(void)
{
Evas_List *l;
Eina_List *l;
if (!e_config->show_cursor) return;
for (l = _e_pointers; l; l = l->next)
{
E_Pointer *p;
Evas_List *updates;
Eina_List *updates;
p = l->data;
if (!p->e_cursor) continue;
@ -332,14 +332,14 @@ _e_pointer_cb_move(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event
static void
_e_pointer_free(E_Pointer *p)
{
_e_pointers = evas_list_remove(_e_pointers, p);
_e_pointers = eina_list_remove(_e_pointers, p);
_e_pointer_canvas_del(p);
while (p->stack)
{
_e_pointer_stack_free(p->stack->data);
p->stack = evas_list_remove_list(p->stack, p->stack);
p->stack = eina_list_remove_list(p->stack, p->stack);
}
if (p->type) eina_stringshare_del(p->type);
@ -535,7 +535,7 @@ static int
_e_pointer_cb_mouse_down(void *data, int type, void *event)
{
Ecore_X_Event_Mouse_Button_Down *ev;
Evas_List *l;
Eina_List *l;
E_Pointer *p;
ev = event;
@ -556,7 +556,7 @@ static int
_e_pointer_cb_mouse_up(void *data, int type, void *event)
{
Ecore_X_Event_Mouse_Button_Up *ev;
Evas_List *l;
Eina_List *l;
E_Pointer *p;
ev = event;
@ -577,7 +577,7 @@ static int
_e_pointer_cb_mouse_move(void *data, int type, void *event)
{
Ecore_X_Event_Mouse_Move *ev;
Evas_List *l;
Eina_List *l;
E_Pointer *p;
ev = event;
@ -598,7 +598,7 @@ static int
_e_pointer_cb_mouse_wheel(void *data, int type, void *event)
{
Ecore_X_Event_Mouse_Wheel *ev;
Evas_List *l;
Eina_List *l;
E_Pointer *p;
ev = event;

2
src/bin/e_pointer.h
View File

@ -31,7 +31,7 @@ struct _E_Pointer
const char *type;
void *obj;
Evas_List *stack;
Eina_List *stack;
struct {
int x, y;

16
src/bin/e_popup.c
View File

@ -16,7 +16,7 @@ static Ecore_Event_Handler *_e_popup_window_shape_handler = NULL;
static Ecore_Event_Handler *_e_popup_mouse_down_handler = NULL;
static Ecore_Event_Handler *_e_popup_mouse_up_handler = NULL;
static Ecore_Event_Handler *_e_popup_mouse_wheel_handler = NULL;
static Evas_List *_e_popup_list = NULL;
static Eina_List *_e_popup_list = NULL;
/* externally accessible functions */
@ -73,8 +73,8 @@ e_popup_new(E_Zone *zone, int x, int y, int w, int h)
ecore_evas_name_class_set(pop->ecore_evas, "E", "_e_popup_window");
ecore_evas_title_set(pop->ecore_evas, "E Popup");
e_object_ref(E_OBJECT(pop->zone));
pop->zone->popups = evas_list_append(pop->zone->popups, pop);
_e_popup_list = evas_list_append(_e_popup_list, pop);
pop->zone->popups = eina_list_append(pop->zone->popups, pop);
_e_popup_list = eina_list_append(_e_popup_list, pop);
return pop;
}
@ -192,7 +192,7 @@ e_popup_layer_set(E_Popup *pop, int layer)
EAPI void
e_popup_idler_before(void)
{
Evas_List *l;
Eina_List *l;
for (l = _e_popup_list; l; l = l->next)
{
@ -279,15 +279,15 @@ _e_popup_free(E_Popup *pop)
e_canvas_del(pop->ecore_evas);
ecore_evas_free(pop->ecore_evas);
e_object_unref(E_OBJECT(pop->zone));
pop->zone->popups = evas_list_remove(pop->zone->popups, pop);
_e_popup_list = evas_list_remove(_e_popup_list, pop);
pop->zone->popups = eina_list_remove(pop->zone->popups, pop);
_e_popup_list = eina_list_remove(_e_popup_list, pop);
free(pop);
}
static int
_e_popup_cb_window_shape(void *data, int ev_type, void *ev)
{
Evas_List *l;
Eina_List *l;
Ecore_X_Event_Window_Shape *e;
e = ev;
@ -306,7 +306,7 @@ static E_Popup *
_e_popup_find_by_window(Ecore_X_Window win)
{
E_Popup *pop;
Evas_List *l;
Eina_List *l;
for (l = _e_popup_list; l; l = l->next)
{

8
src/bin/e_powersave.c
View File

@ -16,7 +16,7 @@ static void _e_powersave_mode_eval(void);
/* local subsystem globals */
static int walking_deferred_actions = 0;
static Evas_List *deferred_actions = NULL;
static Eina_List *deferred_actions = NULL;
static Ecore_Timer *deferred_timer = NULL;
static E_Powersave_Mode powersave_mode_min = E_POWERSAVE_MODE_NONE;
static E_Powersave_Mode powersave_mode_max = E_POWERSAVE_MODE_EXTREME;
@ -50,7 +50,7 @@ e_powersave_deferred_action_add(void (*func) (void *data), const void *data)
NULL);
pa->func = func;
pa->data = data;
deferred_actions = evas_list_append(deferred_actions, pa);
deferred_actions = eina_list_append(deferred_actions, pa);
return pa;
}
@ -64,7 +64,7 @@ e_powersave_deferred_action_del(E_Powersave_Deferred_Action *pa)
}
else
{
deferred_actions = evas_list_remove(deferred_actions, pa);
deferred_actions = eina_list_remove(deferred_actions, pa);
free(pa);
if (!deferred_actions)
{
@ -131,7 +131,7 @@ _e_powersave_cb_deferred_timer(void *data)
E_Powersave_Deferred_Action *pa;
pa = deferred_actions->data;
deferred_actions = evas_list_remove_list(deferred_actions, deferred_actions);
deferred_actions = eina_list_remove_list(deferred_actions, deferred_actions);
if (!pa->delete_me) pa->func((void *)pa->data);
free(pa);
}

20
src/bin/e_remember.c
View File

@ -19,7 +19,7 @@ static E_Remember *_e_remember_find(E_Border *bd, int check_usable);
EAPI int
e_remember_init(E_Startup_Mode mode)
{
Evas_List *l = NULL;
Eina_List *l = NULL;
int not_updated = 0;
if (mode == E_STARTUP_START)
@ -59,7 +59,7 @@ e_remember_init(E_Startup_Mode mode)
}
if (not_updated)
e_config->remembers = evas_list_sort(e_config->remembers, -1,
e_config->remembers = eina_list_sort(e_config->remembers, -1,
_e_remember_sort_list);
#endif
return 1;
@ -78,7 +78,7 @@ e_remember_new(void)
rem = E_NEW(E_Remember, 1);
if (!rem) return NULL;
e_config->remembers = evas_list_prepend(e_config->remembers, rem);
e_config->remembers = eina_list_prepend(e_config->remembers, rem);
return rem;
}
@ -109,7 +109,7 @@ e_remember_del(E_Remember *rem)
if (rem->delete_me) return;
if (rem->used_count != 0)
{
Evas_List *l = NULL;
Eina_List *l = NULL;
rem->delete_me = 1;
for (l = e_border_client_list(); l; l = l->next)
@ -164,11 +164,11 @@ e_remember_match_update(E_Remember *rem)
/* The number of matches for this remember has changed so we
* need to remove from list and insert back into the appropriate
* loction. */
Evas_List *l = NULL;
Eina_List *l = NULL;
E_Remember *r;
rem->max_score = max_count;
e_config->remembers = evas_list_remove(e_config->remembers, rem);
e_config->remembers = eina_list_remove(e_config->remembers, rem);
for (l = e_config->remembers; l; l = l->next)
{
@ -177,9 +177,9 @@ e_remember_match_update(E_Remember *rem)
}
if (l)
e_config->remembers = evas_list_prepend_relative_list(e_config->remembers, rem, l);
e_config->remembers = eina_list_prepend_relative_list(e_config->remembers, rem, l);
else
e_config->remembers = evas_list_append(e_config->remembers, rem);
e_config->remembers = eina_list_append(e_config->remembers, rem);
}
}
@ -349,7 +349,7 @@ e_remember_update(E_Remember *rem, E_Border *bd)
static E_Remember *
_e_remember_find(E_Border *bd, int check_usable)
{
Evas_List *l = NULL;
Eina_List *l = NULL;
#if REMEMBER_SIMPLE
for (l = e_config->remembers; l; l = l->next)
@ -455,7 +455,7 @@ _e_remember_find(E_Border *bd, int check_usable)
static void
_e_remember_free(E_Remember *rem)
{
e_config->remembers = evas_list_remove(e_config->remembers, rem);
e_config->remembers = eina_list_remove(e_config->remembers, rem);
if (rem->name) eina_stringshare_del(rem->name);
if (rem->class) eina_stringshare_del(rem->class);
if (rem->title) eina_stringshare_del(rem->title);

24
src/bin/e_resist.c
View File

@ -12,15 +12,15 @@ struct _E_Resist_Rect
int resist_out;
};
static void _e_resist_rects(Evas_List *rects, int px, int py, int pw, int ph, int x, int y, int w, int h, int *rx, int *ry, int *rw, int *rh);
static void _e_resist_rects(Eina_List *rects, int px, int py, int pw, int ph, int x, int y, int w, int h, int *rx, int *ry, int *rw, int *rh);
EAPI int
e_resist_container_border_position(E_Container *con, Evas_List *skiplist,
e_resist_container_border_position(E_Container *con, Eina_List *skiplist,
int px, int py, int pw, int ph,
int x, int y, int w, int h,
int *rx, int *ry, int *rw, int *rh)
{
Evas_List *l, *ll, *rects = NULL;
Eina_List *l, *ll, *rects = NULL;
E_Resist_Rect *r;
E_Border_List *bl;
E_Border *bd;
@ -41,14 +41,14 @@ e_resist_container_border_position(E_Container *con, Evas_List *skiplist,
r = E_NEW(E_Resist_Rect, 1); \
r->x = _x; r->y = _y; r->w = _w; r->h = _h; r->v1 = _resist; \
r->resist_out = 0; \
rects = evas_list_append(rects, r); \
rects = eina_list_append(rects, r); \
}
#define HOLDER(_x, _y, _w, _h, _resist) \
{ \
r = E_NEW(E_Resist_Rect, 1); \
r->x = _x; r->y = _y; r->w = _w; r->h = _h; r->v1 = _resist; \
r->resist_out = 1; \
rects = evas_list_append(rects, r); \
rects = eina_list_append(rects, r); \
}
for (l = con->zones; l; l = l->next)
@ -90,7 +90,7 @@ e_resist_container_border_position(E_Container *con, Evas_List *skiplist,
for (l = e_shelf_list(); l; l = l->next)
{
E_Shelf *es;
Evas_List *ll;
Eina_List *ll;
es = l->data;
if (es->zone->container == con)
@ -129,18 +129,18 @@ e_resist_container_border_position(E_Container *con, Evas_List *skiplist,
{
E_FREE(l->data);
}
evas_list_free(rects);
eina_list_free(rects);
}
return 1;
}
EAPI int
e_resist_container_gadman_position(E_Container *con, Evas_List *skiplist,
e_resist_container_gadman_position(E_Container *con, Eina_List *skiplist,
int px, int py, int pw, int ph,
int x, int y, int w, int h,
int *rx, int *ry)
{
Evas_List *l, *rects = NULL;
Eina_List *l, *rects = NULL;
E_Resist_Rect *r;
if (!e_config->use_resist)
@ -173,13 +173,13 @@ e_resist_container_gadman_position(E_Container *con, Evas_List *skiplist,
{
E_FREE(l->data);
}
evas_list_free(rects);
eina_list_free(rects);
}
return 1;
}
static void
_e_resist_rects(Evas_List *rects,
_e_resist_rects(Eina_List *rects,
int px, int py, int pw, int ph,
int x, int y, int w, int h,
int *rx, int *ry, int *rw, int *rh)
@ -187,7 +187,7 @@ _e_resist_rects(Evas_List *rects,
int dx, dy, dw, dh, d, pd;
int resist_x = 0, resist_y = 0;
int resist_w = 0, resist_h = 0;
Evas_List *l;
Eina_List *l;
E_Resist_Rect *r;
dx = x - px;

4
src/bin/e_resist.h
View File

@ -6,8 +6,8 @@
#ifndef E_RESIST_H
#define E_RESIST_H
EAPI int e_resist_container_border_position(E_Container *con, Evas_List *skiplist, int px, int py, int pw, int ph, int x, int y, int w, int h, int *rx, int *ry, int *rw, int *rh);
EAPI int e_resist_container_gadman_position(E_Container *con, Evas_List *skiplist, int px, int py, int pw, int ph, int x, int y, int w, int h, int *rx, int *ry);
EAPI int e_resist_container_border_position(E_Container *con, Eina_List *skiplist, int px, int py, int pw, int ph, int x, int y, int w, int h, int *rx, int *ry, int *rw, int *rh);
EAPI int e_resist_container_gadman_position(E_Container *con, Eina_List *skiplist, int px, int py, int pw, int ph, int x, int y, int w, int h, int *rx, int *ry);
#endif
#endif

36
src/bin/e_shelf.c
View File

@ -28,7 +28,7 @@ static void _e_shelf_menu_pre_cb(void *data, E_Menu *m);
static void _e_shelf_edge_event_register(E_Shelf *es, int reg);
static Evas_List *shelves = NULL;
static Eina_List *shelves = NULL;
static Evas_Hash *winid_shelves = NULL;
/* externally accessible functions */
@ -55,7 +55,7 @@ e_shelf_shutdown(void)
EAPI void
e_shelf_config_init(void)
{
Evas_List *l;
Eina_List *l;
int id = 0;
while (shelves)
@ -82,10 +82,10 @@ e_shelf_config_init(void)
}
}
EAPI Evas_List *
EAPI Eina_List *
e_shelf_list(void)
{
shelves = evas_list_sort(shelves, -1, _e_shelf_cb_id_sort);
shelves = eina_list_sort(shelves, -1, _e_shelf_cb_id_sort);
return shelves;
}
@ -127,13 +127,13 @@ e_shelf_zone_new(E_Zone *zone, const char *name, const char *style, int popup, i
evas_object_event_callback_add(es->o_event, EVAS_CALLBACK_MOUSE_DOWN, _e_shelf_cb_mouse_down, es);
/* TODO: We should have a mouse out on the evas object if we are on the desktop */
es->handlers = evas_list_append(es->handlers,
es->handlers = eina_list_append(es->handlers,
ecore_event_handler_add(E_EVENT_ZONE_EDGE_IN, _e_shelf_cb_mouse_in, es));
es->handlers = evas_list_append(es->handlers,
es->handlers = eina_list_append(es->handlers,
ecore_event_handler_add(E_EVENT_ZONE_EDGE_MOVE, _e_shelf_cb_mouse_in, es));
es->handlers = evas_list_append(es->handlers,
es->handlers = eina_list_append(es->handlers,
ecore_event_handler_add(ECORE_X_EVENT_MOUSE_IN, _e_shelf_cb_mouse_in, es));
es->handlers = evas_list_append(es->handlers,
es->handlers = eina_list_append(es->handlers,
ecore_event_handler_add(ECORE_X_EVENT_MOUSE_OUT, _e_shelf_cb_mouse_out, es));
es->o_base = edje_object_add(es->evas);
@ -189,7 +189,7 @@ e_shelf_zone_new(E_Zone *zone, const char *name, const char *style, int popup, i
e_gadcon_util_menu_attach_func_set(es->gadcon,
_e_shelf_cb_menu_items_append, es);
shelves = evas_list_append(shelves, es);
shelves = eina_list_append(shelves, es);
es->hidden = 0;
es->hide_step = 0;
@ -213,7 +213,7 @@ e_shelf_zone_new(E_Zone *zone, const char *name, const char *style, int popup, i
EAPI void
e_shelf_zone_move_resize_handle(E_Zone *zone)
{
Evas_List *l;
Eina_List *l;
E_Shelf *es;
for (l = shelves; l; l = l->next)
@ -409,7 +409,7 @@ e_shelf_save(E_Shelf *es)
cf_es->zone = es->zone->num;
if (es->popup) cf_es->popup = 1;
cf_es->layer = es->layer;
e_config->shelves = evas_list_append(e_config->shelves, cf_es);
e_config->shelves = eina_list_append(e_config->shelves, cf_es);
cf_es->orient = es->gadcon->orient;
cf_es->style = eina_stringshare_add(es->style);
cf_es->fit_along = es->fit_along;
@ -430,7 +430,7 @@ e_shelf_unsave(E_Shelf *es)
E_OBJECT_TYPE_CHECK(es, E_SHELF_TYPE);
if (es->cfg)
{
e_config->shelves = evas_list_remove(e_config->shelves, es->cfg);
e_config->shelves = eina_list_remove(e_config->shelves, es->cfg);
eina_stringshare_del(es->cfg->name);
if (es->cfg->style) eina_stringshare_del(es->cfg->style);
free(es->cfg);
@ -668,7 +668,7 @@ e_shelf_config_new(E_Zone *zone, E_Config_Shelf *cf_es)
if (cf_es->desk_show_mode)
{
E_Desk *desk;
Evas_List *ll;
Eina_List *ll;
desk = e_desk_current_get(zone);
for (ll = cf_es->desk_list; ll; ll = ll->next)
@ -722,7 +722,7 @@ _e_shelf_free(E_Shelf *es)
es->menu = NULL;
}
if (es->config_dialog) e_object_del(E_OBJECT(es->config_dialog));
shelves = evas_list_remove(shelves, es);
shelves = eina_list_remove(shelves, es);
eina_stringshare_del(es->name);
eina_stringshare_del(es->style);
evas_object_del(es->o_event);
@ -999,7 +999,7 @@ _e_shelf_gadcon_frame_request(void *data, E_Gadcon_Client *gcc, const char *styl
static void
_e_shelf_toggle_border_fix(E_Shelf *es)
{
Evas_List *l;
Eina_List *l;
if (es->cfg->overlap || !e_config->border_fix_on_shelf_toggle)
return;
@ -1161,7 +1161,7 @@ _e_shelf_cb_confirm_dialog_yes(void *data)
cfg = es->cfg;
if (e_object_is_del(E_OBJECT(es))) return;
e_object_del(E_OBJECT(es));
e_config->shelves = evas_list_remove(e_config->shelves, cfg);
e_config->shelves = eina_list_remove(e_config->shelves, cfg);
if (cfg->name) eina_stringshare_del(cfg->name);
if (cfg->style) eina_stringshare_del(cfg->style);
E_FREE(cfg);
@ -1183,7 +1183,7 @@ _e_shelf_cb_menu_delete(void *data, E_Menu *m, E_Menu_Item *mi)
cfg = es->cfg;
if (e_object_is_del(E_OBJECT(es))) return;
e_object_del(E_OBJECT(es));
e_config->shelves = evas_list_remove(e_config->shelves, cfg);
e_config->shelves = eina_list_remove(e_config->shelves, cfg);
if (cfg->name) eina_stringshare_del(cfg->name);
if (cfg->style) eina_stringshare_del(cfg->style);
E_FREE(cfg);
@ -1626,7 +1626,7 @@ static void
_e_shelf_menu_del_hook(void *data)
{
E_Menu *m;
Evas_List *l;
Eina_List *l;
m = data;
for (l = m->items; l; l = l->next)

4
src/bin/e_shelf.h
View File

@ -38,7 +38,7 @@ struct _E_Shelf
int interrupted;
float instant_delay;
Ecore_Timer *instant_timer;
Evas_List *handlers;
Eina_List *handlers;
unsigned char fit_along : 1;
unsigned char fit_size : 1;
unsigned char hidden : 1;
@ -50,7 +50,7 @@ struct _E_Shelf
EAPI int e_shelf_init(void);
EAPI int e_shelf_shutdown(void);
EAPI void e_shelf_config_init(void);
EAPI Evas_List *e_shelf_list(void);
EAPI Eina_List *e_shelf_list(void);
EAPI E_Shelf *e_shelf_zone_new(E_Zone *zone, const char *name, const char *style, int popup, int layer, int id);
EAPI void e_shelf_zone_move_resize_handle(E_Zone *zone);
EAPI void e_shelf_populate(E_Shelf *es);

14
src/bin/e_slidecore.c
View File

@ -16,7 +16,7 @@ struct _E_Smart_Data
Evas_Object *smart_obj;
Evas_Object *event_obj;
Evas_Object *o1, *o2;
Evas_List *items;
Eina_List *items;
double slide_time, slide_start;
Ecore_Animator *slide_animator;
Evas_Coord dist, pos, slide_pos, slide_start_pos;
@ -81,7 +81,7 @@ e_slidecore_item_add(Evas_Object *obj, const char *label, const char *icon, voi
if (icon) it->icon = eina_stringshare_add(icon);
it->func = func;
it->data = data;
sd->items = evas_list_append(sd->items, it);
sd->items = eina_list_append(sd->items, it);
_e_smart_reconfigure(sd);
}
@ -161,7 +161,7 @@ _e_smart_event_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info)
int n;
sd->down = 0;
n = evas_list_count(sd->items);
n = eina_list_count(sd->items);
gop = sd->pos - (sd->p1 * sd->dist);
gop = ((gop / sd->dist) * sd->dist) + (sd->p1 * sd->dist);
@ -198,7 +198,7 @@ _e_smart_reconfigure(E_Smart_Data *sd)
evas_object_resize(sd->event_obj, sd->w, sd->h);
pos = sd->pos;
n = evas_list_count(sd->items);
n = eina_list_count(sd->items);
while (pos < 0) pos += (sd->dist * n);
p1 = pos / sd->dist;
p2 = (pos + sd->dist) / sd->dist;
@ -227,8 +227,8 @@ _e_smart_reconfigure(E_Smart_Data *sd)
sd->o2 = NULL;
pl1 = sd->p1 % n;
pl2 = sd->p2 % n;
it1 = evas_list_nth(sd->items, pl1);
it2 = evas_list_nth(sd->items, pl2);
it1 = eina_list_nth(sd->items, pl1);
it2 = eina_list_nth(sd->items, pl2);
if (it1 && it2)
{
sd->o1 = e_util_icon_theme_icon_add(it1->icon, 512,
@ -323,7 +323,7 @@ _e_smart_del(Evas_Object *obj)
E_Smart_Item *it;
it = sd->items->data;
sd->items = evas_list_remove_list(sd->items, sd->items);
sd->items = eina_list_remove_list(sd->items, sd->items);
if (it->label) eina_stringshare_del(it->label);
if (it->icon) eina_stringshare_del(it->icon);
free(it);

4
src/bin/e_slidesel.c
View File

@ -17,7 +17,7 @@ struct _E_Smart_Data
Evas_Object *edje_obj;
Evas_Object *event_obj;
Evas_Object *slide_obj;
Evas_List *items;
Eina_List *items;
Evas_Coord down_x, down_y;
E_Smart_Item *cur;
double down_time;
@ -93,7 +93,7 @@ e_slidesel_item_add(Evas_Object *obj, const char *label, const char *icon, void
if (icon) it->icon = eina_stringshare_add(icon);
it->func = func;
it->data = data;
sd->items = evas_list_append(sd->items, it);
sd->items = eina_list_append(sd->items, it);
e_slidecore_item_add(sd->slide_obj, label, icon, _e_smart_label_change, it);
}

2
src/bin/e_startup.c
View File

@ -47,7 +47,7 @@ _e_startup(void)
e_init_done();
return;
}
desktop = evas_list_nth(startup_apps->desktops, start_app_pos);
desktop = eina_list_nth(startup_apps->desktops, start_app_pos);
start_app_pos++;
if (!desktop)
{

4
src/bin/e_sys.c
View File

@ -248,7 +248,7 @@ _e_sys_cb_logout_abort(void *data, E_Dialog *dia)
static int
_e_sys_cb_logout_timer(void *data)
{
Evas_List *l;
Eina_List *l;
int pending = 0;
for (l = e_border_client_list(); l; l = l->next)
@ -315,7 +315,7 @@ _e_sys_logout_after(void)
static void
_e_sys_logout_begin(E_Sys_Action a_after)
{
Evas_List *l;
Eina_List *l;
E_Obj_Dialog *od;
/* start logout - at end do the a_after action */

12
src/bin/e_table.c
View File

@ -14,7 +14,7 @@ struct _E_Smart_Data
int frozen;
unsigned char changed : 1;
unsigned char homogenous : 1;
Evas_List *items;
Eina_List *items;
struct {
Evas_Coord w, h;
} min, max;
@ -113,7 +113,7 @@ e_table_pack(Evas_Object *obj, Evas_Object *child, int col, int row, int colspan
sd = evas_object_smart_data_get(obj);
_e_table_smart_adopt(sd, child);
sd->items = evas_list_append(sd->items, child);
sd->items = eina_list_append(sd->items, child);
ti = evas_object_data_get(child, "e_table_data");
if (ti)
{
@ -158,7 +158,7 @@ e_table_unpack(Evas_Object *obj)
ti = evas_object_data_get(obj, "e_table_data");
if (!ti) return;
sd = ti->sd;
sd->items = evas_list_remove(sd->items, obj);
sd->items = eina_list_remove(sd->items, obj);
_e_table_smart_disown(obj);
sd->changed = 1;
if (sd->frozen <= 0) _e_table_smart_reconfigure(sd);
@ -288,7 +288,7 @@ static void
_e_table_smart_reconfigure(E_Smart_Data *sd)
{
Evas_Coord x, y, w, h, xx, yy;
Evas_List *l;
Eina_List *l;
int minw, minh, expandw, expandh;
if (!sd->changed) return;
@ -622,7 +622,7 @@ _e_table_smart_reconfigure(E_Smart_Data *sd)
static void
_e_table_smart_extents_calcuate(E_Smart_Data *sd)
{
Evas_List *l;
Eina_List *l;
int minw, minh;
sd->max.w = -1; /* max < 0 == unlimited */
@ -896,7 +896,7 @@ _e_table_smart_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
if ((x == sd->x) && (y == sd->y)) return;
if ((x == sd->x) && (y == sd->y)) return;
{
Evas_List *l;
Eina_List *l;
Evas_Coord dx, dy;
dx = x - sd->x;

14
src/bin/e_test.c
View File

@ -8,7 +8,7 @@ static void _e_test_internal(E_Container *con);
EAPI void
e_test(void)
{
Evas_List *managers, *l, *ll;
Eina_List *managers, *l, *ll;
managers = e_manager_list();
for (l = managers; l; l = l->next)
@ -31,7 +31,7 @@ static int
_e_test_timer(void *data)
{
E_Menu *m;
Evas_List *managers, *l;
Eina_List *managers, *l;
m = data;
if (m)
@ -122,7 +122,7 @@ static void
_e_test_internal(E_Container *con)
{
E_Menu *m;
Evas_List *managers, *l;
Eina_List *managers, *l;
managers = e_manager_list();
for (l = managers; l; l = l->next)
@ -457,7 +457,7 @@ _e_test_cb_changed(void *data, Evas_Object *obj, void *event_info)
static void
_e_test_cb_favorites_selected(void *data, Evas_Object *obj, void *event_info)
{
Evas_List *selected;
Eina_List *selected;
E_Fm2_Icon_Info *ici;
printf("FAV SELECTED\n");
@ -470,13 +470,13 @@ _e_test_cb_favorites_selected(void *data, Evas_Object *obj, void *event_info)
e_fm2_path_set(data, NULL, ici->link);
// FIXME: this should happen on the scrollframe not the fm obj
// e_widget_scrollframe_child_pos_set(data, 0, 0);
evas_list_free(selected);
eina_list_free(selected);
}
static void
_e_test_cb_favorites_files_changed(void *data, Evas_Object *obj, void *event_info)
{
Evas_List *icons, *l;
Eina_List *icons, *l;
E_Fm2_Icon_Info *ici;
const char *realpath;
char *p1, *p2;
@ -504,7 +504,7 @@ _e_test_cb_favorites_files_changed(void *data, Evas_Object *obj, void *event_inf
}
done:
E_FREE(p1);
evas_list_free(icons);
eina_list_free(icons);
}
static void

76
src/bin/e_theme.c
View File

@ -16,18 +16,18 @@ struct _E_Theme_Result
static Evas_Bool _e_theme_mappings_free_cb(const Evas_Hash *hash, const char *key, void *data, void *fdata);
static Evas_Bool _e_theme_mappings_quickfind_free_cb(const Evas_Hash *hash, const char *key, void *data, void *fdata);
static void _e_theme_category_register(const char *category);
static Evas_List *_e_theme_collection_item_register(Evas_List *list, const char *name);
static Evas_List *_e_theme_collection_items_find(const char *base, const char *collname);
static Eina_List *_e_theme_collection_item_register(Eina_List *list, const char *name);
static Eina_List *_e_theme_collection_items_find(const char *base, const char *collname);
/* local subsystem globals */
static Evas_Hash *mappings = NULL;
static Evas_Hash *group_cache = NULL;
static Evas_List *categories = NULL;
static Evas_List *transitions = NULL;
static Evas_List *borders = NULL;
static Evas_List *shelfs = NULL;
static Eina_List *categories = NULL;
static Eina_List *transitions = NULL;
static Eina_List *borders = NULL;
static Eina_List *shelfs = NULL;
static E_Fm2_Mime_Handler *theme_hdl = NULL;
/* externally accessible functions */
@ -35,7 +35,7 @@ static E_Fm2_Mime_Handler *theme_hdl = NULL;
EAPI int
e_theme_init(void)
{
Evas_List *l = NULL;
Eina_List *l = NULL;
/* Register mime handler */
theme_hdl = e_fm2_mime_handler_new(_("Set As Theme"), "enlightenment/themes",
@ -122,22 +122,22 @@ e_theme_shutdown(void)
while (categories)
{
eina_stringshare_del(categories->data);
categories = evas_list_remove_list(categories, categories);
categories = eina_list_remove_list(categories, categories);
}
while (transitions)
{
eina_stringshare_del(transitions->data);
transitions = evas_list_remove_list(transitions, transitions);
transitions = eina_list_remove_list(transitions, transitions);
}
while (borders)
{
eina_stringshare_del(borders->data);
borders = evas_list_remove_list(borders, borders);
borders = eina_list_remove_list(borders, borders);
}
while (shelfs)
{
eina_stringshare_del(shelfs->data);
shelfs = evas_list_remove_list(shelfs, shelfs);
shelfs = eina_list_remove_list(shelfs, shelfs);
}
return 1;
}
@ -238,7 +238,7 @@ e_theme_edje_file_get(const char *category, const char *group)
if (str)
{
void *tres;
Evas_List *coll, *l;
Eina_List *coll, *l;
int ok;
snprintf(buf, sizeof(buf), "%s/::/%s", str, group);
@ -321,7 +321,7 @@ EAPI int
e_theme_config_set(const char *category, const char *file)
{
E_Config_Theme *ect;
Evas_List *next;
Eina_List *next;
/* Don't accept unused categories */
#if 0
@ -331,7 +331,7 @@ e_theme_config_set(const char *category, const char *file)
/* search for the category */
for (next = e_config->themes; next; next = next->next)
{
ect = evas_list_data(next);
ect = eina_list_data_get(next);
if (!strcmp(ect->category, category))
{
if (ect->file) eina_stringshare_del(ect->file);
@ -345,7 +345,7 @@ e_theme_config_set(const char *category, const char *file)
ect->category = eina_stringshare_add(category);
ect->file = eina_stringshare_add(file);
e_config->themes = evas_list_append(e_config->themes, ect);
e_config->themes = eina_list_append(e_config->themes, ect);
return 1;
}
@ -356,12 +356,12 @@ EAPI E_Config_Theme *
e_theme_config_get(const char *category)
{
E_Config_Theme *ect = NULL;
Evas_List *next;
Eina_List *next;
/* search for the category */
for (next = e_config->themes; next; next = next->next)
{
ect = evas_list_data(next);
ect = eina_list_data_get(next);
if (!strcmp(ect->category, category))
return ect;
}
@ -372,15 +372,15 @@ EAPI int
e_theme_config_remove(const char *category)
{
E_Config_Theme *ect;
Evas_List *next;
Eina_List *next;
/* search for the category */
for (next = e_config->themes; next; next = next->next)
{
ect = evas_list_data(next);
ect = eina_list_data_get(next);
if (!strcmp(ect->category, category))
{
e_config->themes = evas_list_remove_list(e_config->themes, next);
e_config->themes = eina_list_remove_list(e_config->themes, next);
if (ect->category) eina_stringshare_del(ect->category);
if (ect->file) eina_stringshare_del(ect->file);
free(ect);
@ -390,7 +390,7 @@ e_theme_config_remove(const char *category)
return 1;
}
EAPI Evas_List *
EAPI Eina_List *
e_theme_config_list(void)
{
return e_config->themes;
@ -399,7 +399,7 @@ e_theme_config_list(void)
EAPI int
e_theme_category_find(const char *category)
{
Evas_List *l;
Eina_List *l;
for (l = categories; l; l = l->next)
{
@ -409,7 +409,7 @@ e_theme_category_find(const char *category)
return 0;
}
EAPI Evas_List *
EAPI Eina_List *
e_theme_category_list(void)
{
return categories;
@ -418,7 +418,7 @@ e_theme_category_list(void)
EAPI int
e_theme_transition_find(const char *transition)
{
Evas_List *l;
Eina_List *l;
for (l = transitions; l; l = l->next)
{
@ -428,7 +428,7 @@ e_theme_transition_find(const char *transition)
return 0;
}
EAPI Evas_List *
EAPI Eina_List *
e_theme_transition_list(void)
{
return transitions;
@ -437,7 +437,7 @@ e_theme_transition_list(void)
EAPI int
e_theme_border_find(const char *border)
{
Evas_List *l;
Eina_List *l;
for (l = borders; l; l = l->next)
{
@ -447,7 +447,7 @@ e_theme_border_find(const char *border)
return 0;
}
EAPI Evas_List *
EAPI Eina_List *
e_theme_border_list(void)
{
return borders;
@ -456,7 +456,7 @@ e_theme_border_list(void)
EAPI int
e_theme_shelf_find(const char *shelf)
{
Evas_List *l;
Eina_List *l;
for (l = shelfs; l; l = l->next)
{
@ -466,7 +466,7 @@ e_theme_shelf_find(const char *shelf)
return 0;
}
EAPI Evas_List *
EAPI Eina_List *
e_theme_shelf_list(void)
{
return shelfs;
@ -521,33 +521,33 @@ _e_theme_mappings_quickfind_free_cb(const Evas_Hash *hash, const char *key, void
static void
_e_theme_category_register(const char *category)
{
Evas_List *l;
Eina_List *l;
for (l = categories; l; l = l->next)
{
if (!strcmp(category, l->data)) return;
}
categories = evas_list_append(categories, eina_stringshare_add(category));
categories = eina_list_append(categories, eina_stringshare_add(category));
}
static Evas_List *
_e_theme_collection_item_register(Evas_List *list, const char *name)
static Eina_List *
_e_theme_collection_item_register(Eina_List *list, const char *name)
{
Evas_List *l;
Eina_List *l;
for (l = list; l; l = l->next)
{
if (!strcmp(name, l->data)) return list;
}
list = evas_list_append(list, eina_stringshare_add(name));
list = eina_list_append(list, eina_stringshare_add(name));
return list;
}
static Evas_List *
static Eina_List *
_e_theme_collection_items_find(const char *base, const char *collname)
{
Evas_List *list = NULL;
Eina_List *list = NULL;
E_Theme_Result *res;
char *category, *p, *p2;
int collname_len;
@ -575,7 +575,7 @@ _e_theme_collection_items_find(const char *base, const char *collname)
}
if (str)
{
Evas_List *coll, *l;
Eina_List *coll, *l;
coll = edje_file_collection_list(str);
if (coll)

10
src/bin/e_theme.h
View File

@ -16,16 +16,16 @@ EAPI void e_theme_file_set(const char *category, const char *file);
EAPI int e_theme_config_set(const char *category, const char *file);
EAPI E_Config_Theme *e_theme_config_get(const char *category);
EAPI int e_theme_config_remove(const char *category);
EAPI Evas_List *e_theme_config_list(void);
EAPI Eina_List *e_theme_config_list(void);
EAPI int e_theme_category_find(const char *category);
EAPI Evas_List *e_theme_category_list(void);
EAPI Eina_List *e_theme_category_list(void);
EAPI int e_theme_transition_find(const char *transition);
EAPI Evas_List *e_theme_transition_list(void);
EAPI Eina_List *e_theme_transition_list(void);
EAPI int e_theme_border_find(const char *border);
EAPI Evas_List *e_theme_border_list(void);
EAPI Eina_List *e_theme_border_list(void);
EAPI int e_theme_shelf_find(const char *shelf);
EAPI Evas_List *e_theme_shelf_list(void);
EAPI Eina_List *e_theme_shelf_list(void);
EAPI void e_theme_handler_set(Evas_Object *obj, const char *path, void *data);
EAPI int e_theme_handler_test(Evas_Object *obj, const char *path, void *data);

46
src/bin/e_thumb.c
View File

@ -29,9 +29,9 @@ static int _e_thumb_cb_kill(void *data);
static int _e_thumb_cb_exe_event_del(void *data, int type, void *event);
/* local subsystem globals */
static Evas_List *_thumbnailers = NULL;
static Evas_List *_thumbnailers_exe = NULL;
static Evas_List *_thumb_queue = NULL;
static Eina_List *_thumbnailers = NULL;
static Eina_List *_thumbnailers_exe = NULL;
static Eina_List *_thumb_queue = NULL;
static int _objid = 0;
static Evas_Hash *_thumbs = NULL;
static int _pending = 0;
@ -56,13 +56,13 @@ e_thumb_shutdown(void)
_e_thumb_cb_kill(NULL);
ecore_event_handler_del(_exe_del_handler);
_exe_del_handler = NULL;
_thumbnailers = evas_list_free(_thumbnailers);
_thumbnailers = eina_list_free(_thumbnailers);
while (_thumbnailers_exe)
{
ecore_exe_free(_thumbnailers_exe->data);
_thumbnailers_exe = evas_list_remove_list(_thumbnailers_exe, _thumbnailers_exe);
_thumbnailers_exe = eina_list_remove_list(_thumbnailers_exe, _thumbnailers_exe);
}
_thumb_queue = evas_list_free(_thumb_queue);
_thumb_queue = eina_list_free(_thumb_queue);
_objid = 0;
evas_hash_free(_thumbs);
_thumbs = NULL;
@ -130,23 +130,23 @@ e_thumb_icon_begin(Evas_Object *obj)
if (!eth->file) return;
if (!_thumbnailers)
{
while (evas_list_count(_thumbnailers_exe) < _num_thumbnailers)
while (eina_list_count(_thumbnailers_exe) < _num_thumbnailers)
{
Ecore_Exe *exe;
snprintf(buf, sizeof(buf), "%s/enlightenment_thumb --nice=%d", e_prefix_bin_get(),
e_config->thumb_nice);
exe = ecore_exe_run(buf, NULL);
_thumbnailers_exe = evas_list_append(_thumbnailers_exe, exe);
_thumbnailers_exe = eina_list_append(_thumbnailers_exe, exe);
}
_thumb_queue = evas_list_append(_thumb_queue, eth);
_thumb_queue = eina_list_append(_thumb_queue, eth);
eth->queued = 1;
return;
}
while (_thumb_queue)
{
eth2 = _thumb_queue->data;
_thumb_queue = evas_list_remove_list(_thumb_queue, _thumb_queue);
_thumb_queue = eina_list_remove_list(_thumb_queue, _thumb_queue);
eth2->queued = 0;
eth2->busy = 1;
_pending++;
@ -168,7 +168,7 @@ e_thumb_icon_end(Evas_Object *obj)
if (!eth) return;
if (eth->queued)
{
_thumb_queue = evas_list_remove(_thumb_queue, eth);
_thumb_queue = eina_list_remove(_thumb_queue, eth);
eth->queued = 0;
}
if (eth->busy)
@ -202,8 +202,8 @@ e_thumb_client_data(Ecore_Ipc_Event_Client_Data *e)
E_Thumb *eth;
Evas_Object *obj;
if (!evas_list_find(_thumbnailers, e->client))
_thumbnailers = evas_list_prepend(_thumbnailers, e->client);
if (!eina_list_data_find(_thumbnailers, e->client))
_thumbnailers = eina_list_prepend(_thumbnailers, e->client);
if (e->minor == 2)
{
objid = e->ref;
@ -232,7 +232,7 @@ e_thumb_client_data(Ecore_Ipc_Event_Client_Data *e)
while (_thumb_queue)
{
eth = _thumb_queue->data;
_thumb_queue = evas_list_remove_list(_thumb_queue, _thumb_queue);
_thumb_queue = eina_list_remove_list(_thumb_queue, _thumb_queue);
eth->queued = 0;
eth->busy = 1;
_pending++;
@ -245,8 +245,8 @@ e_thumb_client_data(Ecore_Ipc_Event_Client_Data *e)
EAPI void
e_thumb_client_del(Ecore_Ipc_Event_Client_Del *e)
{
if (!evas_list_find(_thumbnailers, e->client)) return;
_thumbnailers = evas_list_remove(_thumbnailers, e->client);
if (!eina_list_data_find(_thumbnailers, e->client)) return;
_thumbnailers = eina_list_remove(_thumbnailers, e->client);
if ((!_thumbs) && (!_thumbnailers)) _objid = 0;
}
@ -268,15 +268,15 @@ _e_thumb_gen_begin(int objid, const char *file, const char *key, int w, int h)
else buf[l1 + 1] = 0;
cli = _thumbnailers->data;
if (!cli) return;
_thumbnailers = evas_list_remove_list(_thumbnailers, _thumbnailers);
_thumbnailers = evas_list_append(_thumbnailers, cli);
_thumbnailers = eina_list_remove_list(_thumbnailers, _thumbnailers);
_thumbnailers = eina_list_append(_thumbnailers, cli);
ecore_ipc_client_send(cli, E_IPC_DOMAIN_THUMB, 1, objid, w, h, buf, l1 + 1 + l2 + 1);
}
static void
_e_thumb_gen_end(int objid)
{
Evas_List *l;
Eina_List *l;
Ecore_Ipc_Client *cli;
/* send thumb cancel */
@ -304,7 +304,7 @@ _e_thumb_del_hook(void *data, Evas *e, Evas_Object *obj, void *event_info)
if (_pending == 0) _e_thumb_thumbnailers_kill();
}
if (eth->queued)
_thumb_queue = evas_list_remove(_thumb_queue, eth);
_thumb_queue = eina_list_remove(_thumb_queue, eth);
if (eth->file) eina_stringshare_del(eth->file);
if (eth->key) eina_stringshare_del(eth->key);
free(eth);
@ -355,7 +355,7 @@ _e_thumb_thumbnailers_kill_cancel(void)
static int
_e_thumb_cb_kill(void *data)
{
Evas_List *l;
Eina_List *l;
for (l = _thumbnailers_exe; l; l = l->next)
ecore_exe_terminate(l->data);
@ -367,14 +367,14 @@ static int
_e_thumb_cb_exe_event_del(void *data, int type, void *event)
{
Ecore_Exe_Event_Del *ev;
Evas_List *l;
Eina_List *l;
ev = event;
for (l = _thumbnailers_exe; l; l = l->next)
{
if (l->data == ev->exe)
{
_thumbnailers_exe = evas_list_remove_list(_thumbnailers_exe, l);
_thumbnailers_exe = eina_list_remove_list(_thumbnailers_exe, l);
break;
}
}

12
src/bin/e_thumb_main.c
View File

@ -36,7 +36,7 @@ static char *_e_thumb_file_id(char *file, char *key);
/* local subsystem globals */
static Ecore_Ipc_Server *_e_ipc_server = NULL;
static Evas_List *_thumblist = NULL;
static Eina_List *_thumblist = NULL;
static Ecore_Timer *_timer = NULL;
static char _thumbdir[4096] = "";
@ -154,7 +154,7 @@ _e_ipc_cb_server_data(void *data, int type, void *event)
{
Ecore_Ipc_Event_Server_Data *e;
E_Thumb *eth;
Evas_List *l;
Eina_List *l;
char *file = NULL;
char *key = NULL;
@ -181,7 +181,7 @@ _e_ipc_cb_server_data(void *data, int type, void *event)
eth->h = e->response;
eth->file = strdup(file);
if (key) eth->key = strdup(key);
_thumblist = evas_list_append(_thumblist, eth);
_thumblist = eina_list_append(_thumblist, eth);
if (!_timer) _timer = ecore_timer_add(0.001, _e_cb_timer, NULL);
}
}
@ -193,7 +193,7 @@ _e_ipc_cb_server_data(void *data, int type, void *event)
eth = l->data;
if (eth->objid == e->ref)
{
_thumblist = evas_list_remove_list(_thumblist, l);
_thumblist = eina_list_remove_list(_thumblist, l);
if (eth->file) free(eth->file);
if (eth->key) free(eth->key);
free(eth);
@ -216,14 +216,14 @@ _e_cb_timer(void *data)
{
E_Thumb *eth;
/*
Evas_List *del_list = NULL, *l;
Eina_List *del_list = NULL, *l;
*/
/* take thumb at head of list */
if (_thumblist)
{
eth = _thumblist->data;
_thumblist = evas_list_remove_list(_thumblist, _thumblist);
_thumblist = eina_list_remove_list(_thumblist, _thumblist);
_e_thumb_generate(eth);
if (eth->file) free(eth->file);
if (eth->key) free(eth->key);

22
src/bin/e_toolbar.c
View File

@ -21,7 +21,7 @@ static void _e_toolbar_fm2_selection_changed(void *data, Evas_Object *obj, void
static void _e_toolbar_menu_items_append(void *data, E_Gadcon_Client *gcc, E_Menu *mn);
/* local vars */
static Evas_List *toolbars = NULL;
static Eina_List *toolbars = NULL;
EAPI int
e_toolbar_init(void)
@ -53,7 +53,7 @@ e_toolbar_new(Evas *evas, const char *name, E_Win *fwin, Evas_Object *fm2)
tbar = E_OBJECT_ALLOC(E_Toolbar, E_TOOLBAR_TYPE, _e_toolbar_free);
if (!tbar) return NULL;
tbar->id = 1;
// tbar->id = evas_list_count(toolbars) + 1;
// tbar->id = eina_list_count(toolbars) + 1;
tbar->x = tbar->y = 0;
tbar->h = 32;
tbar->w = fwin->w;
@ -103,7 +103,7 @@ e_toolbar_new(Evas *evas, const char *name, E_Win *fwin, Evas_Object *fm2)
_e_toolbar_menu_items_append, tbar);
e_gadcon_populate(tbar->gadcon);
toolbars = evas_list_append(toolbars, tbar);
toolbars = eina_list_append(toolbars, tbar);
return tbar;
}
@ -254,7 +254,7 @@ e_toolbar_populate(E_Toolbar *tbar)
static void
_e_toolbar_free(E_Toolbar *tbar)
{
toolbars = evas_list_remove(toolbars, tbar);
toolbars = eina_list_remove(toolbars, tbar);
if (tbar->menu)
{
@ -362,7 +362,7 @@ static void
_e_toolbar_menu_del_hook(void *data)
{
E_Menu *mn;
Evas_List *l = NULL;
Eina_List *l = NULL;
mn = data;
for (l = mn->items; l; l = l->next)
@ -508,7 +508,7 @@ static void
_e_toolbar_fm2_changed(void *data, Evas_Object *obj, void *event_info)
{
E_Toolbar *tbar;
Evas_List *l = NULL;
Eina_List *l = NULL;
tbar = data;
if (!tbar) return;
@ -526,7 +526,7 @@ static void
_e_toolbar_fm2_dir_changed(void *data, Evas_Object *obj, void *event_info)
{
E_Toolbar *tbar;
Evas_List *l = NULL;
Eina_List *l = NULL;
tbar = data;
if (!tbar) return;
@ -544,7 +544,7 @@ static void
_e_toolbar_fm2_dir_deleted(void *data, Evas_Object *obj, void *event_info)
{
E_Toolbar *tbar;
Evas_List *l = NULL;
Eina_List *l = NULL;
tbar = data;
if (!tbar) return;
@ -562,7 +562,7 @@ static void
_e_toolbar_fm2_files_deleted(void *data, Evas_Object *obj, void *event_info)
{
E_Toolbar *tbar;
Evas_List *l = NULL;
Eina_List *l = NULL;
tbar = data;
if (!tbar) return;
@ -580,7 +580,7 @@ static void
_e_toolbar_fm2_selected(void *data, Evas_Object *obj, void *event_info)
{
E_Toolbar *tbar;
Evas_List *l = NULL;
Eina_List *l = NULL;
tbar = data;
if (!tbar) return;
@ -598,7 +598,7 @@ static void
_e_toolbar_fm2_selection_changed(void *data, Evas_Object *obj, void *event_info)
{
E_Toolbar *tbar;
Evas_List *l = NULL;
Eina_List *l = NULL;
tbar = data;
if (!tbar) return;

20
src/bin/e_utils.c
View File

@ -127,7 +127,7 @@ e_util_glob_case_match(const char *str, const char *glob)
EAPI E_Container *
e_util_container_number_get(int num)
{
Evas_List *l;
Eina_List *l;
for (l = e_manager_list(); l; l = l->next)
{
@ -240,7 +240,7 @@ e_util_both_str_empty(const char *s1, const char *s2)
EAPI int
e_util_immortal_check(void)
{
Evas_List *wins;
Eina_List *wins;
wins = e_border_immortal_windows_get();
if (wins)
@ -252,7 +252,7 @@ e_util_immortal_check(void)
/* FIXME: should really display a list of these lifespan locked */
/* windows in a dialog and let the user disable their locks in */
/* this dialog */
evas_list_free(wins);
eina_list_free(wins);
return 1;
}
return 0;
@ -402,7 +402,7 @@ e_util_menu_item_edje_icon_set(E_Menu_Item *mi, const char *name)
EAPI E_Container *
e_util_container_window_find(Ecore_X_Window win)
{
Evas_List *l, *ll;
Eina_List *l, *ll;
for (l = e_manager_list(); l; l = l->next)
{
@ -426,7 +426,7 @@ EAPI E_Border *
e_util_desk_border_above(E_Border *bd)
{
E_Border *above = NULL;
Evas_List *l;
Eina_List *l;
int pos, i;
E_OBJECT_CHECK_RETURN(bd, NULL);
@ -439,7 +439,7 @@ e_util_desk_border_above(E_Border *bd)
else if ((bd->layer > 150) && (bd->layer <= 200)) pos = 4;
else pos = 5;
for (l = evas_list_find_list(bd->zone->container->layers[pos].clients, bd);
for (l = eina_list_data_find_list(bd->zone->container->layers[pos].clients, bd);
(l) && (l->next) && (!above);
l = l->next)
{
@ -469,7 +469,7 @@ EAPI E_Border *
e_util_desk_border_below(E_Border *bd)
{
E_Border *below = NULL;
Evas_List *l;
Eina_List *l;
int pos, i;
E_OBJECT_CHECK_RETURN(bd, NULL);
@ -482,7 +482,7 @@ e_util_desk_border_below(E_Border *bd)
else if ((bd->layer > 150) && (bd->layer <= 200)) pos = 4;
else pos = 5;
for (l = evas_list_find_list(bd->zone->container->layers[pos].clients, bd);
for (l = eina_list_data_find_list(bd->zone->container->layers[pos].clients, bd);
(l) && (l->prev) && (!below);
l = l->prev)
{
@ -497,7 +497,7 @@ e_util_desk_border_below(E_Border *bd)
{
if (bd->zone->container->layers[i].clients)
{
for (l = evas_list_last(bd->zone->container->layers[i].clients);
for (l = eina_list_last(bd->zone->container->layers[i].clients);
(l) && (!below);
l = l->prev)
{
@ -515,7 +515,7 @@ e_util_desk_border_below(E_Border *bd)
EAPI int
e_util_edje_collection_exists(const char *file, const char *coll)
{
Evas_List *clist, *l;
Eina_List *clist, *l;
clist = edje_file_collection_list(file);
for (l = clist; l; l = l->next)

20
src/bin/e_widget.c
View File

@ -13,7 +13,7 @@ struct _E_Smart_Data
Evas_Object *parent_obj;
Evas_Coord x, y, w, h;
Evas_Coord minw, minh;
Evas_List *subobjs;
Eina_List *subobjs;
Evas_Object *resize_obj;
void (*del_func) (Evas_Object *obj);
void (*focus_func) (Evas_Object *obj);
@ -134,7 +134,7 @@ EAPI void
e_widget_sub_object_add(Evas_Object *obj, Evas_Object *sobj)
{
API_ENTRY return;
sd->subobjs = evas_list_append(sd->subobjs, sobj);
sd->subobjs = eina_list_append(sd->subobjs, sobj);
if (!sd->child_can_focus)
{
if (e_widget_can_focus_get(sobj)) sd->child_can_focus = 1;
@ -154,7 +154,7 @@ EAPI void
e_widget_sub_object_del(Evas_Object *obj, Evas_Object *sobj)
{
API_ENTRY return;
sd->subobjs = evas_list_remove(sd->subobjs, sobj);
sd->subobjs = eina_list_remove(sd->subobjs, sobj);
if (!sd->child_can_focus)
{
if (e_widget_can_focus_get(sobj)) sd->child_can_focus = 0;
@ -197,7 +197,7 @@ e_widget_focus_get(Evas_Object *obj)
EAPI Evas_Object *
e_widget_focused_object_get(Evas_Object *obj)
{
Evas_List *l;
Eina_List *l;
API_ENTRY return NULL;
if (!sd->focused) return NULL;
for (l = sd->subobjs; l; l = l->next)
@ -228,7 +228,7 @@ e_widget_focus_jump(Evas_Object *obj, int forward)
/* its some container */
else
{
Evas_List *l;
Eina_List *l;
int focus_next;
focus_next = 0;
@ -270,7 +270,7 @@ e_widget_focus_jump(Evas_Object *obj, int forward)
}
else
{
for (l = evas_list_last(sd->subobjs); l; l = l->prev)
for (l = eina_list_last(sd->subobjs); l; l = l->prev)
{
if (e_widget_can_focus_get(l->data))
{
@ -318,7 +318,7 @@ e_widget_focus_set(Evas_Object *obj, int first)
}
else
{
Evas_List *l;
Eina_List *l;
if (first)
{
@ -334,7 +334,7 @@ e_widget_focus_set(Evas_Object *obj, int first)
}
else
{
for (l = evas_list_last(sd->subobjs); l; l = l->prev)
for (l = eina_list_last(sd->subobjs); l; l = l->prev)
{
if ((e_widget_can_focus_get(l->data)) &&
(!e_widget_disabled_get(l->data)))
@ -357,7 +357,7 @@ e_widget_parent_get(Evas_Object *obj)
EAPI void
e_widget_focused_object_clear(Evas_Object *obj)
{
Evas_List *l;
Eina_List *l;
API_ENTRY return;
if (!sd->focused) return;
sd->focused = 0;
@ -502,7 +502,7 @@ _e_smart_del(Evas_Object *obj)
while (sd->subobjs)
{
sobj = sd->subobjs->data;
sd->subobjs = evas_list_remove_list(sd->subobjs, sd->subobjs);
sd->subobjs = eina_list_remove_list(sd->subobjs, sd->subobjs);
evas_object_del(sobj);
}
free(sd);

14
src/bin/e_widget_csel.c
View File

@ -7,8 +7,8 @@ typedef struct _E_Widget_Data E_Widget_Data;
struct _E_Widget_Data
{
Evas_Object *obj;
Evas_List *sliders;
Evas_List *entries;
Eina_List *sliders;
Eina_List *entries;
Evas_Object *spectrum, *vert, *well;
E_Color *cv;
char **values;
@ -31,8 +31,8 @@ _e_wid_del_hook(Evas_Object *obj)
}
E_FREE(wd->values);
evas_list_free(wd->sliders);
evas_list_free(wd->entries);
eina_list_free(wd->sliders);
eina_list_free(wd->entries);
E_FREE(wd);
}
@ -50,7 +50,7 @@ static void
_e_wid_cb_color_changed(void *data, Evas_Object *o)
{
E_Widget_Data *wd = data;
Evas_List *l;
Eina_List *l;
int i;
int changed = -1;
@ -238,14 +238,14 @@ e_widget_csel_add(Evas *evas, E_Color *color)
o = e_widget_cslider_add(evas, i, wd->cv, 0, 0);
e_widget_sub_object_add(obj, o);
evas_object_show(o);
wd->sliders = evas_list_append(wd->sliders, o);
wd->sliders = eina_list_append(wd->sliders, o);
e_widget_on_change_hook_set(o, _e_wid_cb_color_changed, wd);
e_widget_table_object_append(frame, o, 1, i, 1, 1, 1, 1, 1, 0);
o = e_widget_entry_add(evas, &(wd->values[i]), NULL, NULL, NULL);
e_widget_sub_object_add(obj, o);
evas_object_show(o);
wd->entries = evas_list_append(wd->entries, o);
wd->entries = eina_list_append(wd->entries, o);
e_widget_table_object_append(frame, o, 2, i, 1, 1, 1, 1, 1, 1);
e_widget_on_change_hook_set(o, _e_wid_cb_color_changed, wd);

18
src/bin/e_widget_desk_preview.c
View File

@ -10,7 +10,7 @@ struct _E_Widget_Data
Evas_Object *obj;
Evas_Object *aspect;
Evas_Object *table;
Evas_List *desks;
Eina_List *desks;
Ecore_Event_Handler *update_handler;
@ -35,7 +35,7 @@ static void
_e_wid_del_hook(Evas_Object *obj)
{
E_Widget_Data *wd;
Evas_List *l;
Eina_List *l;
wd = e_widget_data_get(obj);
if (!wd) return;
@ -49,7 +49,7 @@ _e_wid_del_hook(Evas_Object *obj)
dd = e_widget_data_get(o);
e_thumb_icon_end(o);
}
evas_list_free(wd->desks);
eina_list_free(wd->desks);
free(wd);
}
@ -123,7 +123,7 @@ e_widget_deskpreview_desk_add(Evas *evas, E_Zone *zone, int x, int y, int tw, in
static void
_e_wid_reconfigure(E_Widget_Data *wd)
{
Evas_List *l, *delete = NULL;
Eina_List *l, *delete = NULL;
int x, y;
int aw, ah; /* available */
int mw, mh; /* min size for each desk */
@ -179,7 +179,7 @@ _e_wid_reconfigure(E_Widget_Data *wd)
}
else
{
delete = evas_list_append(delete, dw);
delete = eina_list_append(delete, dw);
}
}
while (delete)
@ -187,8 +187,8 @@ _e_wid_reconfigure(E_Widget_Data *wd)
Evas_Object *dw = delete->data;
e_widget_table_unpack(wd->table, dw);
evas_object_del(dw);
wd->desks = evas_list_remove(wd->desks, dw);
delete = evas_list_remove_list(delete, delete);
wd->desks = eina_list_remove(wd->desks, dw);
delete = eina_list_remove_list(delete, delete);
}
for (y = 0; y < ny; y++)
@ -204,7 +204,7 @@ _e_wid_reconfigure(E_Widget_Data *wd)
e_widget_min_size_set(dw, mw, mh);
e_widget_table_object_append(wd->table, dw, x, y, 1, 1, 1, 1, 1, 1);
wd->desks = evas_list_append(wd->desks, dw);
wd->desks = eina_list_append(wd->desks, dw);
}
}
@ -271,7 +271,7 @@ _e_wid_cb_bg_update(void *data, int type, void *event)
{
E_Event_Bg_Update *ev;
E_Widget_Data *wd;
Evas_List *l;
Eina_List *l;
if (type != E_EVENT_BG_UPDATE) return 1;

4
src/bin/e_widget_flist.c
View File

@ -94,7 +94,7 @@ e_widget_flist_path_set(Evas_Object *obj, const char *dev, const char *path)
e_scrollframe_child_pos_set(wd->o_scroll, 0, 0);
}
EAPI Evas_List *
EAPI Eina_List *
e_widget_flist_all_list_get(Evas_Object *obj)
{
E_Widget_Data *wd = NULL;
@ -103,7 +103,7 @@ e_widget_flist_all_list_get(Evas_Object *obj)
return e_fm2_all_list_get(wd->o_fm);
}
EAPI Evas_List *
EAPI Eina_List *
e_widget_flist_selected_list_get(Evas_Object *obj)
{
E_Widget_Data *wd = NULL;

Some files were not shown because too many files have changed in this diff Show More