summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-06-10 17:29:40 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-06-10 17:33:53 +0900
commite691de04be0946856a423ab4bae9d73680b3ab0f (patch)
tree962e8f40b58070d057c9f0fd92f97288f070a404
parent36cec53890ac8f9fd9133e99d457c9a87437a067 (diff)
Evas: Rename Clickable_Interface to Efl.Ui.Clickable
Event prefix is efl_ui: EFL_UI_EVENT_CLICKED EFL_UI_EVENT_CLICKED_DOUBLE ... The event prefix could be reduced to efl but I personally prefer with UI.
-rw-r--r--src/Makefile_Evas.am2
-rw-r--r--src/bin/elementary/test_events.c4
-rw-r--r--src/bin/elementary/test_grid_static.c4
-rw-r--r--src/bin/elementary/test_ui_grid.c12
-rw-r--r--src/lib/elementary/efl_ui_image.c4
-rw-r--r--src/lib/elementary/efl_ui_image.eo2
-rw-r--r--src/lib/elementary/elc_combobox.c8
-rw-r--r--src/lib/elementary/elc_fileselector.c10
-rw-r--r--src/lib/elementary/elc_fileselector_button.c3
-rw-r--r--src/lib/elementary/elc_fileselector_entry.c18
-rw-r--r--src/lib/elementary/elc_hoversel.c6
-rw-r--r--src/lib/elementary/elc_multibuttonentry.c4
-rw-r--r--src/lib/elementary/elc_naviframe.c10
-rw-r--r--src/lib/elementary/elc_player.c2
-rw-r--r--src/lib/elementary/elm_bubble.c2
-rw-r--r--src/lib/elementary/elm_bubble.eo2
-rw-r--r--src/lib/elementary/elm_button.c10
-rw-r--r--src/lib/elementary/elm_button.eo2
-rw-r--r--src/lib/elementary/elm_color_class.c2
-rw-r--r--src/lib/elementary/elm_colorselector.c10
-rw-r--r--src/lib/elementary/elm_colorselector.eo2
-rw-r--r--src/lib/elementary/elm_diskselector.c2
-rw-r--r--src/lib/elementary/elm_diskselector.eo2
-rw-r--r--src/lib/elementary/elm_entry.c12
-rw-r--r--src/lib/elementary/elm_entry.eo2
-rw-r--r--src/lib/elementary/elm_fileselector.eo2
-rw-r--r--src/lib/elementary/elm_fileselector_entry.eo2
-rw-r--r--src/lib/elementary/elm_frame.c2
-rw-r--r--src/lib/elementary/elm_frame.eo2
-rw-r--r--src/lib/elementary/elm_gengrid.c8
-rw-r--r--src/lib/elementary/elm_gengrid.eo2
-rw-r--r--src/lib/elementary/elm_genlist.c8
-rw-r--r--src/lib/elementary/elm_genlist.eo2
-rw-r--r--src/lib/elementary/elm_hover.c6
-rw-r--r--src/lib/elementary/elm_hover.eo2
-rw-r--r--src/lib/elementary/elm_hoversel.eo2
-rw-r--r--src/lib/elementary/elm_index.c2
-rw-r--r--src/lib/elementary/elm_index.eo2
-rw-r--r--src/lib/elementary/elm_list.c6
-rw-r--r--src/lib/elementary/elm_list.eo2
-rw-r--r--src/lib/elementary/elm_map.c6
-rw-r--r--src/lib/elementary/elm_map.eo2
-rw-r--r--src/lib/elementary/elm_menu.c6
-rw-r--r--src/lib/elementary/elm_menu.eo2
-rw-r--r--src/lib/elementary/elm_panes.c4
-rw-r--r--src/lib/elementary/elm_panes.eo2
-rw-r--r--src/lib/elementary/elm_photo.c2
-rw-r--r--src/lib/elementary/elm_photo.eo2
-rw-r--r--src/lib/elementary/elm_photocam.c6
-rw-r--r--src/lib/elementary/elm_photocam.eo2
-rw-r--r--src/lib/elementary/elm_plug.c2
-rw-r--r--src/lib/elementary/elm_plug.eo2
-rw-r--r--src/lib/elementary/elm_spinner.c8
-rw-r--r--src/lib/elementary/elm_thumb.c4
-rw-r--r--src/lib/elementary/elm_thumb.eo2
-rw-r--r--src/lib/elementary/elm_toolbar.c6
-rw-r--r--src/lib/elementary/elm_toolbar.eo2
-rw-r--r--src/lib/evas/Evas_Eo.h2
-rw-r--r--src/lib/evas/canvas/common_interfaces.c8
-rw-r--r--src/lib/evas/canvas/efl_ui_clickable.eo (renamed from src/lib/evas/canvas/evas_clickable_interface.eo)3
-rw-r--r--src/modules/elementary/datetime_input_ctxpopup/datetime_input_ctxpopup.c6
-rw-r--r--src/modules/elementary/prefs/elm_button.c2
62 files changed, 130 insertions, 138 deletions
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index da73b78bcf..e163b11d0a 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -11,7 +11,7 @@ evas_eolian_pub_files = \
11 lib/evas/canvas/evas_canvas.eo \ 11 lib/evas/canvas/evas_canvas.eo \
12 lib/evas/canvas/efl_canvas_image_internal.eo \ 12 lib/evas/canvas/efl_canvas_image_internal.eo \
13 lib/evas/canvas/evas_draggable_interface.eo \ 13 lib/evas/canvas/evas_draggable_interface.eo \
14 lib/evas/canvas/evas_clickable_interface.eo \ 14 lib/evas/canvas/efl_ui_clickable.eo \
15 lib/evas/canvas/evas_scrollable_interface.eo \ 15 lib/evas/canvas/evas_scrollable_interface.eo \
16 lib/evas/canvas/evas_selectable_interface.eo \ 16 lib/evas/canvas/evas_selectable_interface.eo \
17 lib/evas/canvas/evas_zoomable_interface.eo \ 17 lib/evas/canvas/evas_zoomable_interface.eo \
diff --git a/src/bin/elementary/test_events.c b/src/bin/elementary/test_events.c
index ef1eefcf53..dafdeef381 100644
--- a/src/bin/elementary/test_events.c
+++ b/src/bin/elementary/test_events.c
@@ -234,8 +234,8 @@ test_events(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
234 efl_pack(bx, o); 234 efl_pack(bx, o);
235 evas_object_show(o); 235 evas_object_show(o);
236 236
237 eo_event_callback_add(td->button, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _clicked_button1, td); 237 eo_event_callback_add(td->button, EFL_UI_EVENT_CLICKED, _clicked_button1, td);
238 eo_event_callback_add(bt, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _clicked_button2, td); 238 eo_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _clicked_button2, td);
239 eo_event_callback_add(win, EO_EVENT_DEL, _win_del, td); 239 eo_event_callback_add(win, EO_EVENT_DEL, _win_del, td);
240 eo_event_callback_array_add(o, rect_pointer_callbacks(), td); 240 eo_event_callback_array_add(o, rect_pointer_callbacks(), td);
241 eo_event_callback_array_add(win, win_key_callbacks(), td); 241 eo_event_callback_array_add(win, win_key_callbacks(), td);
diff --git a/src/bin/elementary/test_grid_static.c b/src/bin/elementary/test_grid_static.c
index 55b2c5d9bf..0cb89360c7 100644
--- a/src/bin/elementary/test_grid_static.c
+++ b/src/bin/elementary/test_grid_static.c
@@ -147,7 +147,7 @@ test_grid_static(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
147 147
148 bt = elm_button_add(win); 148 bt = elm_button_add(win);
149 elm_object_text_set(bt, "Next API function"); 149 elm_object_text_set(bt, "Next API function");
150 eo_event_callback_add(bt, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _api_bt_clicked, api); 150 eo_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _api_bt_clicked, api);
151 efl_pack_grid(gd, bt, 30, 0, 40, 10); 151 efl_pack_grid(gd, bt, 30, 0, 40, 10);
152 elm_object_disabled_set(bt, api->state == API_STATE_LAST); 152 elm_object_disabled_set(bt, api->state == API_STATE_LAST);
153 efl_gfx_visible_set(bt, 1); 153 efl_gfx_visible_set(bt, 1);
@@ -176,7 +176,7 @@ test_grid_static(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
176 bt = elm_button_add(win); 176 bt = elm_button_add(win);
177 elm_object_text_set(bt, "Change"); 177 elm_object_text_set(bt, "Change");
178 efl_pack_grid(gd, bt, 40, 40, 20, 20); 178 efl_pack_grid(gd, bt, 40, 40, 20, 20);
179 eo_event_callback_add(bt, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _ch_grid, gd); 179 eo_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _ch_grid, gd);
180 efl_gfx_visible_set(bt, 1); 180 efl_gfx_visible_set(bt, 1);
181 181
182 rc = eo_add(EFL_CANVAS_RECTANGLE_CLASS, win); 182 rc = eo_add(EFL_CANVAS_RECTANGLE_CLASS, win);
diff --git a/src/bin/elementary/test_ui_grid.c b/src/bin/elementary/test_ui_grid.c
index 2c002f2030..99e263dc78 100644
--- a/src/bin/elementary/test_ui_grid.c
+++ b/src/bin/elementary/test_ui_grid.c
@@ -511,7 +511,7 @@ append_cb(void *data, const Eo_Event *ev EINA_UNUSED)
511 Eo *grid = data; 511 Eo *grid = data;
512 Eo *o = elm_button_add(grid); 512 Eo *o = elm_button_add(grid);
513 elm_object_text_set(o, btn_text("appended")); 513 elm_object_text_set(o, btn_text("appended"));
514 eo_event_callback_add(o, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, remove_cb, NULL); 514 eo_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL);
515 elm_object_tooltip_text_set(o, "Click to unpack"); 515 elm_object_tooltip_text_set(o, "Click to unpack");
516 efl_pack_end(grid, o); 516 efl_pack_end(grid, o);
517 efl_gfx_visible_set(o, 1); 517 efl_gfx_visible_set(o, 1);
@@ -567,7 +567,7 @@ test_ui_grid_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
567 o = elm_button_add(win); 567 o = elm_button_add(win);
568 elm_object_content_set(o, ico); 568 elm_object_content_set(o, ico);
569 elm_object_text_set(o, "Append"); 569 elm_object_text_set(o, "Append");
570 eo_event_callback_add(o, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, append_cb, grid); 570 eo_event_callback_add(o, EFL_UI_EVENT_CLICKED, append_cb, grid);
571 efl_pack(hbox, o); 571 efl_pack(hbox, o);
572 efl_gfx_visible_set(o, 1); 572 efl_gfx_visible_set(o, 1);
573 573
@@ -576,7 +576,7 @@ test_ui_grid_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
576 o = elm_button_add(win); 576 o = elm_button_add(win);
577 elm_object_content_set(o, ico); 577 elm_object_content_set(o, ico);
578 elm_object_text_set(o, "Clear"); 578 elm_object_text_set(o, "Clear");
579 eo_event_callback_add(o, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, clear_cb, grid); 579 eo_event_callback_add(o, EFL_UI_EVENT_CLICKED, clear_cb, grid);
580 efl_pack(hbox, o); 580 efl_pack(hbox, o);
581 efl_gfx_visible_set(o, 1); 581 efl_gfx_visible_set(o, 1);
582 582
@@ -624,19 +624,19 @@ test_ui_grid_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
624 624
625 o = elm_button_add(win); 625 o = elm_button_add(win);
626 elm_object_text_set(o, btn_text(NULL)); 626 elm_object_text_set(o, btn_text(NULL));
627 eo_event_callback_add(o, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, remove_cb, NULL); 627 eo_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL);
628 efl_pack(grid, o); 628 efl_pack(grid, o);
629 efl_gfx_visible_set(o, 1); 629 efl_gfx_visible_set(o, 1);
630 630
631 o = elm_button_add(win); 631 o = elm_button_add(win);
632 elm_object_text_set(o, btn_text(NULL)); 632 elm_object_text_set(o, btn_text(NULL));
633 eo_event_callback_add(o, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, remove_cb, NULL); 633 eo_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL);
634 efl_pack(grid, o); 634 efl_pack(grid, o);
635 efl_gfx_visible_set(o, 1); 635 efl_gfx_visible_set(o, 1);
636 636
637 o = elm_button_add(win); 637 o = elm_button_add(win);
638 elm_object_text_set(o, btn_text(NULL)); 638 elm_object_text_set(o, btn_text(NULL));
639 eo_event_callback_add(o, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, remove_cb, NULL); 639 eo_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL);
640 efl_pack(grid, o); 640 efl_pack(grid, o);
641 efl_gfx_visible_set(o, 1); 641 efl_gfx_visible_set(o, 1);
642 642
diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c
index ebb974b09f..13f4cc5fdc 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -79,7 +79,7 @@ _on_mouse_up(void *data,
79 if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return; 79 if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
80 if (!wd->still_in) return; 80 if (!wd->still_in) return;
81 81
82 eo_event_callback_call(data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL); 82 eo_event_callback_call(data, EFL_UI_EVENT_CLICKED, NULL);
83} 83}
84 84
85static Eina_Bool 85static Eina_Bool
@@ -749,7 +749,7 @@ _efl_ui_image_elm_widget_theme_apply(Eo *obj, Efl_Ui_Image_Data *sd EINA_UNUSED)
749static Eina_Bool 749static Eina_Bool
750_key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED) 750_key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
751{ 751{
752 eo_event_callback_call(obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL); 752 eo_event_callback_call(obj, EFL_UI_EVENT_CLICKED, NULL);
753 return EINA_TRUE; 753 return EINA_TRUE;
754} 754}
755 755
diff --git a/src/lib/elementary/efl_ui_image.eo b/src/lib/elementary/efl_ui_image.eo
index 4c87fe2ab1..ae176db4fc 100644
--- a/src/lib/elementary/efl_ui_image.eo
+++ b/src/lib/elementary/efl_ui_image.eo
@@ -44,7 +44,7 @@ struct Efl.Ui.Image.Error
44 open_error: bool; 44 open_error: bool;
45} 45}
46 46
47class Efl.Ui.Image (Elm.Widget, Evas.Clickable_Interface, Evas.Draggable_Interface, 47class Efl.Ui.Image (Elm.Widget, Efl.Ui.Clickable, Evas.Draggable_Interface,
48 Efl.File, Efl.Image, Efl.Image.Load, Efl.Player, Efl.Gfx.View, 48 Efl.File, Efl.Image, Efl.Image.Load, Efl.Player, Efl.Gfx.View,
49 Elm.Interface.Atspi_Image, Elm.Interface.Atspi_Widget_Action, 49 Elm.Interface.Atspi_Image, Elm.Interface.Atspi_Widget_Action,
50 Edje.Object, Efl.Orientation, Efl.Flipable) 50 Edje.Object, Efl.Orientation, Efl.Flipable)
diff --git a/src/lib/elementary/elc_combobox.c b/src/lib/elementary/elc_combobox.c
index d955fdc909..7fdf783fb9 100644
--- a/src/lib/elementary/elc_combobox.c
+++ b/src/lib/elementary/elc_combobox.c
@@ -278,7 +278,7 @@ _elm_combobox_evas_object_smart_add(Eo *obj, Elm_Combobox_Data *sd EINA_UNUSED)
278 278
279 elm_widget_mirrored_automatic_set(obj, EINA_FALSE); 279 elm_widget_mirrored_automatic_set(obj, EINA_FALSE);
280 280
281 eo_event_callback_add(obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _on_clicked, obj); 281 eo_event_callback_add(obj, EFL_UI_EVENT_CLICKED, _on_clicked, obj);
282 282
283 //What are you doing here? 283 //What are you doing here?
284 elm_obj_widget_theme_apply(obj); 284 elm_obj_widget_theme_apply(obj);
@@ -349,7 +349,7 @@ _mbe_item_added(void *data, const Eo_Event *event EINA_UNUSED)
349} 349}
350 350
351EO_CALLBACKS_ARRAY_DEFINE(mbe_callbacks, 351EO_CALLBACKS_ARRAY_DEFINE(mbe_callbacks,
352 { EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _mbe_clicked_cb }, 352 { EFL_UI_EVENT_CLICKED, _mbe_clicked_cb },
353 { ELM_WIDGET_EVENT_FOCUSED, _mbe_focused_cb }, 353 { ELM_WIDGET_EVENT_FOCUSED, _mbe_focused_cb },
354 { ELM_WIDGET_EVENT_UNFOCUSED, _mbe_unfocused_cb }, 354 { ELM_WIDGET_EVENT_UNFOCUSED, _mbe_unfocused_cb },
355 { ELM_MULTIBUTTONENTRY_EVENT_ITEM_ADDED , _mbe_item_added }); 355 { ELM_MULTIBUTTONENTRY_EVENT_ITEM_ADDED , _mbe_item_added });
@@ -443,7 +443,7 @@ _elm_combobox_eo_base_constructor(Eo *obj, Elm_Combobox_Data *sd)
443 elm_object_style_set(sd->hover, buf); 443 elm_object_style_set(sd->hover, buf);
444 444
445 eo_event_callback_add 445 eo_event_callback_add
446 (sd->hover, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _on_hover_clicked, obj); 446 (sd->hover, EFL_UI_EVENT_CLICKED, _on_hover_clicked, obj);
447 elm_layout_signal_callback_add 447 elm_layout_signal_callback_add
448 (sd->hover, "elm,action,hide,finished", "elm", _hover_end_finished, obj); 448 (sd->hover, "elm,action,hide,finished", "elm", _hover_end_finished, obj);
449 449
@@ -563,7 +563,7 @@ _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
563 elm_combobox_hover_begin(obj); 563 elm_combobox_hover_begin(obj);
564 else 564 else
565 { 565 {
566 eo_event_callback_call(sd->genlist, EVAS_CLICKABLE_INTERFACE_EVENT_PRESSED, sd->item); 566 eo_event_callback_call(sd->genlist, EFL_UI_EVENT_PRESSED, sd->item);
567 elm_entry_cursor_end_set(sd->entry); 567 elm_entry_cursor_end_set(sd->entry);
568 } 568 }
569 return EINA_TRUE; 569 return EINA_TRUE;
diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c
index b15b99de16..1a088a014e 100644
--- a/src/lib/elementary/elc_fileselector.c
+++ b/src/lib/elementary/elc_fileselector.c
@@ -1877,7 +1877,7 @@ _elm_fileselector_evas_object_smart_add(Eo *obj, Elm_Fileselector_Data *priv)
1877 elm_object_part_content_set(bt, "icon", ic); 1877 elm_object_part_content_set(bt, "icon", ic);
1878 elm_object_domain_translatable_text_set(bt, PACKAGE, N_("Up")); 1878 elm_object_domain_translatable_text_set(bt, PACKAGE, N_("Up"));
1879 eo_event_callback_add 1879 eo_event_callback_add
1880 (bt, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _on_dir_up, obj); 1880 (bt, EFL_UI_EVENT_CLICKED, _on_dir_up, obj);
1881 1881
1882 priv->up_button = bt; 1882 priv->up_button = bt;
1883 elm_object_style_set(priv->up_button, buf); 1883 elm_object_style_set(priv->up_button, buf);
@@ -1891,7 +1891,7 @@ _elm_fileselector_evas_object_smart_add(Eo *obj, Elm_Fileselector_Data *priv)
1891 elm_object_part_content_set(bt, "icon", ic); 1891 elm_object_part_content_set(bt, "icon", ic);
1892 elm_object_domain_translatable_text_set(bt, PACKAGE, N_("Home")); 1892 elm_object_domain_translatable_text_set(bt, PACKAGE, N_("Home"));
1893 eo_event_callback_add 1893 eo_event_callback_add
1894 (bt, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _home, obj); 1894 (bt, EFL_UI_EVENT_CLICKED, _home, obj);
1895 1895
1896 priv->home_button = bt; 1896 priv->home_button = bt;
1897 elm_object_style_set(priv->home_button, buf); 1897 elm_object_style_set(priv->home_button, buf);
@@ -2112,8 +2112,7 @@ _elm_fileselector_buttons_ok_cancel_set(Eo *obj, Elm_Fileselector_Data *sd, Eina
2112 elm_widget_mirrored_automatic_set(bt, EINA_FALSE); 2112 elm_widget_mirrored_automatic_set(bt, EINA_FALSE);
2113 elm_object_domain_translatable_text_set(bt, PACKAGE, N_("Cancel")); 2113 elm_object_domain_translatable_text_set(bt, PACKAGE, N_("Cancel"));
2114 2114
2115 eo_event_callback_add 2115 eo_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _canc, obj);
2116 (bt, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _canc, obj);
2117 2116
2118 sd->cancel_button = bt; 2117 sd->cancel_button = bt;
2119 elm_object_part_content_set(obj, "elm.swallow.cancel", sd->cancel_button); 2118 elm_object_part_content_set(obj, "elm.swallow.cancel", sd->cancel_button);
@@ -2123,8 +2122,7 @@ _elm_fileselector_buttons_ok_cancel_set(Eo *obj, Elm_Fileselector_Data *sd, Eina
2123 elm_widget_mirrored_automatic_set(bt, EINA_FALSE); 2122 elm_widget_mirrored_automatic_set(bt, EINA_FALSE);
2124 elm_object_domain_translatable_text_set(bt, PACKAGE, N_("OK")); 2123 elm_object_domain_translatable_text_set(bt, PACKAGE, N_("OK"));
2125 2124
2126 eo_event_callback_add 2125 eo_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _ok, obj);
2127 (bt, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _ok, obj);
2128 2126
2129 sd->ok_button = bt; 2127 sd->ok_button = bt;
2130 elm_object_part_content_set(obj, "elm.swallow.ok", sd->ok_button); 2128 elm_object_part_content_set(obj, "elm.swallow.ok", sd->ok_button);
diff --git a/src/lib/elementary/elc_fileselector_button.c b/src/lib/elementary/elc_fileselector_button.c
index 5cfdcfd314..f32a3ae14a 100644
--- a/src/lib/elementary/elc_fileselector_button.c
+++ b/src/lib/elementary/elc_fileselector_button.c
@@ -239,8 +239,7 @@ _elm_fileselector_button_evas_object_smart_add(Eo *obj, Elm_Fileselector_Button_
239 239
240 elm_widget_mirrored_automatic_set(obj, EINA_FALSE); 240 elm_widget_mirrored_automatic_set(obj, EINA_FALSE);
241 241
242 eo_event_callback_add 242 eo_event_callback_add(obj, EFL_UI_EVENT_CLICKED, _button_clicked, priv);
243 (obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _button_clicked, priv);
244 243
245 elm_obj_widget_theme_apply(obj); 244 elm_obj_widget_theme_apply(obj);
246 elm_widget_can_focus_set(obj, EINA_TRUE); 245 elm_widget_can_focus_set(obj, EINA_TRUE);
diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c
index f0bdb2b456..6d680635fb 100644
--- a/src/lib/elementary/elc_fileselector_entry.c
+++ b/src/lib/elementary/elc_fileselector_entry.c
@@ -55,15 +55,15 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] =
55 } 55 }
56SIG_FWD(CHANGED, ELM_FILESELECTOR_ENTRY_EVENT_CHANGED) 56SIG_FWD(CHANGED, ELM_FILESELECTOR_ENTRY_EVENT_CHANGED)
57SIG_FWD(PRESS, ELM_FILESELECTOR_ENTRY_EVENT_PRESS) 57SIG_FWD(PRESS, ELM_FILESELECTOR_ENTRY_EVENT_PRESS)
58SIG_FWD(LONGPRESSED, EVAS_CLICKABLE_INTERFACE_EVENT_LONGPRESSED) 58SIG_FWD(LONGPRESSED, EFL_UI_EVENT_LONGPRESSED)
59SIG_FWD(CLICKED, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED) 59SIG_FWD(CLICKED, EFL_UI_EVENT_CLICKED)
60SIG_FWD(CLICKED_DOUBLE, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE) 60SIG_FWD(CLICKED_DOUBLE, EFL_UI_EVENT_CLICKED_DOUBLE)
61SIG_FWD(FOCUSED, ELM_WIDGET_EVENT_FOCUSED) 61SIG_FWD(FOCUSED, ELM_WIDGET_EVENT_FOCUSED)
62SIG_FWD(UNFOCUSED, ELM_WIDGET_EVENT_UNFOCUSED) 62SIG_FWD(UNFOCUSED, ELM_WIDGET_EVENT_UNFOCUSED)
63SIG_FWD(SELECTION_PASTE, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_PASTE) 63SIG_FWD(SELECTION_PASTE, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_PASTE)
64SIG_FWD(SELECTION_COPY, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_COPY) 64SIG_FWD(SELECTION_COPY, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_COPY)
65SIG_FWD(SELECTION_CUT, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_CUT) 65SIG_FWD(SELECTION_CUT, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_CUT)
66SIG_FWD(UNPRESSED, EVAS_CLICKABLE_INTERFACE_EVENT_UNPRESSED) 66SIG_FWD(UNPRESSED, EFL_UI_EVENT_UNPRESSED)
67#undef SIG_FWD 67#undef SIG_FWD
68 68
69static void 69static void
@@ -332,8 +332,8 @@ _elm_fileselector_entry_evas_object_smart_add(Eo *obj, Elm_Fileselector_Entry_Da
332 332
333#define SIG_FWD(name, event) \ 333#define SIG_FWD(name, event) \
334 eo_event_callback_add(priv->button, event, _##name##_fwd, obj) 334 eo_event_callback_add(priv->button, event, _##name##_fwd, obj)
335 SIG_FWD(CLICKED, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED); 335 SIG_FWD(CLICKED, EFL_UI_EVENT_CLICKED);
336 SIG_FWD(UNPRESSED, EVAS_CLICKABLE_INTERFACE_EVENT_UNPRESSED); 336 SIG_FWD(UNPRESSED, EFL_UI_EVENT_UNPRESSED);
337 // EVENTS: should not call legacy 337 // EVENTS: should not call legacy
338 //SIG_FWD(FILE_CHOSEN, ELM_FILESELECTOR_BUTTON_EVENT_FILE_CHOSEN); 338 //SIG_FWD(FILE_CHOSEN, ELM_FILESELECTOR_BUTTON_EVENT_FILE_CHOSEN);
339#undef SIG_FWD 339#undef SIG_FWD
@@ -352,9 +352,9 @@ _elm_fileselector_entry_evas_object_smart_add(Eo *obj, Elm_Fileselector_Entry_Da
352 SIG_FWD(CHANGED, ELM_ENTRY_EVENT_CHANGED); 352 SIG_FWD(CHANGED, ELM_ENTRY_EVENT_CHANGED);
353 SIG_FWD(ACTIVATED, ELM_ENTRY_EVENT_ACTIVATED); 353 SIG_FWD(ACTIVATED, ELM_ENTRY_EVENT_ACTIVATED);
354 SIG_FWD(PRESS, ELM_ENTRY_EVENT_PRESS); 354 SIG_FWD(PRESS, ELM_ENTRY_EVENT_PRESS);
355 SIG_FWD(LONGPRESSED, EVAS_CLICKABLE_INTERFACE_EVENT_LONGPRESSED); 355 SIG_FWD(LONGPRESSED, EFL_UI_EVENT_LONGPRESSED);
356 SIG_FWD(CLICKED, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED); 356 SIG_FWD(CLICKED, EFL_UI_EVENT_CLICKED);
357 SIG_FWD(CLICKED_DOUBLE, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE); 357 SIG_FWD(CLICKED_DOUBLE, EFL_UI_EVENT_CLICKED_DOUBLE);
358 SIG_FWD(FOCUSED, ELM_WIDGET_EVENT_FOCUSED); 358 SIG_FWD(FOCUSED, ELM_WIDGET_EVENT_FOCUSED);
359 SIG_FWD(UNFOCUSED, ELM_WIDGET_EVENT_UNFOCUSED); 359 SIG_FWD(UNFOCUSED, ELM_WIDGET_EVENT_UNFOCUSED);
360 SIG_FWD(SELECTION_PASTE, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_PASTE); 360 SIG_FWD(SELECTION_PASTE, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_PASTE);
diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c
index 915b965ca2..8e851c189d 100644
--- a/src/lib/elementary/elc_hoversel.c
+++ b/src/lib/elementary/elc_hoversel.c
@@ -411,7 +411,7 @@ _activate(Evas_Object *obj)
411 elm_object_style_set(sd->hover, buf); 411 elm_object_style_set(sd->hover, buf);
412 412
413 eo_event_callback_add 413 eo_event_callback_add
414 (sd->hover, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _on_hover_clicked, obj); 414 (sd->hover, EFL_UI_EVENT_CLICKED, _on_hover_clicked, obj);
415 elm_layout_signal_callback_add 415 elm_layout_signal_callback_add
416 (sd->hover, "elm,action,hide,finished", "elm", _hover_end_finished, obj); 416 (sd->hover, "elm,action,hide,finished", "elm", _hover_end_finished, obj);
417 elm_hover_target_set(sd->hover, obj); 417 elm_hover_target_set(sd->hover, obj);
@@ -566,7 +566,7 @@ _elm_hoversel_evas_object_smart_add(Eo *obj, Elm_Hoversel_Data *priv)
566 evas_obj_smart_add(eo_super(obj, MY_CLASS)); 566 evas_obj_smart_add(eo_super(obj, MY_CLASS));
567 elm_widget_sub_object_parent_add(obj); 567 elm_widget_sub_object_parent_add(obj);
568 568
569 eo_event_callback_add(obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _on_clicked, obj); 569 eo_event_callback_add(obj, EFL_UI_EVENT_CLICKED, _on_clicked, obj);
570 570
571 //What are you doing here? 571 //What are you doing here?
572 elm_obj_widget_theme_apply(obj); 572 elm_obj_widget_theme_apply(obj);
@@ -800,7 +800,7 @@ _elm_hoversel_item_add(Eo *obj, Elm_Hoversel_Data *sd, const char *label, const
800 800
801 evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); 801 evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
802 evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); 802 evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
803 eo_event_callback_add(bt, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _on_item_clicked, item); 803 eo_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_item_clicked, item);
804 eo_event_callback_add(bt, ELM_WIDGET_EVENT_FOCUSED, _item_focused_cb, item); 804 eo_event_callback_add(bt, ELM_WIDGET_EVENT_FOCUSED, _item_focused_cb, item);
805 eo_event_callback_add(bt, ELM_WIDGET_EVENT_UNFOCUSED, _item_unfocused_cb, item); 805 eo_event_callback_add(bt, ELM_WIDGET_EVENT_UNFOCUSED, _item_unfocused_cb, item);
806 806
diff --git a/src/lib/elementary/elc_multibuttonentry.c b/src/lib/elementary/elc_multibuttonentry.c
index 6679f7b8be..5210a09d66 100644
--- a/src/lib/elementary/elc_multibuttonentry.c
+++ b/src/lib/elementary/elc_multibuttonentry.c
@@ -58,7 +58,7 @@ EO_CALLBACKS_ARRAY_DEFINE(_multi_buttonentry_cb,
58 { ELM_MULTIBUTTONENTRY_EVENT_CHANGED, _entry_changed_cb }, 58 { ELM_MULTIBUTTONENTRY_EVENT_CHANGED, _entry_changed_cb },
59 { ELM_WIDGET_EVENT_FOCUSED, _entry_focus_in_cb }, 59 { ELM_WIDGET_EVENT_FOCUSED, _entry_focus_in_cb },
60 { ELM_WIDGET_EVENT_UNFOCUSED, _entry_focus_out_cb }, 60 { ELM_WIDGET_EVENT_UNFOCUSED, _entry_focus_out_cb },
61 { EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _entry_clicked_cb } 61 { EFL_UI_EVENT_CLICKED, _entry_clicked_cb }
62); 62);
63 63
64EOLIAN static Eina_Bool 64EOLIAN static Eina_Bool
@@ -969,7 +969,7 @@ _mouse_clicked_signal_cb(void *data EINA_UNUSED,
969 const char *emission EINA_UNUSED, 969 const char *emission EINA_UNUSED,
970 const char *source EINA_UNUSED) 970 const char *source EINA_UNUSED)
971{ 971{
972 eo_event_callback_call(obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL); 972 eo_event_callback_call(obj, EFL_UI_EVENT_CLICKED, NULL);
973} 973}
974 974
975static void 975static void
diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c
index 3dd1bb172c..0022fb6145 100644
--- a/src/lib/elementary/elc_naviframe.c
+++ b/src/lib/elementary/elc_naviframe.c
@@ -696,7 +696,7 @@ _item_title_prev_btn_unset(Elm_Naviframe_Item_Data *it)
696 evas_object_event_callback_del 696 evas_object_event_callback_del
697 (content, EVAS_CALLBACK_DEL, _item_title_prev_btn_del_cb); 697 (content, EVAS_CALLBACK_DEL, _item_title_prev_btn_del_cb);
698 Eo* parent = eo_parent_get(content); 698 Eo* parent = eo_parent_get(content);
699 eo_event_callback_del(content, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _on_item_back_btn_clicked, parent); 699 eo_event_callback_del(content, EFL_UI_EVENT_CLICKED, _on_item_back_btn_clicked, parent);
700 it->title_prev_btn = NULL; 700 it->title_prev_btn = NULL;
701 if (it->auto_pushed_btn) it->auto_pushed_btn = NULL; 701 if (it->auto_pushed_btn) it->auto_pushed_btn = NULL;
702 return content; 702 return content;
@@ -960,7 +960,7 @@ _on_item_back_btn_clicked(void *data, const Eo_Event *event)
960 multiple times on some heavy environment. This callback del will 960 multiple times on some heavy environment. This callback del will
961 prevent those scenario and guarantee only one clicked for it's own 961 prevent those scenario and guarantee only one clicked for it's own
962 page. */ 962 page. */
963 eo_event_callback_del(event->object, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _on_item_back_btn_clicked, data); 963 eo_event_callback_del(event->object, EFL_UI_EVENT_CLICKED, _on_item_back_btn_clicked, data);
964 elm_naviframe_item_pop(data); 964 elm_naviframe_item_pop(data);
965 965
966 return EINA_TRUE; 966 return EINA_TRUE;
@@ -976,7 +976,7 @@ _back_btn_new(Evas_Object *obj, const char *title_label)
976 976
977 if (!btn) return NULL; 977 if (!btn) return NULL;
978 eo_event_callback_add 978 eo_event_callback_add
979 (btn, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _on_item_back_btn_clicked, obj); 979 (btn, EFL_UI_EVENT_CLICKED, _on_item_back_btn_clicked, obj);
980 snprintf 980 snprintf
981 (buf, sizeof(buf), "naviframe/back_btn/%s", elm_widget_style_get(obj)); 981 (buf, sizeof(buf), "naviframe/back_btn/%s", elm_widget_style_get(obj));
982 elm_object_style_set(btn, buf); 982 elm_object_style_set(btn, buf);
@@ -1494,7 +1494,7 @@ _key_action_top_item_get(Evas_Object *obj, const char *params EINA_UNUSED)
1494 ///Leave for compatibility. 1494 ///Leave for compatibility.
1495 ELM_NAVIFRAME_ITEM_DATA_GET(eo_item, it); 1495 ELM_NAVIFRAME_ITEM_DATA_GET(eo_item, it);
1496 if (it->title_prev_btn) 1496 if (it->title_prev_btn)
1497 eo_event_callback_call(it->title_prev_btn, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL); 1497 eo_event_callback_call(it->title_prev_btn, EFL_UI_EVENT_CLICKED, NULL);
1498 1498
1499 return EINA_TRUE; 1499 return EINA_TRUE;
1500} 1500}
@@ -1730,7 +1730,7 @@ _elm_naviframe_item_pop(Eo *obj, Elm_Naviframe_Data *sd)
1730 callback of the auto pushed button should be restored. */ 1730 callback of the auto pushed button should be restored. */
1731 if (it->auto_pushed_btn) 1731 if (it->auto_pushed_btn)
1732 eo_event_callback_add 1732 eo_event_callback_add
1733 (it->auto_pushed_btn, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _on_item_back_btn_clicked, obj); 1733 (it->auto_pushed_btn, EFL_UI_EVENT_CLICKED, _on_item_back_btn_clicked, obj);
1734 it->popping = EINA_FALSE; 1734 it->popping = EINA_FALSE;
1735 } 1735 }
1736 evas_object_unref(obj); 1736 evas_object_unref(obj);
diff --git a/src/lib/elementary/elc_player.c b/src/lib/elementary/elc_player.c
index 16e3dfc2bc..cf0adbf536 100644
--- a/src/lib/elementary/elc_player.c
+++ b/src/lib/elementary/elc_player.c
@@ -535,7 +535,7 @@ _player_button_add(Evas_Object *obj,
535 elm_widget_style_get(obj)); 535 elm_widget_style_get(obj));
536 elm_object_style_set(bt, buf); 536 elm_object_style_set(bt, buf);
537 eo_event_callback_add 537 eo_event_callback_add
538 (bt, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, func, obj); 538 (bt, EFL_UI_EVENT_CLICKED, func, obj);
539 snprintf(buf, sizeof(buf), "elm.swallow.media_player.%s", name); 539 snprintf(buf, sizeof(buf), "elm.swallow.media_player.%s", name);
540 if (!elm_layout_content_set(obj, buf, bt)) 540 if (!elm_layout_content_set(obj, buf, bt))
541 { 541 {
diff --git a/src/lib/elementary/elm_bubble.c b/src/lib/elementary/elm_bubble.c
index b3e4dbd339..659e9c6330 100644
--- a/src/lib/elementary/elm_bubble.c
+++ b/src/lib/elementary/elm_bubble.c
@@ -71,7 +71,7 @@ _on_mouse_up(void *data,
71 if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) 71 if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD)
72 return; 72 return;
73 73
74 eo_event_callback_call(data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL); 74 eo_event_callback_call(data, EFL_UI_EVENT_CLICKED, NULL);
75} 75}
76 76
77/* overriding layout's focus_next() in order to just cycle through the 77/* overriding layout's focus_next() in order to just cycle through the
diff --git a/src/lib/elementary/elm_bubble.eo b/src/lib/elementary/elm_bubble.eo
index 22b02620bd..1b2b307fb3 100644
--- a/src/lib/elementary/elm_bubble.eo
+++ b/src/lib/elementary/elm_bubble.eo
@@ -12,7 +12,7 @@ enum Elm.Bubble.Pos
12 bottom_right [[The arrow of the bubble points to the bottom right corner.]] 12 bottom_right [[The arrow of the bubble points to the bottom right corner.]]
13} 13}
14 14
15class Elm.Bubble (Elm.Layout, Evas.Clickable_Interface) 15class Elm.Bubble (Elm.Layout, Efl.Ui.Clickable)
16{ 16{
17 [[Speech bubble widget used in messaging applications]] 17 [[Speech bubble widget used in messaging applications]]
18 18
diff --git a/src/lib/elementary/elm_button.c b/src/lib/elementary/elm_button.c
index 24334b6a20..39f863ec1b 100644
--- a/src/lib/elementary/elm_button.c
+++ b/src/lib/elementary/elm_button.c
@@ -70,7 +70,7 @@ _activate(Evas_Object *obj)
70 if (!elm_widget_disabled_get(obj) && 70 if (!elm_widget_disabled_get(obj) &&
71 !evas_object_freeze_events_get(obj)) 71 !evas_object_freeze_events_get(obj))
72 eo_event_callback_call 72 eo_event_callback_call
73 (obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL); 73 (obj, EFL_UI_EVENT_CLICKED, NULL);
74 } 74 }
75} 75}
76 76
@@ -94,7 +94,7 @@ _elm_button_elm_widget_activate(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED, Elm_A
94 if (evas_object_freeze_events_get(obj)) return EINA_FALSE; 94 if (evas_object_freeze_events_get(obj)) return EINA_FALSE;
95 95
96 eo_event_callback_call 96 eo_event_callback_call
97 (obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL); 97 (obj, EFL_UI_EVENT_CLICKED, NULL);
98 elm_layout_signal_emit(obj, "elm,anim,activate", "elm"); 98 elm_layout_signal_emit(obj, "elm,anim,activate", "elm");
99 99
100 return EINA_TRUE; 100 return EINA_TRUE;
@@ -202,7 +202,7 @@ _autorepeat_send(void *data)
202 ELM_BUTTON_DATA_GET_OR_RETURN_VAL(data, sd, ECORE_CALLBACK_CANCEL); 202 ELM_BUTTON_DATA_GET_OR_RETURN_VAL(data, sd, ECORE_CALLBACK_CANCEL);
203 203
204 eo_event_callback_call 204 eo_event_callback_call
205 (data, EVAS_CLICKABLE_INTERFACE_EVENT_REPEATED, NULL); 205 (data, EFL_UI_EVENT_REPEATED, NULL);
206 if (!sd->repeating) 206 if (!sd->repeating)
207 { 207 {
208 sd->timer = NULL; 208 sd->timer = NULL;
@@ -243,7 +243,7 @@ _on_pressed_signal(void *data,
243 } 243 }
244 244
245 eo_event_callback_call 245 eo_event_callback_call
246 (data, EVAS_CLICKABLE_INTERFACE_EVENT_PRESSED, NULL); 246 (data, EFL_UI_EVENT_PRESSED, NULL);
247} 247}
248 248
249static void 249static void
@@ -257,7 +257,7 @@ _on_unpressed_signal(void *data,
257 ELM_SAFE_FREE(sd->timer, ecore_timer_del); 257 ELM_SAFE_FREE(sd->timer, ecore_timer_del);
258 sd->repeating = EINA_FALSE; 258 sd->repeating = EINA_FALSE;
259 eo_event_callback_call 259 eo_event_callback_call
260 (data, EVAS_CLICKABLE_INTERFACE_EVENT_UNPRESSED, NULL); 260 (data, EFL_UI_EVENT_UNPRESSED, NULL);
261} 261}
262 262
263static char * 263static char *
diff --git a/src/lib/elementary/elm_button.eo b/src/lib/elementary/elm_button.eo
index a4c3fc265e..51251c4541 100644
--- a/src/lib/elementary/elm_button.eo
+++ b/src/lib/elementary/elm_button.eo
@@ -1,4 +1,4 @@
1class Elm.Button (Elm.Layout, Evas.Clickable_Interface, 1class Elm.Button (Elm.Layout, Efl.Ui.Clickable,
2 Elm.Interface.Atspi_Widget_Action) 2 Elm.Interface.Atspi_Widget_Action)
3{ 3{
4 [[Push-button widget 4 [[Push-button widget
diff --git a/src/lib/elementary/elm_color_class.c b/src/lib/elementary/elm_color_class.c
index 41bd65ea0c..b49dcab348 100644
--- a/src/lib/elementary/elm_color_class.c
+++ b/src/lib/elementary/elm_color_class.c
@@ -744,7 +744,7 @@ elm_color_class_editor_add(Evas_Object *obj)
744 elm_object_text_set(bt, "Reset"); 744 elm_object_text_set(bt, "Reset");
745 elm_object_part_content_set(ly, "elm.swallow.reset", bt); 745 elm_object_part_content_set(ly, "elm.swallow.reset", bt);
746 eo_event_callback_add 746 eo_event_callback_add
747 (bt, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _colorclass_reset, cc); 747 (bt, EFL_UI_EVENT_CLICKED, _colorclass_reset, cc);
748 748
749 cc->cs = cs = elm_colorselector_add(ly); 749 cc->cs = cs = elm_colorselector_add(ly);
750 elm_colorselector_mode_set(cs, ELM_COLORSELECTOR_COMPONENTS); 750 elm_colorselector_mode_set(cs, ELM_COLORSELECTOR_COMPONENTS);
diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c
index 3ec5277bd8..61190c5d71 100644
--- a/src/lib/elementary/elm_colorselector.c
+++ b/src/lib/elementary/elm_colorselector.c
@@ -897,7 +897,7 @@ _create_colorpicker(Evas_Object *obj)
897 elm_object_style_set(sd->button, style); 897 elm_object_style_set(sd->button, style);
898 elm_object_text_set(sd->button, E_("Pick a color")); 898 elm_object_text_set(sd->button, E_("Pick a color"));
899 eo_event_callback_add 899 eo_event_callback_add
900 (sd->button, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _start_grab_pick_cb, obj); 900 (sd->button, EFL_UI_EVENT_CLICKED, _start_grab_pick_cb, obj);
901 elm_box_pack_end(bx, sd->button); 901 elm_box_pack_end(bx, sd->button);
902 evas_object_show(sd->button); 902 evas_object_show(sd->button);
903 } 903 }
@@ -1246,14 +1246,14 @@ _color_bars_add(Evas_Object *obj)
1246 edje_object_part_swallow 1246 edje_object_part_swallow
1247 (sd->cb_data[i]->colorbar, "elm.l_button", sd->cb_data[i]->lbt); 1247 (sd->cb_data[i]->colorbar, "elm.l_button", sd->cb_data[i]->lbt);
1248 eo_event_callback_add 1248 eo_event_callback_add
1249 (sd->cb_data[i]->lbt, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _button_clicked_cb, sd->cb_data[i]); 1249 (sd->cb_data[i]->lbt, EFL_UI_EVENT_CLICKED, _button_clicked_cb, sd->cb_data[i]);
1250 elm_button_autorepeat_set(sd->cb_data[i]->lbt, EINA_TRUE); 1250 elm_button_autorepeat_set(sd->cb_data[i]->lbt, EINA_TRUE);
1251 elm_button_autorepeat_initial_timeout_set 1251 elm_button_autorepeat_initial_timeout_set
1252 (sd->cb_data[i]->lbt, _elm_config->longpress_timeout); 1252 (sd->cb_data[i]->lbt, _elm_config->longpress_timeout);
1253 elm_button_autorepeat_gap_timeout_set 1253 elm_button_autorepeat_gap_timeout_set
1254 (sd->cb_data[i]->lbt, (1.0 / _elm_config->fps)); 1254 (sd->cb_data[i]->lbt, (1.0 / _elm_config->fps));
1255 eo_event_callback_add 1255 eo_event_callback_add
1256 (sd->cb_data[i]->lbt, EVAS_CLICKABLE_INTERFACE_EVENT_REPEATED, _button_repeat_cb, sd->cb_data[i]); 1256 (sd->cb_data[i]->lbt, EFL_UI_EVENT_REPEATED, _button_repeat_cb, sd->cb_data[i]);
1257 1257
1258 /* load right button */ 1258 /* load right button */
1259 if (!sd->cb_data[i]->rbt) sd->cb_data[i]->rbt = elm_button_add(sd->col_bars_area); 1259 if (!sd->cb_data[i]->rbt) sd->cb_data[i]->rbt = elm_button_add(sd->col_bars_area);
@@ -1264,14 +1264,14 @@ _color_bars_add(Evas_Object *obj)
1264 edje_object_part_swallow 1264 edje_object_part_swallow
1265 (sd->cb_data[i]->colorbar, "elm.r_button", sd->cb_data[i]->rbt); 1265 (sd->cb_data[i]->colorbar, "elm.r_button", sd->cb_data[i]->rbt);
1266 eo_event_callback_add 1266 eo_event_callback_add
1267 (sd->cb_data[i]->rbt, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _button_clicked_cb, sd->cb_data[i]); 1267 (sd->cb_data[i]->rbt, EFL_UI_EVENT_CLICKED, _button_clicked_cb, sd->cb_data[i]);
1268 elm_button_autorepeat_set(sd->cb_data[i]->rbt, EINA_TRUE); 1268 elm_button_autorepeat_set(sd->cb_data[i]->rbt, EINA_TRUE);
1269 elm_button_autorepeat_initial_timeout_set 1269 elm_button_autorepeat_initial_timeout_set
1270 (sd->cb_data[i]->rbt, _elm_config->longpress_timeout); 1270 (sd->cb_data[i]->rbt, _elm_config->longpress_timeout);
1271 elm_button_autorepeat_gap_timeout_set 1271 elm_button_autorepeat_gap_timeout_set
1272 (sd->cb_data[i]->rbt, (1.0 / _elm_config->fps)); 1272 (sd->cb_data[i]->rbt, (1.0 / _elm_config->fps));
1273 eo_event_callback_add 1273 eo_event_callback_add
1274 (sd->cb_data[i]->rbt, EVAS_CLICKABLE_INTERFACE_EVENT_REPEATED, _button_repeat_cb, sd->cb_data[i]); 1274 (sd->cb_data[i]->rbt, EFL_UI_EVENT_REPEATED, _button_repeat_cb, sd->cb_data[i]);
1275 } 1275 }
1276} 1276}
1277 1277
diff --git a/src/lib/elementary/elm_colorselector.eo b/src/lib/elementary/elm_colorselector.eo
index b36f083f24..12dec40bb3 100644
--- a/src/lib/elementary/elm_colorselector.eo
+++ b/src/lib/elementary/elm_colorselector.eo
@@ -13,7 +13,7 @@ enum Elm.Colorselector.Mode
13} 13}
14 14
15class Elm.Colorselector (Elm.Layout, Elm.Interface.Atspi_Widget_Action, 15class Elm.Colorselector (Elm.Layout, Elm.Interface.Atspi_Widget_Action,
16 Evas.Clickable_Interface) 16 Efl.Ui.Clickable)
17{ 17{
18 legacy_prefix: elm_colorselector; 18 legacy_prefix: elm_colorselector;
19 eo_prefix: elm_obj_colorselector; 19 eo_prefix: elm_obj_colorselector;
diff --git a/src/lib/elementary/elm_diskselector.c b/src/lib/elementary/elm_diskselector.c
index ed79eeb007..cbe13cb041 100644
--- a/src/lib/elementary/elm_diskselector.c
+++ b/src/lib/elementary/elm_diskselector.c
@@ -612,7 +612,7 @@ _item_click_cb(void *data,
612 612
613 if (it->func) it->func((void *)WIDGET_ITEM_DATA_GET(eo_it), WIDGET(it), eo_it); 613 if (it->func) it->func((void *)WIDGET_ITEM_DATA_GET(eo_it), WIDGET(it), eo_it);
614 eo_event_callback_call 614 eo_event_callback_call
615 (WIDGET(it), EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, eo_it); 615 (WIDGET(it), EFL_UI_EVENT_CLICKED, eo_it);
616} 616}
617 617
618static char * 618static char *
diff --git a/src/lib/elementary/elm_diskselector.eo b/src/lib/elementary/elm_diskselector.eo
index b60764ee38..7c37cff4ff 100644
--- a/src/lib/elementary/elm_diskselector.eo
+++ b/src/lib/elementary/elm_diskselector.eo
@@ -1,6 +1,6 @@
1class Elm.Diskselector (Elm.Widget, Elm.Interface_Scrollable, 1class Elm.Diskselector (Elm.Widget, Elm.Interface_Scrollable,
2 Elm.Interface.Atspi_Widget_Action, 2 Elm.Interface.Atspi_Widget_Action,
3 Evas.Clickable_Interface, Evas.Scrollable_Interface, 3 Efl.Ui.Clickable, Evas.Scrollable_Interface,
4 Evas.Selectable_Interface) 4 Evas.Selectable_Interface)
5{ 5{
6 legacy_prefix: elm_diskselector; 6 legacy_prefix: elm_diskselector;
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index 72687c4fe4..b9f61a9f2e 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -1910,7 +1910,7 @@ _long_press_cb(void *data)
1910 1910
1911 sd->longpress_timer = NULL; 1911 sd->longpress_timer = NULL;
1912 eo_event_callback_call 1912 eo_event_callback_call
1913 (data, EVAS_CLICKABLE_INTERFACE_EVENT_LONGPRESSED, NULL); 1913 (data, EFL_UI_EVENT_LONGPRESSED, NULL);
1914 1914
1915 return ECORE_CALLBACK_CANCEL; 1915 return ECORE_CALLBACK_CANCEL;
1916} 1916}
@@ -2526,7 +2526,7 @@ _entry_hover_anchor_clicked_do(Evas_Object *obj,
2526 2526
2527 eo_event_callback_call(obj, ELM_ENTRY_EVENT_ANCHOR_HOVER_OPENED, &ei); 2527 eo_event_callback_call(obj, ELM_ENTRY_EVENT_ANCHOR_HOVER_OPENED, &ei);
2528 eo_event_callback_add 2528 eo_event_callback_add
2529 (sd->anchor_hover.hover, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _anchor_hover_clicked_cb, obj); 2529 (sd->anchor_hover.hover, EFL_UI_EVENT_CLICKED, _anchor_hover_clicked_cb, obj);
2530 2530
2531 /* FIXME: Should just check if there's any callback registered to 2531 /* FIXME: Should just check if there's any callback registered to
2532 * the smart events instead. This is used to determine if anyone 2532 * the smart events instead. This is used to determine if anyone
@@ -2651,7 +2651,7 @@ _entry_mouse_clicked_signal_cb(void *data,
2651 const char *source EINA_UNUSED) 2651 const char *source EINA_UNUSED)
2652{ 2652{
2653 eo_event_callback_call 2653 eo_event_callback_call
2654 (data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL); 2654 (data, EFL_UI_EVENT_CLICKED, NULL);
2655} 2655}
2656 2656
2657static void 2657static void
@@ -2661,7 +2661,7 @@ _entry_mouse_double_signal_cb(void *data,
2661 const char *source EINA_UNUSED) 2661 const char *source EINA_UNUSED)
2662{ 2662{
2663 eo_event_callback_call 2663 eo_event_callback_call
2664 (data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE, NULL); 2664 (data, EFL_UI_EVENT_CLICKED_DOUBLE, NULL);
2665} 2665}
2666 2666
2667static void 2667static void
@@ -2671,7 +2671,7 @@ _entry_mouse_triple_signal_cb(void *data,
2671 const char *source EINA_UNUSED) 2671 const char *source EINA_UNUSED)
2672{ 2672{
2673 eo_event_callback_call 2673 eo_event_callback_call
2674 (data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_TRIPLE, NULL); 2674 (data, EFL_UI_EVENT_CLICKED_TRIPLE, NULL);
2675} 2675}
2676 2676
2677static Evas_Object * 2677static Evas_Object *
@@ -5313,7 +5313,7 @@ _elm_entry_elm_widget_activate(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, Elm_Act
5313 !evas_object_freeze_events_get(obj)) 5313 !evas_object_freeze_events_get(obj))
5314 { 5314 {
5315 eo_event_callback_call 5315 eo_event_callback_call
5316 (obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL); 5316 (obj, EFL_UI_EVENT_CLICKED, NULL);
5317 if (sd->editable && sd->input_panel_enable) 5317 if (sd->editable && sd->input_panel_enable)
5318 edje_object_part_text_input_panel_show(sd->entry_edje, "elm.text"); 5318 edje_object_part_text_input_panel_show(sd->entry_edje, "elm.text");
5319 } 5319 }
diff --git a/src/lib/elementary/elm_entry.eo b/src/lib/elementary/elm_entry.eo
index f7ab96f542..a9dc70643b 100644
--- a/src/lib/elementary/elm_entry.eo
+++ b/src/lib/elementary/elm_entry.eo
@@ -114,7 +114,7 @@ enum Elm.Cnp_Mode
114 plaintext, [[ copy & paste text without markup tag ]] 114 plaintext, [[ copy & paste text without markup tag ]]
115} 115}
116 116
117class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interface, 117class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
118 Elm.Interface.Atspi.Text, Elm.Interface.Atspi.Text.Editable, Efl.File, 118 Elm.Interface.Atspi.Text, Elm.Interface.Atspi.Text.Editable, Efl.File,
119 Evas.Selectable_Interface, Evas.Scrollable_Interface) 119 Evas.Selectable_Interface, Evas.Scrollable_Interface)
120{ 120{
diff --git a/src/lib/elementary/elm_fileselector.eo b/src/lib/elementary/elm_fileselector.eo
index 5d111b377a..c668148ba5 100644
--- a/src/lib/elementary/elm_fileselector.eo
+++ b/src/lib/elementary/elm_fileselector.eo
@@ -1,6 +1,6 @@
1class Elm.Fileselector (Elm.Layout, Elm.Interface.Fileselector, 1class Elm.Fileselector (Elm.Layout, Elm.Interface.Fileselector,
2 Elm.Interface.Atspi_Widget_Action, 2 Elm.Interface.Atspi_Widget_Action,
3 Evas.Clickable_Interface, Evas.Selectable_Interface) 3 Efl.Ui.Clickable, Evas.Selectable_Interface)
4{ 4{
5 legacy_prefix: elm_fileselector; 5 legacy_prefix: elm_fileselector;
6 eo_prefix: elm_obj_fileselector; 6 eo_prefix: elm_obj_fileselector;
diff --git a/src/lib/elementary/elm_fileselector_entry.eo b/src/lib/elementary/elm_fileselector_entry.eo
index a1561b8dd6..4f61088d6b 100644
--- a/src/lib/elementary/elm_fileselector_entry.eo
+++ b/src/lib/elementary/elm_fileselector_entry.eo
@@ -1,5 +1,5 @@
1class Elm.Fileselector_Entry (Elm.Layout, Elm.Interface.Fileselector, 1class Elm.Fileselector_Entry (Elm.Layout, Elm.Interface.Fileselector,
2 Evas.Clickable_Interface, Evas.Selectable_Interface) 2 Efl.Ui.Clickable, Evas.Selectable_Interface)
3{ 3{
4 [[Not an EO API.]] 4 [[Not an EO API.]]
5 event_prefix: elm_fileselector_entry; 5 event_prefix: elm_fileselector_entry;
diff --git a/src/lib/elementary/elm_frame.c b/src/lib/elementary/elm_frame.c
index 3d38ae90a1..80dfbcea8d 100644
--- a/src/lib/elementary/elm_frame.c
+++ b/src/lib/elementary/elm_frame.c
@@ -140,7 +140,7 @@ _on_frame_clicked(void *data,
140 sd->anim = EINA_TRUE; 140 sd->anim = EINA_TRUE;
141 } 141 }
142 eo_event_callback_call 142 eo_event_callback_call
143 (data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL); 143 (data, EFL_UI_EVENT_CLICKED, NULL);
144} 144}
145 145
146/* using deferred sizing evaluation, just like the parent */ 146/* using deferred sizing evaluation, just like the parent */
diff --git a/src/lib/elementary/elm_frame.eo b/src/lib/elementary/elm_frame.eo
index 714cf124fe..d08fb7e408 100644
--- a/src/lib/elementary/elm_frame.eo
+++ b/src/lib/elementary/elm_frame.eo
@@ -1,4 +1,4 @@
1class Elm.Frame (Elm.Layout, Evas.Clickable_Interface) 1class Elm.Frame (Elm.Layout, Efl.Ui.Clickable)
2{ 2{
3 legacy_prefix: elm_frame; 3 legacy_prefix: elm_frame;
4 eo_prefix: elm_obj_frame; 4 eo_prefix: elm_obj_frame;
diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c
index ef49a484e7..49ea633e4e 100644
--- a/src/lib/elementary/elm_gengrid.c
+++ b/src/lib/elementary/elm_gengrid.c
@@ -680,7 +680,7 @@ _long_press_cb(void *data)
680 return ECORE_CALLBACK_CANCEL; 680 return ECORE_CALLBACK_CANCEL;
681 sd->longpressed = EINA_TRUE; 681 sd->longpressed = EINA_TRUE;
682 eo_event_callback_call 682 eo_event_callback_call
683 (WIDGET(it), EVAS_CLICKABLE_INTERFACE_EVENT_LONGPRESSED, EO_OBJ(it)); 683 (WIDGET(it), EFL_UI_EVENT_LONGPRESSED, EO_OBJ(it));
684 684
685 if (sd->reorder_mode) 685 if (sd->reorder_mode)
686 { 686 {
@@ -776,11 +776,11 @@ _item_mouse_down_cb(void *data,
776 it->highlight_cb(it); 776 it->highlight_cb(it);
777 if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK) 777 if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
778 { 778 {
779 eo_event_callback_call(WIDGET(it), EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE, EO_OBJ(it)); 779 eo_event_callback_call(WIDGET(it), EFL_UI_EVENT_CLICKED_DOUBLE, EO_OBJ(it));
780 eo_event_callback_call(WIDGET(it), ELM_GENGRID_EVENT_ACTIVATED, EO_OBJ(it)); 780 eo_event_callback_call(WIDGET(it), ELM_GENGRID_EVENT_ACTIVATED, EO_OBJ(it));
781 } 781 }
782 782
783 eo_event_callback_call(WIDGET(it), EVAS_CLICKABLE_INTERFACE_EVENT_PRESSED, EO_OBJ(it)); 783 eo_event_callback_call(WIDGET(it), EFL_UI_EVENT_PRESSED, EO_OBJ(it));
784 ELM_SAFE_FREE(it->long_timer, ecore_timer_del); 784 ELM_SAFE_FREE(it->long_timer, ecore_timer_del);
785 if (it->realized) 785 if (it->realized)
786 it->long_timer = ecore_timer_add 786 it->long_timer = ecore_timer_add
@@ -1041,7 +1041,7 @@ _item_mouse_up_cb(void *data,
1041 if (dy < 0) dy = -dy; 1041 if (dy < 0) dy = -dy;
1042 if ((dx < 5) && (dy < 5)) 1042 if ((dx < 5) && (dy < 5))
1043 eo_event_callback_call 1043 eo_event_callback_call
1044 (WIDGET(it), EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_RIGHT, EO_OBJ(it)); 1044 (WIDGET(it), EFL_UI_EVENT_CLICKED_RIGHT, EO_OBJ(it));
1045 return; 1045 return;
1046 } 1046 }
1047 1047
diff --git a/src/lib/elementary/elm_gengrid.eo b/src/lib/elementary/elm_gengrid.eo
index e3fae4b58f..fd4df55fd4 100644
--- a/src/lib/elementary/elm_gengrid.eo
+++ b/src/lib/elementary/elm_gengrid.eo
@@ -8,7 +8,7 @@ enum Elm.Gengrid.Reorder_Type
8} 8}
9 9
10class Elm.Gengrid (Elm.Layout, Elm.Interface_Scrollable, 10class Elm.Gengrid (Elm.Layout, Elm.Interface_Scrollable,
11 Evas.Clickable_Interface, Elm.Interface.Atspi_Widget_Action, 11 Efl.Ui.Clickable, Elm.Interface.Atspi_Widget_Action,
12 Elm.Interface.Atspi.Selection) 12 Elm.Interface.Atspi.Selection)
13{ 13{
14 legacy_prefix: elm_gengrid; 14 legacy_prefix: elm_gengrid;
diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c
index 998f18f2bc..c77dcec13a 100644
--- a/src/lib/elementary/elm_genlist.c
+++ b/src/lib/elementary/elm_genlist.c
@@ -3984,7 +3984,7 @@ _long_press_cb(void *data)
3984 3984
3985 sd->longpressed = EINA_TRUE; 3985 sd->longpressed = EINA_TRUE;
3986 eo_event_callback_call 3986 eo_event_callback_call
3987 (WIDGET(it), EVAS_CLICKABLE_INTERFACE_EVENT_LONGPRESSED, EO_OBJ(it)); 3987 (WIDGET(it), EFL_UI_EVENT_LONGPRESSED, EO_OBJ(it));
3988 if ((sd->reorder_mode) && !(GL_IT(it)->type & ELM_GENLIST_ITEM_GROUP)) 3988 if ((sd->reorder_mode) && !(GL_IT(it)->type & ELM_GENLIST_ITEM_GROUP))
3989 { 3989 {
3990 sd->reorder_it = it; 3990 sd->reorder_it = it;
@@ -4268,12 +4268,12 @@ _item_mouse_down_cb(void *data,
4268 if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK) 4268 if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
4269 { 4269 {
4270 eo_event_callback_call 4270 eo_event_callback_call
4271 (WIDGET(it), EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE, eo_it); 4271 (WIDGET(it), EFL_UI_EVENT_CLICKED_DOUBLE, eo_it);
4272 eo_event_callback_call 4272 eo_event_callback_call
4273 (WIDGET(it), ELM_GENLIST_EVENT_ACTIVATED, eo_it); 4273 (WIDGET(it), ELM_GENLIST_EVENT_ACTIVATED, eo_it);
4274 } 4274 }
4275 eo_event_callback_call 4275 eo_event_callback_call
4276 (WIDGET(it), EVAS_CLICKABLE_INTERFACE_EVENT_PRESSED, eo_it); 4276 (WIDGET(it), EFL_UI_EVENT_PRESSED, eo_it);
4277} 4277}
4278 4278
4279static Item_Block * 4279static Item_Block *
@@ -4852,7 +4852,7 @@ _item_mouse_up_cb(void *data,
4852 if (dy < 0) dy = -dy; 4852 if (dy < 0) dy = -dy;
4853 if ((dx < 5) && (dy < 5)) 4853 if ((dx < 5) && (dy < 5))
4854 eo_event_callback_call 4854 eo_event_callback_call
4855 (WIDGET(it), EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_RIGHT, EO_OBJ(it)); 4855 (WIDGET(it), EFL_UI_EVENT_CLICKED_RIGHT, EO_OBJ(it));
4856 return; 4856 return;
4857 } 4857 }
4858 4858
diff --git a/src/lib/elementary/elm_genlist.eo b/src/lib/elementary/elm_genlist.eo
index 67c65ddc46..dd5f2b423e 100644
--- a/src/lib/elementary/elm_genlist.eo
+++ b/src/lib/elementary/elm_genlist.eo
@@ -2,7 +2,7 @@ import elm_general;
2import elm_list; 2import elm_list;
3import elm_genlist_item; 3import elm_genlist_item;
4 4
5class Elm.Genlist (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interface, 5class Elm.Genlist (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
6 Elm.Interface.Atspi_Widget_Action, Elm.Interface.Atspi.Selection, 6 Elm.Interface.Atspi_Widget_Action, Elm.Interface.Atspi.Selection,
7 Evas.Selectable_Interface) 7 Evas.Selectable_Interface)
8{ 8{
diff --git a/src/lib/elementary/elm_hover.c b/src/lib/elementary/elm_hover.c
index f5f43ee43d..9b9d610f4c 100644
--- a/src/lib/elementary/elm_hover.c
+++ b/src/lib/elementary/elm_hover.c
@@ -552,13 +552,13 @@ _hov_dismiss_cb(void *data,
552 { 552 {
553 _hide_signals_emit(data); 553 _hide_signals_emit(data);
554 eo_event_callback_call 554 eo_event_callback_call
555 (data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL); 555 (data, EFL_UI_EVENT_CLICKED, NULL);
556 } 556 }
557 else 557 else
558 { 558 {
559 evas_object_hide(data); 559 evas_object_hide(data);
560 eo_event_callback_call 560 eo_event_callback_call
561 (data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL); 561 (data, EFL_UI_EVENT_CLICKED, NULL);
562 eo_event_callback_call(data, ELM_HOVER_EVENT_DISMISSED, NULL); 562 eo_event_callback_call(data, ELM_HOVER_EVENT_DISMISSED, NULL);
563 } // for backward compatibility 563 } // for backward compatibility
564} 564}
@@ -603,7 +603,7 @@ _elm_hover_evas_object_smart_del(Eo *obj, Elm_Hover_Data *sd)
603 if (evas_object_visible_get(obj)) 603 if (evas_object_visible_get(obj))
604 { 604 {
605 eo_event_callback_call 605 eo_event_callback_call
606 (obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL); 606 (obj, EFL_UI_EVENT_CLICKED, NULL);
607 eo_event_callback_call(obj, ELM_HOVER_EVENT_DISMISSED, NULL); 607 eo_event_callback_call(obj, ELM_HOVER_EVENT_DISMISSED, NULL);
608 } 608 }
609 609
diff --git a/src/lib/elementary/elm_hover.eo b/src/lib/elementary/elm_hover.eo
index 9abec305d2..64fa0850a4 100644
--- a/src/lib/elementary/elm_hover.eo
+++ b/src/lib/elementary/elm_hover.eo
@@ -7,7 +7,7 @@ enum Elm.Hover.Axis
7 both [[ELM_HOVER_AXIS_BOTH -- both.]] 7 both [[ELM_HOVER_AXIS_BOTH -- both.]]
8} 8}
9 9
10class Elm.Hover (Elm.Layout, Evas.Clickable_Interface, Elm.Interface.Atspi_Widget_Action) 10class Elm.Hover (Elm.Layout, Efl.Ui.Clickable, Elm.Interface.Atspi_Widget_Action)
11{ 11{
12 legacy_prefix: elm_hover; 12 legacy_prefix: elm_hover;
13 eo_prefix: elm_obj_hover; 13 eo_prefix: elm_obj_hover;
diff --git a/src/lib/elementary/elm_hoversel.eo b/src/lib/elementary/elm_hoversel.eo
index 0eb2c7b94e..d8a02e9426 100644
--- a/src/lib/elementary/elm_hoversel.eo
+++ b/src/lib/elementary/elm_hoversel.eo
@@ -1,6 +1,6 @@
1import elm_icon; 1import elm_icon;
2class Elm.Hoversel (Elm.Button, Evas.Selectable_Interface, 2class Elm.Hoversel (Elm.Button, Evas.Selectable_Interface,
3 Evas.Clickable_Interface, 3 Efl.Ui.Clickable,
4 Elm.Interface.Atspi_Widget_Action) 4 Elm.Interface.Atspi_Widget_Action)
5{ 5{
6 legacy_prefix: elm_hoversel; 6 legacy_prefix: elm_hoversel;
diff --git a/src/lib/elementary/elm_index.c b/src/lib/elementary/elm_index.c
index f7a4ab2e76..c35282ecc3 100644
--- a/src/lib/elementary/elm_index.c
+++ b/src/lib/elementary/elm_index.c
@@ -856,7 +856,7 @@ _on_mouse_up(void *data,
856 if (eo_item) 856 if (eo_item)
857 { 857 {
858 eo_event_callback_call 858 eo_event_callback_call
859 (data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, eo_item); 859 (data, EFL_UI_EVENT_CLICKED, eo_item);
860 eo_event_callback_call 860 eo_event_callback_call
861 (data, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, eo_item); 861 (data, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, eo_item);
862 eo_id_item = eo_item; 862 eo_id_item = eo_item;
diff --git a/src/lib/elementary/elm_index.eo b/src/lib/elementary/elm_index.eo
index 236f4f82d2..2ae62d9b46 100644
--- a/src/lib/elementary/elm_index.eo
+++ b/src/lib/elementary/elm_index.eo
@@ -1,5 +1,5 @@
1class Elm.Index (Elm.Layout, Efl.Orientation, 1class Elm.Index (Elm.Layout, Efl.Orientation,
2 Evas.Clickable_Interface, Evas.Selectable_Interface) 2 Efl.Ui.Clickable, Evas.Selectable_Interface)
3{ 3{
4 legacy_prefix: elm_index; 4 legacy_prefix: elm_index;
5 eo_prefix: elm_obj_index; 5 eo_prefix: elm_obj_index;
diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c
index 506ddded3c..2629710072 100644
--- a/src/lib/elementary/elm_list.c
+++ b/src/lib/elementary/elm_list.c
@@ -1549,7 +1549,7 @@ _long_press_cb(void *data)
1549 1549
1550 sd->longpressed = EINA_TRUE; 1550 sd->longpressed = EINA_TRUE;
1551 eo_event_callback_call 1551 eo_event_callback_call
1552 (WIDGET(it), EVAS_CLICKABLE_INTERFACE_EVENT_LONGPRESSED, EO_OBJ(it)); 1552 (WIDGET(it), EFL_UI_EVENT_LONGPRESSED, EO_OBJ(it));
1553 1553
1554end: 1554end:
1555 return ECORE_CALLBACK_CANCEL; 1555 return ECORE_CALLBACK_CANCEL;
@@ -1700,7 +1700,7 @@ _mouse_down_cb(void *data,
1700 if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK) 1700 if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
1701 { 1701 {
1702 eo_event_callback_call 1702 eo_event_callback_call
1703 (WIDGET(it), EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE, EO_OBJ(it)); 1703 (WIDGET(it), EFL_UI_EVENT_CLICKED_DOUBLE, EO_OBJ(it));
1704 eo_event_callback_call 1704 eo_event_callback_call
1705 (WIDGET(it), ELM_LIST_EVENT_ACTIVATED, EO_OBJ(it)); 1705 (WIDGET(it), ELM_LIST_EVENT_ACTIVATED, EO_OBJ(it));
1706 } 1706 }
@@ -1736,7 +1736,7 @@ _mouse_up_cb(void *data,
1736 if (dy < 0) dy = -dy; 1736 if (dy < 0) dy = -dy;
1737 if ((dx < 5) && (dy < 5)) 1737 if ((dx < 5) && (dy < 5))
1738 eo_event_callback_call 1738 eo_event_callback_call
1739 (obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_RIGHT, EO_OBJ(it)); 1739 (obj, EFL_UI_EVENT_CLICKED_RIGHT, EO_OBJ(it));
1740 return; 1740 return;
1741 } 1741 }
1742 1742
diff --git a/src/lib/elementary/elm_list.eo b/src/lib/elementary/elm_list.eo
index 2f3215cdd6..0bf9d032fe 100644
--- a/src/lib/elementary/elm_list.eo
+++ b/src/lib/elementary/elm_list.eo
@@ -38,7 +38,7 @@ enum Elm.List.Mode
38 38
39class Elm.List (Elm.Layout, Elm.Interface_Scrollable, 39class Elm.List (Elm.Layout, Elm.Interface_Scrollable,
40 Elm.Interface.Atspi_Widget_Action, Elm.Interface.Atspi.Selection, 40 Elm.Interface.Atspi_Widget_Action, Elm.Interface.Atspi.Selection,
41 Evas.Clickable_Interface, Evas.Selectable_Interface) 41 Efl.Ui.Clickable, Evas.Selectable_Interface)
42{ 42{
43 legacy_prefix: elm_list; 43 legacy_prefix: elm_list;
44 eo_prefix: elm_obj_list; 44 eo_prefix: elm_obj_list;
diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c
index 231cf45c3f..91f8d9839b 100644
--- a/src/lib/elementary/elm_map.c
+++ b/src/lib/elementary/elm_map.c
@@ -1332,7 +1332,7 @@ _long_press_cb(void *data)
1332 1332
1333 sd->long_timer = NULL; 1333 sd->long_timer = NULL;
1334 eo_event_callback_call 1334 eo_event_callback_call
1335 (sd->obj, EVAS_CLICKABLE_INTERFACE_EVENT_LONGPRESSED, &sd->ev); 1335 (sd->obj, EFL_UI_EVENT_LONGPRESSED, &sd->ev);
1336 1336
1337 return ECORE_CALLBACK_CANCEL; 1337 return ECORE_CALLBACK_CANCEL;
1338} 1338}
@@ -1352,7 +1352,7 @@ _mouse_down_cb(void *data,
1352 1352
1353 if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK) 1353 if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
1354 eo_event_callback_call 1354 eo_event_callback_call
1355 (sd->obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE, ev); 1355 (sd->obj, EFL_UI_EVENT_CLICKED_DOUBLE, ev);
1356 else 1356 else
1357 eo_event_callback_call 1357 eo_event_callback_call
1358 (sd->obj, ELM_MAP_EVENT_PRESS, ev); 1358 (sd->obj, ELM_MAP_EVENT_PRESS, ev);
@@ -1383,7 +1383,7 @@ _mouse_up_cb(void *data,
1383 1383
1384 if (!sd->on_hold) 1384 if (!sd->on_hold)
1385 eo_event_callback_call 1385 eo_event_callback_call
1386 (sd->obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, ev); 1386 (sd->obj, EFL_UI_EVENT_CLICKED, ev);
1387 sd->on_hold = EINA_FALSE; 1387 sd->on_hold = EINA_FALSE;
1388} 1388}
1389 1389
diff --git a/src/lib/elementary/elm_map.eo b/src/lib/elementary/elm_map.eo
index 20d3253ea8..eae739e836 100644
--- a/src/lib/elementary/elm_map.eo
+++ b/src/lib/elementary/elm_map.eo
@@ -71,7 +71,7 @@ enum Elm.Map.Route_Method
71 71
72class Elm.Map (Elm.Widget, Elm.Interface_Scrollable, 72class Elm.Map (Elm.Widget, Elm.Interface_Scrollable,
73 Elm.Interface.Atspi_Widget_Action, 73 Elm.Interface.Atspi_Widget_Action,
74 Evas.Clickable_Interface) 74 Efl.Ui.Clickable)
75{ 75{
76 legacy_prefix: elm_map; 76 legacy_prefix: elm_map;
77 eo_prefix: elm_obj_map; 77 eo_prefix: elm_obj_map;
diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c
index b2f3346011..b05196def1 100644
--- a/src/lib/elementary/elm_menu.c
+++ b/src/lib/elementary/elm_menu.c
@@ -428,7 +428,7 @@ _hover_dismissed_cb(void *data, const Eo_Event *event)
428{ 428{
429 _menu_hide(data, event->object, event->info); 429 _menu_hide(data, event->object, event->info);
430 eo_event_callback_call 430 eo_event_callback_call
431 (data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL); 431 (data, EFL_UI_EVENT_CLICKED, NULL);
432 eo_event_callback_call(data, ELM_MENU_EVENT_DISMISSED, NULL); 432 eo_event_callback_call(data, ELM_MENU_EVENT_DISMISSED, NULL);
433 433
434 return EINA_TRUE; 434 return EINA_TRUE;
@@ -763,13 +763,13 @@ _elm_menu_menu_bar_set(Eo *obj, Eina_Bool menu_bar)
763 if (menu_bar) 763 if (menu_bar)
764 { 764 {
765 eo_event_callback_add 765 eo_event_callback_add
766 (item->submenu.hv, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _hover_dismissed_cb, WIDGET(item)); 766 (item->submenu.hv, EFL_UI_EVENT_CLICKED, _hover_dismissed_cb, WIDGET(item));
767 snprintf(style, sizeof(style), "main_menu_submenu//%s", elm_widget_style_get(obj)); 767 snprintf(style, sizeof(style), "main_menu_submenu//%s", elm_widget_style_get(obj));
768 elm_object_style_set(item->submenu.hv, style); 768 elm_object_style_set(item->submenu.hv, style);
769 } 769 }
770 else 770 else
771 { 771 {
772 eo_event_callback_del(item->submenu.hv, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _hover_dismissed_cb, WIDGET(item)); 772 eo_event_callback_del(item->submenu.hv, EFL_UI_EVENT_CLICKED, _hover_dismissed_cb, WIDGET(item));
773 snprintf(style, sizeof(style), "submenu/%s", elm_widget_style_get(obj)); 773 snprintf(style, sizeof(style), "submenu/%s", elm_widget_style_get(obj));
774 elm_object_style_set(item->submenu.hv, style); 774 elm_object_style_set(item->submenu.hv, style);
775 } 775 }
diff --git a/src/lib/elementary/elm_menu.eo b/src/lib/elementary/elm_menu.eo
index 60a570e7a2..d2a6688b4d 100644
--- a/src/lib/elementary/elm_menu.eo
+++ b/src/lib/elementary/elm_menu.eo
@@ -1,4 +1,4 @@
1class Elm.Menu (Elm.Widget, Evas.Clickable_Interface, Elm.Interface.Atspi.Selection) 1class Elm.Menu (Elm.Widget, Efl.Ui.Clickable, Elm.Interface.Atspi.Selection)
2{ 2{
3 legacy_prefix: elm_menu; 3 legacy_prefix: elm_menu;
4 eo_prefix: elm_obj_menu; 4 eo_prefix: elm_obj_menu;
diff --git a/src/lib/elementary/elm_panes.c b/src/lib/elementary/elm_panes.c
index 1c322235ff..ecfa856290 100644
--- a/src/lib/elementary/elm_panes.c
+++ b/src/lib/elementary/elm_panes.c
@@ -141,7 +141,7 @@ _on_clicked(void *data,
141 const char *emission EINA_UNUSED, 141 const char *emission EINA_UNUSED,
142 const char *source EINA_UNUSED) 142 const char *source EINA_UNUSED)
143{ 143{
144 eo_event_callback_call(data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL); 144 eo_event_callback_call(data, EFL_UI_EVENT_CLICKED, NULL);
145} 145}
146 146
147static void 147static void
@@ -175,7 +175,7 @@ _on_unpressed(void *data,
175 175
176 if (sd->double_clicked) 176 if (sd->double_clicked)
177 { 177 {
178 eo_event_callback_call(data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE, NULL); 178 eo_event_callback_call(data, EFL_UI_EVENT_CLICKED_DOUBLE, NULL);
179 sd->double_clicked = EINA_FALSE; 179 sd->double_clicked = EINA_FALSE;
180 } 180 }
181} 181}
diff --git a/src/lib/elementary/elm_panes.eo b/src/lib/elementary/elm_panes.eo
index b245c49063..3e4b88e741 100644
--- a/src/lib/elementary/elm_panes.eo
+++ b/src/lib/elementary/elm_panes.eo
@@ -1,5 +1,5 @@
1class Elm.Panes (Elm.Layout, Efl.Orientation, 1class Elm.Panes (Elm.Layout, Efl.Orientation,
2 Evas.Clickable_Interface) 2 Efl.Ui.Clickable)
3{ 3{
4 legacy_prefix: elm_panes; 4 legacy_prefix: elm_panes;
5 eo_prefix: elm_obj_panes; 5 eo_prefix: elm_obj_panes;
diff --git a/src/lib/elementary/elm_photo.c b/src/lib/elementary/elm_photo.c
index 9752007465..a00d60ea1a 100644
--- a/src/lib/elementary/elm_photo.c
+++ b/src/lib/elementary/elm_photo.c
@@ -216,7 +216,7 @@ _mouse_up(void *data,
216 ELM_SAFE_FREE(sd->long_press_timer, ecore_timer_del); 216 ELM_SAFE_FREE(sd->long_press_timer, ecore_timer_del);
217 217
218 if (!sd->drag_started) 218 if (!sd->drag_started)
219 eo_event_callback_call(data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL); 219 eo_event_callback_call(data, EFL_UI_EVENT_CLICKED, NULL);
220} 220}
221 221
222static void 222static void
diff --git a/src/lib/elementary/elm_photo.eo b/src/lib/elementary/elm_photo.eo
index 31feae5512..a8c7fa9284 100644
--- a/src/lib/elementary/elm_photo.eo
+++ b/src/lib/elementary/elm_photo.eo
@@ -1,4 +1,4 @@
1class Elm.Photo (Elm.Widget, Efl.File, Evas.Clickable_Interface, Evas.Draggable_Interface) 1class Elm.Photo (Elm.Widget, Efl.File, Efl.Ui.Clickable, Evas.Draggable_Interface)
2{ 2{
3 legacy_prefix: elm_photo; 3 legacy_prefix: elm_photo;
4 eo_prefix: elm_obj_photo; 4 eo_prefix: elm_obj_photo;
diff --git a/src/lib/elementary/elm_photocam.c b/src/lib/elementary/elm_photocam.c
index 876d2f4b24..6858bb8796 100644
--- a/src/lib/elementary/elm_photocam.c
+++ b/src/lib/elementary/elm_photocam.c
@@ -801,7 +801,7 @@ _long_press_cb(void *data)
801 sd->long_timer = NULL; 801 sd->long_timer = NULL;
802 sd->longpressed = EINA_TRUE; 802 sd->longpressed = EINA_TRUE;
803 eo_event_callback_call 803 eo_event_callback_call
804 (data, EVAS_CLICKABLE_INTERFACE_EVENT_LONGPRESSED, NULL); 804 (data, EFL_UI_EVENT_LONGPRESSED, NULL);
805 805
806 return ECORE_CALLBACK_CANCEL; 806 return ECORE_CALLBACK_CANCEL;
807} 807}
@@ -821,7 +821,7 @@ _mouse_down_cb(void *data,
821 else sd->on_hold = EINA_FALSE; 821 else sd->on_hold = EINA_FALSE;
822 if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK) 822 if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
823 eo_event_callback_call 823 eo_event_callback_call
824 (data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE, NULL); 824 (data, EFL_UI_EVENT_CLICKED_DOUBLE, NULL);
825 else 825 else
826 eo_event_callback_call(data, ELM_PHOTOCAM_EVENT_PRESS, NULL); 826 eo_event_callback_call(data, ELM_PHOTOCAM_EVENT_PRESS, NULL);
827 sd->longpressed = EINA_FALSE; 827 sd->longpressed = EINA_FALSE;
@@ -846,7 +846,7 @@ _mouse_up_cb(void *data,
846 ELM_SAFE_FREE(sd->long_timer, ecore_timer_del); 846 ELM_SAFE_FREE(sd->long_timer, ecore_timer_del);
847 if (!sd->on_hold) 847 if (!sd->on_hold)
848 eo_event_callback_call 848 eo_event_callback_call
849 (data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL); 849 (data, EFL_UI_EVENT_CLICKED, NULL);
850 sd->on_hold = EINA_FALSE; 850 sd->on_hold = EINA_FALSE;
851} 851}
852 852
diff --git a/src/lib/elementary/elm_photocam.eo b/src/lib/elementary/elm_photocam.eo
index ff82bc4b0a..b1ed834338 100644
--- a/src/lib/elementary/elm_photocam.eo
+++ b/src/lib/elementary/elm_photocam.eo
@@ -12,7 +12,7 @@ enum Elm.Photocam.Zoom_Mode
12 12
13class Elm.Photocam (Elm.Widget, Elm.Interface_Scrollable, 13class Elm.Photocam (Elm.Widget, Elm.Interface_Scrollable,
14 Elm.Interface.Atspi_Widget_Action, Efl.File, 14 Elm.Interface.Atspi_Widget_Action, Efl.File,
15 Evas.Clickable_Interface, Evas.Scrollable_Interface, 15 Efl.Ui.Clickable, Evas.Scrollable_Interface,
16 Evas.Zoomable_Interface) 16 Evas.Zoomable_Interface)
17{ 17{
18 legacy_prefix: elm_photocam; 18 legacy_prefix: elm_photocam;
diff --git a/src/lib/elementary/elm_plug.c b/src/lib/elementary/elm_plug.c
index a567d63502..24205d4ced 100644
--- a/src/lib/elementary/elm_plug.c
+++ b/src/lib/elementary/elm_plug.c
@@ -103,7 +103,7 @@ _on_mouse_up(void *data,
103 if (ev->button != 1) return; 103 if (ev->button != 1) return;
104 if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return; 104 if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
105 105
106 eo_event_callback_call(data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL); 106 eo_event_callback_call(data, EFL_UI_EVENT_CLICKED, NULL);
107} 107}
108 108
109EOLIAN static void 109EOLIAN static void
diff --git a/src/lib/elementary/elm_plug.eo b/src/lib/elementary/elm_plug.eo
index 2fa1b78de1..1f7eecff59 100644
--- a/src/lib/elementary/elm_plug.eo
+++ b/src/lib/elementary/elm_plug.eo
@@ -1,4 +1,4 @@
1class Elm.Plug (Elm.Widget, Evas.Clickable_Interface) 1class Elm.Plug (Elm.Widget, Efl.Ui.Clickable)
2{ 2{
3 legacy_prefix: elm_plug; 3 legacy_prefix: elm_plug;
4 eo_prefix: elm_obj_plug; 4 eo_prefix: elm_obj_plug;
diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c
index ab187a1f9c..ca6924b8a7 100644
--- a/src/lib/elementary/elm_spinner.c
+++ b/src/lib/elementary/elm_spinner.c
@@ -57,9 +57,9 @@ static const Elm_Action key_actions[] = {
57}; 57};
58 58
59EO_CALLBACKS_ARRAY_DEFINE(_inc_dec_button_cb, 59EO_CALLBACKS_ARRAY_DEFINE(_inc_dec_button_cb,
60 { EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _inc_dec_button_clicked_cb}, 60 { EFL_UI_EVENT_CLICKED, _inc_dec_button_clicked_cb},
61 { EVAS_CLICKABLE_INTERFACE_EVENT_PRESSED, _inc_dec_button_pressed_cb}, 61 { EFL_UI_EVENT_PRESSED, _inc_dec_button_pressed_cb},
62 { EVAS_CLICKABLE_INTERFACE_EVENT_UNPRESSED, _inc_dec_button_unpressed_cb}, 62 { EFL_UI_EVENT_UNPRESSED, _inc_dec_button_unpressed_cb},
63 { EVAS_OBJECT_EVENT_MOUSE_MOVE, _inc_dec_button_mouse_move_cb } 63 { EVAS_OBJECT_EVENT_MOUSE_MOVE, _inc_dec_button_mouse_move_cb }
64); 64);
65 65
@@ -1195,7 +1195,7 @@ _elm_spinner_evas_object_smart_add(Eo *obj, Elm_Spinner_Data *priv)
1195 elm_object_style_set(priv->text_button, "spinner/default"); 1195 elm_object_style_set(priv->text_button, "spinner/default");
1196 1196
1197 eo_event_callback_add 1197 eo_event_callback_add
1198 (priv->text_button, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _text_button_clicked_cb, obj); 1198 (priv->text_button, EFL_UI_EVENT_CLICKED, _text_button_clicked_cb, obj);
1199 1199
1200 elm_layout_content_set(obj, "elm.swallow.text_button", priv->text_button); 1200 elm_layout_content_set(obj, "elm.swallow.text_button", priv->text_button);
1201 elm_widget_sub_object_add(obj, priv->text_button); 1201 elm_widget_sub_object_add(obj, priv->text_button);
diff --git a/src/lib/elementary/elm_thumb.c b/src/lib/elementary/elm_thumb.c
index 8df3a13314..cf09e10941 100644
--- a/src/lib/elementary/elm_thumb.c
+++ b/src/lib/elementary/elm_thumb.c
@@ -62,7 +62,7 @@ _mouse_down_cb(void *data,
62 else sd->on_hold = EINA_FALSE; 62 else sd->on_hold = EINA_FALSE;
63 63
64 if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK) 64 if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
65 eo_event_callback_call(obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE, NULL); 65 eo_event_callback_call(obj, EFL_UI_EVENT_CLICKED_DOUBLE, NULL);
66 else 66 else
67 eo_event_callback_call(obj, ELM_THUMB_EVENT_PRESS, NULL); 67 eo_event_callback_call(obj, ELM_THUMB_EVENT_PRESS, NULL);
68} 68}
@@ -81,7 +81,7 @@ _mouse_up_cb(void *data,
81 else sd->on_hold = EINA_FALSE; 81 else sd->on_hold = EINA_FALSE;
82 82
83 if (!sd->on_hold) 83 if (!sd->on_hold)
84 eo_event_callback_call(obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL); 84 eo_event_callback_call(obj, EFL_UI_EVENT_CLICKED, NULL);
85 85
86 sd->on_hold = EINA_FALSE; 86 sd->on_hold = EINA_FALSE;
87} 87}
diff --git a/src/lib/elementary/elm_thumb.eo b/src/lib/elementary/elm_thumb.eo
index adf491d3e2..9b447b05b7 100644
--- a/src/lib/elementary/elm_thumb.eo
+++ b/src/lib/elementary/elm_thumb.eo
@@ -1,5 +1,5 @@
1 1
2class Elm.Thumb (Elm.Layout, Efl.File, Evas.Clickable_Interface, 2class Elm.Thumb (Elm.Layout, Efl.File, Efl.Ui.Clickable,
3 Evas.Draggable_Interface) 3 Evas.Draggable_Interface)
4{ 4{
5 legacy_prefix: elm_thumb; 5 legacy_prefix: elm_thumb;
diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c
index 69a9a66a12..dd9f1068f0 100644
--- a/src/lib/elementary/elm_toolbar.c
+++ b/src/lib/elementary/elm_toolbar.c
@@ -1813,7 +1813,7 @@ _mouse_clicked_cb(Elm_Toolbar_Item_Data *it,
1813 if (button == 1) 1813 if (button == 1)
1814 { 1814 {
1815 /* regular left click event */ 1815 /* regular left click event */
1816 eo_event_callback_call(WIDGET(it), EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, EO_OBJ(it)); 1816 eo_event_callback_call(WIDGET(it), EFL_UI_EVENT_CLICKED, EO_OBJ(it));
1817 return; 1817 return;
1818 } 1818 }
1819 snprintf(buf, sizeof(buf), "elm,action,click,%d", button); 1819 snprintf(buf, sizeof(buf), "elm,action,click,%d", button);
@@ -2205,7 +2205,7 @@ _long_press_cb(void *data)
2205 if (sd->reorder_mode) 2205 if (sd->reorder_mode)
2206 _item_reorder_start(it); 2206 _item_reorder_start(it);
2207 2207
2208 eo_event_callback_call(WIDGET(it), EVAS_CLICKABLE_INTERFACE_EVENT_LONGPRESSED, EO_OBJ(it)); 2208 eo_event_callback_call(WIDGET(it), EFL_UI_EVENT_LONGPRESSED, EO_OBJ(it));
2209 2209
2210 return ECORE_CALLBACK_CANCEL; 2210 return ECORE_CALLBACK_CANCEL;
2211} 2211}
@@ -2238,7 +2238,7 @@ _mouse_down_cb(Elm_Toolbar_Item_Data *it,
2238 2238
2239 if (ev->button != 1) return; 2239 if (ev->button != 1) return;
2240 if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK) 2240 if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
2241 eo_event_callback_call(WIDGET(it), EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE, EO_OBJ(it)); 2241 eo_event_callback_call(WIDGET(it), EFL_UI_EVENT_CLICKED_DOUBLE, EO_OBJ(it));
2242 sd->mouse_down = EINA_TRUE; 2242 sd->mouse_down = EINA_TRUE;
2243 sd->long_press = EINA_FALSE; 2243 sd->long_press = EINA_FALSE;
2244 if (sd->long_timer) 2244 if (sd->long_timer)
diff --git a/src/lib/elementary/elm_toolbar.eo b/src/lib/elementary/elm_toolbar.eo
index ea23a5a7df..961ff4a23c 100644
--- a/src/lib/elementary/elm_toolbar.eo
+++ b/src/lib/elementary/elm_toolbar.eo
@@ -26,7 +26,7 @@ enum Elm.Toolbar.Shrink_Mode
26 26
27class Elm.Toolbar (Elm.Widget, Elm.Interface_Scrollable, Efl.Orientation, 27class Elm.Toolbar (Elm.Widget, Elm.Interface_Scrollable, Efl.Orientation,
28 Elm.Interface.Atspi_Widget_Action, Elm.Interface.Atspi.Selection, 28 Elm.Interface.Atspi_Widget_Action, Elm.Interface.Atspi.Selection,
29 Evas.Clickable_Interface, Evas.Selectable_Interface) 29 Efl.Ui.Clickable, Evas.Selectable_Interface)
30{ 30{
31 legacy_prefix: elm_toolbar; 31 legacy_prefix: elm_toolbar;
32 eo_prefix: elm_obj_toolbar; 32 eo_prefix: elm_obj_toolbar;
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index eff2dcbfe5..b4681af0e5 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -3,7 +3,7 @@
3#endif 3#endif
4 4
5#include "canvas/evas_draggable_interface.eo.h" 5#include "canvas/evas_draggable_interface.eo.h"
6#include "canvas/evas_clickable_interface.eo.h" 6#include "canvas/efl_ui_clickable.eo.h"
7#include "canvas/evas_scrollable_interface.eo.h" 7#include "canvas/evas_scrollable_interface.eo.h"
8#include "canvas/evas_selectable_interface.eo.h" 8#include "canvas/evas_selectable_interface.eo.h"
9#include "canvas/evas_zoomable_interface.eo.h" 9#include "canvas/evas_zoomable_interface.eo.h"
diff --git a/src/lib/evas/canvas/common_interfaces.c b/src/lib/evas/canvas/common_interfaces.c
index 0e1988781a..582a474671 100644
--- a/src/lib/evas/canvas/common_interfaces.c
+++ b/src/lib/evas/canvas/common_interfaces.c
@@ -1,14 +1,8 @@
1#include "evas_common_private.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3 3
4static const Eo_Event_Description *_evas_clickable_interface_event_desc[];
5static const Eo_Event_Description *_evas_draggable_interface_event_desc[];
6static const Eo_Event_Description *_evas_scrollable_interface_event_desc[];
7static const Eo_Event_Description *_evas_selectable_interface_event_desc[];
8static const Eo_Event_Description *_evas_zoomable_interface_event_desc[];
9
10#include "canvas/evas_draggable_interface.eo.c" 4#include "canvas/evas_draggable_interface.eo.c"
11#include "canvas/evas_clickable_interface.eo.c" 5#include "canvas/efl_ui_clickable.eo.c"
12#include "canvas/evas_scrollable_interface.eo.c" 6#include "canvas/evas_scrollable_interface.eo.c"
13#include "canvas/evas_selectable_interface.eo.c" 7#include "canvas/evas_selectable_interface.eo.c"
14#include "canvas/evas_zoomable_interface.eo.c" 8#include "canvas/evas_zoomable_interface.eo.c"
diff --git a/src/lib/evas/canvas/evas_clickable_interface.eo b/src/lib/evas/canvas/efl_ui_clickable.eo
index e89c373ca7..1d977012a6 100644
--- a/src/lib/evas/canvas/evas_clickable_interface.eo
+++ b/src/lib/evas/canvas/efl_ui_clickable.eo
@@ -1,5 +1,6 @@
1interface Evas.Clickable_Interface () 1interface Efl.Ui.Clickable ()
2{ 2{
3 event_prefix: efl_ui;
3 events { 4 events {
4 clicked; 5 clicked;
5 clicked,double; 6 clicked,double;
diff --git a/src/modules/elementary/datetime_input_ctxpopup/datetime_input_ctxpopup.c b/src/modules/elementary/datetime_input_ctxpopup/datetime_input_ctxpopup.c
index caff642b52..ae57d27696 100644
--- a/src/modules/elementary/datetime_input_ctxpopup/datetime_input_ctxpopup.c
+++ b/src/modules/elementary/datetime_input_ctxpopup/datetime_input_ctxpopup.c
@@ -159,7 +159,7 @@ _field_clicked_cb(void *data, const Eo_Event *event)
159 159
160 diskselector = elm_diskselector_add(elm_widget_top_get(ctx_mod->mod_data.base)); 160 diskselector = elm_diskselector_add(elm_widget_top_get(ctx_mod->mod_data.base));
161 eo_event_callback_add 161 eo_event_callback_add
162 (diskselector, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _diskselector_cb, NULL); 162 (diskselector, EFL_UI_EVENT_CLICKED, _diskselector_cb, NULL);
163 elm_object_style_set(diskselector, buf); 163 elm_object_style_set(diskselector, buf);
164 elm_object_content_set(ctx_mod->ctxpopup, diskselector); 164 elm_object_content_set(ctx_mod->ctxpopup, diskselector);
165 165
@@ -310,7 +310,7 @@ field_create(Elm_Datetime_Module_Data *module_data, Elm_Datetime_Field_Type fie
310 { 310 {
311 field_obj = elm_button_add(ctx_mod->mod_data.base); 311 field_obj = elm_button_add(ctx_mod->mod_data.base);
312 eo_event_callback_add 312 eo_event_callback_add
313 (field_obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _ampm_clicked_cb, ctx_mod); 313 (field_obj, EFL_UI_EVENT_CLICKED, _ampm_clicked_cb, ctx_mod);
314 } 314 }
315 else 315 else
316 { 316 {
@@ -320,7 +320,7 @@ field_create(Elm_Datetime_Module_Data *module_data, Elm_Datetime_Field_Type fie
320 elm_entry_input_panel_enabled_set(field_obj, EINA_FALSE); 320 elm_entry_input_panel_enabled_set(field_obj, EINA_FALSE);
321 elm_entry_context_menu_disabled_set(field_obj, EINA_TRUE); 321 elm_entry_context_menu_disabled_set(field_obj, EINA_TRUE);
322 eo_event_callback_add 322 eo_event_callback_add
323 (field_obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _field_clicked_cb, ctx_mod); 323 (field_obj, EFL_UI_EVENT_CLICKED, _field_clicked_cb, ctx_mod);
324 } 324 }
325 evas_object_data_set(field_obj, "_field_type", (void *)field_type); 325 evas_object_data_set(field_obj, "_field_type", (void *)field_type);
326 326
diff --git a/src/modules/elementary/prefs/elm_button.c b/src/modules/elementary/prefs/elm_button.c
index 8922c5743a..4c6af6a562 100644
--- a/src/modules/elementary/prefs/elm_button.c
+++ b/src/modules/elementary/prefs/elm_button.c
@@ -27,7 +27,7 @@ elm_prefs_button_add(const Elm_Prefs_Item_Iface *iface EINA_UNUSED,
27 Evas_Object *obj = elm_button_add(prefs); 27 Evas_Object *obj = elm_button_add(prefs);
28 28
29 eo_event_callback_add 29 eo_event_callback_add
30 (obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _item_changed_cb, cb); 30 (obj, EFL_UI_EVENT_CLICKED, _item_changed_cb, cb);
31 31
32 return obj; 32 return obj;
33} 33}