From 54ae9cc18b6c0fdb9a10f03ad2681587ca062c6c Mon Sep 17 00:00:00 2001 From: Amitesh Singh Date: Wed, 6 Dec 2017 12:15:39 +0900 Subject: [PATCH] edje: rename Edje.Object to Efl.Canvas.Layout --- src/Makefile_Edje.am | 2 +- src/lib/edje/Edje_Eo.h | 2 +- src/lib/edje/Edje_Legacy.h | 2 +- src/lib/edje/edje_edit.c | 10 +- src/lib/edje/edje_edit.eo | 2 +- src/lib/edje/edje_legacy.c | 38 +++---- src/lib/edje/edje_load.c | 6 +- src/lib/edje/edje_message_queue.c | 4 +- src/lib/edje/edje_part.c | 2 +- src/lib/edje/edje_private.h | 2 +- src/lib/edje/edje_program.c | 14 +-- src/lib/edje/edje_smart.c | 48 ++++---- src/lib/edje/edje_util.c | 106 +++++++++--------- .../{edje_object.eo => efl_canvas_layout.eo} | 11 +- src/lib/elementary/efl_ui_image.c | 4 +- src/lib/elementary/efl_ui_layout.c | 4 +- src/lib/elementary/efl_ui_text.c | 2 +- src/lib/elementary/efl_ui_win.c | 2 +- src/lib/elementary/elm_colorselector.c | 2 +- src/lib/elementary/elm_widget.c | 6 +- src/tests/edje/edje_test_edje.c | 22 ++-- src/tests/emotion/emotion_test_main-eo.c | 4 +- 22 files changed, 147 insertions(+), 148 deletions(-) rename src/lib/edje/{edje_object.eo => efl_canvas_layout.eo} (93%) diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am index 1f7ffe980f..0831e01dba 100644 --- a/src/Makefile_Edje.am +++ b/src/Makefile_Edje.am @@ -5,7 +5,7 @@ edje_eolian_files = \ lib/edje/efl_layout_calc.eo \ lib/edje/efl_layout_signal.eo \ lib/edje/efl_layout_group.eo \ - lib/edje/edje_object.eo \ + lib/edje/efl_canvas_layout.eo \ lib/edje/efl_canvas_layout_part.eo \ lib/edje/efl_canvas_layout_part_box.eo \ lib/edje/efl_canvas_layout_part_external.eo \ diff --git a/src/lib/edje/Edje_Eo.h b/src/lib/edje/Edje_Eo.h index 663d6c5244..859d4d0183 100644 --- a/src/lib/edje/Edje_Eo.h +++ b/src/lib/edje/Edje_Eo.h @@ -3,7 +3,7 @@ #include "efl_layout_calc.eo.h" #include "efl_layout_signal.eo.h" #include "efl_layout_group.eo.h" -#include "edje_object.eo.h" +#include "efl_canvas_layout.eo.h" #include "edje_edit.eo.h" #include "efl_canvas_layout_part.eo.h" diff --git a/src/lib/edje/Edje_Legacy.h b/src/lib/edje/Edje_Legacy.h index 730b6ff64b..b7350114d4 100644 --- a/src/lib/edje/Edje_Legacy.h +++ b/src/lib/edje/Edje_Legacy.h @@ -3109,6 +3109,6 @@ typedef Efl_Canvas_Layout_Part_Type Edje_Part_Type; /** * @} */ -#include "edje_object.eo.legacy.h" +#include "efl_canvas_layout.eo.legacy.h" #include "edje_edit.eo.legacy.h" #include "efl_layout_group.eo.legacy.h" diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c index 4aebf29726..0d39dc0274 100644 --- a/src/lib/edje/edje_edit.c +++ b/src/lib/edje/edje_edit.c @@ -39,9 +39,9 @@ EAPI Eina_Error EDJE_EDIT_ERROR_GROUP_DOES_NOT_EXIST = 0; /* Get ed(Edje*) from obj(Evas_Object*) */ #define GET_ED_OR_RETURN(RET) \ Edje *ed; \ - if (!efl_isa(obj, EDJE_OBJECT_CLASS)) \ + if (!efl_isa(obj, EFL_CANVAS_LAYOUT_CLASS)) \ return RET; \ - ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS); + ed = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_CLASS); /* Get rp(Edje_Real_Part*) from obj(Evas_Object*) and part(char*) */ #define GET_RP_OR_RETURN(RET) \ @@ -298,7 +298,7 @@ edje_edit_object_add(Evas *evas) EOLIAN static Eo * _edje_edit_efl_object_constructor(Eo *obj, Edje_Edit *eed) { - eed->base = efl_data_ref(obj, EDJE_OBJECT_CLASS); + eed->base = efl_data_ref(obj, EFL_CANVAS_LAYOUT_CLASS); return efl_constructor(efl_super(obj, MY_CLASS)); } @@ -1145,7 +1145,7 @@ _delete_play_actions(Evas_Object *obj, const char *name, int action_type, Eet_Fi continue; eeo = edje_edit_object_add(ed->base.evas); - if (!efl_isa(eeo, EDJE_OBJECT_CLASS)) + if (!efl_isa(eeo, EFL_CANVAS_LAYOUT_CLASS)) return EINA_FALSE; if (!edje_object_file_set(eeo, ed->file->path, pce->entry)) @@ -1161,7 +1161,7 @@ _delete_play_actions(Evas_Object *obj, const char *name, int action_type, Eet_Fi continue; } - eed = efl_data_scope_get(eeo, EDJE_OBJECT_CLASS); + eed = efl_data_scope_get(eeo, EFL_CANVAS_LAYOUT_CLASS); for (i = 0; i < eed->collection->patterns.table_programs_size; i++) { Edje_Program *program; diff --git a/src/lib/edje/edje_edit.eo b/src/lib/edje/edje_edit.eo index 297120e492..1f225ae3de 100644 --- a/src/lib/edje/edje_edit.eo +++ b/src/lib/edje/edje_edit.eo @@ -1,4 +1,4 @@ -class Edje.Edit (Edje.Object) +class Edje.Edit (Efl.Canvas.Layout) { [[Edje editing class to access edje object internals. diff --git a/src/lib/edje/edje_legacy.c b/src/lib/edje/edje_legacy.c index 2ead3b40be..6638270d57 100644 --- a/src/lib/edje/edje_legacy.c +++ b/src/lib/edje/edje_legacy.c @@ -369,7 +369,7 @@ edje_object_part_text_cursor_content_get(const Edje_Object *obj, const char *par Edje_Real_Part *rp; Edje *ed; - ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS); + ed = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_CLASS); if ((!ed) || (!part)) return NULL; rp = _edje_real_part_recursive_get(&ed, part); if (!rp) return NULL; @@ -398,7 +398,7 @@ edje_object_part_text_hide_visible_password(Eo *obj, const char *part) Eina_Bool int_ret = EINA_FALSE; Edje *ed; - ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS); + ed = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_CLASS); if ((!ed) || (!part)) return EINA_FALSE; rp = _edje_real_part_recursive_get(&ed, part); @@ -490,7 +490,7 @@ edje_object_part_text_style_user_push(Eo *obj EINA_UNUSED, const char *part, con Evas_Textblock_Style *ts; Edje *ed; - ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS); + ed = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_CLASS); if ((!ed) || (!part) || (!style)) return; rp = _edje_real_part_recursive_get(&ed, part); @@ -514,7 +514,7 @@ edje_object_part_text_style_user_pop(Eo *obj EINA_UNUSED, const char *part) Edje_Real_Part *rp; Edje *ed; - ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS); + ed = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_CLASS); if ((!ed) || (!part)) return; rp = _edje_real_part_recursive_get(&ed, part); @@ -536,7 +536,7 @@ edje_object_part_text_style_user_peek(const Eo *obj EINA_UNUSED, const char *par const Evas_Textblock_Style *ts; Edje *ed; - ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS); + ed = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_CLASS); if ((!ed) || (!part)) return NULL; rp = _edje_real_part_recursive_get(&ed, part); @@ -556,7 +556,7 @@ edje_object_part_text_item_list_get(const Eo *obj EINA_UNUSED, const char *part) Edje_Real_Part *rp; Edje *ed; - ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS); + ed = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_CLASS); if ((!ed) || (!part)) return NULL; rp = _edje_real_part_recursive_get(&ed, part); @@ -573,7 +573,7 @@ edje_object_part_text_item_geometry_get(const Eo *obj EINA_UNUSED, const char *p Edje_Real_Part *rp; Edje *ed; - ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS); + ed = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_CLASS); if ((!ed) || (!part)) return EINA_FALSE; rp = _edje_real_part_recursive_get(&ed, part); @@ -592,7 +592,7 @@ edje_object_text_insert_filter_callback_add(Eo *obj EINA_UNUSED, const char *par Edje_Text_Insert_Filter_Callback *cb; Edje *ed; - ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS); + ed = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_CLASS); if ((!ed) || (!part)) return; cb = calloc(1, sizeof(Edje_Text_Insert_Filter_Callback)); @@ -610,7 +610,7 @@ edje_object_text_insert_filter_callback_del(Eo *obj EINA_UNUSED, const char *par Eina_List *l; Edje *ed; - ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS); + ed = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_CLASS); if ((!ed) || (!part)) return NULL; EINA_LIST_FOREACH(ed->text_insert_filter_callbacks, l, cb) @@ -636,7 +636,7 @@ edje_object_text_insert_filter_callback_del_full(Eo *obj EINA_UNUSED, const char Eina_List *l; Edje *ed; - ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS); + ed = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_CLASS); if ((!ed) || (!part)) return NULL; EINA_LIST_FOREACH(ed->text_insert_filter_callbacks, l, cb) @@ -662,7 +662,7 @@ edje_object_text_markup_filter_callback_add(Eo *obj EINA_UNUSED, const char *par Edje_Markup_Filter_Callback *cb; Edje *ed; - ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS); + ed = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_CLASS); if ((!ed) || (!part)) return; cb = calloc(1, sizeof(Edje_Markup_Filter_Callback)); @@ -680,7 +680,7 @@ edje_object_text_markup_filter_callback_del(Eo *obj EINA_UNUSED, const char *par Eina_List *l; Edje *ed; - ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS); + ed = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_CLASS); if ((!ed) || (!part)) return NULL; EINA_LIST_FOREACH(ed->markup_filter_callbacks, l, cb) @@ -706,7 +706,7 @@ edje_object_text_markup_filter_callback_del_full(Eo *obj EINA_UNUSED, const char Eina_List *l; Edje *ed; - ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS); + ed = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_CLASS); if ((!ed) || (!part)) return NULL; EINA_LIST_FOREACH(ed->markup_filter_callbacks, l, cb) @@ -732,7 +732,7 @@ edje_object_part_text_user_insert(const Eo *obj, const char *part, const char *t Edje_Real_Part *rp; Edje *ed; - ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS); + ed = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_CLASS); if ((!ed) || (!part)) return; rp = _edje_real_part_recursive_get(&ed, part); @@ -785,7 +785,7 @@ edje_object_part_text_append(Eo *obj, const char *part, const char *text) Edje *ed; - ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS); + ed = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_CLASS); if ((!ed) || (!part)) return; rp = _edje_real_part_recursive_get(&ed, part); if (!rp) return; @@ -809,7 +809,7 @@ edje_object_part_text_escaped_set(Eo *obj, const char *part, const char *text) Eina_Bool int_ret; Edje *ed; - ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS); + ed = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_CLASS); if ((!ed) || (!part)) return EINA_FALSE; rp = _edje_real_part_recursive_get(&ed, part); @@ -995,7 +995,7 @@ edje_object_part_text_unescaped_set(Eo *obj, const char *part, const char *text_ Eina_Bool int_ret = EINA_FALSE; Edje *ed; - ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS); + ed = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_CLASS); if ((!ed) || (!part)) return EINA_FALSE; rp = _edje_real_part_recursive_get(&ed, part); @@ -1022,7 +1022,7 @@ edje_object_part_text_unescaped_get(const Eo *obj EINA_UNUSED, const char *part) Edje_Real_Part *rp; Edje *ed; - ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS); + ed = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_CLASS); if ((!ed) || (!part)) return NULL; @@ -1076,7 +1076,7 @@ edje_object_part_text_insert(Eo *obj, const char *part, const char *text) Edje_Real_Part *rp; Edje *ed; - ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS); + ed = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_CLASS); if ((!ed) || (!part)) return; rp = _edje_real_part_recursive_get(&ed, part); diff --git a/src/lib/edje/edje_load.c b/src/lib/edje/edje_load.c index 59b1e18ce2..080cca567d 100644 --- a/src/lib/edje/edje_load.c +++ b/src/lib/edje/edje_load.c @@ -160,16 +160,16 @@ static int _sort_defined_boxes(const void *a, const void *b); /************************** API Routines **************************/ EOLIAN void -_edje_object_efl_file_file_get(Eo *obj EINA_UNUSED, Edje *ed, const char **file, const char **group) +_efl_canvas_layout_efl_file_file_get(Eo *obj EINA_UNUSED, Edje *ed, const char **file, const char **group) { if (file) *file = ed->path; if (group) *group = ed->group; } EOLIAN Efl_Image_Load_Error -_edje_object_efl_file_load_error_get(Eo *obj, Edje *ed) +_efl_canvas_layout_efl_file_load_error_get(Eo *obj, Edje *ed) { - Efl_Image_Load_Error p = efl_file_load_error_get(efl_super(obj, EDJE_OBJECT_CLASS)); + Efl_Image_Load_Error p = efl_file_load_error_get(efl_super(obj, EFL_CANVAS_LAYOUT_CLASS)); if (p != EFL_IMAGE_LOAD_ERROR_NONE) return p; switch (ed->load_error) diff --git a/src/lib/edje/edje_message_queue.c b/src/lib/edje/edje_message_queue.c index d971582e4d..4d8cbc754d 100644 --- a/src/lib/edje/edje_message_queue.c +++ b/src/lib/edje/edje_message_queue.c @@ -32,7 +32,7 @@ _edje_object_message_propagate_send(Evas_Object *obj, Edje_Message_Type type, in } EOLIAN void -_edje_object_efl_layout_signal_message_send(Eo *obj, Edje *pd EINA_UNUSED, int id, const Eina_Value val) +_efl_canvas_layout_efl_layout_signal_message_send(Eo *obj, Edje *pd EINA_UNUSED, int id, const Eina_Value val) { const Eina_Value_Type *valtype; Edje_Message_Type msgtype; @@ -228,7 +228,7 @@ end: } EOLIAN void -_edje_object_efl_layout_signal_signal_process(Eo *obj, Edje *ed, Eina_Bool recurse) +_efl_canvas_layout_efl_layout_signal_signal_process(Eo *obj, Edje *ed, Eina_Bool recurse) { Eina_List *l; Evas_Object *o; diff --git a/src/lib/edje/edje_part.c b/src/lib/edje/edje_part.c index 741dcbef75..98e9f20e82 100644 --- a/src/lib/edje/edje_part.c +++ b/src/lib/edje/edje_part.c @@ -42,7 +42,7 @@ _part_reuse_error(Efl_Canvas_Layout_Part_Data *pd) // TODO: Enable full debug only for eo_debug? // Don't trust pd->ed as it may be invalid now. - ed = efl_data_scope_safe_get(pd->obj, EDJE_OBJECT_CLASS); + ed = efl_data_scope_safe_get(pd->obj, EFL_CANVAS_LAYOUT_CLASS); if (!ed) { ERR("A previous misuse of efl_part has been detected. Handles returned " diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h index eae37b8244..217aa48c22 100644 --- a/src/lib/edje/edje_private.h +++ b/src/lib/edje/edje_private.h @@ -40,7 +40,7 @@ #endif // auto_unref -#define EDJE_OBJECT_BETA +#define EFL_CANVAS_LAYOUT_BETA #define EFL_CANVAS_OBJECT_PROTECTED #define EFL_LAYOUT_CALC_PROTECTED diff --git a/src/lib/edje/edje_program.c b/src/lib/edje/edje_program.c index 7412fa2674..dd6e73c260 100644 --- a/src/lib/edje/edje_program.c +++ b/src/lib/edje/edje_program.c @@ -178,13 +178,13 @@ _edje_emit_send(Edje *ed, Eina_Bool broadcast, const char *sig, const char *src, *============================================================================*/ EOLIAN Eina_Stringshare* -_edje_object_seat_name_get(Eo *obj EINA_UNUSED, Edje *ed, Efl_Input_Device *device) +_efl_canvas_layout_seat_name_get(Eo *obj EINA_UNUSED, Edje *ed, Efl_Input_Device *device) { return _edje_seat_name_get(ed, device); } EOLIAN Efl_Input_Device * -_edje_object_seat_get(Eo *obj EINA_UNUSED, Edje *ed, Eina_Stringshare *name) +_efl_canvas_layout_seat_get(Eo *obj EINA_UNUSED, Edje *ed, Eina_Stringshare *name) { return _edje_seat_get(ed, name); } @@ -248,13 +248,13 @@ edje_object_propagate_callback_add(Evas_Object *obj, Efl_Signal_Cb func, void *d } EOLIAN Eina_Bool -_edje_object_efl_layout_signal_signal_callback_add(Eo *obj EINA_UNUSED, Edje *ed, const char *emission, const char *source, Efl_Signal_Cb func, void *data) +_efl_canvas_layout_efl_layout_signal_signal_callback_add(Eo *obj EINA_UNUSED, Edje *ed, const char *emission, const char *source, Efl_Signal_Cb func, void *data) { return _edje_object_signal_callback_add(ed, emission, source, func, data); } EOLIAN Eina_Bool -_edje_object_efl_layout_signal_signal_callback_del(Eo *obj EINA_UNUSED, Edje *ed, const char *emission, const char *source, Efl_Signal_Cb func, void *data) +_efl_canvas_layout_efl_layout_signal_signal_callback_del(Eo *obj EINA_UNUSED, Edje *ed, const char *emission, const char *source, Efl_Signal_Cb func, void *data) { Edje_Signal_Callback_Group *gp; Eina_Bool ok; @@ -277,7 +277,7 @@ _edje_object_efl_layout_signal_signal_callback_del(Eo *obj EINA_UNUSED, Edje *ed } EOLIAN void -_edje_object_efl_layout_signal_signal_emit(Eo *obj EINA_UNUSED, Edje *ed, const char *emission, const char *source) +_efl_canvas_layout_efl_layout_signal_signal_emit(Eo *obj EINA_UNUSED, Edje *ed, const char *emission, const char *source) { if (ed->delete_me) return; if ((!emission) || (!source)) return; @@ -286,7 +286,7 @@ _edje_object_efl_layout_signal_signal_emit(Eo *obj EINA_UNUSED, Edje *ed, const /* FIXDOC: Verify/Expand */ EOLIAN void -_edje_object_animation_set(Eo *obj, Edje *ed, Eina_Bool on) +_efl_canvas_layout_animation_set(Eo *obj, Edje *ed, Eina_Bool on) { Eina_List *l; unsigned short i; @@ -356,7 +356,7 @@ break_prog: } EOLIAN Eina_Bool -_edje_object_animation_get(Eo *obj EINA_UNUSED, Edje *ed) +_efl_canvas_layout_animation_get(Eo *obj EINA_UNUSED, Edje *ed) { if (!ed) return EINA_FALSE; if (ed->delete_me) return EINA_FALSE; diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c index 6c2406d13a..ae038fb10e 100644 --- a/src/lib/edje/edje_smart.c +++ b/src/lib/edje/edje_smart.c @@ -7,7 +7,7 @@ # undef MY_CLASS #endif -#define MY_CLASS EDJE_OBJECT_CLASS +#define MY_CLASS EFL_CANVAS_LAYOUT_CLASS #define MY_CLASS_NAME "Edje" #define MY_CLASS_NAME_LEGACY "edje" @@ -24,7 +24,7 @@ edje_object_add(Evas *evas) } EOLIAN static Eo * -_edje_object_efl_object_constructor(Eo *obj, Edje *ed) +_efl_canvas_layout_efl_object_constructor(Eo *obj, Edje *ed) { Eo *parent; Evas *e; @@ -48,7 +48,7 @@ _edje_object_efl_object_constructor(Eo *obj, Edje *ed) } EOLIAN static void -_edje_object_efl_object_debug_name_override(Eo *obj, Edje *ed, Eina_Strbuf *sb) +_efl_canvas_layout_efl_object_debug_name_override(Eo *obj, Edje *ed, Eina_Strbuf *sb) { efl_debug_name_override(efl_super(obj, MY_CLASS), sb); eina_strbuf_append_printf(sb, ":file='%s':group='%s'", @@ -57,7 +57,7 @@ _edje_object_efl_object_debug_name_override(Eo *obj, Edje *ed, Eina_Strbuf *sb) } EOLIAN static void -_edje_object_efl_object_dbg_info_get(Eo *eo_obj, Edje *_pd EINA_UNUSED, Efl_Dbg_Info *root) EINA_ARG_NONNULL(3) +_efl_canvas_layout_efl_object_dbg_info_get(Eo *eo_obj, Edje *_pd EINA_UNUSED, Efl_Dbg_Info *root) EINA_ARG_NONNULL(3) { efl_dbg_info_get(efl_super(eo_obj, MY_CLASS), root); Efl_Dbg_Info *group = EFL_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME); @@ -106,7 +106,7 @@ _edje_size_class_free(void *data) /* Private Routines */ EOLIAN static void -_edje_object_efl_canvas_group_group_add(Eo *obj, Edje *ed) +_efl_canvas_layout_efl_canvas_group_group_add(Eo *obj, Edje *ed) { Evas *tev = evas_object_evas_get(obj); @@ -130,7 +130,7 @@ _edje_object_efl_canvas_group_group_add(Eo *obj, Edje *ed) } EOLIAN static void -_edje_object_efl_canvas_group_group_del(Eo *obj, Edje *ed) +_efl_canvas_layout_efl_canvas_group_group_del(Eo *obj, Edje *ed) { _edje_block_violate(ed); ed->delete_me = 1; @@ -155,7 +155,7 @@ _edje_object_efl_canvas_group_group_del(Eo *obj, Edje *ed) } EOLIAN static void -_edje_object_efl_gfx_position_set(Eo *obj, Edje *ed, Eina_Position2D pos) +_efl_canvas_layout_efl_gfx_position_set(Eo *obj, Edje *ed, Eina_Position2D pos) { unsigned short i; @@ -250,7 +250,7 @@ _edje_limit_get(Edje *ed, Edje_Limit **limits, unsigned int length, Evas_Coord s } EOLIAN static void -_edje_object_efl_gfx_size_set(Eo *obj, Edje *ed, Eina_Size2D sz) +_efl_canvas_layout_efl_gfx_size_set(Eo *obj, Edje *ed, Eina_Size2D sz) { if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h)) return; @@ -334,7 +334,7 @@ _edje_object_hide(Eo *obj, Edje *ed) } EOLIAN static void -_edje_object_efl_gfx_visible_set(Eo *obj, Edje *ed, Eina_Bool vis) +_efl_canvas_layout_efl_gfx_visible_set(Eo *obj, Edje *ed, Eina_Bool vis) { if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_VISIBLE, 0, vis)) return; @@ -344,7 +344,7 @@ _edje_object_efl_gfx_visible_set(Eo *obj, Edje *ed, Eina_Bool vis) } EOLIAN static void -_edje_object_efl_canvas_object_no_render_set(Eo *obj, Edje *ed, Eina_Bool enable) +_efl_canvas_layout_efl_canvas_object_no_render_set(Eo *obj, Edje *ed, Eina_Bool enable) { Eina_List *l; Edje *edg; @@ -358,13 +358,13 @@ _edje_object_efl_canvas_object_no_render_set(Eo *obj, Edje *ed, Eina_Bool enable } EOLIAN static void -_edje_object_efl_canvas_group_group_calculate(Eo *obj EINA_UNUSED, Edje *ed) +_efl_canvas_layout_efl_canvas_group_group_calculate(Eo *obj EINA_UNUSED, Edje *ed) { _edje_recalc_do(ed); } EOLIAN static Eina_Bool -_edje_object_efl_file_mmap_set(Eo *obj, Edje *pd EINA_UNUSED, +_efl_canvas_layout_efl_file_mmap_set(Eo *obj, Edje *pd EINA_UNUSED, const Eina_File *f, const char *key) { Eina_Bool ret; @@ -384,7 +384,7 @@ _edje_object_efl_file_mmap_set(Eo *obj, Edje *pd EINA_UNUSED, } EOLIAN static void -_edje_object_efl_file_mmap_get(Eo *obj EINA_UNUSED, Edje *pd, +_efl_canvas_layout_efl_file_mmap_get(Eo *obj EINA_UNUSED, Edje *pd, const Eina_File **f, const char **key) { if (f) *f = pd->file ? pd->file->f : NULL; @@ -410,7 +410,7 @@ edje_object_file_get(const Edje_Object *obj, const char **file, const char **gro } EOLIAN static void -_edje_object_efl_canvas_object_paragraph_direction_set(Eo *obj, Edje *ed, Evas_BiDi_Direction dir) +_efl_canvas_layout_efl_canvas_object_paragraph_direction_set(Eo *obj, Edje *ed, Evas_BiDi_Direction dir) { efl_canvas_object_paragraph_direction_set(efl_super(obj, MY_CLASS), dir); @@ -421,7 +421,7 @@ _edje_object_efl_canvas_object_paragraph_direction_set(Eo *obj, Edje *ed, Evas_B } EOLIAN static void -_edje_object_efl_observer_update(Eo *obj EINA_UNUSED, Edje *ed, Efl_Object *obs, const char *key, void *data) +_efl_canvas_layout_efl_observer_update(Eo *obj EINA_UNUSED, Edje *ed, Efl_Object *obs, const char *key, void *data) { if (!obs) return; @@ -471,13 +471,13 @@ _edje_object_efl_observer_update(Eo *obj EINA_UNUSED, Edje *ed, Efl_Object *obs, } EOLIAN Eina_Bool -_edje_object_efl_player_playable_get(Eo *obj EINA_UNUSED, Edje *pd EINA_UNUSED) +_efl_canvas_layout_efl_player_playable_get(Eo *obj EINA_UNUSED, Edje *pd EINA_UNUSED) { return EINA_TRUE; } EOLIAN void -_edje_object_efl_player_play_set(Eo *obj EINA_UNUSED, Edje *ed, Eina_Bool play) +_efl_canvas_layout_efl_player_play_set(Eo *obj EINA_UNUSED, Edje *ed, Eina_Bool play) { double t; Eina_List *l; @@ -514,7 +514,7 @@ _edje_object_efl_player_play_set(Eo *obj EINA_UNUSED, Edje *ed, Eina_Bool play) } EOLIAN Eina_Bool -_edje_object_efl_player_play_get(Eo *obj EINA_UNUSED, Edje *ed) +_efl_canvas_layout_efl_player_play_get(Eo *obj EINA_UNUSED, Edje *ed) { if (!ed) return EINA_FALSE; if (ed->delete_me) return EINA_FALSE; @@ -524,25 +524,25 @@ _edje_object_efl_player_play_get(Eo *obj EINA_UNUSED, Edje *ed) } EOLIAN void -_edje_object_efl_player_play_speed_set(Eo *obj EINA_UNUSED, Edje *pd , double speed) +_efl_canvas_layout_efl_player_play_speed_set(Eo *obj EINA_UNUSED, Edje *pd , double speed) { if (speed <= 0.0) speed = 1.0; pd->duration_scale = 1.0/speed; } EOLIAN double -_edje_object_efl_player_play_speed_get(Eo *obj EINA_UNUSED, Edje *pd) +_efl_canvas_layout_efl_player_play_speed_get(Eo *obj EINA_UNUSED, Edje *pd) { return 1.0/pd->duration_scale; } /* Internal EO APIs and hidden overrides */ -#define EDJE_OBJECT_EXTRA_OPS \ - EFL_CANVAS_GROUP_ADD_DEL_OPS(edje_object), \ - EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _edje_object_efl_object_dbg_info_get) +#define EFL_CANVAS_LAYOUT_EXTRA_OPS \ + EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_canvas_layout), \ + EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _efl_canvas_layout_efl_object_dbg_info_get) -#include "edje_object.eo.c" +#include "efl_canvas_layout.eo.c" #include "edje_global.eo.c" #include "efl_layout_calc.eo.c" #include "efl_layout_signal.eo.c" diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c index 3ff4c31b80..258a7499b0 100644 --- a/src/lib/edje/edje_util.c +++ b/src/lib/edje/edje_util.c @@ -238,7 +238,7 @@ _edje_language_signal_emit(Edje *ed, Evas_Object *obj, char *signal) } EOLIAN void -_edje_object_efl_ui_base_language_set(Eo *obj, Edje *ed, const char *locale) +_efl_canvas_layout_efl_ui_base_language_set(Eo *obj, Edje *ed, const char *locale) { const char *lookup; char *signal; @@ -260,7 +260,7 @@ _edje_object_efl_ui_base_language_set(Eo *obj, Edje *ed, const char *locale) } EOLIAN const char * -_edje_object_efl_ui_base_language_get(Eo *obj EINA_UNUSED, Edje *ed) +_efl_canvas_layout_efl_ui_base_language_get(Eo *obj EINA_UNUSED, Edje *ed) { if (!ed->language) return _edje_language; @@ -364,7 +364,7 @@ edje_password_show_last_timeout_set(double password_show_last_timeout) } EOLIAN void -_edje_object_efl_gfx_scale_set(Eo *obj EINA_UNUSED, Edje *ed, double scale) +_efl_canvas_layout_efl_gfx_scale_set(Eo *obj EINA_UNUSED, Edje *ed, double scale) { Edje *ged; Evas_Object *o; @@ -390,7 +390,7 @@ _edje_object_efl_gfx_scale_set(Eo *obj EINA_UNUSED, Edje *ed, double scale) } EOLIAN double -_edje_object_efl_gfx_scale_get(Eo *obj EINA_UNUSED, Edje *ed) +_efl_canvas_layout_efl_gfx_scale_get(Eo *obj EINA_UNUSED, Edje *ed) { return TO_DOUBLE(ed->scale); } @@ -406,7 +406,7 @@ edje_object_base_scale_get(const Evas_Object *obj) } EOLIAN Eina_Bool -_edje_object_efl_ui_base_mirrored_get(Eo *obj EINA_UNUSED, Edje *ed) +_efl_canvas_layout_efl_ui_base_mirrored_get(Eo *obj EINA_UNUSED, Edje *ed) { return ed->is_rtl; } @@ -422,7 +422,7 @@ _edje_object_orientation_inform(Evas_Object *obj) } EOLIAN void -_edje_object_efl_ui_base_mirrored_set(Eo *obj, Edje *ed, Eina_Bool rtl) +_efl_canvas_layout_efl_ui_base_mirrored_set(Eo *obj, Edje *ed, Eina_Bool rtl) { unsigned short i; @@ -450,7 +450,7 @@ _edje_object_efl_ui_base_mirrored_set(Eo *obj, Edje *ed, Eina_Bool rtl) } EOLIAN const char * -_edje_object_efl_layout_group_group_data_get(Eo *obj EINA_UNUSED, Edje *ed, const char *key) +_efl_canvas_layout_efl_layout_group_group_data_get(Eo *obj EINA_UNUSED, Edje *ed, const char *key) { if (!key) return NULL; if (!ed->collection) return NULL; @@ -460,7 +460,7 @@ _edje_object_efl_layout_group_group_data_get(Eo *obj EINA_UNUSED, Edje *ed, cons } EOLIAN int -_edje_object_efl_layout_calc_calc_freeze(Eo *obj EINA_UNUSED, Edje *ed) +_efl_canvas_layout_efl_layout_calc_calc_freeze(Eo *obj EINA_UNUSED, Edje *ed) { unsigned short i; @@ -478,7 +478,7 @@ _edje_object_efl_layout_calc_calc_freeze(Eo *obj EINA_UNUSED, Edje *ed) } EOLIAN int -_edje_object_efl_layout_calc_calc_thaw(Eo *obj EINA_UNUSED, Edje *ed) +_efl_canvas_layout_efl_layout_calc_calc_thaw(Eo *obj EINA_UNUSED, Edje *ed) { unsigned short i; @@ -754,7 +754,7 @@ _edje_color_class_active_iterator_next(Eina_Iterator *it, void **data) if (!eina_iterator_next(tuple->data, (void **)&o)) return EINA_FALSE; - ed = efl_data_scope_get(o, EDJE_OBJECT_CLASS); + ed = efl_data_scope_get(o, EFL_CANVAS_LAYOUT_CLASS); if (!ed) return EINA_FALSE; /* @@ -839,7 +839,7 @@ edje_object_color_class_set(Evas_Object *obj, const char *color_class, int r, in } EOLIAN Eina_Bool -_edje_object_efl_gfx_color_class_color_class_set(Eo *obj EINA_UNUSED, Edje *ed, const char *color_class, Efl_Gfx_Color_Class_Layer layer, int r, int g, int b, int a) +_efl_canvas_layout_efl_gfx_color_class_color_class_set(Eo *obj EINA_UNUSED, Edje *ed, const char *color_class, Efl_Gfx_Color_Class_Layer layer, int r, int g, int b, int a) { Eina_Bool int_ret; Eina_Bool need_update; @@ -887,7 +887,7 @@ edje_object_color_class_get(const Evas_Object *obj, const char *color_class, int } EOLIAN Eina_Bool -_edje_object_efl_gfx_color_class_color_class_get(Eo *obj EINA_UNUSED, Edje *ed, const char *color_class, Efl_Gfx_Color_Class_Layer layer, int *r, int *g, int *b, int *a) +_efl_canvas_layout_efl_gfx_color_class_color_class_get(Eo *obj EINA_UNUSED, Edje *ed, const char *color_class, Efl_Gfx_Color_Class_Layer layer, int *r, int *g, int *b, int *a) { Edje_Color_Class *cc; @@ -906,7 +906,7 @@ edje_objcet_color_class_description_get(const Evas_Object *obj, const char *colo } EOLIAN const char * -_edje_object_efl_gfx_color_class_color_class_description_get(Eo *obj EINA_UNUSED, Edje *ed, const char *color_class) +_efl_canvas_layout_efl_gfx_color_class_color_class_description_get(Eo *obj EINA_UNUSED, Edje *ed, const char *color_class) { Edje_Color_Class *cc = _edje_color_class_find(ed, color_class); return cc ? cc->desc : NULL; @@ -919,7 +919,7 @@ edje_object_color_class_del(Evas_Object *obj, const char *color_class) } EOLIAN void -_edje_object_efl_gfx_color_class_color_class_del(Eo *obj EINA_UNUSED, Edje *ed, const char *color_class) +_efl_canvas_layout_efl_gfx_color_class_color_class_del(Eo *obj EINA_UNUSED, Edje *ed, const char *color_class) { Edje_Color_Class *cc = NULL; unsigned short i; @@ -958,7 +958,7 @@ edje_object_color_class_clear(const Evas_Object *obj) } EOLIAN void -_edje_object_efl_gfx_color_class_color_class_clear(Eo *obj EINA_UNUSED, Edje *ed) +_efl_canvas_layout_efl_gfx_color_class_color_class_clear(Eo *obj EINA_UNUSED, Edje *ed) { Edje_List_Foreach_Data fdata; Edje_Color_Class *cc = NULL; @@ -1212,7 +1212,7 @@ _edje_text_class_active_iterator_next(Eina_Iterator *it, void **data) if (!eina_iterator_next(tuple->data, (void **)&o)) return EINA_FALSE; - ed = efl_data_scope_get(o, EDJE_OBJECT_CLASS); + ed = efl_data_scope_get(o, EFL_CANVAS_LAYOUT_CLASS); if (!ed) return EINA_FALSE; /* @@ -1282,7 +1282,7 @@ edje_object_text_class_set(Evas_Object *obj, const char *text_class, const char } EOLIAN Eina_Bool -_edje_object_efl_gfx_text_class_text_class_set(Eo *obj EINA_UNUSED, Edje *ed, const char *text_class, const char *font, Efl_Font_Size size) +_efl_canvas_layout_efl_gfx_text_class_text_class_set(Eo *obj EINA_UNUSED, Edje *ed, const char *text_class, const char *font, Efl_Font_Size size) { Edje_Text_Class *tc = NULL; unsigned short i; @@ -1352,7 +1352,7 @@ edje_object_text_class_get(const Evas_Object *obj, const char *text_class, const } EOLIAN Eina_Bool -_edje_object_efl_gfx_text_class_text_class_get(Eo *obj EINA_UNUSED, Edje *ed, const char *text_class, const char **font, Efl_Font_Size *size) +_efl_canvas_layout_efl_gfx_text_class_text_class_get(Eo *obj EINA_UNUSED, Edje *ed, const char *text_class, const char **font, Efl_Font_Size *size) { Edje_Text_Class *tc = _edje_text_class_find(ed, text_class); @@ -1378,7 +1378,7 @@ edje_object_text_class_del(Evas_Object *obj, const char *text_class) } EOLIAN void -_edje_object_efl_gfx_text_class_text_class_del(Eo *obj EINA_UNUSED, Edje *ed, const char *text_class) +_efl_canvas_layout_efl_gfx_text_class_text_class_del(Eo *obj EINA_UNUSED, Edje *ed, const char *text_class) { Edje_Text_Class *tc = NULL; unsigned short i; @@ -1622,7 +1622,7 @@ _edje_size_class_active_iterator_next(Eina_Iterator *it, void **data) if (!eina_iterator_next(tuple->data, (void **)&o)) return EINA_FALSE; - ed = efl_data_scope_get(o, EDJE_OBJECT_CLASS); + ed = efl_data_scope_get(o, EFL_CANVAS_LAYOUT_CLASS); if (!ed) return EINA_FALSE; /* @@ -1692,7 +1692,7 @@ edje_object_size_class_set(Evas_Object *obj, const char *size_class, Evas_Coord } EOLIAN Eina_Bool -_edje_object_efl_gfx_size_class_size_class_set(Eo *obj EINA_UNUSED, Edje *ed, const char *size_class, Evas_Coord minw, Evas_Coord minh, Evas_Coord maxw, Evas_Coord maxh) +_efl_canvas_layout_efl_gfx_size_class_size_class_set(Eo *obj EINA_UNUSED, Edje *ed, const char *size_class, Evas_Coord minw, Evas_Coord minh, Evas_Coord maxw, Evas_Coord maxh) { Edje_Size_Class *sc = NULL; unsigned short i; @@ -1760,7 +1760,7 @@ edje_object_size_class_get(const Evas_Object *obj, const char *size_class, Evas_ } EOLIAN Eina_Bool -_edje_object_efl_gfx_size_class_size_class_get(Eo *obj EINA_UNUSED, Edje *ed, const char *size_class, Evas_Coord *minw, Evas_Coord *minh, Evas_Coord *maxw, Evas_Coord *maxh) +_efl_canvas_layout_efl_gfx_size_class_size_class_get(Eo *obj EINA_UNUSED, Edje *ed, const char *size_class, Evas_Coord *minw, Evas_Coord *minh, Evas_Coord *maxw, Evas_Coord *maxh) { Edje_Size_Class *sc = _edje_size_class_find(ed, size_class); @@ -1790,7 +1790,7 @@ edje_object_size_class_del(Evas_Object *obj, const char *size_class) } EOLIAN void -_edje_object_efl_gfx_size_class_size_class_del(Eo *obj EINA_UNUSED, Edje *ed, const char *size_class) +_efl_canvas_layout_efl_gfx_size_class_size_class_del(Eo *obj EINA_UNUSED, Edje *ed, const char *size_class) { Edje_Size_Class *sc = NULL; unsigned short i; @@ -1907,7 +1907,7 @@ edje_object_part_object_get(const Eo *obj, const char *part) } EOLIAN void -_edje_object_item_provider_set(Eo *obj EINA_UNUSED, Edje *ed, Edje_Item_Provider_Cb func, void *data) +_efl_canvas_layout_item_provider_set(Eo *obj EINA_UNUSED, Edje *ed, Edje_Item_Provider_Cb func, void *data) { ed->item_provider.func = func; ed->item_provider.data = data; @@ -2151,7 +2151,7 @@ edje_object_part_text_select_all(const Eo *obj, const char *part) } EOLIAN void -_edje_object_part_text_cursor_geometry_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) +_efl_canvas_layout_part_text_cursor_geometry_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) { Edje_Real_Part *rp; @@ -2231,7 +2231,7 @@ edje_object_part_text_select_extend(const Eo *obj, const char *part) } EOLIAN Eina_Bool -_edje_object_part_text_cursor_next(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) +_efl_canvas_layout_part_text_cursor_next(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) { Edje_Real_Part *rp; @@ -2247,7 +2247,7 @@ _edje_object_part_text_cursor_next(Eo *obj EINA_UNUSED, Edje *ed, const char *pa } EOLIAN Eina_Bool -_edje_object_part_text_cursor_prev(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) +_efl_canvas_layout_part_text_cursor_prev(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) { Edje_Real_Part *rp; @@ -2263,7 +2263,7 @@ _edje_object_part_text_cursor_prev(Eo *obj EINA_UNUSED, Edje *ed, const char *pa } EOLIAN Eina_Bool -_edje_object_part_text_cursor_up(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) +_efl_canvas_layout_part_text_cursor_up(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) { Edje_Real_Part *rp; @@ -2279,7 +2279,7 @@ _edje_object_part_text_cursor_up(Eo *obj EINA_UNUSED, Edje *ed, const char *part } EOLIAN Eina_Bool -_edje_object_part_text_cursor_down(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) +_efl_canvas_layout_part_text_cursor_down(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) { Edje_Real_Part *rp; @@ -2295,7 +2295,7 @@ _edje_object_part_text_cursor_down(Eo *obj EINA_UNUSED, Edje *ed, const char *pa } EOLIAN void -_edje_object_part_text_cursor_begin_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) +_efl_canvas_layout_part_text_cursor_begin_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) { Edje_Real_Part *rp; @@ -2309,7 +2309,7 @@ _edje_object_part_text_cursor_begin_set(Eo *obj EINA_UNUSED, Edje *ed, const cha } EOLIAN void -_edje_object_part_text_cursor_end_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) +_efl_canvas_layout_part_text_cursor_end_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) { Edje_Real_Part *rp; @@ -2323,7 +2323,7 @@ _edje_object_part_text_cursor_end_set(Eo *obj EINA_UNUSED, Edje *ed, const char } EOLIAN void -_edje_object_part_text_cursor_copy(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor src, Edje_Cursor dst) +_efl_canvas_layout_part_text_cursor_copy(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor src, Edje_Cursor dst) { Edje_Real_Part *rp; @@ -2337,7 +2337,7 @@ _edje_object_part_text_cursor_copy(Eo *obj EINA_UNUSED, Edje *ed, const char *pa } EOLIAN void -_edje_object_part_text_cursor_line_begin_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) +_efl_canvas_layout_part_text_cursor_line_begin_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) { Edje_Real_Part *rp; @@ -2351,7 +2351,7 @@ _edje_object_part_text_cursor_line_begin_set(Eo *obj EINA_UNUSED, Edje *ed, cons } EOLIAN void -_edje_object_part_text_cursor_line_end_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) +_efl_canvas_layout_part_text_cursor_line_end_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) { Edje_Real_Part *rp; @@ -2365,7 +2365,7 @@ _edje_object_part_text_cursor_line_end_set(Eo *obj EINA_UNUSED, Edje *ed, const } EOLIAN Eina_Bool -_edje_object_part_text_cursor_coord_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur, Evas_Coord x, Evas_Coord y) +_efl_canvas_layout_part_text_cursor_coord_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur, Evas_Coord x, Evas_Coord y) { Edje_Real_Part *rp; @@ -2381,7 +2381,7 @@ _edje_object_part_text_cursor_coord_set(Eo *obj EINA_UNUSED, Edje *ed, const cha } EOLIAN void -_edje_object_part_text_cursor_pos_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur, int pos) +_efl_canvas_layout_part_text_cursor_pos_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur, int pos) { Edje_Real_Part *rp; @@ -2395,7 +2395,7 @@ _edje_object_part_text_cursor_pos_set(Eo *obj EINA_UNUSED, Edje *ed, const char } EOLIAN int -_edje_object_part_text_cursor_pos_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) +_efl_canvas_layout_part_text_cursor_pos_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) { int ret; Edje_Real_Part *rp; @@ -3230,7 +3230,7 @@ _swallow_real_part_get(Evas_Object *obj_swallow) } EOLIAN Eina_Bool -_edje_object_efl_container_content_remove(Eo *obj EINA_UNUSED, Edje *ed, Evas_Object *obj_swallow) +_efl_canvas_layout_efl_container_content_remove(Eo *obj EINA_UNUSED, Edje *ed, Evas_Object *obj_swallow) { Edje_Real_Part *rp; Edje_User_Defined *eud; @@ -3290,7 +3290,7 @@ _edje_efl_content_content_get(Edje *ed, const char *part) } EOLIAN Eo * -_edje_object_efl_part_part(Eo *obj, Edje *ed, const char *part) +_efl_canvas_layout_efl_part_part(Eo *obj, Edje *ed, const char *part) { Edje_Real_Part *rp; @@ -3316,7 +3316,7 @@ _edje_object_efl_part_part(Eo *obj, Edje *ed, const char *part) } EOLIAN Eina_Size2D -_edje_object_efl_layout_group_group_size_min_get(Eo *obj EINA_UNUSED, Edje *ed) +_efl_canvas_layout_efl_layout_group_group_size_min_get(Eo *obj EINA_UNUSED, Edje *ed) { if ((!ed) || (!ed->collection)) return EINA_SIZE2D(0, 0); @@ -3325,7 +3325,7 @@ _edje_object_efl_layout_group_group_size_min_get(Eo *obj EINA_UNUSED, Edje *ed) } EOLIAN Eina_Size2D -_edje_object_efl_layout_group_group_size_max_get(Eo *obj EINA_UNUSED, Edje *ed EINA_UNUSED) +_efl_canvas_layout_efl_layout_group_group_size_max_get(Eo *obj EINA_UNUSED, Edje *ed EINA_UNUSED) { Eina_Size2D sz; @@ -3344,7 +3344,7 @@ _edje_object_efl_layout_group_group_size_max_get(Eo *obj EINA_UNUSED, Edje *ed E } EOLIAN void -_edje_object_efl_layout_calc_calc_force(Eo *obj EINA_UNUSED, Edje *ed) +_efl_canvas_layout_efl_layout_calc_calc_force(Eo *obj EINA_UNUSED, Edje *ed) { int pf, pf2; @@ -3367,7 +3367,7 @@ _edje_object_efl_layout_calc_calc_force(Eo *obj EINA_UNUSED, Edje *ed) } EOLIAN Eina_Rectangle -_edje_object_efl_layout_calc_calc_parts_extends(Eo *obj EINA_UNUSED, Edje *ed) +_efl_canvas_layout_efl_layout_calc_calc_parts_extends(Eo *obj EINA_UNUSED, Edje *ed) { Evas_Coord xx1 = INT_MAX, yy1 = INT_MAX; Evas_Coord xx2 = 0, yy2 = 0, w = 0, h = 0; @@ -3407,7 +3407,7 @@ _edje_object_efl_layout_calc_calc_parts_extends(Eo *obj EINA_UNUSED, Edje *ed) } EOLIAN Eina_Size2D -_edje_object_efl_layout_calc_calc_size_min(Eo *obj EINA_UNUSED, Edje *ed, Eina_Size2D restricted) +_efl_canvas_layout_efl_layout_calc_calc_size_min(Eo *obj EINA_UNUSED, Edje *ed, Eina_Size2D restricted) { const int CALC_COUNT_LIMIT = 255; @@ -4395,7 +4395,7 @@ _part_iterator_free(Part_Iterator *it) } EOLIAN Eina_Iterator * -_edje_object_access_part_iterate(Eo *obj EINA_UNUSED, Edje *ed) +_efl_canvas_layout_access_part_iterate(Eo *obj EINA_UNUSED, Edje *ed) { Part_Iterator *it; @@ -4422,7 +4422,7 @@ edje_object_access_part_list_get(const Edje_Object *obj) Eina_Iterator *it; const char *str; - it = edje_obj_access_part_iterate((Eo *) obj); + it = efl_canvas_layout_access_part_iterate((Eo *) obj); EINA_ITERATOR_FOREACH(it, str) access_parts = eina_list_append(access_parts, str); eina_iterator_free(it); @@ -4792,7 +4792,7 @@ _edje_perspective_obj_del(void *data, EINA_UNUSED Evas *e, EINA_UNUSED Evas_Obje { Edje *ed; - ed = efl_data_scope_get(o, EDJE_OBJECT_CLASS); + ed = efl_data_scope_get(o, EFL_CANVAS_LAYOUT_CLASS); if (!ed) continue; ed->persp = NULL; ed->dirty = EINA_TRUE; @@ -4845,7 +4845,7 @@ edje_perspective_set(Edje_Perspective *ps, Evas_Coord px, Evas_Coord py, Evas_Co { Edje *ed; - ed = efl_data_scope_get(o, EDJE_OBJECT_CLASS); + ed = efl_data_scope_get(o, EFL_CANVAS_LAYOUT_CLASS); if (!ed) continue; if (!ed->persp) { @@ -5040,7 +5040,7 @@ edje_object_preload(Eo *obj, Eina_Bool cancel) } EOLIAN void -_edje_object_efl_layout_calc_calc_auto_update_hints_set(Eo *obj EINA_UNUSED, Edje *ed, Eina_Bool update) +_efl_canvas_layout_efl_layout_calc_calc_auto_update_hints_set(Eo *obj EINA_UNUSED, Edje *ed, Eina_Bool update) { if (!ed) return; if (ed->update_hints == !!update) return; @@ -5054,7 +5054,7 @@ _edje_object_efl_layout_calc_calc_auto_update_hints_set(Eo *obj EINA_UNUSED, Edj } EOLIAN Eina_Bool -_edje_object_efl_layout_calc_calc_auto_update_hints_get(Eo *obj EINA_UNUSED, Edje *ed) +_efl_canvas_layout_efl_layout_calc_calc_auto_update_hints_get(Eo *obj EINA_UNUSED, Edje *ed) { return ed->update_hints; } @@ -5597,9 +5597,9 @@ _edje_fetch(const Evas_Object *obj) { Edje *ed; - if (!obj || !efl_isa(obj, EDJE_OBJECT_CLASS)) + if (!obj || !efl_isa(obj, EFL_CANVAS_LAYOUT_CLASS)) return NULL; - ed = efl_data_scope_get(obj, EDJE_OBJECT_CLASS); + ed = efl_data_scope_get(obj, EFL_CANVAS_LAYOUT_CLASS); if ((ed) && (ed->delete_me)) return NULL; return ed; } @@ -5693,7 +5693,7 @@ _edje_real_part_swallow_hints_update(Edje_Real_Part *rp) rp->typedata.swallow->swallow_params.min.h = 0; rp->typedata.swallow->swallow_params.max.w = -1; rp->typedata.swallow->swallow_params.max.h = -1; - if (efl_isa(rp->typedata.swallow->swallowed_object, EDJE_OBJECT_CLASS)) + if (efl_isa(rp->typedata.swallow->swallowed_object, EFL_CANVAS_LAYOUT_CLASS)) { Evas_Coord w = 0, h = 0; diff --git a/src/lib/edje/edje_object.eo b/src/lib/edje/efl_canvas_layout.eo similarity index 93% rename from src/lib/edje/edje_object.eo rename to src/lib/edje/efl_canvas_layout.eo index 5af4a417b5..b6cb5b7543 100644 --- a/src/lib/edje/edje_object.eo +++ b/src/lib/edje/efl_canvas_layout.eo @@ -2,15 +2,14 @@ import edje_types; // FIXME: This EO doc needs a direct link to the "edcref" doc -class Edje.Object (Efl.Canvas.Group, Efl.File, Efl.Container, Efl.Part, - Efl.Observer, Efl.Ui.Base, Efl.Layout.Calc, - Efl.Layout.Signal, Efl.Layout.Group, - Efl.Player, Efl.Gfx.Color_Class, Efl.Gfx.Text_Class, - Efl.Gfx.Size_Class) +class Efl.Canvas.Layout (Efl.Canvas.Group, Efl.File, Efl.Container, Efl.Part, + Efl.Observer, Efl.Ui.Base, Efl.Layout.Calc, + Efl.Layout.Signal, Efl.Layout.Group, + Efl.Player, Efl.Gfx.Color_Class, Efl.Gfx.Text_Class, + Efl.Gfx.Size_Class) { [[Edje object class]] legacy_prefix: edje_object; - eo_prefix: edje_obj; event_prefix: edje_object; data: Edje; methods { diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c index ef34892c4e..dd184a5286 100644 --- a/src/lib/elementary/efl_ui_image.c +++ b/src/lib/elementary/efl_ui_image.c @@ -155,7 +155,7 @@ _image_sizing_eval(Efl_Ui_Image_Data *sd, Evas_Object *img) { Evas_Coord x = 0, y = 0, w = 1, h = 1; - if (efl_isa(img, EDJE_OBJECT_CLASS)) + if (efl_isa(img, EFL_CANVAS_LAYOUT_CLASS)) { x = sd->img_x; y = sd->img_y; @@ -1257,7 +1257,7 @@ _efl_ui_image_efl_gfx_view_view_size_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data { int tw, th; - if (efl_isa(sd->img, EDJE_OBJECT_CLASS)) + if (efl_isa(sd->img, EFL_CANVAS_LAYOUT_CLASS)) edje_object_size_min_get(sd->img, &tw, &th); else evas_object_image_size_get(sd->img, &tw, &th); diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c index 2ed5db22cc..a0365f8749 100644 --- a/src/lib/elementary/efl_ui_layout.c +++ b/src/lib/elementary/efl_ui_layout.c @@ -407,7 +407,7 @@ _efl_ui_layout_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_ efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), item); - if (efl_isa(wd->resize_obj, EDJE_OBJECT_CLASS)) + if (efl_isa(wd->resize_obj, EFL_CANVAS_LAYOUT_CLASS)) edje_object_message_signal_process(wd->resize_obj); return EINA_TRUE; @@ -1791,7 +1791,7 @@ _efl_ui_layout_efl_object_dbg_info_get(Eo *eo_obj, Efl_Ui_Layout_Data *_pd EINA_ efl_dbg_info_get(efl_super(eo_obj, MY_CLASS), root); ELM_WIDGET_DATA_GET_OR_RETURN(eo_obj, wd); - if (wd->resize_obj && efl_isa(wd->resize_obj, EDJE_OBJECT_CLASS)) + if (wd->resize_obj && efl_isa(wd->resize_obj, EFL_CANVAS_LAYOUT_CLASS)) { Efl_Dbg_Info *group = EFL_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME); const char *file, *edje_group; diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c index 341b5a4bdb..758681272a 100644 --- a/src/lib/elementary/efl_ui_text.c +++ b/src/lib/elementary/efl_ui_text.c @@ -4642,7 +4642,7 @@ static inline Eo * _decoration_create(Efl_Ui_Text_Data *sd, const char *file, const char *source, Eina_Bool above) { - Eo *ret = efl_add(EDJE_OBJECT_CLASS, sd->entry_edje); + Eo *ret = efl_add(EFL_CANVAS_LAYOUT_CLASS, sd->entry_edje); Eo *text_obj = edje_object_part_swallow_get(sd->entry_edje, "elm.text"); edje_object_file_set(ret, file, source); evas_object_smart_member_add(ret, sd->entry_edje); diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index 3ebbdb116c..5472d8197f 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -8330,7 +8330,7 @@ elm_win_resize_object_add(Eo *obj, Evas_Object *subobj) // Little hack for E if (evas_obj_box_count(sd->legacy.box) > 0) sd->single_edje_content = 0; - else if (efl_isa(subobj, EDJE_OBJECT_CLASS)) + else if (efl_isa(subobj, EFL_CANVAS_LAYOUT_CLASS)) sd->single_edje_content = 1; ret = elm_widget_sub_object_add(obj, subobj); diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c index 625e63665c..2c2856be95 100644 --- a/src/lib/elementary/elm_colorselector.c +++ b/src/lib/elementary/elm_colorselector.c @@ -1419,7 +1419,7 @@ _sub_obj_size_hints_set(Evas_Object *sobj, Evas_Coord minw = -1, minh = -1; elm_coords_finger_size_adjust(timesw, &minw, timesh, &minh); - if (sobj && efl_isa(sobj, EDJE_OBJECT_CLASS)) + if (sobj && efl_isa(sobj, EFL_CANVAS_LAYOUT_CLASS)) edje_object_size_min_restricted_calc(sobj, &minw, &minh, minw, minh); evas_object_size_hint_min_set(sobj, minw, minh); evas_object_size_hint_max_set(sobj, -1, -1); diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c index 43414ce521..5f9a4eb18b 100644 --- a/src/lib/elementary/elm_widget.c +++ b/src/lib/elementary/elm_widget.c @@ -3322,7 +3322,7 @@ elm_widget_focus_highlight_focus_part_geometry_get(const Evas_Object *obj, const char *target_hl_part = NULL; const Evas_Object *edje_obj = NULL; - if (obj && efl_isa(obj, EDJE_OBJECT_CLASS)) + if (obj && efl_isa(obj, EFL_CANVAS_LAYOUT_CLASS)) { edje_obj = obj; if (!(target_hl_part = edje_object_data_get(edje_obj, "focus_part"))) @@ -3650,7 +3650,7 @@ _elm_widget_item_signal_callback_list_get(Elm_Widget_Item_Data *item, Eina_List elm_object_signal_callback_del(item->view, wisd->emission, wisd->source, _elm_widget_item_signal_cb); - else if (efl_isa(item->view, EDJE_OBJECT_CLASS)) + else if (efl_isa(item->view, EFL_CANVAS_LAYOUT_CLASS)) edje_object_signal_callback_del_full(item->view, wisd->emission, wisd->source, _elm_widget_item_signal_cb, wisd); @@ -4717,7 +4717,7 @@ _elm_widget_item_signal_callback_add(Eo *eo_item, if (_elm_widget_is(item->view)) elm_object_signal_callback_add(item->view, emission, source, _elm_widget_item_signal_cb, wisd); - else if (efl_isa(item->view, EDJE_OBJECT_CLASS)) + else if (efl_isa(item->view, EFL_CANVAS_LAYOUT_CLASS)) edje_object_signal_callback_add(item->view, emission, source, _elm_widget_item_signal_cb, wisd); else { diff --git a/src/tests/edje/edje_test_edje.c b/src/tests/edje/edje_test_edje.c index a8dbbf32e4..6d545086a7 100644 --- a/src/tests/edje/edje_test_edje.c +++ b/src/tests/edje/edje_test_edje.c @@ -6,7 +6,7 @@ #include #define EFL_GFX_FILTER_BETA -#define EDJE_OBJECT_BETA +#define EFL_CANVAS_LAYOUT_BETA #include #include @@ -362,13 +362,13 @@ START_TEST(edje_test_swallows) Evas *evas = EDJE_TEST_INIT_EVAS(); Evas_Object *ly, *o1, *o2; - ly = efl_add(EDJE_OBJECT_CLASS, evas); + ly = efl_add(EFL_CANVAS_LAYOUT_CLASS, evas); fail_unless(edje_object_file_set(ly, test_layout_get("test_swallows.edj"), "test_group")); fail_unless(edje_object_part_exists(ly, "swallow")); - o1 = efl_add(EDJE_OBJECT_CLASS, ly); + o1 = efl_add(EFL_CANVAS_LAYOUT_CLASS, ly); fail_if(!edje_object_part_swallow(ly, "swallow", o1)); ck_assert_ptr_eq(efl_parent_get(o1), ly); @@ -378,7 +378,7 @@ START_TEST(edje_test_swallows) fail_if(!edje_object_part_swallow(ly, "swallow", o1)); ck_assert_ptr_eq(efl_parent_get(o1), ly); - o2 = efl_add(EDJE_OBJECT_CLASS, ly); + o2 = efl_add(EFL_CANVAS_LAYOUT_CLASS, ly); fail_if(!edje_object_part_swallow(ly, "swallow", o2)); ck_assert_ptr_eq(efl_parent_get(o2), ly); /* o1 is deleted at this point. */ @@ -393,13 +393,13 @@ START_TEST(edje_test_swallows_eoapi) Evas *evas = EDJE_TEST_INIT_EVAS(); Evas_Object *ly, *o1, *o2; - ly = efl_add(EDJE_OBJECT_CLASS, evas); + ly = efl_add(EFL_CANVAS_LAYOUT_CLASS, evas); fail_unless(edje_object_file_set(ly, test_layout_get("test_swallows.edj"), "test_group")); fail_unless(edje_object_part_exists(ly, "swallow")); - o1 = efl_add(EDJE_OBJECT_CLASS, ly); + o1 = efl_add(EFL_CANVAS_LAYOUT_CLASS, ly); fail_if(!efl_content_set(efl_part(ly, "swallow"), o1)); ck_assert_ptr_eq(efl_parent_get(o1), ly); @@ -409,7 +409,7 @@ START_TEST(edje_test_swallows_eoapi) fail_if(!efl_content_set(efl_part(ly, "swallow"), o1)); ck_assert_ptr_eq(efl_parent_get(o1), ly); - o2 = efl_add(EDJE_OBJECT_CLASS, ly); + o2 = efl_add(EFL_CANVAS_LAYOUT_CLASS, ly); fail_if(!efl_content_set(efl_part(ly, "swallow"), o2)); ck_assert_ptr_eq(efl_parent_get(o2), ly); /* o1 is deleted at this point. */ @@ -433,7 +433,7 @@ START_TEST(edje_test_access) fail_unless(edje_object_file_set(obj, test_layout_get("test_layout.edj"), "test_group")); /* eo api */ - it = edje_obj_access_part_iterate(obj); + it = efl_canvas_layout_access_part_iterate(obj); fail_if(!it); EINA_ITERATOR_FOREACH(it, name) @@ -825,7 +825,7 @@ START_TEST(edje_test_message_send_eo) evas = EDJE_TEST_INIT_EVAS(); - obj = efl_add(EDJE_OBJECT_CLASS, evas, + obj = efl_add(EFL_CANVAS_LAYOUT_CLASS, evas, efl_file_set(efl_added, test_layout_get("test_messages.edj"), "test_group")); // FIXME: EO API HERE @@ -882,7 +882,7 @@ START_TEST(edje_test_signals) evas = EDJE_TEST_INIT_EVAS(); - obj = efl_add(EDJE_OBJECT_CLASS, evas, + obj = efl_add(EFL_CANVAS_LAYOUT_CLASS, evas, efl_file_set(efl_added, test_layout_get("test_signals.edj"), "level1"), efl_gfx_size_set(efl_added, EINA_SIZE2D(320, 240)), efl_gfx_visible_set(efl_added, 1)); @@ -925,7 +925,7 @@ START_TEST(edje_test_signal_callback_del_full) evas = EDJE_TEST_INIT_EVAS(); - obj = efl_add(EDJE_OBJECT_CLASS, evas, + obj = efl_add(EFL_CANVAS_LAYOUT_CLASS, evas, efl_file_set(efl_added, test_layout_get("test_signal_callback_del_full.edj"), "test"), efl_gfx_size_set(efl_added, EINA_SIZE2D(320, 240)), diff --git a/src/tests/emotion/emotion_test_main-eo.c b/src/tests/emotion/emotion_test_main-eo.c index d3e4218408..b5848517cc 100644 --- a/src/tests/emotion/emotion_test_main-eo.c +++ b/src/tests/emotion/emotion_test_main-eo.c @@ -111,7 +111,7 @@ main_delete_request(Ecore_Evas *ee EINA_UNUSED) static void bg_setup(void) { - o_bg = efl_add(EDJE_OBJECT_CLASS, evas); + o_bg = efl_add(EFL_CANVAS_LAYOUT_CLASS, evas); efl_file_set(o_bg, theme_file, "background"); efl_gfx_position_set(o_bg, EINA_POSITION2D(0, 0)); efl_gfx_size_set(o_bg, EINA_SIZE2D(startw, starth)); @@ -621,7 +621,7 @@ init_video_object(const char *module_filename, const char *filename) fd = calloc(1, sizeof(Frame_Data)); if (!fd) exit(1); - oe = efl_add(EDJE_OBJECT_CLASS, evas); + oe = efl_add(EFL_CANVAS_LAYOUT_CLASS, evas); efl_event_callback_add(oe, EFL_EVENT_DEL, _oe_free_cb, fd); efl_key_data_set(oe, "frame_data", fd); efl_file_set(oe, theme_file, reflex ? "video_controller/reflex" : "video_controller");