summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorWooHyun Jung <wh0705.jung@samsung.com>2019-07-29 11:42:34 +0200
committerXavi Artigas <xavierartigas@yahoo.es>2019-07-29 11:43:01 +0200
commit77e268e6aba2d07b9d4b06c83515041775210c27 (patch)
treef50da1eada65a948147a62ede0cc815e66105784 /src/lib
parent9b294d6284fbda62dde20bcb31732a1c63a65962 (diff)
efl_input_clickable: rename efl_ui_clickable to efl_input_clickable
Summary: Renamed all efl_ui_clickable_XXX to efl_input_clickable_XXX based on the discussion in T7847 ref T7847 T7976 Reviewers: zmike, bu5hm4n, segfaultxavi Reviewed By: segfaultxavi Subscribers: cedric, #reviewers, #committers Tags: #efl Maniphest Tasks: T7976, T7847 Differential Revision: https://phab.enlightenment.org/D9427
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/elementary/Efl_Ui.h1
-rw-r--r--src/lib/elementary/Elementary.h1
-rw-r--r--src/lib/elementary/efl_ui_alert_popup.c6
-rw-r--r--src/lib/elementary/efl_ui_button.c10
-rw-r--r--src/lib/elementary/efl_ui_button.eo2
-rw-r--r--src/lib/elementary/efl_ui_calendar.c2
-rw-r--r--src/lib/elementary/efl_ui_clickable_util.c24
-rw-r--r--src/lib/elementary/efl_ui_clickable_util.eo12
-rw-r--r--src/lib/elementary/efl_ui_collection.c20
-rw-r--r--src/lib/elementary/efl_ui_frame.c4
-rw-r--r--src/lib/elementary/efl_ui_frame.eo2
-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/efl_ui_image_zoomable.c2
-rw-r--r--src/lib/elementary/efl_ui_item.c8
-rw-r--r--src/lib/elementary/efl_ui_item.eo2
-rw-r--r--src/lib/elementary/efl_ui_navigation_bar.c6
-rw-r--r--src/lib/elementary/efl_ui_panes.c6
-rw-r--r--src/lib/elementary/efl_ui_panes.eo2
-rw-r--r--src/lib/elementary/efl_ui_spin_button.c2
-rw-r--r--src/lib/elementary/efl_ui_tags.c4
-rw-r--r--src/lib/elementary/efl_ui_text.c6
-rw-r--r--src/lib/elementary/efl_ui_text.eo2
-rw-r--r--src/lib/elementary/efl_ui_timepicker.c2
-rw-r--r--src/lib/elementary/elc_multibuttonentry.c2
-rw-r--r--src/lib/elementary/elc_naviframe.c2
-rw-r--r--src/lib/elementary/elm_bubble_eo.c2
-rw-r--r--src/lib/elementary/elm_calendar.c6
-rw-r--r--src/lib/elementary/elm_color_class.c2
-rw-r--r--src/lib/elementary/elm_colorselector.c4
-rw-r--r--src/lib/elementary/elm_colorselector_eo.c2
-rw-r--r--src/lib/elementary/elm_diskselector_eo.c2
-rw-r--r--src/lib/elementary/elm_entry.c2
-rw-r--r--src/lib/elementary/elm_entry_eo.c2
-rw-r--r--src/lib/elementary/elm_fileselector_entry_eo.c2
-rw-r--r--src/lib/elementary/elm_fileselector_eo.c2
-rw-r--r--src/lib/elementary/elm_gengrid_eo.c2
-rw-r--r--src/lib/elementary/elm_genlist_eo.c2
-rw-r--r--src/lib/elementary/elm_hover_eo.c2
-rw-r--r--src/lib/elementary/elm_hoversel_eo.c2
-rw-r--r--src/lib/elementary/elm_index_eo.c2
-rw-r--r--src/lib/elementary/elm_list_eo.c2
-rw-r--r--src/lib/elementary/elm_map_eo.c2
-rw-r--r--src/lib/elementary/elm_menu.c4
-rw-r--r--src/lib/elementary/elm_menu_eo.c2
-rw-r--r--src/lib/elementary/elm_multibuttonentry_eo.c2
-rw-r--r--src/lib/elementary/elm_photo_eo.c2
-rw-r--r--src/lib/elementary/elm_plug_eo.c2
-rw-r--r--src/lib/elementary/elm_spinner.c8
-rw-r--r--src/lib/elementary/elm_thumb_eo.c2
-rw-r--r--src/lib/elementary/elm_toolbar_eo.c2
-rw-r--r--src/lib/elementary/meson.build2
-rw-r--r--src/lib/evas/Evas_Eo.h1
-rw-r--r--src/lib/evas/canvas/efl_input_clickable.c (renamed from src/lib/elementary/efl_ui_clickable.c)33
-rw-r--r--src/lib/evas/canvas/efl_input_clickable.eo (renamed from src/lib/elementary/efl_ui_clickable.eo)12
-rw-r--r--src/lib/evas/canvas/meson.build2
56 files changed, 125 insertions, 125 deletions
diff --git a/src/lib/elementary/Efl_Ui.h b/src/lib/elementary/Efl_Ui.h
index e390b89efe..8ccc063dea 100644
--- a/src/lib/elementary/Efl_Ui.h
+++ b/src/lib/elementary/Efl_Ui.h
@@ -246,7 +246,6 @@ typedef Eo Efl_Ui_Spotlight_Indicator;
246# include <efl_ui_navigation_bar_part.eo.h> 246# include <efl_ui_navigation_bar_part.eo.h>
247# include <efl_ui_navigation_bar_part_back_button.eo.h> 247# include <efl_ui_navigation_bar_part_back_button.eo.h>
248# include <efl_ui_navigation_layout.eo.h> 248# include <efl_ui_navigation_layout.eo.h>
249# include <efl_ui_clickable.eo.h>
250# include <efl_ui_clickable_util.eo.h> 249# include <efl_ui_clickable_util.eo.h>
251# include <efl_ui_format.eo.h> 250# include <efl_ui_format.eo.h>
252# include <efl_ui_spin.eo.h> 251# include <efl_ui_spin.eo.h>
diff --git a/src/lib/elementary/Elementary.h b/src/lib/elementary/Elementary.h
index bdc128a2b8..1e273b3d95 100644
--- a/src/lib/elementary/Elementary.h
+++ b/src/lib/elementary/Elementary.h
@@ -169,7 +169,6 @@ typedef Eo Efl_Ui_Focus_Manager;
169#ifdef EFL_BETA_API_SUPPORT 169#ifdef EFL_BETA_API_SUPPORT
170# include <elm_interface_scrollable.h> 170# include <elm_interface_scrollable.h>
171# include <elm_interface_scrollable.eo.h> 171# include <elm_interface_scrollable.eo.h>
172#include <efl_ui_clickable.eo.h>
173#endif 172#endif
174 173
175#include <elm_tooltip.h> 174#include <elm_tooltip.h>
diff --git a/src/lib/elementary/efl_ui_alert_popup.c b/src/lib/elementary/efl_ui_alert_popup.c
index e7eac4a955..b80e6e6388 100644
--- a/src/lib/elementary/efl_ui_alert_popup.c
+++ b/src/lib/elementary/efl_ui_alert_popup.c
@@ -154,15 +154,15 @@ _efl_ui_alert_popup_button_set(Eo *obj, Efl_Ui_Alert_Popup_Data *pd, Efl_Ui_Aler
154 switch (type) 154 switch (type)
155 { 155 {
156 case EFL_UI_ALERT_POPUP_BUTTON_POSITIVE: 156 case EFL_UI_ALERT_POPUP_BUTTON_POSITIVE:
157 efl_event_callback_add(pd->button[type], EFL_UI_EVENT_CLICKED, 157 efl_event_callback_add(pd->button[type], EFL_INPUT_EVENT_CLICKED,
158 _positive_button_clicked_cb, obj); 158 _positive_button_clicked_cb, obj);
159 break; 159 break;
160 case EFL_UI_ALERT_POPUP_BUTTON_NEGATIVE: 160 case EFL_UI_ALERT_POPUP_BUTTON_NEGATIVE:
161 efl_event_callback_add(pd->button[type], EFL_UI_EVENT_CLICKED, 161 efl_event_callback_add(pd->button[type], EFL_INPUT_EVENT_CLICKED,
162 _negative_button_clicked_cb, obj); 162 _negative_button_clicked_cb, obj);
163 break; 163 break;
164 case EFL_UI_ALERT_POPUP_BUTTON_USER: 164 case EFL_UI_ALERT_POPUP_BUTTON_USER:
165 efl_event_callback_add(pd->button[type], EFL_UI_EVENT_CLICKED, 165 efl_event_callback_add(pd->button[type], EFL_INPUT_EVENT_CLICKED,
166 _user_button_clicked_cb, obj); 166 _user_button_clicked_cb, obj);
167 break; 167 break;
168 default: 168 default:
diff --git a/src/lib/elementary/efl_ui_button.c b/src/lib/elementary/efl_ui_button.c
index 6694a91f4a..834e00f43d 100644
--- a/src/lib/elementary/efl_ui_button.c
+++ b/src/lib/elementary/efl_ui_button.c
@@ -6,7 +6,7 @@
6#define EFL_ACCESS_OBJECT_PROTECTED 6#define EFL_ACCESS_OBJECT_PROTECTED
7#define ELM_LAYOUT_PROTECTED 7#define ELM_LAYOUT_PROTECTED
8#define EFL_PART_PROTECTED 8#define EFL_PART_PROTECTED
9#define EFL_UI_CLICKABLE_PROTECTED 9#define EFL_INPUT_CLICKABLE_PROTECTED
10 10
11#include <Elementary.h> 11#include <Elementary.h>
12#include "elm_priv.h" 12#include "elm_priv.h"
@@ -77,8 +77,8 @@ _activate(Evas_Object *obj)
77 evas_object_smart_callback_call(obj, "clicked", NULL); 77 evas_object_smart_callback_call(obj, "clicked", NULL);
78 else 78 else
79 { 79 {
80 efl_ui_clickable_press(obj, 1); 80 efl_input_clickable_press(obj, 1);
81 efl_ui_clickable_unpress(obj, 1); 81 efl_input_clickable_unpress(obj, 1);
82 } 82 }
83 } 83 }
84 } 84 }
@@ -107,8 +107,8 @@ _efl_ui_button_efl_ui_widget_on_access_activate(Eo *obj, Efl_Ui_Button_Data *_pd
107 evas_object_smart_callback_call(obj, "clicked", NULL); 107 evas_object_smart_callback_call(obj, "clicked", NULL);
108 else 108 else
109 { 109 {
110 efl_ui_clickable_press(obj, 1); 110 efl_input_clickable_press(obj, 1);
111 efl_ui_clickable_unpress(obj, 1); 111 efl_input_clickable_unpress(obj, 1);
112 } 112 }
113 113
114 if (elm_widget_is_legacy(obj)) 114 if (elm_widget_is_legacy(obj))
diff --git a/src/lib/elementary/efl_ui_button.eo b/src/lib/elementary/efl_ui_button.eo
index 449d501276..794ed9b04a 100644
--- a/src/lib/elementary/efl_ui_button.eo
+++ b/src/lib/elementary/efl_ui_button.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Button extends Efl.Ui.Layout_Base implements Efl.Ui.Clickable, Efl.Ui.Autorepeat, 1class Efl.Ui.Button extends Efl.Ui.Layout_Base implements Efl.Input.Clickable, Efl.Ui.Autorepeat,
2 Efl.Text, Efl.Content, 2 Efl.Text, Efl.Content,
3 Efl.Access.Widget.Action 3 Efl.Access.Widget.Action
4{ 4{
diff --git a/src/lib/elementary/efl_ui_calendar.c b/src/lib/elementary/efl_ui_calendar.c
index 7fb174273f..d905324c82 100644
--- a/src/lib/elementary/efl_ui_calendar.c
+++ b/src/lib/elementary/efl_ui_calendar.c
@@ -441,7 +441,7 @@ _btn_create(Eo *obj, const char *style, char *part)
441 efl_ui_autorepeat_enabled_set(efl_added, EINA_TRUE), 441 efl_ui_autorepeat_enabled_set(efl_added, EINA_TRUE),
442 efl_ui_autorepeat_initial_timeout_set(efl_added, FIRST_INTERVAL), 442 efl_ui_autorepeat_initial_timeout_set(efl_added, FIRST_INTERVAL),
443 efl_ui_autorepeat_gap_timeout_set(efl_added, INTERVAL), 443 efl_ui_autorepeat_gap_timeout_set(efl_added, INTERVAL),
444 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, 444 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
445 _inc_dec_btn_clicked_cb, obj), 445 _inc_dec_btn_clicked_cb, obj),
446 efl_event_callback_add(efl_added, EFL_UI_AUTOREPEAT_EVENT_REPEATED, 446 efl_event_callback_add(efl_added, EFL_UI_AUTOREPEAT_EVENT_REPEATED,
447 _inc_dec_btn_repeated_cb, obj), 447 _inc_dec_btn_repeated_cb, obj),
diff --git a/src/lib/elementary/efl_ui_clickable_util.c b/src/lib/elementary/efl_ui_clickable_util.c
index 3243b725bb..50251c48fd 100644
--- a/src/lib/elementary/efl_ui_clickable_util.c
+++ b/src/lib/elementary/efl_ui_clickable_util.c
@@ -2,7 +2,7 @@
2# include <config.h> 2# include <config.h>
3#endif 3#endif
4 4
5#define EFL_UI_CLICKABLE_PROTECTED 1 5#define EFL_INPUT_CLICKABLE_PROTECTED 1
6 6
7#include <Efl_Ui.h> 7#include <Efl_Ui.h>
8#include "elm_priv.h" 8#include "elm_priv.h"
@@ -17,7 +17,7 @@ _on_press_cb(void *data,
17 const char *emission EINA_UNUSED, 17 const char *emission EINA_UNUSED,
18 const char *source EINA_UNUSED) 18 const char *source EINA_UNUSED)
19{ 19{
20 efl_ui_clickable_press(data, 1); 20 efl_input_clickable_press(data, 1);
21} 21}
22 22
23static void 23static void
@@ -26,7 +26,7 @@ _on_unpress_cb(void *data,
26 const char *emission EINA_UNUSED, 26 const char *emission EINA_UNUSED,
27 const char *source EINA_UNUSED) 27 const char *source EINA_UNUSED)
28{ 28{
29 efl_ui_clickable_unpress(data, 1); 29 efl_input_clickable_unpress(data, 1);
30} 30}
31 31
32static void 32static void
@@ -35,7 +35,7 @@ _on_mouse_out(void *data,
35 const char *emission EINA_UNUSED, 35 const char *emission EINA_UNUSED,
36 const char *source EINA_UNUSED) 36 const char *source EINA_UNUSED)
37{ 37{
38 efl_ui_clickable_button_state_reset(data, 1); 38 efl_input_clickable_button_state_reset(data, 1);
39} 39}
40 40
41static void 41static void
@@ -44,7 +44,7 @@ _theme_move_cb(void *data, const Efl_Event *ev EINA_UNUSED)
44 Efl_Input_Pointer *pointer = ev->info; 44 Efl_Input_Pointer *pointer = ev->info;
45 45
46 if (efl_input_processed_get(pointer)) 46 if (efl_input_processed_get(pointer))
47 efl_ui_clickable_button_state_reset(data, 1); 47 efl_input_clickable_button_state_reset(data, 1);
48} 48}
49 49
50EFL_CALLBACKS_ARRAY_DEFINE(bind_to_theme_callbacks, 50EFL_CALLBACKS_ARRAY_DEFINE(bind_to_theme_callbacks,
@@ -52,7 +52,7 @@ EFL_CALLBACKS_ARRAY_DEFINE(bind_to_theme_callbacks,
52) 52)
53 53
54EOLIAN static void 54EOLIAN static void
55_efl_ui_clickable_util_bind_to_theme(Efl_Canvas_Layout *object, Efl_Ui_Clickable *clickable) 55_efl_ui_clickable_util_bind_to_theme(Efl_Canvas_Layout *object, Efl_Input_Clickable *clickable)
56{ 56{
57 efl_event_callback_array_add(object, bind_to_theme_callbacks(), clickable); 57 efl_event_callback_array_add(object, bind_to_theme_callbacks(), clickable);
58 58
@@ -67,7 +67,7 @@ _press_cb(void *data, const Efl_Event *ev)
67 Efl_Input_Pointer *pointer = ev->info; 67 Efl_Input_Pointer *pointer = ev->info;
68 if (!efl_input_processed_get(pointer)) 68 if (!efl_input_processed_get(pointer))
69 { 69 {
70 efl_ui_clickable_press(data, 1); 70 efl_input_clickable_press(data, 1);
71 efl_input_processed_set(pointer, EINA_TRUE); 71 efl_input_processed_set(pointer, EINA_TRUE);
72 } 72 }
73} 73}
@@ -80,21 +80,21 @@ _unpress_cb(void *data, const Efl_Event *ev EINA_UNUSED)
80 Eina_Rect geom = efl_gfx_entity_geometry_get(data); 80 Eina_Rect geom = efl_gfx_entity_geometry_get(data);
81 if (efl_input_processed_get(pointer)) 81 if (efl_input_processed_get(pointer))
82 { 82 {
83 efl_ui_clickable_button_state_reset(data, 1); 83 efl_input_clickable_button_state_reset(data, 1);
84 } 84 }
85 else if (!eina_rectangle_coords_inside(&geom.rect, mouse_pos.x, mouse_pos.y)) 85 else if (!eina_rectangle_coords_inside(&geom.rect, mouse_pos.x, mouse_pos.y))
86 { 86 {
87 //we are emulating edje behavior here, do press unpress on the event, but not click 87 //we are emulating edje behavior here, do press unpress on the event, but not click
88 efl_ui_clickable_button_state_reset(data, 1); 88 efl_input_clickable_button_state_reset(data, 1);
89 if (efl_canvas_object_pointer_mode_get(data) == EFL_INPUT_OBJECT_POINTER_MODE_AUTO_GRAB) 89 if (efl_canvas_object_pointer_mode_get(data) == EFL_INPUT_OBJECT_POINTER_MODE_AUTO_GRAB)
90 { 90 {
91 efl_ui_clickable_unpress(data, 1); 91 efl_input_clickable_unpress(data, 1);
92 efl_input_processed_set(pointer, EINA_TRUE); 92 efl_input_processed_set(pointer, EINA_TRUE);
93 } 93 }
94 } 94 }
95 else 95 else
96 { 96 {
97 efl_ui_clickable_unpress(data, 1); 97 efl_input_clickable_unpress(data, 1);
98 efl_input_processed_set(pointer, EINA_TRUE); 98 efl_input_processed_set(pointer, EINA_TRUE);
99 } 99 }
100} 100}
@@ -105,7 +105,7 @@ EFL_CALLBACKS_ARRAY_DEFINE(bind_to_object_callbacks,
105) 105)
106 106
107EOLIAN static void 107EOLIAN static void
108_efl_ui_clickable_util_bind_to_object(Efl_Input_Interface *object, Efl_Ui_Clickable *clickable) 108_efl_ui_clickable_util_bind_to_object(Efl_Input_Interface *object, Efl_Input_Clickable *clickable)
109{ 109{
110 efl_event_callback_array_add(object, bind_to_object_callbacks(), clickable); 110 efl_event_callback_array_add(object, bind_to_object_callbacks(), clickable);
111} 111}
diff --git a/src/lib/elementary/efl_ui_clickable_util.eo b/src/lib/elementary/efl_ui_clickable_util.eo
index d086c24581..5db5e67a5c 100644
--- a/src/lib/elementary/efl_ui_clickable_util.eo
+++ b/src/lib/elementary/efl_ui_clickable_util.eo
@@ -1,12 +1,12 @@
1class @beta Efl.Ui.Clickable_Util { 1class @beta Efl.Ui.Clickable_Util {
2 [[Helper class that connects theme signals or object events to the @Efl.Ui.Clickable interface. 2 [[Helper class that connects theme signals or object events to the @Efl.Input.Clickable interface.
3 3
4 This simplifies creating widgets that implement the @Efl.Ui.Clickable interface. 4 This simplifies creating widgets that implement the @Efl.Input.Clickable interface.
5 ]] 5 ]]
6 methods { 6 methods {
7 bind_to_theme @class { 7 bind_to_theme @class {
8 [[This will listen to the standard "click" events on a theme and emit the appropriate 8 [[This will listen to the standard "click" events on a theme and emit the appropriate
9 events through the @Efl.Ui.Clickable interface. 9 events through the @Efl.Input.Clickable interface.
10 10
11 Using these methods widgets do not need to listen to the theme signals. This class 11 Using these methods widgets do not need to listen to the theme signals. This class
12 does it and calls the correct clickable functions. 12 does it and calls the correct clickable functions.
@@ -16,12 +16,12 @@ class @beta Efl.Ui.Clickable_Util {
16 ]] 16 ]]
17 params { 17 params {
18 object : Efl.Canvas.Layout; [[The object to listen on.]] 18 object : Efl.Canvas.Layout; [[The object to listen on.]]
19 clickable : Efl.Ui.Clickable; [[The object to call the clickable methods on.]] 19 clickable : Efl.Input.Clickable; [[The object to call the clickable methods on.]]
20 } 20 }
21 } 21 }
22 bind_to_object @class { 22 bind_to_object @class {
23 [[This will listen to the standard "click" events on an object, and emit the appropriate 23 [[This will listen to the standard "click" events on an object, and emit the appropriate
24 events through the @Efl.Ui.Clickable interface. 24 events through the @Efl.Input.Clickable interface.
25 25
26 Using these methods widgets do not need to listen to the object events. This class 26 Using these methods widgets do not need to listen to the object events. This class
27 does it and calls the correct clickable functions. 27 does it and calls the correct clickable functions.
@@ -30,7 +30,7 @@ class @beta Efl.Ui.Clickable_Util {
30 ]] 30 ]]
31 params { 31 params {
32 object : Efl.Input.Interface; [[The object to listen on.]] 32 object : Efl.Input.Interface; [[The object to listen on.]]
33 clickable : Efl.Ui.Clickable; [[The object to call the clickable methods on.]] 33 clickable : Efl.Input.Clickable; [[The object to call the clickable methods on.]]
34 } 34 }
35 } 35 }
36 } 36 }
diff --git a/src/lib/elementary/efl_ui_collection.c b/src/lib/elementary/efl_ui_collection.c
index 564bb108e0..b12712b139 100644
--- a/src/lib/elementary/efl_ui_collection.c
+++ b/src/lib/elementary/efl_ui_collection.c
@@ -517,11 +517,11 @@ _redirect_cb(void *data, const Efl_Event *ev)
517 517
518#define REDIRECT_EVT(item_evt, item) \ 518#define REDIRECT_EVT(item_evt, item) \
519 if (item_evt == ev->desc) efl_event_callback_call(obj, item, ev->object); 519 if (item_evt == ev->desc) efl_event_callback_call(obj, item, ev->object);
520 REDIRECT_EVT(EFL_UI_EVENT_PRESSED, EFL_UI_EVENT_ITEM_PRESSED); 520 REDIRECT_EVT(EFL_INPUT_EVENT_PRESSED, EFL_UI_EVENT_ITEM_PRESSED);
521 REDIRECT_EVT(EFL_UI_EVENT_UNPRESSED, EFL_UI_EVENT_ITEM_UNPRESSED); 521 REDIRECT_EVT(EFL_INPUT_EVENT_UNPRESSED, EFL_UI_EVENT_ITEM_UNPRESSED);
522 REDIRECT_EVT(EFL_UI_EVENT_LONGPRESSED, EFL_UI_EVENT_ITEM_LONGPRESSED); 522 REDIRECT_EVT(EFL_INPUT_EVENT_LONGPRESSED, EFL_UI_EVENT_ITEM_LONGPRESSED);
523 REDIRECT_EVT(EFL_UI_EVENT_CLICKED_ANY, EFL_UI_EVENT_ITEM_CLICKED_ANY); 523 REDIRECT_EVT(EFL_INPUT_EVENT_CLICKED_ANY, EFL_UI_EVENT_ITEM_CLICKED_ANY);
524 REDIRECT_EVT(EFL_UI_EVENT_CLICKED, EFL_UI_EVENT_ITEM_CLICKED); 524 REDIRECT_EVT(EFL_INPUT_EVENT_CLICKED, EFL_UI_EVENT_ITEM_CLICKED);
525#undef REDIRECT_EVT 525#undef REDIRECT_EVT
526} 526}
527 527
@@ -529,11 +529,11 @@ EFL_CALLBACKS_ARRAY_DEFINE(active_item,
529 {EFL_GFX_ENTITY_EVENT_HINTS_CHANGED, _hints_changed_cb}, 529 {EFL_GFX_ENTITY_EVENT_HINTS_CHANGED, _hints_changed_cb},
530 {EFL_UI_EVENT_ITEM_SELECTED, _selected_cb}, 530 {EFL_UI_EVENT_ITEM_SELECTED, _selected_cb},
531 {EFL_UI_EVENT_ITEM_UNSELECTED, _unselected_cb}, 531 {EFL_UI_EVENT_ITEM_UNSELECTED, _unselected_cb},
532 {EFL_UI_EVENT_PRESSED, _redirect_cb}, 532 {EFL_INPUT_EVENT_PRESSED, _redirect_cb},
533 {EFL_UI_EVENT_UNPRESSED, _redirect_cb}, 533 {EFL_INPUT_EVENT_UNPRESSED, _redirect_cb},
534 {EFL_UI_EVENT_LONGPRESSED, _redirect_cb}, 534 {EFL_INPUT_EVENT_LONGPRESSED, _redirect_cb},
535 {EFL_UI_EVENT_CLICKED, _redirect_cb}, 535 {EFL_INPUT_EVENT_CLICKED, _redirect_cb},
536 {EFL_UI_EVENT_CLICKED_ANY, _redirect_cb}, 536 {EFL_INPUT_EVENT_CLICKED_ANY, _redirect_cb},
537 {EFL_EVENT_INVALIDATE, _invalidate_cb}, 537 {EFL_EVENT_INVALIDATE, _invalidate_cb},
538) 538)
539 539
diff --git a/src/lib/elementary/efl_ui_frame.c b/src/lib/elementary/efl_ui_frame.c
index fd9420d6b7..a47a8669dd 100644
--- a/src/lib/elementary/efl_ui_frame.c
+++ b/src/lib/elementary/efl_ui_frame.c
@@ -5,7 +5,7 @@
5#define EFL_ACCESS_OBJECT_PROTECTED 5#define EFL_ACCESS_OBJECT_PROTECTED
6#define ELM_LAYOUT_PROTECTED 6#define ELM_LAYOUT_PROTECTED
7#define EFL_PART_PROTECTED 7#define EFL_PART_PROTECTED
8#define EFL_UI_CLICKABLE_PROTECTED 8#define EFL_INPUT_CLICKABLE_PROTECTED
9 9
10#include <Elementary.h> 10#include <Elementary.h>
11#include "elm_priv.h" 11#include "elm_priv.h"
@@ -148,7 +148,7 @@ _efl_ui_frame_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Frame_Data *_pd EINA_UN
148 (wd->resize_obj, "efl,anim,done", "efl", 148 (wd->resize_obj, "efl,anim,done", "efl",
149 _on_recalc_done, obj); 149 _on_recalc_done, obj);
150 efl_ui_clickable_util_bind_to_theme(wd->resize_obj, obj); 150 efl_ui_clickable_util_bind_to_theme(wd->resize_obj, obj);
151 efl_event_callback_add(obj, EFL_UI_EVENT_CLICKED, _clicked_cb, obj); 151 efl_event_callback_add(obj, EFL_INPUT_EVENT_CLICKED, _clicked_cb, obj);
152 } 152 }
153 153
154 elm_widget_can_focus_set(obj, EINA_FALSE); 154 elm_widget_can_focus_set(obj, EINA_FALSE);
diff --git a/src/lib/elementary/efl_ui_frame.eo b/src/lib/elementary/efl_ui_frame.eo
index 509bd02df0..31849f95d7 100644
--- a/src/lib/elementary/efl_ui_frame.eo
+++ b/src/lib/elementary/efl_ui_frame.eo
@@ -1,4 +1,4 @@
1class @beta Efl.Ui.Frame extends Efl.Ui.Layout_Base implements Efl.Ui.Clickable, Efl.Text, Efl.Text_Markup, 1class @beta Efl.Ui.Frame extends Efl.Ui.Layout_Base implements Efl.Input.Clickable, Efl.Text, Efl.Text_Markup,
2 Efl.Content 2 Efl.Content
3{ 3{
4 [[Frame widget 4 [[Frame widget
diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c
index dea9ec1b00..4f79fb0c2d 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -7,7 +7,7 @@
7#define EFL_ACCESS_COMPONENT_PROTECTED 7#define EFL_ACCESS_COMPONENT_PROTECTED
8#define EFL_ACCESS_WIDGET_ACTION_PROTECTED 8#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
9#define EFL_LAYOUT_CALC_PROTECTED 9#define EFL_LAYOUT_CALC_PROTECTED
10#define EFL_UI_CLICKABLE_PROTECTED 10#define EFL_INPUT_CLICKABLE_PROTECTED
11 11
12#include <Elementary.h> 12#include <Elementary.h>
13 13
@@ -747,7 +747,7 @@ _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
747 if (elm_widget_is_legacy(obj)) 747 if (elm_widget_is_legacy(obj))
748 evas_object_smart_callback_call(obj, "clicked", NULL); 748 evas_object_smart_callback_call(obj, "clicked", NULL);
749 else 749 else
750 efl_event_callback_call(obj, EFL_UI_EVENT_CLICKED, NULL); 750 efl_event_callback_call(obj, EFL_INPUT_EVENT_CLICKED, NULL);
751 return EINA_TRUE; 751 return EINA_TRUE;
752} 752}
753 753
diff --git a/src/lib/elementary/efl_ui_image.eo b/src/lib/elementary/efl_ui_image.eo
index 728a6c4cb0..f756d179bd 100644
--- a/src/lib/elementary/efl_ui_image.eo
+++ b/src/lib/elementary/efl_ui_image.eo
@@ -16,7 +16,7 @@ struct @beta Efl.Ui.Image_Error
16 open_error: bool; [[$true if the error happened when opening the file, $false otherwise]] 16 open_error: bool; [[$true if the error happened when opening the file, $false otherwise]]
17} 17}
18 18
19class @beta Efl.Ui.Image extends Efl.Ui.Widget implements Efl.Ui.Clickable, Efl.Ui.Draggable, 19class @beta Efl.Ui.Image extends Efl.Ui.Widget implements Efl.Input.Clickable, Efl.Ui.Draggable,
20 Efl.File, Efl.Gfx.Image, Efl.Gfx.Image_Load_Controller, Efl.Player, Efl.Gfx.View, 20 Efl.File, Efl.Gfx.Image, Efl.Gfx.Image_Load_Controller, Efl.Player, Efl.Gfx.View,
21 Efl.Access.Component, Efl.Access.Widget.Action, Efl.Gfx.Color, 21 Efl.Access.Component, Efl.Access.Widget.Action, Efl.Gfx.Color,
22 Efl.Gfx.Image_Orientable, 22 Efl.Gfx.Image_Orientable,
diff --git a/src/lib/elementary/efl_ui_image_zoomable.c b/src/lib/elementary/efl_ui_image_zoomable.c
index 9d834afad2..bc64ecb9eb 100644
--- a/src/lib/elementary/efl_ui_image_zoomable.c
+++ b/src/lib/elementary/efl_ui_image_zoomable.c
@@ -6,7 +6,7 @@
6#define EFL_ACCESS_WIDGET_ACTION_PROTECTED 6#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
7#define EFL_UI_SCROLL_MANAGER_PROTECTED 7#define EFL_UI_SCROLL_MANAGER_PROTECTED
8#define EFL_UI_SCROLLBAR_PROTECTED 8#define EFL_UI_SCROLLBAR_PROTECTED
9#define EFL_UI_CLICKABLE_PROTECTED 9#define EFL_INPUT_CLICKABLE_PROTECTED
10 10
11#include <Elementary.h> 11#include <Elementary.h>
12 12
diff --git a/src/lib/elementary/efl_ui_item.c b/src/lib/elementary/efl_ui_item.c
index 432486bd69..5119568773 100644
--- a/src/lib/elementary/efl_ui_item.c
+++ b/src/lib/elementary/efl_ui_item.c
@@ -175,7 +175,7 @@ _item_longpressed(void *data)
175 175
176 pd->longpress_timer = NULL; 176 pd->longpress_timer = NULL;
177 177
178 efl_event_callback_call(item, EFL_UI_EVENT_LONGPRESSED, NULL); 178 efl_event_callback_call(item, EFL_INPUT_EVENT_LONGPRESSED, NULL);
179 return ECORE_CALLBACK_CANCEL; 179 return ECORE_CALLBACK_CANCEL;
180} 180}
181 181
@@ -195,7 +195,7 @@ _item_mouse_down(void *data,
195 edje_object_signal_emit(wd->resize_obj, "efl,state,pressed", "efl"); 195 edje_object_signal_emit(wd->resize_obj, "efl,state,pressed", "efl");
196 196
197 pd->longpress_timer = ecore_timer_add(_elm_config->longpress_timeout, _item_longpressed, item); 197 pd->longpress_timer = ecore_timer_add(_elm_config->longpress_timeout, _item_longpressed, item);
198 efl_event_callback_call(item, EFL_UI_EVENT_PRESSED, NULL); 198 efl_event_callback_call(item, EFL_INPUT_EVENT_PRESSED, NULL);
199} 199}
200 200
201static void 201static void
@@ -217,7 +217,7 @@ _item_mouse_up(void *data,
217 { 217 {
218 //FIXME: should we send this message to fallback? 218 //FIXME: should we send this message to fallback?
219 edje_object_signal_emit(wd->resize_obj, "efl,state,unpressed", "efl"); 219 edje_object_signal_emit(wd->resize_obj, "efl,state,unpressed", "efl");
220 //efl_event_callback_call(item, EFL_UI_EVENT_UNPRESSED, NULL); 220 //efl_event_callback_call(item, EFL_INPUT_EVENT_UNPRESSED, NULL);
221 return; 221 return;
222 } 222 }
223 223
@@ -228,7 +228,7 @@ _item_mouse_up(void *data,
228 } 228 }
229 229
230 edje_object_signal_emit(wd->resize_obj, "efl,state,unpressed", "efl"); 230 edje_object_signal_emit(wd->resize_obj, "efl,state,unpressed", "efl");
231 efl_event_callback_call(item, EFL_UI_EVENT_UNPRESSED, NULL); 231 efl_event_callback_call(item, EFL_INPUT_EVENT_UNPRESSED, NULL);
232 232
233 m = efl_ui_select_mode_get(efl_ui_item_container_get(item)); 233 m = efl_ui_select_mode_get(efl_ui_item_container_get(item));
234 if ((m != EFL_UI_SELECT_MODE_SINGLE_ALWAYS) && (pd->selected)) 234 if ((m != EFL_UI_SELECT_MODE_SINGLE_ALWAYS) && (pd->selected))
diff --git a/src/lib/elementary/efl_ui_item.eo b/src/lib/elementary/efl_ui_item.eo
index 9ece7e4c0c..a97ec30568 100644
--- a/src/lib/elementary/efl_ui_item.eo
+++ b/src/lib/elementary/efl_ui_item.eo
@@ -1,4 +1,4 @@
1abstract @beta Efl.Ui.Item extends Efl.Ui.Layout_Base implements Efl.Ui.Selectable, Efl.Ui.Clickable 1abstract @beta Efl.Ui.Item extends Efl.Ui.Layout_Base implements Efl.Ui.Selectable, Efl.Input.Clickable
2{ 2{
3 [[Item abstract class for pack widget. All item have to be inherited from this class.]] 3 [[Item abstract class for pack widget. All item have to be inherited from this class.]]
4 methods { 4 methods {
diff --git a/src/lib/elementary/efl_ui_navigation_bar.c b/src/lib/elementary/efl_ui_navigation_bar.c
index 6c1de6773a..039b7f563f 100644
--- a/src/lib/elementary/efl_ui_navigation_bar.c
+++ b/src/lib/elementary/efl_ui_navigation_bar.c
@@ -48,7 +48,7 @@ _efl_ui_navigation_bar_efl_object_constructor(Eo *obj, Efl_Ui_Navigation_Bar_Dat
48 48
49 Eo *back_button = efl_add(EFL_UI_BUTTON_CLASS, obj, 49 Eo *back_button = efl_add(EFL_UI_BUTTON_CLASS, obj,
50 elm_widget_element_update(obj, efl_added, "back_button"), 50 elm_widget_element_update(obj, efl_added, "back_button"),
51 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _back_button_clicked_cb, obj), 51 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _back_button_clicked_cb, obj),
52 efl_gfx_entity_visible_set(efl_added, EINA_FALSE)); 52 efl_gfx_entity_visible_set(efl_added, EINA_FALSE));
53 53
54 pd->back_button = back_button; 54 pd->back_button = back_button;
@@ -182,7 +182,7 @@ _efl_ui_navigation_bar_part_back_button_efl_content_content_set(Eo *obj, void *_
182 182
183 if (content == ppd->back_button) return EINA_FALSE; 183 if (content == ppd->back_button) return EINA_FALSE;
184 184
185 efl_event_callback_add(content, EFL_UI_EVENT_CLICKED, _back_button_clicked_cb, pd->obj); 185 efl_event_callback_add(content, EFL_INPUT_EVENT_CLICKED, _back_button_clicked_cb, pd->obj);
186 ppd->back_button = content; 186 ppd->back_button = content;
187 187
188 return _efl_ui_navigation_bar_content_set(pd->obj, ppd, pd->part, content); 188 return _efl_ui_navigation_bar_content_set(pd->obj, ppd, pd->part, content);
@@ -203,7 +203,7 @@ _efl_ui_navigation_bar_part_back_button_efl_content_content_unset(Eo *obj, void
203 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS); 203 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
204 EFL_UI_NAVIGATION_BAR_DATA_GET_OR_RETURN(pd->obj, ppd, NULL); 204 EFL_UI_NAVIGATION_BAR_DATA_GET_OR_RETURN(pd->obj, ppd, NULL);
205 205
206 efl_event_callback_del(ppd->back_button, EFL_UI_EVENT_CLICKED, _back_button_clicked_cb, pd->obj); 206 efl_event_callback_del(ppd->back_button, EFL_INPUT_EVENT_CLICKED, _back_button_clicked_cb, pd->obj);
207 ppd->back_button = NULL; 207 ppd->back_button = NULL;
208 208
209 return _efl_ui_navigation_bar_content_unset(pd->obj, ppd, pd->part); 209 return _efl_ui_navigation_bar_content_unset(pd->obj, ppd, pd->part);
diff --git a/src/lib/elementary/efl_ui_panes.c b/src/lib/elementary/efl_ui_panes.c
index 7069e3edb5..e14d3de505 100644
--- a/src/lib/elementary/efl_ui_panes.c
+++ b/src/lib/elementary/efl_ui_panes.c
@@ -6,7 +6,7 @@
6#define ELM_LAYOUT_PROTECTED 6#define ELM_LAYOUT_PROTECTED
7#define EFL_GFX_HINT_PROTECTED 7#define EFL_GFX_HINT_PROTECTED
8#define EFL_PART_PROTECTED 8#define EFL_PART_PROTECTED
9#define EFL_UI_CLICKABLE_PROTECTED 9#define EFL_INPUT_CLICKABLE_PROTECTED
10 10
11#include <Elementary.h> 11#include <Elementary.h>
12 12
@@ -184,7 +184,7 @@ _on_pressed(void *data,
184 const char *source EINA_UNUSED) 184 const char *source EINA_UNUSED)
185{ 185{
186 efl_event_callback_legacy_call(data, ELM_PANES_EVENT_PRESS, NULL); 186 efl_event_callback_legacy_call(data, ELM_PANES_EVENT_PRESS, NULL);
187 efl_ui_clickable_press(data, 1); 187 efl_input_clickable_press(data, 1);
188} 188}
189 189
190static void 190static void
@@ -195,7 +195,7 @@ _on_unpressed(void *data,
195{ 195{
196 EFL_UI_PANES_DATA_GET(data, sd); 196 EFL_UI_PANES_DATA_GET(data, sd);
197 efl_event_callback_legacy_call(data, ELM_PANES_EVENT_UNPRESS, NULL); 197 efl_event_callback_legacy_call(data, ELM_PANES_EVENT_UNPRESS, NULL);
198 efl_ui_clickable_unpress(data, 1); 198 efl_input_clickable_unpress(data, 1);
199 if (sd->double_clicked) 199 if (sd->double_clicked)
200 { 200 {
201 evas_object_smart_callback_call(data, "clicked,double", NULL); 201 evas_object_smart_callback_call(data, "clicked,double", NULL);
diff --git a/src/lib/elementary/efl_ui_panes.eo b/src/lib/elementary/efl_ui_panes.eo
index a9c2bbd089..5b5029a67f 100644
--- a/src/lib/elementary/efl_ui_panes.eo
+++ b/src/lib/elementary/efl_ui_panes.eo
@@ -1,5 +1,5 @@
1class @beta Efl.Ui.Panes extends Efl.Ui.Layout_Base implements Efl.Ui.Layout_Orientable, 1class @beta Efl.Ui.Panes extends Efl.Ui.Layout_Base implements Efl.Ui.Layout_Orientable,
2 Efl.Ui.Clickable 2 Efl.Input.Clickable
3{ 3{
4 [[Elementary panes class]] 4 [[Elementary panes class]]
5 event_prefix: elm_panes; 5 event_prefix: elm_panes;
diff --git a/src/lib/elementary/efl_ui_spin_button.c b/src/lib/elementary/efl_ui_spin_button.c
index 6974428dc4..13b3c2ddf2 100644
--- a/src/lib/elementary/efl_ui_spin_button.c
+++ b/src/lib/elementary/efl_ui_spin_button.c
@@ -41,7 +41,7 @@ static void
41_access_increment_decrement_info_say(Evas_Object *obj, Eina_Bool is_incremented); 41_access_increment_decrement_info_say(Evas_Object *obj, Eina_Bool is_incremented);
42 42
43EFL_CALLBACKS_ARRAY_DEFINE(_inc_dec_button_cb, 43EFL_CALLBACKS_ARRAY_DEFINE(_inc_dec_button_cb,
44 { EFL_UI_EVENT_CLICKED, _inc_dec_button_clicked_cb}, 44 { EFL_INPUT_EVENT_CLICKED, _inc_dec_button_clicked_cb},
45 { EFL_UI_AUTOREPEAT_EVENT_REPEATED, _inc_dec_button_clicked_cb}, 45 { EFL_UI_AUTOREPEAT_EVENT_REPEATED, _inc_dec_button_clicked_cb},
46 ); 46 );
47 47
diff --git a/src/lib/elementary/efl_ui_tags.c b/src/lib/elementary/efl_ui_tags.c
index 34bc487355..97393c8d47 100644
--- a/src/lib/elementary/efl_ui_tags.c
+++ b/src/lib/elementary/efl_ui_tags.c
@@ -28,7 +28,7 @@ static void _entry_clicked_cb(void *data, const Efl_Event *event);
28EFL_CALLBACKS_ARRAY_DEFINE(_tags_cb, 28EFL_CALLBACKS_ARRAY_DEFINE(_tags_cb,
29 { ELM_ENTRY_EVENT_CHANGED, _entry_changed_cb }, 29 { ELM_ENTRY_EVENT_CHANGED, _entry_changed_cb },
30 { EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_CHANGED , _entry_focus_changed_cb }, 30 { EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_CHANGED , _entry_focus_changed_cb },
31 { EFL_UI_EVENT_CLICKED, _entry_clicked_cb } 31 { EFL_INPUT_EVENT_CLICKED, _entry_clicked_cb }
32); 32);
33 33
34static void 34static void
@@ -489,7 +489,7 @@ _mouse_clicked_signal_cb(void *data EINA_UNUSED,
489 489
490 if (sd->editable) efl_ui_text_input_panel_show(sd->entry); 490 if (sd->editable) efl_ui_text_input_panel_show(sd->entry);
491 491
492 efl_event_callback_call(obj, EFL_UI_EVENT_CLICKED, NULL); 492 efl_event_callback_call(obj, EFL_INPUT_EVENT_CLICKED, NULL);
493} 493}
494 494
495static void 495static void
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index 3201c8875e..419fd84434 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -7,7 +7,7 @@
7#define EFL_ACCESS_EDITABLE_TEXT_PROTECTED 7#define EFL_ACCESS_EDITABLE_TEXT_PROTECTED
8#define ELM_LAYOUT_PROTECTED 8#define ELM_LAYOUT_PROTECTED
9#define EFL_PART_PROTECTED 9#define EFL_PART_PROTECTED
10#define EFL_UI_CLICKABLE_PROTECTED 10#define EFL_INPUT_CLICKABLE_PROTECTED
11 11
12#include <Elementary.h> 12#include <Elementary.h>
13#include <Elementary_Cursor.h> 13#include <Elementary_Cursor.h>
@@ -2118,7 +2118,7 @@ _efl_ui_text_efl_object_constructor(Eo *obj, Efl_Ui_Text_Data *sd)
2118 if (!elm_widget_theme_klass_get(obj)) 2118 if (!elm_widget_theme_klass_get(obj))
2119 elm_widget_theme_klass_set(obj, "text"); 2119 elm_widget_theme_klass_set(obj, "text");
2120 obj = efl_constructor(efl_super(obj, MY_CLASS)); 2120 obj = efl_constructor(efl_super(obj, MY_CLASS));
2121 efl_event_callback_add(obj, EFL_UI_EVENT_LONGPRESSED, _long_press_cb, obj); 2121 efl_event_callback_add(obj, EFL_INPUT_EVENT_LONGPRESSED, _long_press_cb, obj);
2122 2122
2123 text_obj = efl_add(EFL_UI_INTERNAL_TEXT_INTERACTIVE_CLASS, obj); 2123 text_obj = efl_add(EFL_UI_INTERNAL_TEXT_INTERACTIVE_CLASS, obj);
2124 efl_event_callback_forwarder_add(text_obj, EFL_UI_TEXT_EVENT_CHANGED_USER, obj); 2124 efl_event_callback_forwarder_add(text_obj, EFL_UI_TEXT_EVENT_CHANGED_USER, obj);
@@ -2822,7 +2822,7 @@ _efl_ui_text_efl_ui_widget_on_access_activate(Eo *obj, Efl_Ui_Text_Data *_pd EIN
2822 if (!elm_widget_disabled_get(obj) && 2822 if (!elm_widget_disabled_get(obj) &&
2823 !evas_object_freeze_events_get(obj)) 2823 !evas_object_freeze_events_get(obj))
2824 { 2824 {
2825 efl_event_callback_call(obj, EFL_UI_EVENT_CLICKED, NULL); 2825 efl_event_callback_call(obj, EFL_INPUT_EVENT_CLICKED, NULL);
2826 if (sd->editable && sd->input_panel_enable) 2826 if (sd->editable && sd->input_panel_enable)
2827 edje_object_part_text_input_panel_show(sd->entry_edje, "efl.text"); 2827 edje_object_part_text_input_panel_show(sd->entry_edje, "efl.text");
2828 } 2828 }
diff --git a/src/lib/elementary/efl_ui_text.eo b/src/lib/elementary/efl_ui_text.eo
index d34b2822d2..a0a1807942 100644
--- a/src/lib/elementary/efl_ui_text.eo
+++ b/src/lib/elementary/efl_ui_text.eo
@@ -1,7 +1,7 @@
1/* FIXME - Text object must stop using elm_general! */ 1/* FIXME - Text object must stop using elm_general! */
2import elm_general; 2import elm_general;
3 3
4class @beta Efl.Ui.Text extends Efl.Ui.Layout_Base implements Efl.Ui.Clickable, 4class @beta Efl.Ui.Text extends Efl.Ui.Layout_Base implements Efl.Input.Clickable,
5 Efl.Access.Text, Efl.Access.Editable.Text, Efl.File, 5 Efl.Access.Text, Efl.Access.Editable.Text, Efl.File,
6 Efl.Ui.Selectable, Efl.Text_Interactive, Efl.Text_Markup 6 Efl.Ui.Selectable, Efl.Text_Interactive, Efl.Text_Markup
7{ 7{
diff --git a/src/lib/elementary/efl_ui_timepicker.c b/src/lib/elementary/efl_ui_timepicker.c
index 59ef13d3f1..6d568bcef8 100644
--- a/src/lib/elementary/efl_ui_timepicker.c
+++ b/src/lib/elementary/efl_ui_timepicker.c
@@ -136,7 +136,7 @@ _fields_init(Eo *obj)
136 efl_event_callback_add(efl_added, EFL_UI_SPIN_EVENT_CHANGED,_field_changed_cb, obj)); 136 efl_event_callback_add(efl_added, EFL_UI_SPIN_EVENT_CHANGED,_field_changed_cb, obj));
137 137
138 pd->ampm = efl_add(EFL_UI_BUTTON_CLASS, obj, 138 pd->ampm = efl_add(EFL_UI_BUTTON_CLASS, obj,
139 efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _field_changed_cb, obj), 139 efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _field_changed_cb, obj),
140 elm_widget_element_update(obj, efl_added, "button")); 140 elm_widget_element_update(obj, efl_added, "button"));
141 141
142 pd->dt_manager = efl_add(EFL_DATETIME_MANAGER_CLASS, obj); 142 pd->dt_manager = efl_add(EFL_DATETIME_MANAGER_CLASS, obj);
diff --git a/src/lib/elementary/elc_multibuttonentry.c b/src/lib/elementary/elc_multibuttonentry.c
index 3c7e26c216..9bcb64514e 100644
--- a/src/lib/elementary/elc_multibuttonentry.c
+++ b/src/lib/elementary/elc_multibuttonentry.c
@@ -67,7 +67,7 @@ static void _entry_clicked_cb(void *data, const Efl_Event *event);
67EFL_CALLBACKS_ARRAY_DEFINE(_multi_buttonentry_cb, 67EFL_CALLBACKS_ARRAY_DEFINE(_multi_buttonentry_cb,
68 { ELM_ENTRY_EVENT_CHANGED, _entry_changed_cb }, 68 { ELM_ENTRY_EVENT_CHANGED, _entry_changed_cb },
69 { EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_CHANGED , _entry_focus_changed_cb }, 69 { EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_CHANGED , _entry_focus_changed_cb },
70 { EFL_UI_EVENT_CLICKED, _entry_clicked_cb } 70 { EFL_INPUT_EVENT_CLICKED, _entry_clicked_cb }
71); 71);
72 72
73EOLIAN static void 73EOLIAN static void
diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c
index e2be2f5464..862edec01c 100644
--- a/src/lib/elementary/elc_naviframe.c
+++ b/src/lib/elementary/elc_naviframe.c
@@ -1499,7 +1499,7 @@ _key_action_top_item_get(Evas_Object *obj, const char *params EINA_UNUSED)
1499 ///Leave for compatibility. 1499 ///Leave for compatibility.
1500 ELM_NAVIFRAME_ITEM_DATA_GET(eo_item, it); 1500 ELM_NAVIFRAME_ITEM_DATA_GET(eo_item, it);
1501 if (it->title_prev_btn) 1501 if (it->title_prev_btn)
1502 efl_event_callback_legacy_call(it->title_prev_btn, EFL_UI_EVENT_CLICKED, NULL); 1502 efl_event_callback_legacy_call(it->title_prev_btn, EFL_INPUT_EVENT_CLICKED, NULL);
1503 1503
1504 return EINA_TRUE; 1504 return EINA_TRUE;
1505} 1505}
diff --git a/src/lib/elementary/elm_bubble_eo.c b/src/lib/elementary/elm_bubble_eo.c
index 4f6ee165a3..24780aacf0 100644
--- a/src/lib/elementary/elm_bubble_eo.c
+++ b/src/lib/elementary/elm_bubble_eo.c
@@ -50,6 +50,6 @@ static const Efl_Class_Description _elm_bubble_class_desc = {
50 NULL 50 NULL
51}; 51};
52 52
53EFL_DEFINE_CLASS(elm_bubble_class_get, &_elm_bubble_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_CLICKABLE_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL); 53EFL_DEFINE_CLASS(elm_bubble_class_get, &_elm_bubble_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_INPUT_CLICKABLE_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
54 54
55#include "elm_bubble_eo.legacy.c" 55#include "elm_bubble_eo.legacy.c"
diff --git a/src/lib/elementary/elm_calendar.c b/src/lib/elementary/elm_calendar.c
index b249fd44fe..74619d4a65 100644
--- a/src/lib/elementary/elm_calendar.c
+++ b/src/lib/elementary/elm_calendar.c
@@ -74,9 +74,9 @@ static void
74_inc_dec_button_unpressed_cb(void *data, const Efl_Event *event EINA_UNUSED); 74_inc_dec_button_unpressed_cb(void *data, const Efl_Event *event EINA_UNUSED);
75 75
76EFL_CALLBACKS_ARRAY_DEFINE( _inc_dec_button_cb, 76EFL_CALLBACKS_ARRAY_DEFINE( _inc_dec_button_cb,
77 { EFL_UI_EVENT_CLICKED, _inc_dec_button_clicked_cb}, 77 { EFL_INPUT_EVENT_CLICKED, _inc_dec_button_clicked_cb},
78 { EFL_UI_EVENT_PRESSED, _inc_dec_button_pressed_cb}, 78 { EFL_INPUT_EVENT_PRESSED, _inc_dec_button_pressed_cb},
79 { EFL_UI_EVENT_UNPRESSED, _inc_dec_button_unpressed_cb} 79 { EFL_INPUT_EVENT_UNPRESSED, _inc_dec_button_unpressed_cb}
80); 80);
81 81
82static Eina_Bool _key_action_activate(Evas_Object *obj, const char *params); 82static Eina_Bool _key_action_activate(Evas_Object *obj, const char *params);
diff --git a/src/lib/elementary/elm_color_class.c b/src/lib/elementary/elm_color_class.c
index cd85f52175..962e16f178 100644
--- a/src/lib/elementary/elm_color_class.c
+++ b/src/lib/elementary/elm_color_class.c
@@ -750,7 +750,7 @@ elm_color_class_editor_add(Evas_Object *obj)
750 elm_object_text_set(bt, "Reset"); 750 elm_object_text_set(bt, "Reset");
751 elm_object_part_content_set(ly, "elm.swallow.reset", bt); 751 elm_object_part_content_set(ly, "elm.swallow.reset", bt);
752 efl_event_callback_add 752 efl_event_callback_add
753 (bt, EFL_UI_EVENT_CLICKED, _colorclass_reset, cc); 753 (bt, EFL_INPUT_EVENT_CLICKED, _colorclass_reset, cc);
754 754
755 cc->cs = cs = elm_colorselector_add(ly); 755 cc->cs = cs = elm_colorselector_add(ly);
756 elm_colorselector_mode_set(cs, ELM_COLORSELECTOR_COMPONENTS); 756 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 2ca5b09c5d..5b40c537cd 100644
--- a/src/lib/elementary/elm_colorselector.c
+++ b/src/lib/elementary/elm_colorselector.c
@@ -1287,7 +1287,7 @@ _color_bars_add(Evas_Object *obj)
1287 edje_object_part_swallow 1287 edje_object_part_swallow
1288 (sd->cb_data[i]->colorbar, "elm.l_button", sd->cb_data[i]->lbt); 1288 (sd->cb_data[i]->colorbar, "elm.l_button", sd->cb_data[i]->lbt);
1289 efl_event_callback_add 1289 efl_event_callback_add
1290 (sd->cb_data[i]->lbt, EFL_UI_EVENT_CLICKED, _button_clicked_cb, sd->cb_data[i]); 1290 (sd->cb_data[i]->lbt, EFL_INPUT_EVENT_CLICKED, _button_clicked_cb, sd->cb_data[i]);
1291 elm_button_autorepeat_set(sd->cb_data[i]->lbt, EINA_TRUE); 1291 elm_button_autorepeat_set(sd->cb_data[i]->lbt, EINA_TRUE);
1292 elm_button_autorepeat_initial_timeout_set 1292 elm_button_autorepeat_initial_timeout_set
1293 (sd->cb_data[i]->lbt, _elm_config->longpress_timeout); 1293 (sd->cb_data[i]->lbt, _elm_config->longpress_timeout);
@@ -1305,7 +1305,7 @@ _color_bars_add(Evas_Object *obj)
1305 edje_object_part_swallow 1305 edje_object_part_swallow
1306 (sd->cb_data[i]->colorbar, "elm.r_button", sd->cb_data[i]->rbt); 1306 (sd->cb_data[i]->colorbar, "elm.r_button", sd->cb_data[i]->rbt);
1307 efl_event_callback_add 1307 efl_event_callback_add
1308 (sd->cb_data[i]->rbt, EFL_UI_EVENT_CLICKED, _button_clicked_cb, sd->cb_data[i]); 1308 (sd->cb_data[i]->rbt, EFL_INPUT_EVENT_CLICKED, _button_clicked_cb, sd->cb_data[i]);
1309 elm_button_autorepeat_set(sd->cb_data[i]->rbt, EINA_TRUE); 1309 elm_button_autorepeat_set(sd->cb_data[i]->rbt, EINA_TRUE);
1310 elm_button_autorepeat_initial_timeout_set 1310 elm_button_autorepeat_initial_timeout_set
1311 (sd->cb_data[i]->rbt, _elm_config->longpress_timeout); 1311 (sd->cb_data[i]->rbt, _elm_config->longpress_timeout);
diff --git a/src/lib/elementary/elm_colorselector_eo.c b/src/lib/elementary/elm_colorselector_eo.c
index b6b288a8cf..c7ce07fc82 100644
--- a/src/lib/elementary/elm_colorselector_eo.c
+++ b/src/lib/elementary/elm_colorselector_eo.c
@@ -146,6 +146,6 @@ static const Efl_Class_Description _elm_colorselector_class_desc = {
146 NULL 146 NULL
147}; 147};
148 148
149EFL_DEFINE_CLASS(elm_colorselector_class_get, &_elm_colorselector_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_FOCUS_COMPOSITION_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_UI_CLICKABLE_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL); 149EFL_DEFINE_CLASS(elm_colorselector_class_get, &_elm_colorselector_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_FOCUS_COMPOSITION_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
150 150
151#include "elm_colorselector_eo.legacy.c" 151#include "elm_colorselector_eo.legacy.c"
diff --git a/src/lib/elementary/elm_diskselector_eo.c b/src/lib/elementary/elm_diskselector_eo.c
index d533a106eb..d4158c4e94 100644
--- a/src/lib/elementary/elm_diskselector_eo.c
+++ b/src/lib/elementary/elm_diskselector_eo.c
@@ -222,6 +222,6 @@ static const Efl_Class_Description _elm_diskselector_class_desc = {
222 NULL 222 NULL
223}; 223};
224 224
225EFL_DEFINE_CLASS(elm_diskselector_class_get, &_elm_diskselector_class_desc, EFL_UI_WIDGET_CLASS, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_UI_CLICKABLE_MIXIN, EFL_UI_SCROLLABLE_INTERFACE, EFL_UI_SELECTABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, NULL); 225EFL_DEFINE_CLASS(elm_diskselector_class_get, &_elm_diskselector_class_desc, EFL_UI_WIDGET_CLASS, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, EFL_UI_SCROLLABLE_INTERFACE, EFL_UI_SELECTABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, NULL);
226 226
227#include "elm_diskselector_eo.legacy.c" 227#include "elm_diskselector_eo.legacy.c"
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index ad627a0dc7..22dcaff458 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -2665,7 +2665,7 @@ _entry_hover_anchor_clicked_do(Evas_Object *obj,
2665 2665
2666 efl_event_callback_legacy_call(obj, ELM_ENTRY_EVENT_ANCHOR_HOVER_OPENED, &ei); 2666 efl_event_callback_legacy_call(obj, ELM_ENTRY_EVENT_ANCHOR_HOVER_OPENED, &ei);
2667 efl_event_callback_add 2667 efl_event_callback_add
2668 (sd->anchor_hover.hover, EFL_UI_EVENT_CLICKED, _anchor_hover_clicked_cb, obj); 2668 (sd->anchor_hover.hover, EFL_INPUT_EVENT_CLICKED, _anchor_hover_clicked_cb, obj);
2669 2669
2670 /* FIXME: Should just check if there's any callback registered to 2670 /* FIXME: Should just check if there's any callback registered to
2671 * the smart events instead. This is used to determine if anyone 2671 * the smart events instead. This is used to determine if anyone
diff --git a/src/lib/elementary/elm_entry_eo.c b/src/lib/elementary/elm_entry_eo.c
index 110de558bc..397a6b4ea7 100644
--- a/src/lib/elementary/elm_entry_eo.c
+++ b/src/lib/elementary/elm_entry_eo.c
@@ -1188,6 +1188,6 @@ static const Efl_Class_Description _elm_entry_class_desc = {
1188 NULL 1188 NULL
1189}; 1189};
1190 1190
1191EFL_DEFINE_CLASS(elm_entry_class_get, &_elm_entry_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_UI_CLICKABLE_MIXIN, EFL_ACCESS_TEXT_INTERFACE, EFL_ACCESS_EDITABLE_TEXT_INTERFACE, EFL_FILE_MIXIN, EFL_UI_SELECTABLE_INTERFACE, EFL_UI_SCROLLABLE_INTERFACE, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL); 1191EFL_DEFINE_CLASS(elm_entry_class_get, &_elm_entry_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, EFL_ACCESS_TEXT_INTERFACE, EFL_ACCESS_EDITABLE_TEXT_INTERFACE, EFL_FILE_MIXIN, EFL_UI_SELECTABLE_INTERFACE, EFL_UI_SCROLLABLE_INTERFACE, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
1192 1192
1193#include "elm_entry_eo.legacy.c" 1193#include "elm_entry_eo.legacy.c"
diff --git a/src/lib/elementary/elm_fileselector_entry_eo.c b/src/lib/elementary/elm_fileselector_entry_eo.c
index 04af297c98..3f6e17a701 100644
--- a/src/lib/elementary/elm_fileselector_entry_eo.c
+++ b/src/lib/elementary/elm_fileselector_entry_eo.c
@@ -88,4 +88,4 @@ static const Efl_Class_Description _elm_fileselector_entry_class_desc = {
88 NULL 88 NULL
89}; 89};
90 90
91EFL_DEFINE_CLASS(elm_fileselector_entry_class_get, &_elm_fileselector_entry_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_INTERFACE_FILESELECTOR_INTERFACE, EFL_UI_CLICKABLE_MIXIN, EFL_UI_SELECTABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, NULL); 91EFL_DEFINE_CLASS(elm_fileselector_entry_class_get, &_elm_fileselector_entry_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_INTERFACE_FILESELECTOR_INTERFACE, EFL_INPUT_CLICKABLE_MIXIN, EFL_UI_SELECTABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, NULL);
diff --git a/src/lib/elementary/elm_fileselector_eo.c b/src/lib/elementary/elm_fileselector_eo.c
index 3ae6cd3539..e6b7d726f4 100644
--- a/src/lib/elementary/elm_fileselector_eo.c
+++ b/src/lib/elementary/elm_fileselector_eo.c
@@ -202,6 +202,6 @@ static const Efl_Class_Description _elm_fileselector_class_desc = {
202 _elm_fileselector_class_destructor 202 _elm_fileselector_class_destructor
203}; 203};
204 204
205EFL_DEFINE_CLASS(elm_fileselector_class_get, &_elm_fileselector_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_INTERFACE_FILESELECTOR_INTERFACE, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_UI_FOCUS_COMPOSITION_MIXIN, EFL_UI_CLICKABLE_MIXIN, EFL_UI_SELECTABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, NULL); 205EFL_DEFINE_CLASS(elm_fileselector_class_get, &_elm_fileselector_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_INTERFACE_FILESELECTOR_INTERFACE, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_UI_FOCUS_COMPOSITION_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, EFL_UI_SELECTABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, NULL);
206 206
207#include "elm_fileselector_eo.legacy.c" 207#include "elm_fileselector_eo.legacy.c"
diff --git a/src/lib/elementary/elm_gengrid_eo.c b/src/lib/elementary/elm_gengrid_eo.c
index b3012a57b8..d927aae949 100644
--- a/src/lib/elementary/elm_gengrid_eo.c
+++ b/src/lib/elementary/elm_gengrid_eo.c
@@ -512,6 +512,6 @@ static const Efl_Class_Description _elm_gengrid_class_desc = {
512 NULL 512 NULL
513}; 513};
514 514
515EFL_DEFINE_CLASS(elm_gengrid_class_get, &_elm_gengrid_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_UI_CLICKABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_ACCESS_SELECTION_INTERFACE, EFL_UI_LEGACY_INTERFACE, ELM_WIDGET_ITEM_CONTAINER_INTERFACE, NULL); 515EFL_DEFINE_CLASS(elm_gengrid_class_get, &_elm_gengrid_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_ACCESS_SELECTION_INTERFACE, EFL_UI_LEGACY_INTERFACE, ELM_WIDGET_ITEM_CONTAINER_INTERFACE, NULL);
516 516
517#include "elm_gengrid_eo.legacy.c" 517#include "elm_gengrid_eo.legacy.c"
diff --git a/src/lib/elementary/elm_genlist_eo.c b/src/lib/elementary/elm_genlist_eo.c
index fd0d5216ab..b34ec2a352 100644
--- a/src/lib/elementary/elm_genlist_eo.c
+++ b/src/lib/elementary/elm_genlist_eo.c
@@ -681,6 +681,6 @@ static const Efl_Class_Description _elm_genlist_class_desc = {
681 NULL 681 NULL
682}; 682};
683 683
684EFL_DEFINE_CLASS(elm_genlist_class_get, &_elm_genlist_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_UI_CLICKABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_ACCESS_SELECTION_INTERFACE, EFL_UI_SELECTABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, ELM_WIDGET_ITEM_CONTAINER_INTERFACE, NULL); 684EFL_DEFINE_CLASS(elm_genlist_class_get, &_elm_genlist_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_ACCESS_SELECTION_INTERFACE, EFL_UI_SELECTABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, ELM_WIDGET_ITEM_CONTAINER_INTERFACE, NULL);
685 685
686#include "elm_genlist_eo.legacy.c" 686#include "elm_genlist_eo.legacy.c"
diff --git a/src/lib/elementary/elm_hover_eo.c b/src/lib/elementary/elm_hover_eo.c
index b5a1b20208..c36c6ccf3f 100644
--- a/src/lib/elementary/elm_hover_eo.c
+++ b/src/lib/elementary/elm_hover_eo.c
@@ -92,6 +92,6 @@ static const Efl_Class_Description _elm_hover_class_desc = {
92 NULL 92 NULL
93}; 93};
94 94
95EFL_DEFINE_CLASS(elm_hover_class_get, &_elm_hover_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_FOCUS_LAYER_MIXIN, EFL_UI_CLICKABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL); 95EFL_DEFINE_CLASS(elm_hover_class_get, &_elm_hover_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_FOCUS_LAYER_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
96 96
97#include "elm_hover_eo.legacy.c" 97#include "elm_hover_eo.legacy.c"
diff --git a/src/lib/elementary/elm_hoversel_eo.c b/src/lib/elementary/elm_hoversel_eo.c
index de2f5371c5..52bb001c67 100644
--- a/src/lib/elementary/elm_hoversel_eo.c
+++ b/src/lib/elementary/elm_hoversel_eo.c
@@ -189,6 +189,6 @@ static const Efl_Class_Description _elm_hoversel_class_desc = {
189 NULL 189 NULL
190}; 190};
191 191
192EFL_DEFINE_CLASS(elm_hoversel_class_get, &_elm_hoversel_class_desc, EFL_UI_BUTTON_LEGACY_CLASS, EFL_UI_SELECTABLE_INTERFACE, EFL_UI_CLICKABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL); 192EFL_DEFINE_CLASS(elm_hoversel_class_get, &_elm_hoversel_class_desc, EFL_UI_BUTTON_LEGACY_CLASS, EFL_UI_SELECTABLE_INTERFACE, EFL_INPUT_CLICKABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
193 193
194#include "elm_hoversel_eo.legacy.c" 194#include "elm_hoversel_eo.legacy.c"
diff --git a/src/lib/elementary/elm_index_eo.c b/src/lib/elementary/elm_index_eo.c
index 862e228fa1..806f94ce0b 100644
--- a/src/lib/elementary/elm_index_eo.c
+++ b/src/lib/elementary/elm_index_eo.c
@@ -322,6 +322,6 @@ static const Efl_Class_Description _elm_index_class_desc = {
322 NULL 322 NULL
323}; 323};
324 324
325EFL_DEFINE_CLASS(elm_index_class_get, &_elm_index_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_LAYOUT_ORIENTABLE_INTERFACE, EFL_UI_CLICKABLE_MIXIN, EFL_UI_SELECTABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, NULL); 325EFL_DEFINE_CLASS(elm_index_class_get, &_elm_index_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_LAYOUT_ORIENTABLE_INTERFACE, EFL_INPUT_CLICKABLE_MIXIN, EFL_UI_SELECTABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, NULL);
326 326
327#include "elm_index_eo.legacy.c" 327#include "elm_index_eo.legacy.c"
diff --git a/src/lib/elementary/elm_list_eo.c b/src/lib/elementary/elm_list_eo.c
index 3da0cba750..32f0f77b92 100644
--- a/src/lib/elementary/elm_list_eo.c
+++ b/src/lib/elementary/elm_list_eo.c
@@ -363,6 +363,6 @@ static const Efl_Class_Description _elm_list_class_desc = {
363 NULL 363 NULL
364}; 364};
365 365
366EFL_DEFINE_CLASS(elm_list_class_get, &_elm_list_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_ACCESS_SELECTION_INTERFACE, EFL_ACCESS_OBJECT_MIXIN, EFL_UI_CLICKABLE_MIXIN, EFL_UI_SELECTABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, ELM_WIDGET_ITEM_CONTAINER_INTERFACE, NULL); 366EFL_DEFINE_CLASS(elm_list_class_get, &_elm_list_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_ACCESS_SELECTION_INTERFACE, EFL_ACCESS_OBJECT_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, EFL_UI_SELECTABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, ELM_WIDGET_ITEM_CONTAINER_INTERFACE, NULL);
367 367
368#include "elm_list_eo.legacy.c" 368#include "elm_list_eo.legacy.c"
diff --git a/src/lib/elementary/elm_map_eo.c b/src/lib/elementary/elm_map_eo.c
index 0e522f4635..57a36a570d 100644
--- a/src/lib/elementary/elm_map_eo.c
+++ b/src/lib/elementary/elm_map_eo.c
@@ -360,6 +360,6 @@ static const Efl_Class_Description _elm_map_class_desc = {
360 NULL 360 NULL
361}; 361};
362 362
363EFL_DEFINE_CLASS(elm_map_class_get, &_elm_map_class_desc, EFL_UI_WIDGET_CLASS, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_UI_CLICKABLE_MIXIN, EFL_UI_LEGACY_INTERFACE, EFL_UI_ZOOM_INTERFACE, NULL); 363EFL_DEFINE_CLASS(elm_map_class_get, &_elm_map_class_desc, EFL_UI_WIDGET_CLASS, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, EFL_UI_LEGACY_INTERFACE, EFL_UI_ZOOM_INTERFACE, NULL);
364 364
365#include "elm_map_eo.legacy.c" 365#include "elm_map_eo.legacy.c"
diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c
index 681ac2273d..551b9830b3 100644
--- a/src/lib/elementary/elm_menu.c
+++ b/src/lib/elementary/elm_menu.c
@@ -780,13 +780,13 @@ _elm_menu_menu_bar_set(Eo *obj, Eina_Bool menu_bar)
780 if (menu_bar) 780 if (menu_bar)
781 { 781 {
782 efl_event_callback_add 782 efl_event_callback_add
783 (item->submenu.hv, EFL_UI_EVENT_CLICKED, _hover_dismissed_cb, WIDGET(item)); 783 (item->submenu.hv, EFL_INPUT_EVENT_CLICKED, _hover_dismissed_cb, WIDGET(item));
784 snprintf(style, sizeof(style), "main_menu_submenu//%s", elm_widget_style_get(obj)); 784 snprintf(style, sizeof(style), "main_menu_submenu//%s", elm_widget_style_get(obj));
785 elm_object_style_set(item->submenu.hv, style); 785 elm_object_style_set(item->submenu.hv, style);
786 } 786 }
787 else 787 else
788 { 788 {
789 efl_event_callback_del(item->submenu.hv, EFL_UI_EVENT_CLICKED, _hover_dismissed_cb, WIDGET(item)); 789 efl_event_callback_del(item->submenu.hv, EFL_INPUT_EVENT_CLICKED, _hover_dismissed_cb, WIDGET(item));
790 snprintf(style, sizeof(style), "submenu/%s", elm_widget_style_get(obj)); 790 snprintf(style, sizeof(style), "submenu/%s", elm_widget_style_get(obj));
791 elm_object_style_set(item->submenu.hv, style); 791 elm_object_style_set(item->submenu.hv, style);
792 } 792 }
diff --git a/src/lib/elementary/elm_menu_eo.c b/src/lib/elementary/elm_menu_eo.c
index 4aaa856be8..f202d2e795 100644
--- a/src/lib/elementary/elm_menu_eo.c
+++ b/src/lib/elementary/elm_menu_eo.c
@@ -119,6 +119,6 @@ static const Efl_Class_Description _elm_menu_class_desc = {
119 NULL 119 NULL
120}; 120};
121 121
122EFL_DEFINE_CLASS(elm_menu_class_get, &_elm_menu_class_desc, EFL_UI_WIDGET_CLASS, EFL_UI_CLICKABLE_MIXIN, EFL_ACCESS_SELECTION_INTERFACE, EFL_UI_WIDGET_FOCUS_MANAGER_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL); 122EFL_DEFINE_CLASS(elm_menu_class_get, &_elm_menu_class_desc, EFL_UI_WIDGET_CLASS, EFL_INPUT_CLICKABLE_MIXIN, EFL_ACCESS_SELECTION_INTERFACE, EFL_UI_WIDGET_FOCUS_MANAGER_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
123 123
124#include "elm_menu_eo.legacy.c" 124#include "elm_menu_eo.legacy.c"
diff --git a/src/lib/elementary/elm_multibuttonentry_eo.c b/src/lib/elementary/elm_multibuttonentry_eo.c
index dcfb62778d..d8697d015f 100644
--- a/src/lib/elementary/elm_multibuttonentry_eo.c
+++ b/src/lib/elementary/elm_multibuttonentry_eo.c
@@ -219,6 +219,6 @@ static const Efl_Class_Description _elm_multibuttonentry_class_desc = {
219 NULL 219 NULL
220}; 220};
221 221
222EFL_DEFINE_CLASS(elm_multibuttonentry_class_get, &_elm_multibuttonentry_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_CLICKABLE_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL); 222EFL_DEFINE_CLASS(elm_multibuttonentry_class_get, &_elm_multibuttonentry_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_INPUT_CLICKABLE_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
223 223
224#include "elm_multibuttonentry_eo.legacy.c" 224#include "elm_multibuttonentry_eo.legacy.c"
diff --git a/src/lib/elementary/elm_photo_eo.c b/src/lib/elementary/elm_photo_eo.c
index 6c49b03515..6d46584a74 100644
--- a/src/lib/elementary/elm_photo_eo.c
+++ b/src/lib/elementary/elm_photo_eo.c
@@ -76,4 +76,4 @@ static const Efl_Class_Description _elm_photo_class_desc = {
76 NULL 76 NULL
77}; 77};
78 78
79EFL_DEFINE_CLASS(elm_photo_class_get, &_elm_photo_class_desc, EFL_UI_WIDGET_CLASS, EFL_FILE_MIXIN, EFL_UI_CLICKABLE_MIXIN, EFL_UI_DRAGGABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, NULL); 79EFL_DEFINE_CLASS(elm_photo_class_get, &_elm_photo_class_desc, EFL_UI_WIDGET_CLASS, EFL_FILE_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, EFL_UI_DRAGGABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, NULL);
diff --git a/src/lib/elementary/elm_plug_eo.c b/src/lib/elementary/elm_plug_eo.c
index c40f883d22..292176d630 100644
--- a/src/lib/elementary/elm_plug_eo.c
+++ b/src/lib/elementary/elm_plug_eo.c
@@ -54,6 +54,6 @@ static const Efl_Class_Description _elm_plug_class_desc = {
54 NULL 54 NULL
55}; 55};
56 56
57EFL_DEFINE_CLASS(elm_plug_class_get, &_elm_plug_class_desc, EFL_UI_WIDGET_CLASS, EFL_UI_CLICKABLE_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL); 57EFL_DEFINE_CLASS(elm_plug_class_get, &_elm_plug_class_desc, EFL_UI_WIDGET_CLASS, EFL_INPUT_CLICKABLE_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
58 58
59#include "elm_plug_eo.legacy.c" 59#include "elm_plug_eo.legacy.c"
diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c
index ba22b6fa06..c033e9a732 100644
--- a/src/lib/elementary/elm_spinner.c
+++ b/src/lib/elementary/elm_spinner.c
@@ -60,9 +60,9 @@ static void
60_entry_activated_cb(void *data, const Efl_Event *event); 60_entry_activated_cb(void *data, const Efl_Event *event);
61 61
62EFL_CALLBACKS_ARRAY_DEFINE(_inc_dec_button_cb, 62EFL_CALLBACKS_ARRAY_DEFINE(_inc_dec_button_cb,
63 { EFL_UI_EVENT_CLICKED, _inc_dec_button_clicked_cb}, 63 { EFL_INPUT_EVENT_CLICKED, _inc_dec_button_clicked_cb},
64 { EFL_UI_EVENT_PRESSED, _inc_dec_button_pressed_cb}, 64 { EFL_INPUT_EVENT_PRESSED, _inc_dec_button_pressed_cb},
65 { EFL_UI_EVENT_UNPRESSED, _inc_dec_button_unpressed_cb}, 65 { EFL_INPUT_EVENT_UNPRESSED, _inc_dec_button_unpressed_cb},
66 { EFL_EVENT_POINTER_MOVE, _inc_dec_button_mouse_move_cb } 66 { EFL_EVENT_POINTER_MOVE, _inc_dec_button_mouse_move_cb }
67); 67);
68 68
@@ -1222,7 +1222,7 @@ _elm_spinner_efl_canvas_group_group_add(Eo *obj, Elm_Spinner_Data *priv)
1222 elm_widget_can_focus_set(priv->text_button, _elm_config->access_mode); 1222 elm_widget_can_focus_set(priv->text_button, _elm_config->access_mode);
1223 1223
1224 efl_event_callback_add 1224 efl_event_callback_add
1225 (priv->text_button, EFL_UI_EVENT_CLICKED, _text_button_clicked_cb, obj); 1225 (priv->text_button, EFL_INPUT_EVENT_CLICKED, _text_button_clicked_cb, obj);
1226 1226
1227 efl_event_callback_add 1227 efl_event_callback_add
1228 (priv->text_button, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_CHANGED, _text_button_focus_change, obj); 1228 (priv->text_button, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_CHANGED, _text_button_focus_change, obj);
diff --git a/src/lib/elementary/elm_thumb_eo.c b/src/lib/elementary/elm_thumb_eo.c
index 0e57845112..d7a469060f 100644
--- a/src/lib/elementary/elm_thumb_eo.c
+++ b/src/lib/elementary/elm_thumb_eo.c
@@ -82,4 +82,4 @@ static const Efl_Class_Description _elm_thumb_class_desc = {
82 NULL 82 NULL
83}; 83};
84 84
85EFL_DEFINE_CLASS(elm_thumb_class_get, &_elm_thumb_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_FILE_MIXIN, EFL_UI_CLICKABLE_MIXIN, EFL_UI_DRAGGABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, NULL); 85EFL_DEFINE_CLASS(elm_thumb_class_get, &_elm_thumb_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_FILE_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, EFL_UI_DRAGGABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, NULL);
diff --git a/src/lib/elementary/elm_toolbar_eo.c b/src/lib/elementary/elm_toolbar_eo.c
index f27ea9b4e4..bcb3b23c5f 100644
--- a/src/lib/elementary/elm_toolbar_eo.c
+++ b/src/lib/elementary/elm_toolbar_eo.c
@@ -372,6 +372,6 @@ static const Efl_Class_Description _elm_toolbar_class_desc = {
372 NULL 372 NULL
373}; 373};
374 374
375EFL_DEFINE_CLASS(elm_toolbar_class_get, &_elm_toolbar_class_desc, EFL_UI_WIDGET_CLASS, EFL_UI_FOCUS_COMPOSITION_MIXIN, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_UI_LAYOUT_ORIENTABLE_INTERFACE, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_ACCESS_SELECTION_INTERFACE, EFL_ACCESS_OBJECT_MIXIN, EFL_UI_CLICKABLE_MIXIN, EFL_UI_SELECTABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, ELM_WIDGET_ITEM_CONTAINER_INTERFACE, NULL); 375EFL_DEFINE_CLASS(elm_toolbar_class_get, &_elm_toolbar_class_desc, EFL_UI_WIDGET_CLASS, EFL_UI_FOCUS_COMPOSITION_MIXIN, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_UI_LAYOUT_ORIENTABLE_INTERFACE, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_ACCESS_SELECTION_INTERFACE, EFL_ACCESS_OBJECT_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, EFL_UI_SELECTABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, ELM_WIDGET_ITEM_CONTAINER_INTERFACE, NULL);
376 376
377#include "elm_toolbar_eo.legacy.c" 377#include "elm_toolbar_eo.legacy.c"
diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index 72226f5cf3..3216383f41 100644
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -176,7 +176,6 @@ pub_eo_files = [
176 'efl_ui_caching_factory.eo', 176 'efl_ui_caching_factory.eo',
177 'efl_ui_widget_factory.eo', 177 'efl_ui_widget_factory.eo',
178 'efl_ui_relative_layout.eo', 178 'efl_ui_relative_layout.eo',
179 'efl_ui_clickable.eo',
180 'efl_ui_clickable_util.eo', 179 'efl_ui_clickable_util.eo',
181 'efl_ui_format.eo', 180 'efl_ui_format.eo',
182 'efl_ui_collection.eo', 181 'efl_ui_collection.eo',
@@ -930,7 +929,6 @@ elementary_src = [
930 'efl_ui_exact_model.c', 929 'efl_ui_exact_model.c',
931 'efl_ui_average_model.c', 930 'efl_ui_average_model.c',
932 'efl_ui_relative_layout.c', 931 'efl_ui_relative_layout.c',
933 'efl_ui_clickable.c',
934 'efl_ui_clickable_util.c', 932 'efl_ui_clickable_util.c',
935 'efl_ui_format.c', 933 'efl_ui_format.c',
936 'efl_ui_scroll_util.c', 934 'efl_ui_scroll_util.c',
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index 4122ac7f15..593c4d9a69 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -464,3 +464,4 @@ typedef void (Evas_Canvas3D_Surface_Func)(Evas_Real *out_x,
464#include "canvas/efl_input_hold.eo.h" 464#include "canvas/efl_input_hold.eo.h"
465#include "canvas/efl_input_interface.eo.h" 465#include "canvas/efl_input_interface.eo.h"
466#include "canvas/efl_input_focus.eo.h" 466#include "canvas/efl_input_focus.eo.h"
467#include "canvas/efl_input_clickable.eo.h"
diff --git a/src/lib/elementary/efl_ui_clickable.c b/src/lib/evas/canvas/efl_input_clickable.c
index ced9609e35..fb6c3fe457 100644
--- a/src/lib/elementary/efl_ui_clickable.c
+++ b/src/lib/evas/canvas/efl_input_clickable.c
@@ -2,10 +2,11 @@
2# include <config.h> 2# include <config.h>
3#endif 3#endif
4 4
5#define EFL_UI_CLICKABLE_PROTECTED 1 5#define EFL_INPUT_CLICKABLE_PROTECTED 1
6 6
7#include <Efl_Ui.h> 7#include <Evas.h>
8#include "elm_priv.h" 8#include <Ecore.h>
9#include "evas_common_private.h"
9 10
10typedef struct { 11typedef struct {
11 Eina_Bool pressed; 12 Eina_Bool pressed;
@@ -16,9 +17,9 @@ typedef struct {
16 17
17typedef struct { 18typedef struct {
18 Button_State state[3]; 19 Button_State state[3];
19} Efl_Ui_Clickable_Data; 20} Efl_Input_Clickable_Data;
20 21
21#define MY_CLASS EFL_UI_CLICKABLE_MIXIN 22#define MY_CLASS EFL_INPUT_CLICKABLE_MIXIN
22 23
23#define DOUBLE_CLICK_TIME ((double)0.1) //in seconds 24#define DOUBLE_CLICK_TIME ((double)0.1) //in seconds
24#define LONGPRESS_TIMEOUT ((double)1.0) //in seconds 25#define LONGPRESS_TIMEOUT ((double)1.0) //in seconds
@@ -27,7 +28,7 @@ static void
27_timer_longpress(void *data, const Efl_Event *ev) 28_timer_longpress(void *data, const Efl_Event *ev)
28{ 29{
29 Button_State *state; 30 Button_State *state;
30 Efl_Ui_Clickable_Data *pd = efl_data_scope_get(data, MY_CLASS); 31 Efl_Input_Clickable_Data *pd = efl_data_scope_get(data, MY_CLASS);
31 32
32 for (int i = 0; i < 3; ++i) 33 for (int i = 0; i < 3; ++i)
33 { 34 {
@@ -36,13 +37,13 @@ _timer_longpress(void *data, const Efl_Event *ev)
36 { 37 {
37 efl_del(state->timer); 38 efl_del(state->timer);
38 state->timer = NULL; 39 state->timer = NULL;
39 efl_event_callback_call(data, EFL_UI_EVENT_LONGPRESSED, &i); 40 efl_event_callback_call(data, EFL_INPUT_EVENT_LONGPRESSED, &i);
40 } 41 }
41 } 42 }
42} 43}
43 44
44EOLIAN static void 45EOLIAN static void
45_efl_ui_clickable_press(Eo *obj EINA_UNUSED, Efl_Ui_Clickable_Data *pd, unsigned int button) 46_efl_input_clickable_press(Eo *obj EINA_UNUSED, Efl_Input_Clickable_Data *pd, unsigned int button)
46{ 47{
47 Button_State *state; 48 Button_State *state;
48 EINA_SAFETY_ON_FALSE_RETURN(button < 3); 49 EINA_SAFETY_ON_FALSE_RETURN(button < 3);
@@ -58,13 +59,13 @@ _efl_ui_clickable_press(Eo *obj EINA_UNUSED, Efl_Ui_Clickable_Data *pd, unsigned
58 efl_loop_timer_interval_set(efl_added, LONGPRESS_TIMEOUT), 59 efl_loop_timer_interval_set(efl_added, LONGPRESS_TIMEOUT),
59 efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TIMER_TICK, _timer_longpress, obj)); 60 efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TIMER_TICK, _timer_longpress, obj));
60 61
61 efl_event_callback_call(obj, EFL_UI_EVENT_PRESSED, &button); 62 efl_event_callback_call(obj, EFL_INPUT_EVENT_PRESSED, &button);
62} 63}
63 64
64EOLIAN static void 65EOLIAN static void
65_efl_ui_clickable_unpress(Eo *obj EINA_UNUSED, Efl_Ui_Clickable_Data *pd, unsigned int button) 66_efl_input_clickable_unpress(Eo *obj EINA_UNUSED, Efl_Input_Clickable_Data *pd, unsigned int button)
66{ 67{
67 Efl_Ui_Clickable_Clicked clicked; 68 Efl_Input_Clickable_Clicked clicked;
68 Button_State *state; 69 Button_State *state;
69 Eina_Bool pressed; 70 Eina_Bool pressed;
70 EINA_SAFETY_ON_FALSE_RETURN(button < 3); 71 EINA_SAFETY_ON_FALSE_RETURN(button < 3);
@@ -88,20 +89,20 @@ _efl_ui_clickable_unpress(Eo *obj EINA_UNUSED, Efl_Ui_Clickable_Data *pd, unsign
88 state->timer = NULL; 89 state->timer = NULL;
89 90
90 //populate state 91 //populate state
91 efl_event_callback_call(obj, EFL_UI_EVENT_UNPRESSED, &button); 92 efl_event_callback_call(obj, EFL_INPUT_EVENT_UNPRESSED, &button);
92 if (pressed) 93 if (pressed)
93 { 94 {
94 INF("Widget %s,%p is clicked(%d)", efl_class_name_get(obj), obj, button); 95 INF("Widget %s,%p is clicked(%d)", efl_class_name_get(obj), obj, button);
95 clicked.repeated = state->pressed_before; 96 clicked.repeated = state->pressed_before;
96 clicked.button = button; 97 clicked.button = button;
97 if (button == 1) 98 if (button == 1)
98 efl_event_callback_call(obj, EFL_UI_EVENT_CLICKED, &clicked); 99 efl_event_callback_call(obj, EFL_INPUT_EVENT_CLICKED, &clicked);
99 efl_event_callback_call(obj, EFL_UI_EVENT_CLICKED_ANY, &clicked); 100 efl_event_callback_call(obj, EFL_INPUT_EVENT_CLICKED_ANY, &clicked);
100 } 101 }
101} 102}
102 103
103EOLIAN static void 104EOLIAN static void
104_efl_ui_clickable_button_state_reset(Eo *obj EINA_UNUSED, Efl_Ui_Clickable_Data *pd, unsigned int button) 105_efl_input_clickable_button_state_reset(Eo *obj EINA_UNUSED, Efl_Input_Clickable_Data *pd, unsigned int button)
105{ 106{
106 Button_State *state; 107 Button_State *state;
107 EINA_SAFETY_ON_FALSE_RETURN(button < 3); 108 EINA_SAFETY_ON_FALSE_RETURN(button < 3);
@@ -117,4 +118,4 @@ _efl_ui_clickable_button_state_reset(Eo *obj EINA_UNUSED, Efl_Ui_Clickable_Data
117 state->pressed = EINA_FALSE; 118 state->pressed = EINA_FALSE;
118} 119}
119 120
120#include "efl_ui_clickable.eo.c" 121#include "efl_input_clickable.eo.c"
diff --git a/src/lib/elementary/efl_ui_clickable.eo b/src/lib/evas/canvas/efl_input_clickable.eo
index ace6f6d6e7..14ca084d37 100644
--- a/src/lib/elementary/efl_ui_clickable.eo
+++ b/src/lib/evas/canvas/efl_input_clickable.eo
@@ -1,13 +1,13 @@
1struct @beta Efl.Ui.Clickable_Clicked { 1struct @beta Efl.Input.Clickable_Clicked {
2 [[A struct that expresses a click in elementary.]] 2 [[A struct that expresses a click in elementary.]]
3 repeated : int; [[The amount of how often the clicked event was repeated in a certain amount of time]] 3 repeated : int; [[The amount of how often the clicked event was repeated in a certain amount of time]]
4 button : int; [[The Button that is pressed]] 4 button : int; [[The Button that is pressed]]
5} 5}
6 6
7mixin @beta Efl.Ui.Clickable 7mixin @beta Efl.Input.Clickable
8{ 8{
9 [[Efl UI clickable interface]] 9 [[Efl input clickable interface]]
10 event_prefix: efl_ui; 10 event_prefix: efl_input;
11 methods { 11 methods {
12 press @protected { 12 press @protected {
13 [[Change internal states that a button got pressed. 13 [[Change internal states that a button got pressed.
@@ -38,8 +38,8 @@ mixin @beta Efl.Ui.Clickable
38 } 38 }
39 } 39 }
40 events { 40 events {
41 clicked: Efl.Ui.Clickable_Clicked; [[Called when object is in sequence pressed and unpressed, by the primary button]] 41 clicked: Efl.Input.Clickable_Clicked; [[Called when object is in sequence pressed and unpressed, by the primary button]]
42 clicked,any : Efl.Ui.Clickable_Clicked; [[Called when object is in sequence pressed and unpressed by any button. The button that triggered the event can be found in the event information.]] 42 clicked,any: Efl.Input.Clickable_Clicked; [[Called when object is in sequence pressed and unpressed by any button. The button that triggered the event can be found in the event information.]]
43 pressed: int; [[Called when the object is pressed, event_info is the button that got pressed]] 43 pressed: int; [[Called when the object is pressed, event_info is the button that got pressed]]
44 unpressed: int; [[Called when the object is no longer pressed, event_info is the button that got pressed]] 44 unpressed: int; [[Called when the object is no longer pressed, event_info is the button that got pressed]]
45 longpressed: int; [[Called when the object receives a long press, event_info is the button that got pressed]] 45 longpressed: int; [[Called when the object receives a long press, event_info is the button that got pressed]]
diff --git a/src/lib/evas/canvas/meson.build b/src/lib/evas/canvas/meson.build
index f285316844..c306c900a3 100644
--- a/src/lib/evas/canvas/meson.build
+++ b/src/lib/evas/canvas/meson.build
@@ -27,6 +27,7 @@ pub_eo_files = [
27 'efl_input_pointer.eo', 27 'efl_input_pointer.eo',
28 'efl_input_hold.eo', 28 'efl_input_hold.eo',
29 'efl_input_focus.eo', 29 'efl_input_focus.eo',
30 'efl_input_clickable.eo',
30 'efl_canvas_animation.eo', 31 'efl_canvas_animation.eo',
31 'efl_canvas_animation_alpha.eo', 32 'efl_canvas_animation_alpha.eo',
32 'efl_canvas_animation_rotate.eo', 33 'efl_canvas_animation_rotate.eo',
@@ -168,6 +169,7 @@ evas_src += files([
168 'efl_input_pointer.c', 169 'efl_input_pointer.c',
169 'efl_input_hold.c', 170 'efl_input_hold.c',
170 'efl_input_focus.c', 171 'efl_input_focus.c',
172 'efl_input_clickable.c',
171 'efl_canvas_animation.c', 173 'efl_canvas_animation.c',
172 'efl_canvas_animation_alpha.c', 174 'efl_canvas_animation_alpha.c',
173 'efl_canvas_animation_rotate.c', 175 'efl_canvas_animation_rotate.c',