yakov pushed a commit to branch master.
http://git.enlightenment.org/tools/erigo.git/commit/?id=0058c24e2a2bbada2f483bd4e8e4b44cde50b3a6
commit 0058c24e2a2bbada2f483bd4e8e4b44cde50b3a6
Author: Yakov Goldberg <yako...@samsung.com>
Date: Sun May 31 11:20:04 2015 +0300
Ajust according to Eo changes
---
src/bin/gui/cbview.c | 10 ++++++----
src/bin/gui/contentview.c | 10 +++++++++-
src/bin/gui/dnd.c | 2 +-
src/bin/gui/editor.c | 18 +++++++++---------
src/bin/gui/itemview.c | 20 ++++++++++++++++++--
src/bin/gui/propview.c | 14 +++++++++++---
src/bin/gui/rmview.c | 36 ++++++++++++++++++++++++------------
src/lib/simulator.c | 2 +-
8 files changed, 79 insertions(+), 33 deletions(-)
diff --git a/src/bin/gui/cbview.c b/src/bin/gui/cbview.c
index e5816f6..d54c93b 100644
--- a/src/bin/gui/cbview.c
+++ b/src/bin/gui/cbview.c
@@ -481,10 +481,11 @@ _item_del(void *data, Evas_Object *obj EINA_UNUSED)
_it_data_free(it_data);
}
-static void
-_wdgs_struct_free(void *wdgs)
+static Eina_Bool
+_wdgs_struct_free(void *wdgs, Eo *obj EINA_UNUSED, const Eo_Event_Description2
*desc EINA_UNUSED, void *event_info EINA_UNUSED)
{
free(wdgs);
+ return EINA_TRUE;
}
static Evas_Object *
@@ -506,7 +507,8 @@ _item_content_get(void *data, Evas_Object *obj EINA_UNUSED,
const char *part EIN
if (!cb_item_box)
{
wdgs = egui_layout_cb_item_create(propview_table);
- eo_do(wdgs->cb_item, eo_key_data_set("cb_item_wdgs", wdgs,
_wdgs_struct_free));
+ eo_do(wdgs->cb_item, eo_key_data_set("cb_item_wdgs", wdgs));
+ eo_do(wdgs->cb_item, eo_event_callback_add(EO_BASE_EVENT_DEL,
_wdgs_struct_free, wdgs));
elm_hoversel_item_add(wdgs->cb_action_t_hsel, "Create", NULL,
ELM_ICON_NONE, NULL, NULL);
elm_hoversel_item_add(wdgs->cb_action_t_hsel, "Modify", NULL,
ELM_ICON_NONE, NULL, NULL);
elm_hoversel_item_add(wdgs->cb_action_t_hsel, "Invoke", NULL,
ELM_ICON_NONE, NULL, NULL);
@@ -603,7 +605,7 @@ _item_content_get(void *data, Evas_Object *obj EINA_UNUSED,
const char *part EIN
{
const char *tooltip_text =
op_param_desc_name_get(db_op_desc_nth_param_desc_get(op, i));
elm_object_tooltip_text_set(new_obj,
tooltip_text);
- eo_do(new_obj, eo_key_data_set("cb_it_data",
it_data, NULL));
+ eo_do(new_obj, eo_key_data_set("cb_it_data",
it_data));
if (eo_isa(new_obj, ELM_HOVERSEL_CLASS))
evas_object_smart_callback_add(new_obj,
"selected", _action_prop_update, pi);
else
diff --git a/src/bin/gui/contentview.c b/src/bin/gui/contentview.c
index 51e48cb..4baac59 100644
--- a/src/bin/gui/contentview.c
+++ b/src/bin/gui/contentview.c
@@ -23,6 +23,13 @@ contentview_cbs_get()
return _contentview_cbs;
}
+static Eina_Bool
+_pfd_free_cb(void *pfd, Eo *obj EINA_UNUSED, const Eo_Event_Description2 *desc
EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+ free(pfd);
+ return EINA_TRUE;
+}
+
static Evas_Object *
_content_item_content_get(It_Data *it_data)
{
@@ -53,7 +60,8 @@ _content_item_content_get(It_Data *it_data)
pfd->it_data = it_data;
pfd->par_idx = i;
- eo_do(obj, eo_key_data_set(_STR_EDITOR, pfd, free));
+ eo_do(obj, eo_key_data_set(_STR_EDITOR, pfd));
+ eo_do(obj, eo_event_callback_add(EO_BASE_EVENT_DEL, _pfd_free_cb,
pfd));
const char *tooltip_text =
op_param_desc_name_get(db_op_desc_nth_param_desc_get(it_data->op_desc, i));
elm_object_tooltip_text_set(obj, tooltip_text);
diff --git a/src/bin/gui/dnd.c b/src/bin/gui/dnd.c
index 5ede42a..5944339 100644
--- a/src/bin/gui/dnd.c
+++ b/src/bin/gui/dnd.c
@@ -559,7 +559,7 @@ _target_info_new(Gui_Widget *wdg, Eo *obj)
if (!ti)
{
ti = calloc(1, sizeof(Target_Info));
- eo_do(obj, eo_key_data_set(DROP_TARGET, ti, NULL));
+ eo_do(obj, eo_key_data_set(DROP_TARGET, ti));
}
}
return ti;
diff --git a/src/bin/gui/editor.c b/src/bin/gui/editor.c
index 7755080..a807517 100644
--- a/src/bin/gui/editor.c
+++ b/src/bin/gui/editor.c
@@ -223,7 +223,7 @@ enum
if (!line)\
{\
line = eo_add(EVAS_RECTANGLE_CLASS, base_obj);\
- eo_do(base_obj, eo_key_data_set(STR(id"_"color), line, NULL));\
+ eo_do(base_obj, eo_key_data_set(STR(id"_"color), line));\
switch (color) \
{\
case BORDER_SELECTION:\
@@ -256,7 +256,7 @@ enum
if (!_m)\
{\
_m = eo_add(EVAS_RECTANGLE_CLASS, base_obj);\
- eo_do(base_obj, eo_key_data_set(STR(id), _m, NULL));\
+ eo_do(base_obj, eo_key_data_set(STR(id), _m));\
eo_do(_m, efl_gfx_color_set(0, 255, 0, 255));\
eo_do(_m, efl_gfx_size_set(7, 7));\
eo_do(_m, eo_event_callback_add(EVAS_OBJECT_EVENT_MOUSE_DOWN,
_marker_mouse_down, (void *) (intptr_t) id)); \
@@ -957,7 +957,7 @@ _marker_mouse_in(void *data, Eo *obj EINA_UNUSED, const
Eo_Event_Description *de
eo_do(cur_logo, efl_gfx_size_set(sz, sz));
eo_do(cur_logo, elm_obj_image_resizable_set(EINA_TRUE, EINA_TRUE));
eo_do(cur_logo, efl_file_set(EGUI_LAYOUT_IMAGES_PATH"/resize_red.png",
NULL));
- eo_do(base_obj, eo_key_data_set("cursor", cur_logo, NULL));
+ eo_do(base_obj, eo_key_data_set("cursor", cur_logo));
Elm_Transit *trans;
trans = elm_transit_add();
@@ -2514,7 +2514,7 @@ _widget_add(Gui_Session *session, const Gui_Widget *wdg,
void *data)
Eo *o = _ffi_eo_add(session, wdg, win);
if (!o) return EINA_FALSE;
//eo_do(win, elm_obj_win_resize_object_add(o));
- eo_do(o, eo_key_data_set("__editor_win", win, NULL));
+ eo_do(o, eo_key_data_set("__editor_win", win));
}
else
{
@@ -2571,7 +2571,7 @@ _widget_add(Gui_Session *session, const Gui_Widget *wdg,
void *data)
eo_do(fr, eo_event_callback_add(EVAS_OBJECT_EVENT_MOUSE_DOWN,
_frame_mouse_down, NULL));
eo_do(fr, eo_event_callback_add(EVAS_OBJECT_EVENT_MOUSE_UP,
_frame_mouse_up, NULL));
- eo_do(fr, eo_key_data_set("winwdg", wdg, NULL));
+ eo_do(fr, eo_key_data_set("winwdg", wdg));
}
fr = main_wdg_info_frame_get(wi);
elm_object_theme_set(fr, theme);
@@ -2587,7 +2587,7 @@ _widget_add(Gui_Session *session, const Gui_Widget *wdg,
void *data)
_drop_target_drop_cb, (void *) wdg);
eo_do(fr, efl_gfx_visible_set(EINA_TRUE));
- eo_do(win, eo_key_data_set("__editor_frame", fr, NULL));
+ eo_do(win, eo_key_data_set("__editor_frame", fr));
elm_object_content_set(fr, iwin);
eo_do(win, eo_event_callback_add(EVAS_OBJECT_EVENT_RESIZE,
_win_resize, NULL));
@@ -2621,8 +2621,8 @@ _widget_add(Gui_Session *session, const Gui_Widget *wdg,
void *data)
dw = ow - im_w;
dh = oh - im_h;
/* Save deltas in frame data*/
- eo_do(fr, eo_key_data_set("dw", (void *) (intptr_t) dw, NULL));
- eo_do(fr, eo_key_data_set("dh", (void *) (intptr_t) dh, NULL));
+ eo_do(fr, eo_key_data_set("dw", (void *) (intptr_t) dw));
+ eo_do(fr, eo_key_data_set("dh", (void *) (intptr_t) dh));
/* Resize properly. */
eo_do(fr, efl_gfx_size_set(ow + dw, oh + dh));
eo_do(iwin, efl_gfx_size_set(ow, oh));
@@ -4670,7 +4670,7 @@ editor_init(GuiLogicCbs *_guilogic_cbs)
ecore_idle_enterer_add(_wdg_border_draw_on_idle, NULL);
DnD_Info *di = calloc (1, sizeof(DnD_Info));
- eo_do(g->main_win->canvas_bg, eo_key_data_set(EDITOR_DND_DATA, di, NULL));
+ eo_do(g->main_win->canvas_bg, eo_key_data_set(EDITOR_DND_DATA, di));
drop_target_main_wdg_set(NULL, g->main_win->canvas_bg,
_drop_target_main_wdg_enter, NULL,
_drop_target_main_wdg_leave, NULL,
diff --git a/src/bin/gui/itemview.c b/src/bin/gui/itemview.c
index 3635c79..fd710f5 100644
--- a/src/bin/gui/itemview.c
+++ b/src/bin/gui/itemview.c
@@ -28,6 +28,20 @@ itemview_cbs_get()
return _view_cbs;
}
+static Eina_Bool
+_pfd_free(void *pfd, Eo *obj EINA_UNUSED, const Eo_Event_Description2 *desc
EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+ free(pfd);
+ return EINA_TRUE;
+}
+
+static Eina_Bool
+_it_data_free_cb(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Description2
*desc EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+ _it_data_free(data);
+ return EINA_TRUE;
+}
+
/* Hash table from widgets to genlist items */
Eina_Hash *_witems_to_items_table = NULL;
@@ -50,7 +64,8 @@ _item_list_content_get(void *data, Evas_Object *obj
EINA_UNUSED, const char *par
it_data->prop = item_container_item_prop_get(item);
it_data->op_desc = (Op_Desc *) prop_op_desc_get(it_data->prop);
- eo_do(box, eo_key_data_set("editor", it_data, _it_data_free));
+ eo_do(box, eo_key_data_set("editor", it_data));
+ eo_do(box, eo_event_callback_add(EO_BASE_EVENT_DEL, _it_data_free_cb,
it_data));
Eina_List *itr;
Gui_Value *val;
@@ -87,7 +102,8 @@ _item_list_content_get(void *data, Evas_Object *obj
EINA_UNUSED, const char *par
pfd->it_data = it_data;
pfd->par_idx = i;
- eo_do(o, eo_key_data_set("editor", pfd, free));
+ eo_do(o, eo_key_data_set("editor", pfd));
+ eo_do(o, eo_event_callback_add(EO_BASE_EVENT_DEL, _pfd_free,
pfd));
const char *tooltip_text =
op_param_desc_name_get(db_op_desc_nth_param_desc_get(it_data->op_desc, i));
elm_object_tooltip_text_set(o, tooltip_text);
diff --git a/src/bin/gui/propview.c b/src/bin/gui/propview.c
index 2edad1f..aebb489 100644
--- a/src/bin/gui/propview.c
+++ b/src/bin/gui/propview.c
@@ -78,6 +78,13 @@ _hover_selected_cb(void *data EINA_UNUSED, Eo *obj, const
Eo_Event_Description *
return EO_CALLBACK_CONTINUE;
}
+static Eina_Bool
+_pfd_free_cb(void *pfd, Eo *obj EINA_UNUSED, const Eo_Event_Description2 *desc
EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+ free(pfd);
+ return EINA_TRUE;
+}
+
static Evas_Object *
_property_item_content_get(It_Data *it_data)
{
@@ -114,7 +121,8 @@ _property_item_content_get(It_Data *it_data)
pfd->it_data = it_data;
pfd->par_idx = i;
- eo_do(obj, eo_key_data_set(_STR_EDITOR, pfd, free));
+ eo_do(obj, eo_key_data_set(_STR_EDITOR, pfd));
+ eo_do(obj, eo_event_callback_add(EO_BASE_EVENT_DEL, _pfd_free_cb,
pfd));
const char *tooltip_text =
op_param_desc_name_get(db_op_desc_nth_param_desc_get(op, pfd->par_idx));
elm_object_tooltip_text_set(obj, tooltip_text);
@@ -208,7 +216,7 @@ _prop_item_content_get(void *data, Evas_Object *obj
EINA_UNUSED, const char *par
Eo *prop_menu_button = props_button_add(it_box, NULL);
eo_do(prop_menu_button, evas_obj_size_hint_align_set(1, 0));
eo_do(prop_menu_button, evas_obj_size_hint_weight_set(0.01, 0));
- eo_do(prop_menu_button, eo_key_data_set(_STR_EDITOR, it_data, NULL));
+ eo_do(prop_menu_button, eo_key_data_set(_STR_EDITOR, it_data));
eo_do(prop_menu_button,
eo_event_callback_add(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED,
_view_cbs->property_ctx_menu_cb_func, NULL));
Eo *ic = eo_add(ELM_ICON_CLASS, it_box);
@@ -222,7 +230,7 @@ _prop_item_content_get(void *data, Evas_Object *obj
EINA_UNUSED, const char *par
Eina_List *children = eo_do_ret(it_box, children,
elm_obj_box_children_get());
Eina_List *last = eina_list_last(children);
Eo *prop_menu_button = eina_list_data_get(last);
- eo_do(prop_menu_button, eo_key_data_set(_STR_EDITOR, it_data, NULL));
+ eo_do(prop_menu_button, eo_key_data_set(_STR_EDITOR, it_data));
it_data->box = it_box;
_prop_field_update(it_data->prop, it_box, it_data);
diff --git a/src/bin/gui/rmview.c b/src/bin/gui/rmview.c
index e12a175..ebaff65 100644
--- a/src/bin/gui/rmview.c
+++ b/src/bin/gui/rmview.c
@@ -61,15 +61,17 @@ typedef struct
_data; \
})
-static void
-_field_data_free(void *_data)
+static Eina_Bool
+_field_data_free(void *_data, Eo *obj EINA_UNUSED, const Eo_Event_Description2
*desc EINA_UNUSED, void *event_info EINA_UNUSED)
{
+ ERR("rmview clean");
Rmview_Field_Data *data = _data;
if (--data->it_data->ref_count == 0)
{
free(data->it_data);
}
free(data);
+ return EINA_TRUE;
}
/* Helper func to create label */
@@ -469,7 +471,8 @@ _rmview_build(Rmview_Resource_Type type)
eo_do(g_rm_win->rm_table, elm_obj_table_pack(en, table_col++,
table_line, 1, 1));
data = RMVIEW_FIELD_DATA_BUILD(0, it_data);
- eo_do(en, eo_key_data_set(_STR_RMVIEW, data, _field_data_free));
+ eo_do(en, eo_key_data_set(_STR_RMVIEW, data));
+ eo_do(en, eo_event_callback_add(EO_BASE_EVENT_DEL,
_field_data_free, data));
eo_do(en, eo_event_callback_add(ELM_ENTRY_EVENT_CHANGED_USER,
_res_changed, NULL));
switch (res_type)
@@ -482,7 +485,8 @@ _rmview_build(Rmview_Resource_Type type)
it_data->en2 = en;
eo_do(g_rm_win->rm_table, elm_obj_table_pack(en,
table_col++, table_line, 1, 1));
data = RMVIEW_FIELD_DATA_BUILD(1, it_data);
- eo_do(en, eo_key_data_set(_STR_RMVIEW, data,
_field_data_free));
+ eo_do(en, eo_key_data_set(_STR_RMVIEW, data));
+ eo_do(en, eo_event_callback_add(EO_BASE_EVENT_DEL,
_field_data_free, data));
eo_do(en,
eo_event_callback_add(ELM_ENTRY_EVENT_CHANGED_USER, _res_changed, NULL));
break;
}
@@ -496,7 +500,8 @@ _rmview_build(Rmview_Resource_Type type)
it_data->en2 = en;
eo_do(g_rm_win->rm_table, elm_obj_table_pack(en,
table_col++, table_line, 1, 1));
data = RMVIEW_FIELD_DATA_BUILD(1, it_data);
- eo_do(en, eo_key_data_set(_STR_RMVIEW, data,
_field_data_free));
+ eo_do(en, eo_key_data_set(_STR_RMVIEW, data));
+ eo_do(en, eo_event_callback_add(EO_BASE_EVENT_DEL,
_field_data_free, data));
eo_do(en,
eo_event_callback_add(ELM_FILESELECTOR_ENTRY_EVENT_CHANGED, _res_changed,
NULL));
break;
}
@@ -510,7 +515,8 @@ _rmview_build(Rmview_Resource_Type type)
it_data->en2 = en;
eo_do(g_rm_win->rm_table, elm_obj_table_pack(en,
table_col++, table_line, 1, 1));
data = RMVIEW_FIELD_DATA_BUILD(1, it_data);
- eo_do(en, eo_key_data_set(_STR_RMVIEW, data,
_field_data_free));
+ eo_do(en, eo_key_data_set(_STR_RMVIEW, data));
+ eo_do(en, eo_event_callback_add(EO_BASE_EVENT_DEL,
_field_data_free, data));
eo_do(en,
eo_event_callback_add(ELM_FILESELECTOR_ENTRY_EVENT_CHANGED, _res_changed,
NULL));
break;
}
@@ -525,7 +531,8 @@ _rmview_build(Rmview_Resource_Type type)
eo_do(en, elm_interface_fileselector_path_set(value));
eo_do(en,
eo_event_callback_add(ELM_FILESELECTOR_ENTRY_EVENT_CHANGED, _res_changed,
NULL));
data = RMVIEW_FIELD_DATA_BUILD(1, it_data);
- eo_do(en, eo_key_data_set(_STR_RMVIEW, data,
_field_data_free));
+ eo_do(en, eo_key_data_set(_STR_RMVIEW, data));
+ eo_do(en, eo_event_callback_add(EO_BASE_EVENT_DEL,
_field_data_free, data));
eo_do(box, elm_obj_box_pack_end(en));
it_data->en2 = en;
@@ -535,7 +542,8 @@ _rmview_build(Rmview_Resource_Type type)
eo_do(en, elm_interface_fileselector_path_set(value));
eo_do(en,
eo_event_callback_add(ELM_FILESELECTOR_ENTRY_EVENT_CHANGED, _res_changed,
NULL));
data = RMVIEW_FIELD_DATA_BUILD(2, it_data);
- eo_do(en, eo_key_data_set(_STR_RMVIEW, data,
_field_data_free));
+ eo_do(en, eo_key_data_set(_STR_RMVIEW, data));
+ eo_do(en, eo_event_callback_add(EO_BASE_EVENT_DEL,
_field_data_free, data));
eo_do(box, elm_obj_box_pack_end(en));
it_data->en3 = en;
@@ -550,7 +558,8 @@ _rmview_build(Rmview_Resource_Type type)
it_data->en2 = en;
eo_do(g_rm_win->rm_table, elm_obj_table_pack(en,
table_col++, table_line, 1, 1));
data = RMVIEW_FIELD_DATA_BUILD(1, it_data);
- eo_do(en, eo_key_data_set(_STR_RMVIEW, data,
_field_data_free));
+ eo_do(en, eo_key_data_set(_STR_RMVIEW, data));
+ eo_do(en, eo_event_callback_add(EO_BASE_EVENT_DEL,
_field_data_free, data));
eo_do(en,
eo_event_callback_add(ELM_ENTRY_EVENT_CHANGED_USER, _res_changed, NULL));
break;
}
@@ -579,7 +588,8 @@ _rmview_build(Rmview_Resource_Type type)
eo_do(g_rm_win->rm_table, elm_obj_table_pack(bt,
table_col++, table_line, 1, 1));
data = RMVIEW_FIELD_DATA_BUILD(2, it_data);
- eo_do(bt, eo_key_data_set(_STR_RMVIEW, data,
_field_data_free));
+ eo_do(bt, eo_key_data_set(_STR_RMVIEW, data));
+ eo_do(bt, eo_event_callback_add(EO_BASE_EVENT_DEL,
_field_data_free, data));
eo_do(bt,
eo_event_callback_add(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED,
_enventor_clicked, NULL));
}
#endif
@@ -591,14 +601,16 @@ _rmview_build(Rmview_Resource_Type type)
eo_do(g_rm_win->rm_table, elm_obj_table_pack(bt, table_col++,
table_line, 1, 1));
data = RMVIEW_FIELD_DATA_BUILD(2, it_data);
- eo_do(bt, eo_key_data_set(_STR_RMVIEW, data, _field_data_free));
+ eo_do(bt, eo_key_data_set(_STR_RMVIEW, data));
+ eo_do(bt, eo_event_callback_add(EO_BASE_EVENT_DEL,
_field_data_free, data));
bt = _rmview_button_add(g_rm_win->rm_table, "del");
eo_do(bt,
eo_event_callback_add(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _bt_del_clicked,
NULL));
eo_do(g_rm_win->rm_table, elm_obj_table_pack(bt, table_col++,
table_line, 1, 1));
data = RMVIEW_FIELD_DATA_BUILD(3, it_data);
- eo_do(bt, eo_key_data_set(_STR_RMVIEW, data, _field_data_free));
+ eo_do(bt, eo_key_data_set(_STR_RMVIEW, data));
+ eo_do(bt, eo_event_callback_add(EO_BASE_EVENT_DEL,
_field_data_free, data));
table_line++;
}
diff --git a/src/lib/simulator.c b/src/lib/simulator.c
index 07c981d..955e05d 100644
--- a/src/lib/simulator.c
+++ b/src/lib/simulator.c
@@ -410,7 +410,7 @@ simulator_ctx_call(Gui_Context *ctx, const char
*target_name)
eo_do(rotate, efl_gfx_visible_set(EINA_TRUE));
eo_do(menu_box, elm_obj_box_pack_end(rotate));
/* Hack arpund box, because I need to set position for box, when
rotating. */
- eo_do(rotate, eo_key_data_set("menu_box", menu_box, NULL));
+ eo_do(rotate, eo_key_data_set("menu_box", menu_box));
/* We know current display's DPI and target's dpi. So we can
calculate
* target's size in pixels in current DPI to match metric size of
target. */
--
