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

Fix formatting ugliness. 

Add 'const' to evas_hash_foreach functions as per recent Evas changes.


SVN revision: 33748
This commit is contained in:
Christopher Michael 2008-02-15 19:30:12 +00:00
parent 4d5430d438
commit 6fd085f0aa
1 changed files with 103 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

244
legacy/edje/src/lib/edje_util.c
View File

@ -21,8 +21,8 @@ struct _Edje_List_Foreach_Data
Evas_List *list; Evas_List *list;
}; };
static Evas_Bool _edje_color_class_list_foreach(Evas_Hash *hash, const char *key, void *data, void *fdata); static Evas_Bool _edje_color_class_list_foreach(const Evas_Hash *hash, const char *key, void *data, void *fdata);
static Evas_Bool _edje_text_class_list_foreach(Evas_Hash *hash, const char *key, void *data, void *fdata); static Evas_Bool _edje_text_class_list_foreach(const Evas_Hash *hash, const char *key, void *data, void *fdata);
Edje_Real_Part *_edje_real_part_recursive_get_helper(Edje *ed, char **path); Edje_Real_Part *_edje_real_part_recursive_get_helper(Edje *ed, char **path);
@ -211,7 +211,8 @@ edje_color_class_set(const char *color_class, int r, int g, int b, int a, int r2
free(cc); free(cc);
return; return;
} }
_edje_color_class_hash = evas_hash_add(_edje_color_class_hash, color_class, cc); _edje_color_class_hash =
evas_hash_add(_edje_color_class_hash, color_class, cc);
if (evas_hash_alloc_error()) if (evas_hash_alloc_error())
{ {
evas_stringshare_del(cc->name); evas_stringshare_del(cc->name);
@ -277,7 +278,8 @@ edje_color_class_del(const char *color_class)
cc = evas_hash_find(_edje_color_class_hash, color_class); cc = evas_hash_find(_edje_color_class_hash, color_class);
if (!cc) return; if (!cc) return;
_edje_color_class_hash = evas_hash_del(_edje_color_class_hash, color_class, cc); _edje_color_class_hash =
evas_hash_del(_edje_color_class_hash, color_class, cc);
evas_stringshare_del(cc->name); evas_stringshare_del(cc->name);
free(cc); free(cc);
@ -305,13 +307,14 @@ edje_color_class_list(void)
Edje_List_Foreach_Data fdata; Edje_List_Foreach_Data fdata;
memset(&fdata, 0, sizeof(Edje_List_Foreach_Data)); memset(&fdata, 0, sizeof(Edje_List_Foreach_Data));
evas_hash_foreach(_edje_color_class_member_hash, _edje_color_class_list_foreach, &fdata); evas_hash_foreach(_edje_color_class_member_hash,
_edje_color_class_list_foreach, &fdata);
return fdata.list; return fdata.list;
} }
static Evas_Bool static Evas_Bool
_edje_color_class_list_foreach(Evas_Hash *hash, const char *key, void *data, void *fdata) _edje_color_class_list_foreach(const Evas_Hash *hash, const char *key, void *data, void *fdata)
{ {
Edje_List_Foreach_Data *fd; Edje_List_Foreach_Data *fd;
@ -494,7 +497,8 @@ edje_text_class_set(const char *text_class, const char *font, Evas_Font_Size siz
free(tc); free(tc);
return; return;
} }
_edje_text_class_hash = evas_hash_add(_edje_text_class_hash, text_class, tc); _edje_text_class_hash =
evas_hash_add(_edje_text_class_hash, text_class, tc);
if (evas_hash_alloc_error()) if (evas_hash_alloc_error())
{ {
evas_stringshare_del(tc->name); evas_stringshare_del(tc->name);
@ -516,7 +520,8 @@ edje_text_class_set(const char *text_class, const char *font, Evas_Font_Size siz
tc->font = evas_stringshare_add(font); tc->font = evas_stringshare_add(font);
if (!tc->font) if (!tc->font)
{ {
_edje_text_class_hash = evas_hash_del(_edje_text_class_hash, text_class, tc); _edje_text_class_hash =
evas_hash_del(_edje_text_class_hash, text_class, tc);
free(tc); free(tc);
return; return;
} }
@ -552,7 +557,8 @@ edje_text_class_del(const char *text_class)
tc = evas_hash_find(_edje_text_class_hash, text_class); tc = evas_hash_find(_edje_text_class_hash, text_class);
if (!tc) return; if (!tc) return;
_edje_text_class_hash = evas_hash_del(_edje_text_class_hash, text_class, tc); _edje_text_class_hash =
evas_hash_del(_edje_text_class_hash, text_class, tc);
evas_stringshare_del(tc->name); evas_stringshare_del(tc->name);
evas_stringshare_del(tc->font); evas_stringshare_del(tc->font);
free(tc); free(tc);
@ -582,13 +588,14 @@ edje_text_class_list(void)
Edje_List_Foreach_Data fdata; Edje_List_Foreach_Data fdata;
memset(&fdata, 0, sizeof(Edje_List_Foreach_Data)); memset(&fdata, 0, sizeof(Edje_List_Foreach_Data));
evas_hash_foreach(_edje_text_class_member_hash, _edje_text_class_list_foreach, &fdata); evas_hash_foreach(_edje_text_class_member_hash,
_edje_text_class_list_foreach, &fdata);
return fdata.list; return fdata.list;
} }
static Evas_Bool static Evas_Bool
_edje_text_class_list_foreach(Evas_Hash *hash, const char *key, void *data, void *fdata) _edje_text_class_list_foreach(const Evas_Hash *hash, const char *key, void *data, void *fdata)
{ {
Edje_List_Foreach_Data *fd; Edje_List_Foreach_Data *fd;
@ -623,15 +630,12 @@ edje_object_text_class_set(Evas_Object *obj, const char *text_class, const char
if ((tc->name) && (!strcmp(tc->name, text_class))) if ((tc->name) && (!strcmp(tc->name, text_class)))
{ {
/* Match and the same, return */ /* Match and the same, return */
if ((tc->font) && (font) && if ((tc->font) && (font) && (!strcmp(tc->font, font)) &&
(!strcmp(tc->font, font)) &&
(tc->size == size)) (tc->size == size))
return; return;
/* No font but size is the same, return */ /* No font but size is the same, return */
if ((!tc->font) && (!font) && if ((!tc->font) && (!font) && (tc->size == size)) return;
(tc->size == size))
return;
/* Update new text class properties */ /* Update new text class properties */
if (tc->font) evas_stringshare_del(tc->font); if (tc->font) evas_stringshare_del(tc->font);
@ -809,7 +813,8 @@ edje_object_part_text_set(Evas_Object *obj, const char *part, const char *text)
else rp->text.text = NULL; else rp->text.text = NULL;
rp->edje->dirty = 1; rp->edje->dirty = 1;
_edje_recalc(rp->edje); _edje_recalc(rp->edje);
if (rp->edje->text_change.func) rp->edje->text_change.func(rp->edje->text_change.data, obj, part); if (rp->edje->text_change.func)
rp->edje->text_change.func(rp->edje->text_change.data, obj, part);
} }
/** Returns the text of the object part /** Returns the text of the object part
@ -1004,8 +1009,8 @@ edje_object_part_unswallow(Evas_Object *obj, Evas_Object *obj_swallow)
{ {
evas_object_smart_member_del(rp->swallowed_object); evas_object_smart_member_del(rp->swallowed_object);
evas_object_event_callback_del(rp->swallowed_object, evas_object_event_callback_del(rp->swallowed_object,
EVAS_CALLBACK_FREE, EVAS_CALLBACK_FREE,
_edje_object_part_swallow_free_cb); _edje_object_part_swallow_free_cb);
evas_object_clip_unset(rp->swallowed_object); evas_object_clip_unset(rp->swallowed_object);
evas_object_data_del(rp->swallowed_object, "\377 edje.swallowing_part"); evas_object_data_del(rp->swallowed_object, "\377 edje.swallowing_part");
@ -1310,15 +1315,9 @@ edje_object_part_drag_dir_get(Evas_Object *obj, const char *part)
Edje_Real_Part *rp; Edje_Real_Part *rp;
ed = _edje_fetch(obj); ed = _edje_fetch(obj);
if ((!ed) || (!part)) if ((!ed) || (!part)) return EDJE_DRAG_DIR_NONE;
{
return EDJE_DRAG_DIR_NONE;
}
rp = _edje_real_part_recursive_get(ed, (char *)part); rp = _edje_real_part_recursive_get(ed, (char *)part);
if (!rp) if (!rp) return EDJE_DRAG_DIR_NONE;
{
return EDJE_DRAG_DIR_NONE;
}
if ((rp->part->dragable.x) && (rp->part->dragable.y)) return EDJE_DRAG_DIR_XY; if ((rp->part->dragable.x) && (rp->part->dragable.y)) return EDJE_DRAG_DIR_XY;
else if (rp->part->dragable.x) return EDJE_DRAG_DIR_X; else if (rp->part->dragable.x) return EDJE_DRAG_DIR_X;
else if (rp->part->dragable.y) return EDJE_DRAG_DIR_Y; else if (rp->part->dragable.y) return EDJE_DRAG_DIR_Y;
@ -1340,15 +1339,9 @@ edje_object_part_drag_value_set(Evas_Object *obj, const char *part, double dx, d
Edje_Real_Part *rp; Edje_Real_Part *rp;
ed = _edje_fetch(obj); ed = _edje_fetch(obj);
if ((!ed) || (!part)) if ((!ed) || (!part)) return;
{
return;
}
rp = _edje_real_part_recursive_get(ed, (char *)part); rp = _edje_real_part_recursive_get(ed, (char *)part);
if (!rp) if (!rp) return;
{
return;
}
if (rp->drag.down.count > 0) return; if (rp->drag.down.count > 0) return;
if (rp->part->dragable.confine_id != -1) if (rp->part->dragable.confine_id != -1)
{ {
@ -1417,15 +1410,9 @@ edje_object_part_drag_size_set(Evas_Object *obj, const char *part, double dw, do
Edje_Real_Part *rp; Edje_Real_Part *rp;
ed = _edje_fetch(obj); ed = _edje_fetch(obj);
if ((!ed) || (!part)) if ((!ed) || (!part)) return;
{
return;
}
rp = _edje_real_part_recursive_get(ed, (char *)part); rp = _edje_real_part_recursive_get(ed, (char *)part);
if (!rp) if (!rp) return;
{
return;
}
if (dw < 0.0) dw = 0.0; if (dw < 0.0) dw = 0.0;
else if (dw > 1.0) dw = 1.0; else if (dw > 1.0) dw = 1.0;
if (dh < 0.0) dh = 0.0; if (dh < 0.0) dh = 0.0;
@ -1484,15 +1471,9 @@ edje_object_part_drag_step_set(Evas_Object *obj, const char *part, double dx, do
Edje_Real_Part *rp; Edje_Real_Part *rp;
ed = _edje_fetch(obj); ed = _edje_fetch(obj);
if ((!ed) || (!part)) if ((!ed) || (!part)) return;
{
return;
}
rp = _edje_real_part_recursive_get(ed, (char *)part); rp = _edje_real_part_recursive_get(ed, (char *)part);
if (!rp) if (!rp) return;
{
return;
}
if (dx < 0.0) dx = 0.0; if (dx < 0.0) dx = 0.0;
else if (dx > 1.0) dx = 1.0; else if (dx > 1.0) dx = 1.0;
if (dy < 0.0) dy = 0.0; if (dy < 0.0) dy = 0.0;
@ -1548,15 +1529,9 @@ edje_object_part_drag_page_set(Evas_Object *obj, const char *part, double dx, do
Edje_Real_Part *rp; Edje_Real_Part *rp;
ed = _edje_fetch(obj); ed = _edje_fetch(obj);
if ((!ed) || (!part)) if ((!ed) || (!part)) return;
{
return;
}
rp = _edje_real_part_recursive_get(ed, (char *)part); rp = _edje_real_part_recursive_get(ed, (char *)part);
if (!rp) if (!rp) return;
{
return;
}
if (dx < 0.0) dx = 0.0; if (dx < 0.0) dx = 0.0;
else if (dx > 1.0) dx = 1.0; else if (dx > 1.0) dx = 1.0;
if (dy < 0.0) dy = 0.0; if (dy < 0.0) dy = 0.0;
@ -1614,15 +1589,9 @@ edje_object_part_drag_step(Evas_Object *obj, const char *part, double dx, double
double px, py; double px, py;
ed = _edje_fetch(obj); ed = _edje_fetch(obj);
if ((!ed) || (!part)) if ((!ed) || (!part)) return;
{
return;
}
rp = _edje_real_part_recursive_get(ed, (char *)part); rp = _edje_real_part_recursive_get(ed, (char *)part);
if (!rp) if (!rp) return;
{
return;
}
if (rp->drag.down.count > 0) return; if (rp->drag.down.count > 0) return;
px = rp->drag.val.x; px = rp->drag.val.x;
py = rp->drag.val.y; py = rp->drag.val.y;
@ -1652,15 +1621,9 @@ edje_object_part_drag_page(Evas_Object *obj, const char *part, double dx, double
double px, py; double px, py;
ed = _edje_fetch(obj); ed = _edje_fetch(obj);
if ((!ed) || (!part)) if ((!ed) || (!part)) return;
{
return;
}
rp = _edje_real_part_recursive_get(ed, (char *)part); rp = _edje_real_part_recursive_get(ed, (char *)part);
if (!rp) if (!rp) return;
{
return;
}
if (rp->drag.down.count > 0) return; if (rp->drag.down.count > 0) return;
px = rp->drag.val.x; px = rp->drag.val.x;
py = rp->drag.val.y; py = rp->drag.val.y;
@ -1695,10 +1658,10 @@ _edje_real_part_recursive_get_helper(Edje *ed, char **path)
Edje_Real_Part *rp; Edje_Real_Part *rp;
//printf(" lookup: %s on %s\n", path[0], ed->parent ? ed->parent : "-"); //printf(" lookup: %s on %s\n", path[0], ed->parent ? ed->parent : "-");
rp = _edje_real_part_get(ed, path[0]); rp = _edje_real_part_get(ed, path[0]);
if (path[1] == NULL) if (path[1] == NULL) return rp;
return rp;
if (!rp || rp->part->type != EDJE_PART_TYPE_GROUP || !rp->swallowed_object) return NULL; if ((!rp) || (rp->part->type != EDJE_PART_TYPE_GROUP) ||
(!rp->swallowed_object)) return NULL;
ed = _edje_fetch(rp->swallowed_object); ed = _edje_fetch(rp->swallowed_object);
if (!ed) return NULL; if (!ed) return NULL;
@ -1761,10 +1724,15 @@ _edje_color_class_member_add(Edje *ed, const char *color_class)
if ((!ed) || (!color_class)) return; if ((!ed) || (!color_class)) return;
members = evas_hash_find(_edje_color_class_member_hash, color_class); members = evas_hash_find(_edje_color_class_member_hash, color_class);
if (members) _edje_color_class_member_hash = evas_hash_del(_edje_color_class_member_hash, color_class, members); if (members)
{
_edje_color_class_member_hash =
evas_hash_del(_edje_color_class_member_hash, color_class, members);
}
members = evas_list_prepend(members, ed); members = evas_list_prepend(members, ed);
_edje_color_class_member_hash = evas_hash_add(_edje_color_class_member_hash, color_class, members); _edje_color_class_member_hash =
evas_hash_add(_edje_color_class_member_hash, color_class, members);
} }
void void
@ -1776,56 +1744,54 @@ _edje_color_class_member_del(Edje *ed, const char *color_class)
members = evas_hash_find(_edje_color_class_member_hash, color_class); members = evas_hash_find(_edje_color_class_member_hash, color_class);
if (!members) return; if (!members) return;
_edje_color_class_member_hash = evas_hash_del(_edje_color_class_member_hash, color_class, members); _edje_color_class_member_hash =
evas_hash_del(_edje_color_class_member_hash, color_class, members);
members = evas_list_remove(members, ed); members = evas_list_remove(members, ed);
if (members) _edje_color_class_member_hash = evas_hash_add(_edje_color_class_member_hash, color_class, members); if (members)
{
_edje_color_class_member_hash =
evas_hash_add(_edje_color_class_member_hash, color_class, members);
}
} }
/** /**
* Used to free the member lists that are stored in the text_class * Used to free the member lists that are stored in the text_class
* and color_class hashtables. * and color_class hashtables.
*/ */
static Evas_Bool member_list_free(Evas_Hash *hash, const char *key, static Evas_Bool
void *data, void *fdata) member_list_free(const Evas_Hash *hash, const char *key, void *data, void *fdata)
{ {
evas_list_free(data); evas_list_free(data);
return 1;
return 1;
} }
void void
_edje_color_class_members_free(void) _edje_color_class_members_free(void)
{ {
if (!_edje_color_class_member_hash) return; if (!_edje_color_class_member_hash) return;
evas_hash_foreach(_edje_color_class_member_hash, member_list_free, NULL);
evas_hash_foreach(_edje_color_class_member_hash, member_list_free,
NULL);
evas_hash_free(_edje_color_class_member_hash); evas_hash_free(_edje_color_class_member_hash);
_edje_color_class_member_hash = NULL; _edje_color_class_member_hash = NULL;
} }
static Evas_Bool color_class_hash_list_free(Evas_Hash *hash, static Evas_Bool
const char *key, void *data, color_class_hash_list_free(const Evas_Hash *hash, const char *key, void *data, void *fdata)
void *fdata)
{ {
Edje_Color_Class *cc; Edje_Color_Class *cc;
cc = data; cc = data;
if (cc->name) evas_stringshare_del(cc->name); if (cc->name) evas_stringshare_del(cc->name);
free(cc); free(cc);
return 1;
return 1;
} }
void void
_edje_color_class_hash_free(void) _edje_color_class_hash_free(void)
{ {
if (!_edje_color_class_hash) return; if (!_edje_color_class_hash) return;
evas_hash_foreach(_edje_color_class_hash, color_class_hash_list_free, NULL);
evas_hash_foreach(_edje_color_class_hash, color_class_hash_list_free, evas_hash_free(_edje_color_class_hash);
NULL); _edje_color_class_hash = NULL;
evas_hash_free(_edje_color_class_hash);
_edje_color_class_hash = NULL;
} }
void void
@ -1842,9 +1808,7 @@ _edje_color_class_on_del(Edje *ed, Edje_Part *ep)
desc = tmp->data; desc = tmp->data;
if (desc->color_class) if (desc->color_class)
{ _edje_color_class_member_del(ed, desc->color_class);
_edje_color_class_member_del(ed, desc->color_class);
}
} }
} }
@ -1875,14 +1839,18 @@ _edje_text_class_member_add(Edje *ed, const char *text_class)
members = evas_hash_find(_edje_text_class_member_hash, text_class); members = evas_hash_find(_edje_text_class_member_hash, text_class);
/* Remove members list */ /* Remove members list */
if (members) if (members)
_edje_text_class_member_hash = evas_hash_del(_edje_text_class_member_hash, text_class, members); {
_edje_text_class_member_hash =
evas_hash_del(_edje_text_class_member_hash, text_class, members);
}
/* Update the member list */ /* Update the member list */
members = evas_list_prepend(members, ed); members = evas_list_prepend(members, ed);
/* Add the member list back */ /* Add the member list back */
_edje_text_class_member_hash = evas_hash_add(_edje_text_class_member_hash, text_class, members); _edje_text_class_member_hash =
evas_hash_add(_edje_text_class_member_hash, text_class, members);
} }
void void
@ -1894,46 +1862,45 @@ _edje_text_class_member_del(Edje *ed, const char *text_class)
members = evas_hash_find(_edje_text_class_member_hash, text_class); members = evas_hash_find(_edje_text_class_member_hash, text_class);
if (!members) return; if (!members) return;
_edje_text_class_member_hash = evas_hash_del(_edje_text_class_member_hash, text_class, members); _edje_text_class_member_hash =
evas_hash_del(_edje_text_class_member_hash, text_class, members);
members = evas_list_remove(members, ed); members = evas_list_remove(members, ed);
if (members) _edje_text_class_member_hash = evas_hash_add(_edje_text_class_member_hash, text_class, members); if (members)
{
_edje_text_class_member_hash =
evas_hash_add(_edje_text_class_member_hash, text_class, members);
}
} }
void void
_edje_text_class_members_free(void) _edje_text_class_members_free(void)
{ {
if (!_edje_text_class_member_hash) return; if (!_edje_text_class_member_hash) return;
evas_hash_foreach(_edje_text_class_member_hash, member_list_free, NULL);
evas_hash_foreach(_edje_text_class_member_hash, member_list_free,
NULL);
evas_hash_free(_edje_text_class_member_hash); evas_hash_free(_edje_text_class_member_hash);
_edje_text_class_member_hash = NULL; _edje_text_class_member_hash = NULL;
} }
static Evas_Bool text_class_hash_list_free(Evas_Hash *hash, static Evas_Bool
const char *key, void *data, text_class_hash_list_free(const Evas_Hash *hash, const char *key, void *data, void *fdata)
void *fdata)
{ {
Edje_Text_Class *tc; Edje_Text_Class *tc;
tc = data;
if (tc->name) evas_stringshare_del(tc->name);
if (tc->font) evas_stringshare_del(tc->font);
free(tc);
tc = data;
if (tc->name) evas_stringshare_del(tc->name);
if (tc->font) evas_stringshare_del(tc->font);
free(tc);
return 1; return 1;
} }
void void
_edje_text_class_hash_free(void) _edje_text_class_hash_free(void)
{ {
if (!_edje_text_class_hash) return; if (!_edje_text_class_hash) return;
evas_hash_foreach(_edje_text_class_hash, text_class_hash_list_free, NULL);
evas_hash_foreach(_edje_text_class_hash, text_class_hash_list_free, evas_hash_free(_edje_text_class_hash);
NULL); _edje_text_class_hash = NULL;
evas_hash_free(_edje_text_class_hash);
_edje_text_class_hash = NULL;
} }
Edje * Edje *
@ -1990,10 +1957,7 @@ _edje_unblock(Edje *ed)
if (!ed) return ret; if (!ed) return ret;
ed->block--; ed->block--;
if (ed->block == 0) if (ed->block == 0) ed->block_break = 0;
{
ed->block_break = 0;
}
ret = ed->block; ret = ed->block;
_edje_unref(ed); _edje_unref(ed);
return ret; return ret;
@ -2048,8 +2012,7 @@ _edje_real_part_swallow(Edje_Real_Part *rp, Evas_Object *obj_swallow)
evas_object_clip_set(rp->swallowed_object, rp->clip_to->object); evas_object_clip_set(rp->swallowed_object, rp->clip_to->object);
else evas_object_clip_set(rp->swallowed_object, rp->edje->clipper); else evas_object_clip_set(rp->swallowed_object, rp->edje->clipper);
evas_object_stack_above(rp->swallowed_object, rp->object); evas_object_stack_above(rp->swallowed_object, rp->object);
evas_object_event_callback_add(rp->swallowed_object, evas_object_event_callback_add(rp->swallowed_object, EVAS_CALLBACK_FREE,
EVAS_CALLBACK_FREE,
_edje_object_part_swallow_free_cb, _edje_object_part_swallow_free_cb,
rp->edje->obj); rp->edje->obj);
type = (char *)evas_object_type_get(obj_swallow); type = (char *)evas_object_type_get(obj_swallow);
@ -2068,8 +2031,7 @@ _edje_real_part_swallow(Edje_Real_Part *rp, Evas_Object *obj_swallow)
rp->swallow_params.max.w = w; rp->swallow_params.max.w = w;
rp->swallow_params.max.h = h; rp->swallow_params.max.h = h;
} }
else if ((type) && ((!strcmp(type, "text")) || else if ((type) && ((!strcmp(type, "text")) || (!strcmp(type, "polygon")) ||
(!strcmp(type, "polygon")) ||
(!strcmp(type, "line")))) (!strcmp(type, "line"))))
{ {
Evas_Coord w, h; Evas_Coord w, h;