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

* edje: Remove last set of Evas_Hash, and move to Eina_Bool. 

SVN revision: 41068
This commit is contained in:
Cedric BAIL 2009-06-17 11:10:32 +00:00
parent 6d0ee81526
commit b405fecf1e
5 changed files with 142 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
legacy/edje/src/lib/Edje.h
View File

@ -258,7 +258,7 @@ extern "C" {
EAPI const Eina_List *edje_object_part_text_anchor_list_get(const Evas_Object *obj, const char *part); EAPI const Eina_List *edje_object_part_text_anchor_list_get(const Evas_Object *obj, const char *part);
EAPI const Eina_List *edje_object_part_text_anchor_geometry_get(const Evas_Object *obj, const char *part, const char *anchor); EAPI const Eina_List *edje_object_part_text_anchor_geometry_get(const Evas_Object *obj, const char *part, const char *anchor);
EAPI void edje_object_part_text_cursor_geometry_get(const Evas_Object *obj, const char *part, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h); EAPI void edje_object_part_text_cursor_geometry_get(const Evas_Object *obj, const char *part, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
EAPI void edje_object_part_text_select_allow_set(const Evas_Object *obj, const char *part, Evas_Bool allow); EAPI void edje_object_part_text_select_allow_set(const Evas_Object *obj, const char *part, Eina_Bool allow);
EAPI void edje_object_part_text_select_abort(const Evas_Object *obj, const char *part); EAPI void edje_object_part_text_select_abort(const Evas_Object *obj, const char *part);
EAPI void edje_object_part_swallow (Evas_Object *obj, const char *part, Evas_Object *obj_swallow); EAPI void edje_object_part_swallow (Evas_Object *obj, const char *part, Evas_Object *obj_swallow);
@ -276,17 +276,17 @@ extern "C" {
EAPI void edje_object_part_drag_page_get (const Evas_Object *obj, const char *part, double *dx, double *dy); EAPI void edje_object_part_drag_page_get (const Evas_Object *obj, const char *part, double *dx, double *dy);
EAPI void edje_object_part_drag_step (Evas_Object *obj, const char *part, double dx, double dy); EAPI void edje_object_part_drag_step (Evas_Object *obj, const char *part, double dx, double dy);
EAPI void edje_object_part_drag_page (Evas_Object *obj, const char *part, double dx, double dy); EAPI void edje_object_part_drag_page (Evas_Object *obj, const char *part, double dx, double dy);
EAPI Evas_Bool edje_object_part_box_append (Evas_Object *obj, const char *part, Evas_Object *child); EAPI Eina_Bool edje_object_part_box_append (Evas_Object *obj, const char *part, Evas_Object *child);
EAPI Evas_Bool edje_object_part_box_prepend (Evas_Object *obj, const char *part, Evas_Object *child); EAPI Eina_Bool edje_object_part_box_prepend (Evas_Object *obj, const char *part, Evas_Object *child);
EAPI Evas_Bool edje_object_part_box_insert_before (Evas_Object *obj, const char *part, Evas_Object *child, const Evas_Object *reference); EAPI Eina_Bool edje_object_part_box_insert_before (Evas_Object *obj, const char *part, Evas_Object *child, const Evas_Object *reference);
EAPI Evas_Bool edje_object_part_box_insert_at (Evas_Object *obj, const char *part, Evas_Object *child, unsigned int pos); EAPI Eina_Bool edje_object_part_box_insert_at (Evas_Object *obj, const char *part, Evas_Object *child, unsigned int pos);
EAPI Evas_Object *edje_object_part_box_remove (Evas_Object *obj, const char *part, Evas_Object *child); EAPI Evas_Object *edje_object_part_box_remove (Evas_Object *obj, const char *part, Evas_Object *child);
EAPI Evas_Object *edje_object_part_box_remove_at (Evas_Object *obj, const char *part, unsigned int pos); EAPI Evas_Object *edje_object_part_box_remove_at (Evas_Object *obj, const char *part, unsigned int pos);
EAPI Evas_Bool edje_object_part_box_remove_all (Evas_Object *obj, const char *part, Evas_Bool clear); EAPI Eina_Bool edje_object_part_box_remove_all (Evas_Object *obj, const char *part, Eina_Bool clear);
EAPI Evas_Bool edje_object_part_table_pack (Evas_Object *obj, const char *part, Evas_Object *child_obj, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan); EAPI Eina_Bool edje_object_part_table_pack (Evas_Object *obj, const char *part, Evas_Object *child_obj, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan);
EAPI Evas_Bool edje_object_part_table_unpack (Evas_Object *obj, const char *part, Evas_Object *child_obj); EAPI Eina_Bool edje_object_part_table_unpack (Evas_Object *obj, const char *part, Evas_Object *child_obj);
EAPI Evas_Bool edje_object_part_table_col_row_size_get (const Evas_Object *obj, const char *part, int *cols, int *rows); EAPI Eina_Bool edje_object_part_table_col_row_size_get (const Evas_Object *obj, const char *part, int *cols, int *rows);
EAPI Evas_Bool edje_object_part_table_clear (Evas_Object *obj, const char *part, Evas_Bool clear); EAPI Eina_Bool edje_object_part_table_clear (Evas_Object *obj, const char *part, Eina_Bool clear);
/* edje_message_queue.c */ /* edje_message_queue.c */
EAPI void edje_object_message_send (Evas_Object *obj, Edje_Message_Type type, int id, void *msg); EAPI void edje_object_message_send (Evas_Object *obj, Edje_Message_Type type, int id, void *msg);

2
legacy/edje/src/lib/edje_cache.c
View File

@ -28,7 +28,7 @@ void *alloca (size_t);
#include "edje_private.h" #include "edje_private.h"
static Evas_Hash *_edje_file_hash = NULL; static Eina_Hash *_edje_file_hash = NULL;
static int _edje_file_cache_size = 16; static int _edje_file_cache_size = 16;
static Eina_List *_edje_file_cache = NULL; static Eina_List *_edje_file_cache = NULL;

82
legacy/edje/src/lib/edje_entry.c
View File

@ -50,16 +50,16 @@ struct _Entry
Eina_List *anchors; Eina_List *anchors;
Eina_List *anchorlist; Eina_List *anchorlist;
char *selection; char *selection;
Evas_Bool selecting : 1; Eina_Bool selecting : 1;
Evas_Bool have_selection : 1; Eina_Bool have_selection : 1;
Evas_Bool select_allow : 1; Eina_Bool select_allow : 1;
Evas_Bool select_mod_start : 1; Eina_Bool select_mod_start : 1;
Evas_Bool select_mod_end : 1; Eina_Bool select_mod_end : 1;
Evas_Bool had_sel : 1; Eina_Bool had_sel : 1;
#ifdef HAVE_ECORE_IMF #ifdef HAVE_ECORE_IMF
int comp_len; int comp_len;
Evas_Bool have_composition : 1; Eina_Bool have_composition : 1;
Ecore_IMF_Context *imf_context; Ecore_IMF_Context *imf_context;
Ecore_Event_Handler *imf_ee_handler_commit; Ecore_Event_Handler *imf_ee_handler_commit;
@ -367,7 +367,7 @@ _sel_start(Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en)
en->sel_end = evas_object_textblock_cursor_new(o); en->sel_end = evas_object_textblock_cursor_new(o);
evas_textblock_cursor_copy(c, en->sel_end); evas_textblock_cursor_copy(c, en->sel_end);
en->have_selection = 0; en->have_selection = EINA_FALSE;
if (en->selection) if (en->selection)
{ {
free(en->selection); free(en->selection);
@ -379,7 +379,7 @@ static void
_sel_enable(Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en) _sel_enable(Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en)
{ {
if (en->have_selection) return; if (en->have_selection) return;
en->have_selection = 1; en->have_selection = EINA_TRUE;
if (en->selection) if (en->selection)
{ {
free(en->selection); free(en->selection);
@ -421,7 +421,7 @@ _sel_preextend(Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en)
static void static void
_sel_clear(Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en) _sel_clear(Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en)
{ {
en->had_sel = 0; en->had_sel = EINA_FALSE;
if (en->sel_start) if (en->sel_start)
{ {
evas_textblock_cursor_free(en->sel_start); evas_textblock_cursor_free(en->sel_start);
@ -448,7 +448,7 @@ _sel_clear(Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en)
} }
if (en->have_selection) if (en->have_selection)
{ {
en->have_selection = 0; en->have_selection = EINA_FALSE;
_edje_emit(en->rp->edje, "selection,cleared", en->rp->part->name); _edje_emit(en->rp->edje, "selection,cleared", en->rp->part->name);
} }
} }
@ -930,9 +930,9 @@ _edje_key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
Evas_Event_Key_Down *ev = event_info; Evas_Event_Key_Down *ev = event_info;
Edje_Real_Part *rp = ed->focused_part; Edje_Real_Part *rp = ed->focused_part;
Entry *en; Entry *en;
Evas_Bool control, alt, shift; Eina_Bool control, alt, shift;
Evas_Bool multiline; Eina_Bool multiline;
Evas_Bool cursor_changed; Eina_Bool cursor_changed;
Evas_Textblock_Cursor *tc; Evas_Textblock_Cursor *tc;
if (!rp) return; if (!rp) return;
en = rp->entry_data; en = rp->entry_data;
@ -962,7 +962,7 @@ _edje_key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
alt = evas_key_modifier_is_set(ev->modifiers, "Alt"); alt = evas_key_modifier_is_set(ev->modifiers, "Alt");
shift = evas_key_modifier_is_set(ev->modifiers, "Shift"); shift = evas_key_modifier_is_set(ev->modifiers, "Shift");
multiline = rp->part->multiline; multiline = rp->part->multiline;
cursor_changed = 0; cursor_changed = EINA_FALSE;
if (!strcmp(ev->key, "Escape")) if (!strcmp(ev->key, "Escape"))
{ {
// dead keys here. Escape for now (should emit these) // dead keys here. Escape for now (should emit these)
@ -1188,7 +1188,7 @@ _edje_key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
_anchors_get(en->cursor, rp->object, en); _anchors_get(en->cursor, rp->object, en);
_edje_emit(ed, "entry,changed", rp->part->name); _edje_emit(ed, "entry,changed", rp->part->name);
_edje_emit(ed, "cursor,changed", rp->part->name); _edje_emit(ed, "cursor,changed", rp->part->name);
cursor_changed = 1; cursor_changed = EINA_TRUE;
ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
} }
_edje_emit(ed, "entry,key,enter", rp->part->name); _edje_emit(ed, "entry,key,enter", rp->part->name);
@ -1217,7 +1217,7 @@ _edje_key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
_anchors_get(en->cursor, rp->object, en); _anchors_get(en->cursor, rp->object, en);
_edje_emit(ed, "entry,changed", rp->part->name); _edje_emit(ed, "entry,changed", rp->part->name);
_edje_emit(ed, "cursor,changed", rp->part->name); _edje_emit(ed, "cursor,changed", rp->part->name);
cursor_changed = 1; cursor_changed = EINA_TRUE;
ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
} }
} }
@ -1272,9 +1272,9 @@ _edje_part_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info
Evas_Event_Mouse_Down *ev = event_info; Evas_Event_Mouse_Down *ev = event_info;
Entry *en; Entry *en;
Evas_Coord x, y, w, h; Evas_Coord x, y, w, h;
Evas_Bool multiline; Eina_Bool multiline;
Evas_Textblock_Cursor *tc; Evas_Textblock_Cursor *tc;
Evas_Bool dosel = 0; Eina_Bool dosel = EINA_FALSE;
if (!rp) return; if (!rp) return;
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return; if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
en = rp->entry_data; en = rp->entry_data;
@ -1287,13 +1287,13 @@ _edje_part_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info
return; return;
} }
if (ev->button != 1) return; if (ev->button != 1) return;
en->select_mod_start = 0; en->select_mod_start = EINA_FALSE;
en->select_mod_end = 0; en->select_mod_end = EINA_FALSE;
if (rp->part->select_mode == EDJE_ENTRY_SELECTION_MODE_DEFAULT) if (rp->part->select_mode == EDJE_ENTRY_SELECTION_MODE_DEFAULT)
dosel = 1; dosel = EINA_TRUE;
else if (rp->part->select_mode == EDJE_ENTRY_SELECTION_MODE_EXPLICIT) else if (rp->part->select_mode == EDJE_ENTRY_SELECTION_MODE_EXPLICIT)
{ {
if (en->select_allow) dosel = 1; if (en->select_allow) dosel = EINA_TRUE;
} }
if (dosel) if (dosel)
{ {
@ -1364,23 +1364,23 @@ _edje_part_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info
{ {
if (d1 <= d) if (d1 <= d)
{ {
en->select_mod_start = 1; en->select_mod_start = EINA_TRUE;
en->selecting = 1; en->selecting = EINA_TRUE;
} }
} }
else else
{ {
if (d2 <= d) if (d2 <= d)
{ {
en->select_mod_end = 1; en->select_mod_end = EINA_TRUE;
en->selecting = 1; en->selecting = EINA_TRUE;
} }
} }
} }
} }
else else
{ {
en->selecting = 1; en->selecting = EINA_TRUE;
_sel_clear(en->cursor, rp->object, en); _sel_clear(en->cursor, rp->object, en);
_sel_start(en->cursor, rp->object, en); _sel_start(en->cursor, rp->object, en);
} }
@ -1408,9 +1408,9 @@ _edje_part_mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
Evas_Event_Mouse_Up *ev = event_info; Evas_Event_Mouse_Up *ev = event_info;
Entry *en; Entry *en;
Evas_Coord x, y, w, h; Evas_Coord x, y, w, h;
Evas_Bool multiline; Eina_Bool multiline;
Evas_Textblock_Cursor *tc; Evas_Textblock_Cursor *tc;
Evas_Bool dosel = 0; Eina_Bool dosel = EINA_FALSE;
if (ev->button != 1) return; if (ev->button != 1) return;
if (!rp) return; if (!rp) return;
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return; if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
@ -1456,8 +1456,8 @@ _edje_part_mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
if (en->selecting) if (en->selecting)
{ {
if (en->have_selection) if (en->have_selection)
en->had_sel = 1; en->had_sel = EINA_TRUE;
en->selecting = 0; en->selecting = EINA_FALSE;
} }
if (evas_textblock_cursor_compare(tc, en->cursor)) if (evas_textblock_cursor_compare(tc, en->cursor))
_edje_emit(rp->edje, "cursor,changed", rp->part->name); _edje_emit(rp->edje, "cursor,changed", rp->part->name);
@ -1473,7 +1473,7 @@ _edje_part_mouse_move_cb(void *data, Evas *e, Evas_Object *obj, void *event_info
Entry *en; Entry *en;
Evas_Coord x, y, w, h; Evas_Coord x, y, w, h;
Evas_Textblock_Cursor *tc; Evas_Textblock_Cursor *tc;
Evas_Bool multiline; Eina_Bool multiline;
if (!rp) return; if (!rp) return;
en = rp->entry_data; en = rp->entry_data;
if ((!en) || (rp->part->type != EDJE_PART_TYPE_TEXTBLOCK) || if ((!en) || (rp->part->type != EDJE_PART_TYPE_TEXTBLOCK) ||
@ -1867,7 +1867,7 @@ _edje_entry_cursor_geometry_get(Edje_Real_Part *rp, Evas_Coord *cx, Evas_Coord *
} }
void void
_edje_entry_select_allow_set(Edje_Real_Part *rp, Evas_Bool allow) _edje_entry_select_allow_set(Edje_Real_Part *rp, Eina_Bool allow)
{ {
Entry *en = rp->entry_data; Entry *en = rp->entry_data;
en->select_allow = allow; en->select_allow = allow;
@ -1879,7 +1879,7 @@ _edje_entry_select_abort(Edje_Real_Part *rp)
Entry *en = rp->entry_data; Entry *en = rp->entry_data;
if (en->selecting) if (en->selecting)
{ {
en->selecting = 0; en->selecting = EINA_FALSE;
_edje_entry_real_part_configure(rp); _edje_entry_real_part_configure(rp);
} }
} }
@ -1921,8 +1921,8 @@ _edje_entry_imf_event_commit_cb(void *data, int type, void *event)
Ecore_IMF_Event_Commit *ev = event; Ecore_IMF_Event_Commit *ev = event;
int cursor_pos, composition_pos; int cursor_pos, composition_pos;
int start_pos, end_pos; int start_pos, end_pos;
Evas_Bool selecting; Eina_Bool selecting;
Evas_Bool changed = 0; Eina_Bool changed = EINA_FALSE;
int i; int i;
if (!rp) return 1; if (!rp) return 1;
@ -1939,7 +1939,7 @@ _edje_entry_imf_event_commit_cb(void *data, int type, void *event)
for (i = 0; i < en->comp_len; i++) for (i = 0; i < en->comp_len; i++)
_backspace(en->cursor, rp->object, en); _backspace(en->cursor, rp->object, en);
_sel_clear(en->cursor, rp->object, en); _sel_clear(en->cursor, rp->object, en);
en->have_composition = 0; en->have_composition = EINA_FALSE;
} }
evas_textblock_cursor_text_prepend(en->cursor, ev->str); evas_textblock_cursor_text_prepend(en->cursor, ev->str);
@ -1961,8 +1961,8 @@ _edje_entry_imf_event_changed_cb(void *data, int type, void *event)
int cursor_pos; int cursor_pos;
int composition_pos, length; int composition_pos, length;
int start_pos, end_pos; int start_pos, end_pos;
Evas_Bool selecting = 0; Eina_Bool selecting = EINA_FALSE;
Evas_Bool changed = 0; Eina_Bool changed = EINA_FALSE;
Ecore_IMF_Event_Commit *ev = event; Ecore_IMF_Event_Commit *ev = event;
Evas_Textblock_Cursor *start_cur, *end_cur; Evas_Textblock_Cursor *start_cur, *end_cur;
int i; int i;
@ -2000,7 +2000,7 @@ _edje_entry_imf_event_changed_cb(void *data, int type, void *event)
_sel_enable(en->cursor, rp->object, en); _sel_enable(en->cursor, rp->object, en);
_sel_start(en->cursor, rp->object, en); _sel_start(en->cursor, rp->object, en);
en->have_composition = 1; en->have_composition = EINA_TRUE;
evas_textblock_cursor_text_prepend(en->cursor, preedit_string); evas_textblock_cursor_text_prepend(en->cursor, preedit_string);

20
legacy/edje/src/lib/edje_private.h
View File

@ -1143,18 +1143,18 @@ void _edje_object_part_swallow_free_cb(void *data, Evas *e, Evas_Ob
void _edje_real_part_swallow(Edje_Real_Part *rp, Evas_Object *obj_swallow); void _edje_real_part_swallow(Edje_Real_Part *rp, Evas_Object *obj_swallow);
void _edje_box_init(void); void _edje_box_init(void);
void _edje_box_shutdown(void); void _edje_box_shutdown(void);
Evas_Bool _edje_box_layout_find(const char *name, Evas_Object_Box_Layout *cb, void **data, void (**free_data)(void *data)); Eina_Bool _edje_box_layout_find(const char *name, Evas_Object_Box_Layout *cb, void **data, void (**free_data)(void *data));
Evas_Bool _edje_real_part_box_append(Edje_Real_Part *rp, Evas_Object *child_obj); Eina_Bool _edje_real_part_box_append(Edje_Real_Part *rp, Evas_Object *child_obj);
Evas_Bool _edje_real_part_box_prepend(Edje_Real_Part *rp, Evas_Object *child_obj); Eina_Bool _edje_real_part_box_prepend(Edje_Real_Part *rp, Evas_Object *child_obj);
Evas_Bool _edje_real_part_box_insert_before(Edje_Real_Part *rp, Evas_Object *child_obj, const Evas_Object *ref); Eina_Bool _edje_real_part_box_insert_before(Edje_Real_Part *rp, Evas_Object *child_obj, const Evas_Object *ref);
Evas_Bool _edje_real_part_box_insert_at(Edje_Real_Part *rp, Evas_Object *child_obj, unsigned int pos); Eina_Bool _edje_real_part_box_insert_at(Edje_Real_Part *rp, Evas_Object *child_obj, unsigned int pos);
Evas_Object *_edje_real_part_box_remove(Edje_Real_Part *rp, Evas_Object *child_obj); Evas_Object *_edje_real_part_box_remove(Edje_Real_Part *rp, Evas_Object *child_obj);
Evas_Object *_edje_real_part_box_remove_at(Edje_Real_Part *rp, unsigned int pos); Evas_Object *_edje_real_part_box_remove_at(Edje_Real_Part *rp, unsigned int pos);
Evas_Bool _edje_real_part_box_remove_all(Edje_Real_Part *rp, Evas_Bool clear); Eina_Bool _edje_real_part_box_remove_all(Edje_Real_Part *rp, Eina_Bool clear);
Evas_Bool _edje_real_part_table_pack(Edje_Real_Part *rp, Evas_Object *child_obj, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan); Eina_Bool _edje_real_part_table_pack(Edje_Real_Part *rp, Evas_Object *child_obj, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan);
Evas_Bool _edje_real_part_table_unpack(Edje_Real_Part *rp, Evas_Object *child_obj); Eina_Bool _edje_real_part_table_unpack(Edje_Real_Part *rp, Evas_Object *child_obj);
void _edje_real_part_table_clear(Edje_Real_Part *rp, Evas_Bool clear); void _edje_real_part_table_clear(Edje_Real_Part *rp, Eina_Bool clear);
void _edje_embryo_script_init (Edje *ed); void _edje_embryo_script_init (Edje *ed);
void _edje_embryo_script_shutdown (Edje *ed); void _edje_embryo_script_shutdown (Edje *ed);
@ -1309,7 +1309,7 @@ void _edje_entry_select_all(Edje_Real_Part *rp);
const Eina_List *_edje_entry_anchor_geometry_get(Edje_Real_Part *rp, const char *anchor); const Eina_List *_edje_entry_anchor_geometry_get(Edje_Real_Part *rp, const char *anchor);
const Eina_List *_edje_entry_anchors_list(Edje_Real_Part *rp); const Eina_List *_edje_entry_anchors_list(Edje_Real_Part *rp);
void _edje_entry_cursor_geometry_get(Edje_Real_Part *rp, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch); void _edje_entry_cursor_geometry_get(Edje_Real_Part *rp, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch);
void _edje_entry_select_allow_set(Edje_Real_Part *rp, Evas_Bool allow); void _edje_entry_select_allow_set(Edje_Real_Part *rp, Eina_Bool allow);
void _edje_entry_select_abort(Edje_Real_Part *rp); void _edje_entry_select_abort(Edje_Real_Part *rp);
#endif #endif

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

@ -20,11 +20,11 @@ struct _Edje_Box_Layout
typedef struct _Edje_Box_Layout Edje_Box_Layout; typedef struct _Edje_Box_Layout Edje_Box_Layout;
static Evas_Hash *_edje_color_class_hash = NULL; static Eina_Hash *_edje_color_class_hash = NULL;
static Evas_Hash *_edje_color_class_member_hash = NULL; static Eina_Hash *_edje_color_class_member_hash = NULL;
static Evas_Hash *_edje_text_class_hash = NULL; static Eina_Hash *_edje_text_class_hash = NULL;
static Evas_Hash *_edje_text_class_member_hash = NULL; static Eina_Hash *_edje_text_class_member_hash = NULL;
static Eina_Rbtree *_edje_box_layout_registry = NULL; static Eina_Rbtree *_edje_box_layout_registry = NULL;
@ -40,8 +40,8 @@ struct _Edje_List_Foreach_Data
Eina_List *list; Eina_List *list;
}; };
static Evas_Bool _edje_color_class_list_foreach(const Eina_Hash *hash, const void *key, void *data, void *fdata); static Eina_Bool _edje_color_class_list_foreach(const Eina_Hash *hash, const void *key, void *data, void *fdata);
static Evas_Bool _edje_text_class_list_foreach(const Eina_Hash *hash, const void *key, void *data, void *fdata); static Eina_Bool _edje_text_class_list_foreach(const Eina_Hash *hash, const void *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);
@ -421,7 +421,7 @@ _edje_color_class_list_foreach(const Eina_Hash *hash, const void *key, void *dat
fd = fdata; fd = fdata;
fd->list = eina_list_append(fd->list, strdup(key)); fd->list = eina_list_append(fd->list, strdup(key));
return 1; return EINA_TRUE;
} }
/** Sets the object color class /** Sets the object color class
@ -692,7 +692,7 @@ _edje_text_class_list_foreach(const Eina_Hash *hash, const void *key, void *data
fd = fdata; fd = fdata;
fd->list = eina_list_append(fd->list, eina_stringshare_add(key)); fd->list = eina_list_append(fd->list, eina_stringshare_add(key));
return 1; return EINA_TRUE;
} }
/** Sets Edje text class /** Sets Edje text class
@ -970,7 +970,7 @@ _edje_strbuf_append(char **p_str, size_t *allocated, size_t *used, const char *n
free(*p_str); free(*p_str);
*p_str = NULL; *p_str = NULL;
*allocated = 0; *allocated = 0;
return 0; return EINA_FALSE;
} }
*p_str = tmp; *p_str = tmp;
@ -979,7 +979,7 @@ _edje_strbuf_append(char **p_str, size_t *allocated, size_t *used, const char *n
memcpy(*p_str + *used, news, news_len); memcpy(*p_str + *used, news, news_len);
*used = *used + news_len; *used = *used + news_len;
return 1; return EINA_TRUE;
} }
static char * static char *
@ -1330,7 +1330,7 @@ edje_object_part_text_cursor_geometry_get(const Evas_Object *obj, const char *pa
* @param part The part name * @param part The part name
*/ */
EAPI void EAPI void
edje_object_part_text_select_allow_set(const Evas_Object *obj, const char *part, Evas_Bool allow) edje_object_part_text_select_allow_set(const Evas_Object *obj, const char *part, Eina_Bool allow)
{ {
Edje *ed; Edje *ed;
Edje_Real_Part *rp; Edje_Real_Part *rp;
@ -1568,25 +1568,23 @@ _edje_box_layout_external_find(const char *name)
NULL); NULL);
} }
Evas_Bool Eina_Bool
_edje_box_layout_find(const char *name, Evas_Object_Box_Layout *cb, void **data, void (**free_data)(void *data)) _edje_box_layout_find(const char *name, Evas_Object_Box_Layout *cb, void **data, void (**free_data)(void *data))
{ {
const Edje_Box_Layout *l; const Edje_Box_Layout *l;
if (!name) if (!name) return EINA_FALSE;
return 0;
*cb = _edje_box_layout_builtin_find(name); *cb = _edje_box_layout_builtin_find(name);
if (*cb) if (*cb)
{ {
*free_data = NULL; *free_data = NULL;
*data = NULL; *data = NULL;
return 1; return EINA_TRUE;
} }
l = _edje_box_layout_external_find(name); l = _edje_box_layout_external_find(name);
if (!l) if (!l) return EINA_FALSE;
return 0;
*cb = l->func; *cb = l->func;
*free_data = l->layout_data_free; *free_data = l->layout_data_free;
@ -1595,7 +1593,7 @@ _edje_box_layout_find(const char *name, Evas_Object_Box_Layout *cb, void **data,
else else
*data = NULL; *data = NULL;
return 1; return EINA_TRUE;
} }
void void
@ -2441,18 +2439,18 @@ _edje_box_shutdown(void)
* *
* Appends child to the box indicated by part.\n * Appends child to the box indicated by part.\n
*/ */
EAPI Evas_Bool EAPI Eina_Bool
edje_object_part_box_append(Evas_Object *obj, const char *part, Evas_Object *child) edje_object_part_box_append(Evas_Object *obj, const char *part, Evas_Object *child)
{ {
Edje *ed; Edje *ed;
Edje_Real_Part *rp; Edje_Real_Part *rp;
ed = _edje_fetch(obj); ed = _edje_fetch(obj);
if ((!ed) || (!part) || (!child)) return 0; if ((!ed) || (!part) || (!child)) return EINA_FALSE;
rp = _edje_real_part_recursive_get(ed, part); rp = _edje_real_part_recursive_get(ed, part);
if (!rp) return 0; if (!rp) return EINA_FALSE;
if (rp->part->type != EDJE_PART_TYPE_BOX) return 0; if (rp->part->type != EDJE_PART_TYPE_BOX) return EINA_FALSE;
return _edje_real_part_box_append(rp, child); return _edje_real_part_box_append(rp, child);
} }
@ -2467,18 +2465,18 @@ edje_object_part_box_append(Evas_Object *obj, const char *part, Evas_Object *chi
* *
* Prepends child to the box indicated by part.\n * Prepends child to the box indicated by part.\n
*/ */
EAPI Evas_Bool EAPI Eina_Bool
edje_object_part_box_prepend(Evas_Object *obj, const char *part, Evas_Object *child) edje_object_part_box_prepend(Evas_Object *obj, const char *part, Evas_Object *child)
{ {
Edje *ed; Edje *ed;
Edje_Real_Part *rp; Edje_Real_Part *rp;
ed = _edje_fetch(obj); ed = _edje_fetch(obj);
if ((!ed) || (!part)) return 0; if ((!ed) || (!part)) return EINA_FALSE;
rp = _edje_real_part_recursive_get(ed, part); rp = _edje_real_part_recursive_get(ed, part);
if (!rp) return 0; if (!rp) return EINA_FALSE;
if (rp->part->type != EDJE_PART_TYPE_BOX) return 0; if (rp->part->type != EDJE_PART_TYPE_BOX) return EINA_FALSE;
return _edje_real_part_box_prepend(rp, child); return _edje_real_part_box_prepend(rp, child);
} }
@ -2494,18 +2492,18 @@ edje_object_part_box_prepend(Evas_Object *obj, const char *part, Evas_Object *ch
* *
* Inserts child in the box given by part, in the position marked by reference.\n * Inserts child in the box given by part, in the position marked by reference.\n
*/ */
EAPI Evas_Bool EAPI Eina_Bool
edje_object_part_box_insert_before(Evas_Object *obj, const char *part, Evas_Object *child, const Evas_Object *reference) edje_object_part_box_insert_before(Evas_Object *obj, const char *part, Evas_Object *child, const Evas_Object *reference)
{ {
Edje *ed; Edje *ed;
Edje_Real_Part *rp; Edje_Real_Part *rp;
ed = _edje_fetch(obj); ed = _edje_fetch(obj);
if ((!ed) || (!part)) return 0; if ((!ed) || (!part)) return EINA_FALSE;
rp = _edje_real_part_recursive_get(ed, part); rp = _edje_real_part_recursive_get(ed, part);
if (!rp) return 0; if (!rp) return EINA_FALSE;
if (rp->part->type != EDJE_PART_TYPE_BOX) return 0; if (rp->part->type != EDJE_PART_TYPE_BOX) return EINA_FALSE;
return _edje_real_part_box_insert_before(rp, child, reference); return _edje_real_part_box_insert_before(rp, child, reference);
} }
@ -2521,18 +2519,18 @@ edje_object_part_box_insert_before(Evas_Object *obj, const char *part, Evas_Obje
* *
* Adds child to the box indicated by part, in the position given by pos.\n * Adds child to the box indicated by part, in the position given by pos.\n
*/ */
EAPI Evas_Bool EAPI Eina_Bool
edje_object_part_box_insert_at(Evas_Object *obj, const char *part, Evas_Object *child, unsigned int pos) edje_object_part_box_insert_at(Evas_Object *obj, const char *part, Evas_Object *child, unsigned int pos)
{ {
Edje *ed; Edje *ed;
Edje_Real_Part *rp; Edje_Real_Part *rp;
ed = _edje_fetch(obj); ed = _edje_fetch(obj);
if ((!ed) || (!part)) return 0; if ((!ed) || (!part)) return EINA_FALSE;
rp = _edje_real_part_recursive_get(ed, part); rp = _edje_real_part_recursive_get(ed, part);
if (!rp) return 0; if (!rp) return EINA_FALSE;
if (rp->part->type != EDJE_PART_TYPE_BOX) return 0; if (rp->part->type != EDJE_PART_TYPE_BOX) return EINA_FALSE;
return _edje_real_part_box_insert_at(rp, child, pos); return _edje_real_part_box_insert_at(rp, child, pos);
} }
@ -2600,18 +2598,18 @@ edje_object_part_box_remove_at(Evas_Object *obj, const char *part, unsigned int
* Removes all the external objects from the box indicated by part. * Removes all the external objects from the box indicated by part.
* Elements created from the theme will not be removed.\n * Elements created from the theme will not be removed.\n
*/ */
EAPI Evas_Bool EAPI Eina_Bool
edje_object_part_box_remove_all(Evas_Object *obj, const char *part, Evas_Bool clear) edje_object_part_box_remove_all(Evas_Object *obj, const char *part, Eina_Bool clear)
{ {
Edje *ed; Edje *ed;
Edje_Real_Part *rp; Edje_Real_Part *rp;
ed = _edje_fetch(obj); ed = _edje_fetch(obj);
if ((!ed) || (!part)) return 0; if ((!ed) || (!part)) return EINA_FALSE;
rp = _edje_real_part_recursive_get(ed, part); rp = _edje_real_part_recursive_get(ed, part);
if (!rp) return 0; if (!rp) return EINA_FALSE;
if (rp->part->type != EDJE_PART_TYPE_BOX) return 0; if (rp->part->type != EDJE_PART_TYPE_BOX) return EINA_FALSE;
return _edje_real_part_box_remove_all(rp, clear); return _edje_real_part_box_remove_all(rp, clear);
@ -2645,56 +2643,56 @@ _edje_box_child_remove(Edje_Real_Part *rp, Evas_Object *child)
_edje_recalc(rp->edje); _edje_recalc(rp->edje);
} }
Evas_Bool Eina_Bool
_edje_real_part_box_append(Edje_Real_Part *rp, Evas_Object *child_obj) _edje_real_part_box_append(Edje_Real_Part *rp, Evas_Object *child_obj)
{ {
Evas_Object_Box_Option *opt; Evas_Object_Box_Option *opt;
opt = evas_object_box_append(rp->object, child_obj); opt = evas_object_box_append(rp->object, child_obj);
if (!opt) return 0; if (!opt) return EINA_FALSE;
_edje_box_child_add(rp, child_obj); _edje_box_child_add(rp, child_obj);
return 1; return EINA_TRUE;
} }
Evas_Bool Eina_Bool
_edje_real_part_box_prepend(Edje_Real_Part *rp, Evas_Object *child_obj) _edje_real_part_box_prepend(Edje_Real_Part *rp, Evas_Object *child_obj)
{ {
Evas_Object_Box_Option *opt; Evas_Object_Box_Option *opt;
opt = evas_object_box_prepend(rp->object, child_obj); opt = evas_object_box_prepend(rp->object, child_obj);
if (!opt) return 0; if (!opt) return EINA_FALSE;
_edje_box_child_add(rp, child_obj); _edje_box_child_add(rp, child_obj);
return 1; return EINA_TRUE;
} }
Evas_Bool Eina_Bool
_edje_real_part_box_insert_before(Edje_Real_Part *rp, Evas_Object *child_obj, const Evas_Object *ref) _edje_real_part_box_insert_before(Edje_Real_Part *rp, Evas_Object *child_obj, const Evas_Object *ref)
{ {
Evas_Object_Box_Option *opt; Evas_Object_Box_Option *opt;
opt = evas_object_box_insert_before(rp->object, child_obj, ref); opt = evas_object_box_insert_before(rp->object, child_obj, ref);
if (!opt) return 0; if (!opt) return EINA_FALSE;
_edje_box_child_add(rp, child_obj); _edje_box_child_add(rp, child_obj);
return 1; return EINA_TRUE;
} }
Evas_Bool Eina_Bool
_edje_real_part_box_insert_at(Edje_Real_Part *rp, Evas_Object *child_obj, unsigned int pos) _edje_real_part_box_insert_at(Edje_Real_Part *rp, Evas_Object *child_obj, unsigned int pos)
{ {
Evas_Object_Box_Option *opt; Evas_Object_Box_Option *opt;
opt = evas_object_box_insert_at(rp->object, child_obj, pos); opt = evas_object_box_insert_at(rp->object, child_obj, pos);
if (!opt) return 0; if (!opt) return EINA_FALSE;
_edje_box_child_add(rp, child_obj); _edje_box_child_add(rp, child_obj);
return 1; return EINA_TRUE;
} }
Evas_Object * Evas_Object *
@ -2723,8 +2721,8 @@ _edje_real_part_box_remove_at(Edje_Real_Part *rp, unsigned int pos)
return child_obj; return child_obj;
} }
Evas_Bool Eina_Bool
_edje_real_part_box_remove_all(Edje_Real_Part *rp, Evas_Bool clear) _edje_real_part_box_remove_all(Edje_Real_Part *rp, Eina_Bool clear)
{ {
Eina_List *children; Eina_List *children;
int i; int i;
@ -2740,13 +2738,13 @@ _edje_real_part_box_remove_all(Edje_Real_Part *rp, Evas_Bool clear)
else else
{ {
if (!evas_object_box_remove_at(rp->object, i)) if (!evas_object_box_remove_at(rp->object, i))
return 0; return EINA_FALSE;
if (clear) if (clear)
evas_object_del(child_obj); evas_object_del(child_obj);
} }
children = eina_list_remove_list(children, children); children = eina_list_remove_list(children, children);
} }
return 1; return EINA_TRUE;
} }
static void static void
@ -2791,18 +2789,18 @@ _edje_table_child_remove(Edje_Real_Part *rp, Evas_Object *child)
* *
* Packs an object into the table indicated by part.\n * Packs an object into the table indicated by part.\n
*/ */
EAPI Evas_Bool EAPI Eina_Bool
edje_object_part_table_pack(Evas_Object *obj, const char *part, Evas_Object *child_obj, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan) edje_object_part_table_pack(Evas_Object *obj, const char *part, Evas_Object *child_obj, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan)
{ {
Edje *ed; Edje *ed;
Edje_Real_Part *rp; Edje_Real_Part *rp;
ed = _edje_fetch(obj); ed = _edje_fetch(obj);
if ((!ed) || (!part)) return 0; if ((!ed) || (!part)) return EINA_FALSE;
rp = _edje_real_part_recursive_get(ed, part); rp = _edje_real_part_recursive_get(ed, part);
if (!rp) return 0; if (!rp) return EINA_FALSE;
if (rp->part->type != EDJE_PART_TYPE_TABLE) return 0; if (rp->part->type != EDJE_PART_TYPE_TABLE) return EINA_FALSE;
return _edje_real_part_table_pack(rp, child_obj, col, row, colspan, rowspan); return _edje_real_part_table_pack(rp, child_obj, col, row, colspan, rowspan);
} }
@ -2817,18 +2815,18 @@ edje_object_part_table_pack(Evas_Object *obj, const char *part, Evas_Object *chi
* *
* Removes an object from the table indicated by part.\n * Removes an object from the table indicated by part.\n
*/ */
EAPI Evas_Bool EAPI Eina_Bool
edje_object_part_table_unpack(Evas_Object *obj, const char *part, Evas_Object *child_obj) edje_object_part_table_unpack(Evas_Object *obj, const char *part, Evas_Object *child_obj)
{ {
Edje *ed; Edje *ed;
Edje_Real_Part *rp; Edje_Real_Part *rp;
ed = _edje_fetch(obj); ed = _edje_fetch(obj);
if ((!ed) || (!part)) return 0; if ((!ed) || (!part)) return EINA_FALSE;
rp = _edje_real_part_recursive_get(ed, part); rp = _edje_real_part_recursive_get(ed, part);
if (!rp) return 0; if (!rp) return EINA_FALSE;
if (rp->part->type != EDJE_PART_TYPE_TABLE) return 0; if (rp->part->type != EDJE_PART_TYPE_TABLE) return EINA_FALSE;
return _edje_real_part_table_unpack(rp, child_obj); return _edje_real_part_table_unpack(rp, child_obj);
} }
@ -2844,21 +2842,21 @@ edje_object_part_table_unpack(Evas_Object *obj, const char *part, Evas_Object *c
* *
* Retrieves the size of the table in number of columns and rows.\n * Retrieves the size of the table in number of columns and rows.\n
*/ */
EAPI Evas_Bool EAPI Eina_Bool
edje_object_part_table_col_row_size_get(const Evas_Object *obj, const char *part, int *cols, int *rows) edje_object_part_table_col_row_size_get(const Evas_Object *obj, const char *part, int *cols, int *rows)
{ {
Edje *ed; Edje *ed;
Edje_Real_Part *rp; Edje_Real_Part *rp;
ed = _edje_fetch(obj); ed = _edje_fetch(obj);
if ((!ed) || (!part)) return 0; if ((!ed) || (!part)) return EINA_FALSE;
rp = _edje_real_part_recursive_get(ed, part); rp = _edje_real_part_recursive_get(ed, part);
if (!rp) return 0; if (!rp) return EINA_FALSE;
if (rp->part->type != EDJE_PART_TYPE_TABLE) return 0; if (rp->part->type != EDJE_PART_TYPE_TABLE) return EINA_FALSE;
evas_object_table_col_row_size_get(rp->object, cols, rows); evas_object_table_col_row_size_get(rp->object, cols, rows);
return 1; return EINA_TRUE;
} }
/** Removes all object from the table /** Removes all object from the table
@ -2872,37 +2870,37 @@ edje_object_part_table_col_row_size_get(const Evas_Object *obj, const char *part
* Removes all object from the table indicated by part, except * Removes all object from the table indicated by part, except
* the internal ones set from the theme.\n * the internal ones set from the theme.\n
*/ */
EAPI Evas_Bool EAPI Eina_Bool
edje_object_part_table_clear(Evas_Object *obj, const char *part, Evas_Bool clear) edje_object_part_table_clear(Evas_Object *obj, const char *part, Eina_Bool clear)
{ {
Edje *ed; Edje *ed;
Edje_Real_Part *rp; Edje_Real_Part *rp;
ed = _edje_fetch(obj); ed = _edje_fetch(obj);
if ((!ed) || (!part)) return 0; if ((!ed) || (!part)) return EINA_FALSE;
rp = _edje_real_part_recursive_get(ed, part); rp = _edje_real_part_recursive_get(ed, part);
if (!rp) return 0; if (!rp) return EINA_FALSE;
if (rp->part->type != EDJE_PART_TYPE_TABLE) return 0; if (rp->part->type != EDJE_PART_TYPE_TABLE) return EINA_FALSE;
_edje_real_part_table_clear(rp, clear); _edje_real_part_table_clear(rp, clear);
return 1; return EINA_TRUE;
} }
Evas_Bool Eina_Bool
_edje_real_part_table_pack(Edje_Real_Part *rp, Evas_Object *child_obj, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan) _edje_real_part_table_pack(Edje_Real_Part *rp, Evas_Object *child_obj, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan)
{ {
Evas_Bool ret = evas_object_table_pack(rp->object, child_obj, col, row, colspan, rowspan); Eina_Bool ret = evas_object_table_pack(rp->object, child_obj, col, row, colspan, rowspan);
_edje_table_child_add(rp, child_obj); _edje_table_child_add(rp, child_obj);
return ret; return ret;
} }
Evas_Bool Eina_Bool
_edje_real_part_table_unpack(Edje_Real_Part *rp, Evas_Object *child_obj) _edje_real_part_table_unpack(Edje_Real_Part *rp, Evas_Object *child_obj)
{ {
Evas_Bool ret = evas_object_table_unpack(rp->object, child_obj); Eina_Bool ret = evas_object_table_unpack(rp->object, child_obj);
if (ret) if (ret)
_edje_table_child_remove(rp, child_obj); _edje_table_child_remove(rp, child_obj);
@ -2911,7 +2909,7 @@ _edje_real_part_table_unpack(Edje_Real_Part *rp, Evas_Object *child_obj)
} }
void void
_edje_real_part_table_clear(Edje_Real_Part *rp, Evas_Bool clear) _edje_real_part_table_clear(Edje_Real_Part *rp, Eina_Bool clear)
{ {
Eina_List *children; Eina_List *children;
@ -3047,7 +3045,7 @@ static Eina_Bool
member_list_free(const Eina_Hash *hash, const void *key, void *data, void *fdata) member_list_free(const Eina_Hash *hash, const void *key, void *data, void *fdata)
{ {
eina_list_free(data); eina_list_free(data);
return 1; return EINA_TRUE;
} }
void void
@ -3067,7 +3065,7 @@ color_class_hash_list_free(const Eina_Hash *hash, const void *key, void *data, v
cc = data; cc = data;
if (cc->name) eina_stringshare_del(cc->name); if (cc->name) eina_stringshare_del(cc->name);
free(cc); free(cc);
return 1; return EINA_TRUE;
} }
void void
@ -3165,7 +3163,7 @@ text_class_hash_list_free(const Eina_Hash *hash, const void *key, void *data, vo
if (tc->name) eina_stringshare_del(tc->name); if (tc->name) eina_stringshare_del(tc->name);
if (tc->font) eina_stringshare_del(tc->font); if (tc->font) eina_stringshare_del(tc->font);
free(tc); free(tc);
return 1; return EINA_TRUE;
} }
void void