summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-08-10 15:41:25 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-08-23 11:16:45 +0900
commit069747b9def73436fc253729f1203038754e7fbd (patch)
treeea380e1a905a811b2ff39013a79b976cb4933fe0 /src
parente8826062ebde4f17b438bd612b740feda4093574 (diff)
widget: Add eo event info inside widget_event
This is an internal function that should probably become an overridable protected method, as it's required for proper event handling in widgets. Next step: use eo_event_info in the widgets implementations. Then remove legacy event struct. Ref T5363
Diffstat (limited to 'src')
-rw-r--r--src/lib/elementary/efl_ui_button.c2
-rw-r--r--src/lib/elementary/efl_ui_check.c2
-rw-r--r--src/lib/elementary/efl_ui_image.c2
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable.c2
-rw-r--r--src/lib/elementary/efl_ui_nstate.c2
-rw-r--r--src/lib/elementary/efl_ui_radio.c2
-rw-r--r--src/lib/elementary/efl_ui_slider.c2
-rw-r--r--src/lib/elementary/efl_ui_video.c2
-rw-r--r--src/lib/elementary/efl_ui_win.c2
-rw-r--r--src/lib/elementary/elc_combobox.c5
-rw-r--r--src/lib/elementary/elc_ctxpopup.c2
-rw-r--r--src/lib/elementary/elc_fileselector.c2
-rw-r--r--src/lib/elementary/elc_hoversel.c4
-rw-r--r--src/lib/elementary/elc_multibuttonentry.c2
-rw-r--r--src/lib/elementary/elc_naviframe.c2
-rw-r--r--src/lib/elementary/elc_player.c2
-rw-r--r--src/lib/elementary/elc_popup.c2
-rw-r--r--src/lib/elementary/elm_calendar.c2
-rw-r--r--src/lib/elementary/elm_code_widget.c4
-rw-r--r--src/lib/elementary/elm_colorselector.c2
-rw-r--r--src/lib/elementary/elm_diskselector.c2
-rw-r--r--src/lib/elementary/elm_flipselector.c2
-rw-r--r--src/lib/elementary/elm_gengrid.c2
-rw-r--r--src/lib/elementary/elm_genlist.c2
-rw-r--r--src/lib/elementary/elm_list.c2
-rw-r--r--src/lib/elementary/elm_map.c2
-rw-r--r--src/lib/elementary/elm_panel.c2
-rw-r--r--src/lib/elementary/elm_scroller.c2
-rw-r--r--src/lib/elementary/elm_slideshow.c2
-rw-r--r--src/lib/elementary/elm_spinner.c2
-rw-r--r--src/lib/elementary/elm_toolbar.c2
-rw-r--r--src/lib/elementary/elm_widget.c12
-rw-r--r--src/lib/elementary/elm_widget.eo3
-rw-r--r--src/lib/elementary/elm_widget.h1
34 files changed, 44 insertions, 41 deletions
diff --git a/src/lib/elementary/efl_ui_button.c b/src/lib/elementary/efl_ui_button.c
index 01b978e..1610abb 100644
--- a/src/lib/elementary/efl_ui_button.c
+++ b/src/lib/elementary/efl_ui_button.c
@@ -173,7 +173,7 @@ _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
173} 173}
174 174
175EOLIAN static Eina_Bool 175EOLIAN static Eina_Bool
176_efl_ui_button_elm_widget_widget_event(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) 176_efl_ui_button_elm_widget_widget_event(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUSED, const Efl_Event *eo_event EINA_UNUSED, Evas_Object *src EINA_UNUSED, Evas_Callback_Type type, void *event_info)
177{ 177{
178 (void) src; 178 (void) src;
179 Evas_Event_Key_Down *ev = event_info; 179 Evas_Event_Key_Down *ev = event_info;
diff --git a/src/lib/elementary/efl_ui_check.c b/src/lib/elementary/efl_ui_check.c
index 15d0252..3efd3fd 100644
--- a/src/lib/elementary/efl_ui_check.c
+++ b/src/lib/elementary/efl_ui_check.c
@@ -150,7 +150,7 @@ _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
150} 150}
151 151
152EOLIAN static Eina_Bool 152EOLIAN static Eina_Bool
153_efl_ui_check_elm_widget_widget_event(Eo *obj, Efl_Ui_Check_Data *_pd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) 153_efl_ui_check_elm_widget_widget_event(Eo *obj, Efl_Ui_Check_Data *_pd EINA_UNUSED, const Efl_Event *eo_event EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info)
154{ 154{
155 (void) src; 155 (void) src;
156 Evas_Event_Key_Down *ev = event_info; 156 Evas_Event_Key_Down *ev = event_info;
diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c
index 8f971fb..16d58eb 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -729,7 +729,7 @@ _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
729} 729}
730 730
731EOLIAN static Eina_Bool 731EOLIAN static Eina_Bool
732_efl_ui_image_elm_widget_widget_event(Eo *obj, Efl_Ui_Image_Data *_pd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) 732_efl_ui_image_elm_widget_widget_event(Eo *obj, Efl_Ui_Image_Data *_pd EINA_UNUSED, const Efl_Event *eo_event EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info)
733{ 733{
734 (void) src; 734 (void) src;
735 Evas_Event_Key_Down *ev = event_info; 735 Evas_Event_Key_Down *ev = event_info;
diff --git a/src/lib/elementary/efl_ui_image_zoomable.c b/src/lib/elementary/efl_ui_image_zoomable.c
index e01fbd2..25dc146 100644
--- a/src/lib/elementary/efl_ui_image_zoomable.c
+++ b/src/lib/elementary/efl_ui_image_zoomable.c
@@ -1034,7 +1034,7 @@ _key_action_zoom(Evas_Object *obj, const char *params)
1034} 1034}
1035 1035
1036EOLIAN static Eina_Bool 1036EOLIAN static Eina_Bool
1037_efl_ui_image_zoomable_elm_widget_widget_event(Eo *obj, Efl_Ui_Image_Zoomable_Data *_pd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) 1037_efl_ui_image_zoomable_elm_widget_widget_event(Eo *obj, Efl_Ui_Image_Zoomable_Data *_pd EINA_UNUSED, const Efl_Event *eo_event EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info)
1038{ 1038{
1039 (void) src; 1039 (void) src;
1040 Evas_Event_Key_Down *ev = event_info; 1040 Evas_Event_Key_Down *ev = event_info;
diff --git a/src/lib/elementary/efl_ui_nstate.c b/src/lib/elementary/efl_ui_nstate.c
index 8fe122e..404d237 100644
--- a/src/lib/elementary/efl_ui_nstate.c
+++ b/src/lib/elementary/efl_ui_nstate.c
@@ -159,7 +159,7 @@ _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
159} 159}
160 160
161EOLIAN static Eina_Bool 161EOLIAN static Eina_Bool
162_efl_ui_nstate_elm_widget_widget_event(Eo *obj, Efl_Ui_Nstate_Data *_pd EINA_UNUSED, Evas_Object *src EINA_UNUSED, Evas_Callback_Type type, void *event_info) 162_efl_ui_nstate_elm_widget_widget_event(Eo *obj, Efl_Ui_Nstate_Data *_pd EINA_UNUSED, const Efl_Event *eo_event EINA_UNUSED, Evas_Object *src EINA_UNUSED, Evas_Callback_Type type, void *event_info)
163{ 163{
164 Evas_Event_Key_Down *ev = event_info; 164 Evas_Event_Key_Down *ev = event_info;
165 165
diff --git a/src/lib/elementary/efl_ui_radio.c b/src/lib/elementary/efl_ui_radio.c
index ef5d4af..9206374 100644
--- a/src/lib/elementary/efl_ui_radio.c
+++ b/src/lib/elementary/efl_ui_radio.c
@@ -131,7 +131,7 @@ _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
131} 131}
132 132
133EOLIAN static Eina_Bool 133EOLIAN static Eina_Bool
134_efl_ui_radio_elm_widget_widget_event(Eo *obj, Efl_Ui_Radio_Data *_pd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) 134_efl_ui_radio_elm_widget_widget_event(Eo *obj, Efl_Ui_Radio_Data *_pd EINA_UNUSED, const Efl_Event *eo_event EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info)
135{ 135{
136 (void) src; 136 (void) src;
137 Evas_Event_Key_Down *ev = event_info; 137 Evas_Event_Key_Down *ev = event_info;
diff --git a/src/lib/elementary/efl_ui_slider.c b/src/lib/elementary/efl_ui_slider.c
index 95ddded..d6e7814 100644
--- a/src/lib/elementary/efl_ui_slider.c
+++ b/src/lib/elementary/efl_ui_slider.c
@@ -564,7 +564,7 @@ _wheel_indicator_timer_cb(void *data)
564} 564}
565 565
566EOLIAN static Eina_Bool 566EOLIAN static Eina_Bool
567_efl_ui_slider_elm_widget_widget_event(Eo *obj, Efl_Ui_Slider_Data *sd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) 567_efl_ui_slider_elm_widget_widget_event(Eo *obj, Efl_Ui_Slider_Data *sd EINA_UNUSED, const Efl_Event *eo_event EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info)
568{ 568{
569 (void) src; 569 (void) src;
570 570
diff --git a/src/lib/elementary/efl_ui_video.c b/src/lib/elementary/efl_ui_video.c
index fc71e24..0e5144b 100644
--- a/src/lib/elementary/efl_ui_video.c
+++ b/src/lib/elementary/efl_ui_video.c
@@ -108,7 +108,7 @@ _key_action_play(Evas_Object *obj, const char *params EINA_UNUSED)
108} 108}
109 109
110EOLIAN static Eina_Bool 110EOLIAN static Eina_Bool
111_efl_ui_video_elm_widget_widget_event(Eo *obj, Efl_Ui_Video_Data *_pd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) 111_efl_ui_video_elm_widget_widget_event(Eo *obj, Efl_Ui_Video_Data *_pd EINA_UNUSED, const Efl_Event *eo_event EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info)
112{ 112{
113 (void) src; 113 (void) src;
114 Evas_Event_Key_Down *ev = event_info; 114 Evas_Event_Key_Down *ev = event_info;
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index aaa762e..7b5c4d1 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -1767,7 +1767,7 @@ _key_action_move(Evas_Object *obj, const char *params)
1767} 1767}
1768 1768
1769EOLIAN static Eina_Bool 1769EOLIAN static Eina_Bool
1770_efl_ui_win_elm_widget_widget_event(Eo *obj, Efl_Ui_Win_Data *_pd EINA_UNUSED, Evas_Object *src EINA_UNUSED, Evas_Callback_Type type, void *event_info) 1770_efl_ui_win_elm_widget_widget_event(Eo *obj, Efl_Ui_Win_Data *_pd EINA_UNUSED, const Efl_Event *eo_event EINA_UNUSED, Evas_Object *src EINA_UNUSED, Evas_Callback_Type type, void *event_info)
1771{ 1771{
1772 Evas_Event_Key_Down *ev = event_info; 1772 Evas_Event_Key_Down *ev = event_info;
1773 1773
diff --git a/src/lib/elementary/elc_combobox.c b/src/lib/elementary/elc_combobox.c
index c8c0d87..4480877 100644
--- a/src/lib/elementary/elc_combobox.c
+++ b/src/lib/elementary/elc_combobox.c
@@ -494,8 +494,9 @@ _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
494 494
495EOLIAN static Eina_Bool 495EOLIAN static Eina_Bool
496_elm_combobox_elm_widget_widget_event(Eo *obj, Elm_Combobox_Data *sd, 496_elm_combobox_elm_widget_widget_event(Eo *obj, Elm_Combobox_Data *sd,
497 Evas_Object *src EINA_UNUSED, 497 const Efl_Event *eo_event EINA_UNUSED,
498 Evas_Callback_Type type, void *event_info) 498 Evas_Object *src EINA_UNUSED,
499 Evas_Callback_Type type, void *event_info)
499{ 500{
500 Evas_Event_Key_Down *ev = event_info; 501 Evas_Event_Key_Down *ev = event_info;
501 if (!sd || !sd->hover) return EINA_FALSE; 502 if (!sd || !sd->hover) return EINA_FALSE;
diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c
index 234a9be..1de6d08 100644
--- a/src/lib/elementary/elc_ctxpopup.c
+++ b/src/lib/elementary/elc_ctxpopup.c
@@ -146,7 +146,7 @@ _key_action_escape(Evas_Object *obj, const char *params EINA_UNUSED)
146} 146}
147 147
148EOLIAN static Eina_Bool 148EOLIAN static Eina_Bool
149_elm_ctxpopup_elm_widget_widget_event(Eo *obj, Elm_Ctxpopup_Data *sd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) 149_elm_ctxpopup_elm_widget_widget_event(Eo *obj, Elm_Ctxpopup_Data *sd EINA_UNUSED, const Efl_Event *eo_event EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info)
150{ 150{
151 Evas_Event_Key_Down *ev = event_info; 151 Evas_Event_Key_Down *ev = event_info;
152 (void)src; 152 (void)src;
diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c
index efa644b..007c1b4 100644
--- a/src/lib/elementary/elc_fileselector.c
+++ b/src/lib/elementary/elc_fileselector.c
@@ -307,7 +307,7 @@ _key_action_backspace(Evas_Object *obj, const char *params EINA_UNUSED)
307} 307}
308 308
309EOLIAN static Eina_Bool 309EOLIAN static Eina_Bool
310_elm_fileselector_elm_widget_widget_event(Eo *obj, Elm_Fileselector_Data *sd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) 310_elm_fileselector_elm_widget_widget_event(Eo *obj, Elm_Fileselector_Data *sd EINA_UNUSED, const Efl_Event *eo_event EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info)
311{ 311{
312 Evas_Event_Key_Down *ev = event_info; 312 Evas_Event_Key_Down *ev = event_info;
313 (void) src; 313 (void) src;
diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c
index 4ea9679..4b68eb5 100644
--- a/src/lib/elementary/elc_hoversel.c
+++ b/src/lib/elementary/elc_hoversel.c
@@ -995,13 +995,13 @@ _key_action_escape(Evas_Object *obj, const char *params EINA_UNUSED)
995} 995}
996 996
997EOLIAN static Eina_Bool 997EOLIAN static Eina_Bool
998_elm_hoversel_elm_widget_widget_event(Eo *obj, Elm_Hoversel_Data *sd, Evas_Object *src, Evas_Callback_Type type, void *event_info) 998_elm_hoversel_elm_widget_widget_event(Eo *obj, Elm_Hoversel_Data *sd, const Efl_Event *eo_event, Evas_Object *src, Evas_Callback_Type type, void *event_info)
999{ 999{
1000 (void) src; 1000 (void) src;
1001 Eina_Bool int_ret = EINA_FALSE; 1001 Eina_Bool int_ret = EINA_FALSE;
1002 Evas_Event_Key_Down *ev = event_info; 1002 Evas_Event_Key_Down *ev = event_info;
1003 1003
1004 int_ret = elm_obj_widget_event(efl_super(obj, MY_CLASS), src, type, event_info); 1004 int_ret = elm_obj_widget_event(efl_super(obj, MY_CLASS), eo_event, src, type, event_info);
1005 if (int_ret) return EINA_FALSE; 1005 if (int_ret) return EINA_FALSE;
1006 1006
1007 if (!sd || !sd->hover) return EINA_FALSE; 1007 if (!sd || !sd->hover) return EINA_FALSE;
diff --git a/src/lib/elementary/elc_multibuttonentry.c b/src/lib/elementary/elc_multibuttonentry.c
index edcb604..34d37ca 100644
--- a/src/lib/elementary/elc_multibuttonentry.c
+++ b/src/lib/elementary/elc_multibuttonentry.c
@@ -971,7 +971,7 @@ _item_new(Elm_Multibuttonentry_Data *sd,
971//FIXME: having an empty event handling function and reacting on Evas 971//FIXME: having an empty event handling function and reacting on Evas
972//events on specific objects is crazy, someone should fix that. 972//events on specific objects is crazy, someone should fix that.
973EOLIAN static Eina_Bool 973EOLIAN static Eina_Bool
974_elm_multibuttonentry_elm_widget_widget_event(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Data *sd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *ev) 974_elm_multibuttonentry_elm_widget_widget_event(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Data *sd EINA_UNUSED, const Efl_Event *eo_event EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *ev)
975{ 975{
976 (void)src; 976 (void)src;
977 (void)type; 977 (void)type;
diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c
index f057bb5..e633627 100644
--- a/src/lib/elementary/elc_naviframe.c
+++ b/src/lib/elementary/elc_naviframe.c
@@ -1570,7 +1570,7 @@ _key_action_item_pop(Evas_Object *obj, const char *params EINA_UNUSED)
1570} 1570}
1571 1571
1572EOLIAN static Eina_Bool 1572EOLIAN static Eina_Bool
1573_elm_naviframe_elm_widget_widget_event(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) 1573_elm_naviframe_elm_widget_widget_event(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSED, const Efl_Event *eo_event EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info)
1574{ 1574{
1575 (void)src; 1575 (void)src;
1576 Evas_Event_Key_Down *ev = event_info; 1576 Evas_Event_Key_Down *ev = event_info;
diff --git a/src/lib/elementary/elc_player.c b/src/lib/elementary/elc_player.c
index d5f621c..d29e6b6 100644
--- a/src/lib/elementary/elc_player.c
+++ b/src/lib/elementary/elc_player.c
@@ -145,7 +145,7 @@ _key_action_play(Evas_Object *obj, const char *params EINA_UNUSED)
145} 145}
146 146
147EOLIAN static Eina_Bool 147EOLIAN static Eina_Bool
148_elm_player_elm_widget_widget_event(Eo *obj, Elm_Player_Data *sd, Evas_Object *src, Evas_Callback_Type type, void *event_info) 148_elm_player_elm_widget_widget_event(Eo *obj, Elm_Player_Data *sd, const Efl_Event *eo_event EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info)
149{ 149{
150 Evas_Event_Key_Down *ev = event_info; 150 Evas_Event_Key_Down *ev = event_info;
151 (void) src; 151 (void) src;
diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c
index fd86b93..f386c6c 100644
--- a/src/lib/elementary/elc_popup.c
+++ b/src/lib/elementary/elc_popup.c
@@ -1505,7 +1505,7 @@ _key_action_escape(Evas_Object *obj, const char *params EINA_UNUSED)
1505} 1505}
1506 1506
1507EOLIAN static Eina_Bool 1507EOLIAN static Eina_Bool
1508_elm_popup_elm_widget_widget_event(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) 1508_elm_popup_elm_widget_widget_event(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED, const Efl_Event *eo_event EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info)
1509{ 1509{
1510 (void)src; 1510 (void)src;
1511 Evas_Event_Key_Down *ev = event_info; 1511 Evas_Event_Key_Down *ev = event_info;
diff --git a/src/lib/elementary/elm_calendar.c b/src/lib/elementary/elm_calendar.c
index f75e182..9650dfa 100644
--- a/src/lib/elementary/elm_calendar.c
+++ b/src/lib/elementary/elm_calendar.c
@@ -1656,7 +1656,7 @@ _elm_calendar_elm_widget_on_focus(Eo *obj, Elm_Calendar_Data *sd, Elm_Object_Ite
1656} 1656}
1657 1657
1658EOLIAN static Eina_Bool 1658EOLIAN static Eina_Bool
1659_elm_calendar_elm_widget_widget_event(Eo *obj, Elm_Calendar_Data *sd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) 1659_elm_calendar_elm_widget_widget_event(Eo *obj, Elm_Calendar_Data *sd EINA_UNUSED, const Efl_Event *eo_event EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info)
1660{ 1660{
1661 (void) src; 1661 (void) src;
1662 Evas_Event_Key_Down *ev = event_info; 1662 Evas_Event_Key_Down *ev = event_info;
diff --git a/src/lib/elementary/elm_code_widget.c b/src/lib/elementary/elm_code_widget.c
index 2529321..a2b4b4c 100644
--- a/src/lib/elementary/elm_code_widget.c
+++ b/src/lib/elementary/elm_code_widget.c
@@ -1734,8 +1734,8 @@ _elm_code_widget_scroll_event_cb(void *data, Evas_Object *obj EINA_UNUSED,
1734} 1734}
1735 1735
1736EOLIAN static Eina_Bool 1736EOLIAN static Eina_Bool
1737_elm_code_widget_elm_widget_widget_event(Eo *obj EINA_UNUSED, Elm_Code_Widget_Data *pd EINA_UNUSED, 1737_elm_code_widget_elm_widget_widget_event(Eo *obj EINA_UNUSED, Elm_Code_Widget_Data *pd EINA_UNUSED, const Efl_Event *eo_event EINA_UNUSED,
1738 Evas_Object *src EINA_UNUSED, Evas_Callback_Type type, void *event_info) 1738 Evas_Object *src EINA_UNUSED, Evas_Callback_Type type, void *event_info)
1739{ 1739{
1740 Evas_Event_Key_Down *ev = event_info; 1740 Evas_Event_Key_Down *ev = event_info;
1741 1741
diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c
index 1cce002..f228b18 100644
--- a/src/lib/elementary/elm_colorselector.c
+++ b/src/lib/elementary/elm_colorselector.c
@@ -2164,7 +2164,7 @@ _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
2164} 2164}
2165 2165
2166EOLIAN static Eina_Bool 2166EOLIAN static Eina_Bool
2167_elm_colorselector_elm_widget_widget_event(Eo *obj, Elm_Colorselector_Data *sd, Evas_Object *src, Evas_Callback_Type type, void *event_info) 2167_elm_colorselector_elm_widget_widget_event(Eo *obj, Elm_Colorselector_Data *sd, const Efl_Event *eo_event EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info)
2168{ 2168{
2169 Evas_Event_Key_Down *ev = event_info; 2169 Evas_Event_Key_Down *ev = event_info;
2170 (void) src; 2170 (void) src;
diff --git a/src/lib/elementary/elm_diskselector.c b/src/lib/elementary/elm_diskselector.c
index e243196..630791b 100644
--- a/src/lib/elementary/elm_diskselector.c
+++ b/src/lib/elementary/elm_diskselector.c
@@ -997,7 +997,7 @@ _key_action_move(Evas_Object *obj, const char *params)
997} 997}
998 998
999EOLIAN static Eina_Bool 999EOLIAN static Eina_Bool
1000_elm_diskselector_elm_widget_widget_event(Eo *obj, Elm_Diskselector_Data *sd, Evas_Object *src, Evas_Callback_Type type, void *event_info) 1000_elm_diskselector_elm_widget_widget_event(Eo *obj, Elm_Diskselector_Data *sd, const Efl_Event *eo_event EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info)
1001{ 1001{
1002 Evas_Event_Key_Down *ev = event_info; 1002 Evas_Event_Key_Down *ev = event_info;
1003 1003
diff --git a/src/lib/elementary/elm_flipselector.c b/src/lib/elementary/elm_flipselector.c
index 4176ce9..c7c578b 100644
--- a/src/lib/elementary/elm_flipselector.c
+++ b/src/lib/elementary/elm_flipselector.c
@@ -530,7 +530,7 @@ _elm_flipselector_efl_ui_spin_value_set(Eo *obj EINA_UNUSED, Elm_Flipselector_Da
530} 530}
531 531
532EOLIAN static Eina_Bool 532EOLIAN static Eina_Bool
533_elm_flipselector_elm_widget_widget_event(Eo *obj EINA_UNUSED, Elm_Flipselector_Data *sd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) 533_elm_flipselector_elm_widget_widget_event(Eo *obj EINA_UNUSED, Elm_Flipselector_Data *sd EINA_UNUSED, const Efl_Event *eo_event EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info)
534{ 534{
535 Evas_Event_Key_Down *ev = event_info; 535 Evas_Event_Key_Down *ev = event_info;
536 (void) src; 536 (void) src;
diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c
index 15ff805..bd91470 100644
--- a/src/lib/elementary/elm_gengrid.c
+++ b/src/lib/elementary/elm_gengrid.c
@@ -3415,7 +3415,7 @@ _key_action_escape(Evas_Object *obj, const char *params EINA_UNUSED)
3415} 3415}
3416 3416
3417EOLIAN static Eina_Bool 3417EOLIAN static Eina_Bool
3418_elm_gengrid_elm_widget_widget_event(Eo *obj, Elm_Gengrid_Data *sd, Evas_Object *src, Evas_Callback_Type type, void *event_info) 3418_elm_gengrid_elm_widget_widget_event(Eo *obj, Elm_Gengrid_Data *sd, const Efl_Event *eo_event EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info)
3419{ 3419{
3420 Evas_Event_Key_Down *ev = event_info; 3420 Evas_Event_Key_Down *ev = event_info;
3421 (void) src; 3421 (void) src;
diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c
index 140ff61..04976ca 100644
--- a/src/lib/elementary/elm_genlist.c
+++ b/src/lib/elementary/elm_genlist.c
@@ -3194,7 +3194,7 @@ _key_action_escape(Evas_Object *obj, const char *params EINA_UNUSED)
3194} 3194}
3195 3195
3196EOLIAN static Eina_Bool 3196EOLIAN static Eina_Bool
3197_elm_genlist_elm_widget_widget_event(Eo *obj, Elm_Genlist_Data *sd, Evas_Object *src, Evas_Callback_Type type, void *event_info) 3197_elm_genlist_elm_widget_widget_event(Eo *obj, Elm_Genlist_Data *sd, const Efl_Event *eo_event EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info)
3198{ 3198{
3199 (void) src; 3199 (void) src;
3200 Evas_Event_Key_Down *ev = event_info; 3200 Evas_Event_Key_Down *ev = event_info;
diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c
index d71ac4f..ce816d2 100644
--- a/src/lib/elementary/elm_list.c
+++ b/src/lib/elementary/elm_list.c
@@ -629,7 +629,7 @@ static Eina_Bool _key_action_escape(Evas_Object *obj, const char *params EINA_UN
629} 629}
630 630
631EOLIAN static Eina_Bool 631EOLIAN static Eina_Bool
632_elm_list_elm_widget_widget_event(Eo *obj, Elm_List_Data *sd, Evas_Object *src, Evas_Callback_Type type, void *event_info) 632_elm_list_elm_widget_widget_event(Eo *obj, Elm_List_Data *sd, const Efl_Event *eo_event EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info)
633{ 633{
634 (void) src; 634 (void) src;
635 Evas_Event_Key_Down *ev = event_info; 635 Evas_Event_Key_Down *ev = event_info;
diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c
index 03dd0e0..6ce05ac 100644
--- a/src/lib/elementary/elm_map.c
+++ b/src/lib/elementary/elm_map.c
@@ -4069,7 +4069,7 @@ _key_action_zoom(Evas_Object *obj, const char *params)
4069} 4069}
4070 4070
4071EOLIAN static Eina_Bool 4071EOLIAN static Eina_Bool
4072_elm_map_elm_widget_widget_event(Eo *obj, Elm_Map_Data *sd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) 4072_elm_map_elm_widget_widget_event(Eo *obj, Elm_Map_Data *sd EINA_UNUSED, const Efl_Event *eo_event EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info)
4073{ 4073{
4074 (void) src; 4074 (void) src;
4075 Evas_Event_Key_Down *ev = event_info; 4075 Evas_Event_Key_Down *ev = event_info;
diff --git a/src/lib/elementary/elm_panel.c b/src/lib/elementary/elm_panel.c
index 5c6ee59..c1a4915 100644
--- a/src/lib/elementary/elm_panel.c
+++ b/src/lib/elementary/elm_panel.c
@@ -758,7 +758,7 @@ _key_action_toggle(Evas_Object *obj, const char *params EINA_UNUSED)
758} 758}
759 759
760EOLIAN static Eina_Bool 760EOLIAN static Eina_Bool
761_elm_panel_elm_widget_widget_event(Eo *obj, Elm_Panel_Data *_pd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) 761_elm_panel_elm_widget_widget_event(Eo *obj, Elm_Panel_Data *_pd EINA_UNUSED, const Efl_Event *eo_event EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info)
762{ 762{
763 Evas_Event_Key_Down *ev = event_info; 763 Evas_Event_Key_Down *ev = event_info;
764 if (type != EVAS_CALLBACK_KEY_DOWN) return EINA_FALSE; 764 if (type != EVAS_CALLBACK_KEY_DOWN) return EINA_FALSE;
diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c
index 417d84e..752fa36 100644
--- a/src/lib/elementary/elm_scroller.c
+++ b/src/lib/elementary/elm_scroller.c
@@ -262,7 +262,7 @@ _key_action_move(Evas_Object *obj, const char *params)
262} 262}
263 263
264EOLIAN static Eina_Bool 264EOLIAN static Eina_Bool
265_elm_scroller_elm_widget_widget_event(Eo *obj, Elm_Scroller_Data *sd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) 265_elm_scroller_elm_widget_widget_event(Eo *obj, Elm_Scroller_Data *sd EINA_UNUSED, const Efl_Event *eo_event EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info)
266{ 266{
267 (void) src; 267 (void) src;
268 Evas_Event_Key_Down *ev = event_info; 268 Evas_Event_Key_Down *ev = event_info;
diff --git a/src/lib/elementary/elm_slideshow.c b/src/lib/elementary/elm_slideshow.c
index dd1bb75..e135a9f 100644
--- a/src/lib/elementary/elm_slideshow.c
+++ b/src/lib/elementary/elm_slideshow.c
@@ -75,7 +75,7 @@ _key_action_pause(Evas_Object *obj, const char *params EINA_UNUSED)
75} 75}
76 76
77EOLIAN static Eina_Bool 77EOLIAN static Eina_Bool
78_elm_slideshow_elm_widget_widget_event(Eo *obj, Elm_Slideshow_Data *sd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) 78_elm_slideshow_elm_widget_widget_event(Eo *obj, Elm_Slideshow_Data *sd EINA_UNUSED, const Efl_Event *eo_event EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info)
79{ 79{
80 Evas_Event_Key_Down *ev = event_info; 80 Evas_Event_Key_Down *ev = event_info;
81 (void) src; 81 (void) src;
diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c
index fa19961..6b817e3 100644
--- a/src/lib/elementary/elm_spinner.c
+++ b/src/lib/elementary/elm_spinner.c
@@ -727,7 +727,7 @@ _key_action_toggle(Evas_Object *obj, const char *params EINA_UNUSED)
727} 727}
728 728
729EOLIAN static Eina_Bool 729EOLIAN static Eina_Bool
730_elm_spinner_elm_widget_widget_event(Eo *obj, Elm_Spinner_Data *sd EINA_UNUSED, Evas_Object *src EINA_UNUSED, Evas_Callback_Type type, void *event_info) 730_elm_spinner_elm_widget_widget_event(Eo *obj, Elm_Spinner_Data *sd EINA_UNUSED, const Efl_Event *eo_event EINA_UNUSED, Evas_Object *src EINA_UNUSED, Evas_Callback_Type type, void *event_info)
731{ 731{
732 Evas_Event_Key_Down *ev = event_info; 732 Evas_Event_Key_Down *ev = event_info;
733 Evas_Event_Mouse_Wheel *mev = event_info; 733 Evas_Event_Mouse_Wheel *mev = event_info;
diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c
index ef75fc1..64094d9 100644
--- a/src/lib/elementary/elm_toolbar.c
+++ b/src/lib/elementary/elm_toolbar.c
@@ -905,7 +905,7 @@ _key_action_select(Evas_Object *obj, const char *params EINA_UNUSED)
905} 905}
906 906
907EOLIAN static Eina_Bool 907EOLIAN static Eina_Bool
908_elm_toolbar_elm_widget_widget_event(Eo *obj, Elm_Toolbar_Data *sd, Evas_Object *src, Evas_Callback_Type type, void *event_info) 908_elm_toolbar_elm_widget_widget_event(Eo *obj, Elm_Toolbar_Data *sd, const Efl_Event *eo_event EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info)
909{ 909{
910 (void) src; 910 (void) src;
911 (void) type; 911 (void) type;
diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index 0eead3f..511ef8c 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -111,6 +111,7 @@ static void
111_on_sub_obj_hide(void *data, const Efl_Event *event); 111_on_sub_obj_hide(void *data, const Efl_Event *event);
112static void 112static void
113_propagate_event(void *data, const Efl_Event *event); 113_propagate_event(void *data, const Efl_Event *event);
114static Eina_Bool elm_widget_event_propagate(Evas_Object *obj, const Efl_Event *eo_event, Evas_Callback_Type type, void *event_info, Evas_Event_Flags *event_flags);
114 115
115EFL_CALLBACKS_ARRAY_DEFINE(elm_widget_subitems_callbacks, 116EFL_CALLBACKS_ARRAY_DEFINE(elm_widget_subitems_callbacks,
116 { EFL_EVENT_DEL, _on_sub_obj_del }, 117 { EFL_EVENT_DEL, _on_sub_obj_del },
@@ -1026,7 +1027,7 @@ _propagate_event(void *data EINA_UNUSED, const Efl_Event *event)
1026 return; 1027 return;
1027 1028
1028 prev_flags = *event_flags; 1029 prev_flags = *event_flags;
1029 elm_widget_event_propagate(obj, type, event_info.any, event_flags); 1030 elm_widget_event_propagate(obj, event, type, event_info.any, event_flags);
1030 if (prev_flags != *event_flags) 1031 if (prev_flags != *event_flags)
1031 efl_input_event_flags_set(event->info, *event_flags); 1032 efl_input_event_flags_set(event->info, *event_flags);
1032} 1033}
@@ -2001,8 +2002,9 @@ elm_widget_event_callback_del(Eo *obj, Elm_Event_Cb func, const void *data)
2001 return NULL; 2002 return NULL;
2002} 2003}
2003 2004
2004EAPI Eina_Bool 2005static Eina_Bool
2005elm_widget_event_propagate(Eo *obj, Evas_Callback_Type type, void *event_info, 2006elm_widget_event_propagate(Eo *obj, const Efl_Event *eo_event,
2007 Evas_Callback_Type type, void *event_info,
2006 Evas_Event_Flags *event_flags) 2008 Evas_Event_Flags *event_flags)
2007{ 2009{
2008 Evas_Object *parent = obj; 2010 Evas_Object *parent = obj;
@@ -2023,7 +2025,7 @@ elm_widget_event_propagate(Eo *obj, Evas_Callback_Type type, void *event_info,
2023 continue; 2025 continue;
2024 } 2026 }
2025 2027
2026 int_ret = elm_obj_widget_event(parent, obj, type, event_info); 2028 int_ret = elm_obj_widget_event(parent, eo_event, obj, type, event_info);
2027 if (int_ret) return EINA_TRUE; 2029 if (int_ret) return EINA_TRUE;
2028 2030
2029 EINA_LIST_FOREACH_SAFE(sd->event_cb, l, l_prev, ecd) 2031 EINA_LIST_FOREACH_SAFE(sd->event_cb, l, l_prev, ecd)
@@ -6208,7 +6210,7 @@ _elm_widget_disable(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED)
6208} 6210}
6209 6211
6210EOLIAN static Eina_Bool 6212EOLIAN static Eina_Bool
6211_elm_widget_widget_event(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *source EINA_UNUSED, Evas_Callback_Type type EINA_UNUSED, void *event_info EINA_UNUSED) 6213_elm_widget_widget_event(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, const Efl_Event *eo_event EINA_UNUSED, Evas_Object *source EINA_UNUSED, Evas_Callback_Type type EINA_UNUSED, void *event_info EINA_UNUSED)
6212{ 6214{
6213 return EINA_FALSE; 6215 return EINA_FALSE;
6214} 6216}
diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/elm_widget.eo
index e1dee74..f2428c4 100644
--- a/src/lib/elementary/elm_widget.eo
+++ b/src/lib/elementary/elm_widget.eo
@@ -497,13 +497,14 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible,
497 } 497 }
498 widget_event { 498 widget_event {
499 [['Virtual' function handling input events on the widget.]] 499 [['Virtual' function handling input events on the widget.]]
500 legacy: elm_widget_event;
501 params { 500 params {
501 @in eo_event: const(ptr(Efl.Event)); [[EO event info with an Efl.Input.Event]]
502 @in source: Efl.Canvas.Object; [[Source object]] 502 @in source: Efl.Canvas.Object; [[Source object]]
503 @in type: Evas.Callback_Type; [[Callback type]] 503 @in type: Evas.Callback_Type; [[Callback type]]
504 @in event_info: void_ptr; [[Event info]] 504 @in event_info: void_ptr; [[Event info]]
505 } 505 }
506 return: bool; [[$true on success, $false otherwise]] 506 return: bool; [[$true on success, $false otherwise]]
507 legacy: null;
507 } 508 }
508 access { 509 access {
509 [['Virtual' function on the widget being set access.]] 510 [['Virtual' function on the widget being set access.]]
diff --git a/src/lib/elementary/elm_widget.h b/src/lib/elementary/elm_widget.h
index 9fc2cbe..f29f505 100644
--- a/src/lib/elementary/elm_widget.h
+++ b/src/lib/elementary/elm_widget.h
@@ -671,7 +671,6 @@ EAPI Eina_Bool elm_widget_is(const Evas_Object *obj);
671EAPI Evas_Object *elm_widget_parent_widget_get(const Evas_Object *obj); 671EAPI Evas_Object *elm_widget_parent_widget_get(const Evas_Object *obj);
672EAPI void elm_widget_event_callback_add(Evas_Object *obj, Elm_Event_Cb func, const void *data); 672EAPI void elm_widget_event_callback_add(Evas_Object *obj, Elm_Event_Cb func, const void *data);
673EAPI void *elm_widget_event_callback_del(Evas_Object *obj, Elm_Event_Cb func, const void *data); 673EAPI void *elm_widget_event_callback_del(Evas_Object *obj, Elm_Event_Cb func, const void *data);
674EAPI Eina_Bool elm_widget_event_propagate(Evas_Object *obj, Evas_Callback_Type type, void *event_info, Evas_Event_Flags *event_flags);
675EAPI void elm_widget_focus_custom_chain_set(Evas_Object *obj, Eina_List *objs); 674EAPI void elm_widget_focus_custom_chain_set(Evas_Object *obj, Eina_List *objs);
676EAPI void elm_widget_focus_custom_chain_unset(Evas_Object *obj); 675EAPI void elm_widget_focus_custom_chain_unset(Evas_Object *obj);
677EAPI const Eina_List *elm_widget_focus_custom_chain_get(const Evas_Object *obj); 676EAPI const Eina_List *elm_widget_focus_custom_chain_get(const Evas_Object *obj);