summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-03-08 10:52:03 -0500
committerCedric BAIL <cedric.bail@free.fr>2019-03-08 12:17:54 -0800
commitf629f11bedad7b137b012d36102ad5bb1f2b4b4f (patch)
tree56f879c505874544b9f66e045a142b7a02337f8f
parent36661a436edffa53dd1faf5d25df1a8ea8c00261 (diff)
efl_ui_selectable: namespace events to avoid conflicts
Reviewed-by: Cedric BAIL <cedric.bail@free.fr> Differential Revision: https://phab.enlightenment.org/D8261
-rw-r--r--src/examples/elementary/efl_ui_list_example_1.c4
-rw-r--r--src/lib/efl/interfaces/efl_ui_selectable.eo16
-rw-r--r--src/lib/elementary/efl_ui_grid.c12
-rw-r--r--src/lib/elementary/efl_ui_item.c4
-rw-r--r--src/lib/elementary/efl_ui_list.c12
-rw-r--r--src/lib/elementary/efl_ui_tab_bar.c2
-rw-r--r--src/lib/elementary/efl_ui_tab_pager.c6
-rw-r--r--src/lib/elementary/efl_ui_text.c6
-rw-r--r--src/lib/elementary/elc_fileselector.c16
-rw-r--r--src/lib/elementary/elc_fileselector_entry.c12
-rw-r--r--src/lib/elementary/elc_hoversel.c2
-rw-r--r--src/lib/elementary/elm_actionslider.c12
-rw-r--r--src/lib/elementary/elm_color_class.c2
-rw-r--r--src/lib/elementary/elm_diskselector.c2
-rw-r--r--src/lib/elementary/elm_entry.c16
-rw-r--r--src/lib/elementary/elm_flipselector.c2
-rw-r--r--src/lib/elementary/elm_gengrid.c4
-rw-r--r--src/lib/elementary/elm_genlist.c4
-rw-r--r--src/lib/elementary/elm_index.c4
-rw-r--r--src/lib/elementary/elm_list.c4
-rw-r--r--src/lib/elementary/elm_toolbar.c4
21 files changed, 73 insertions, 73 deletions
diff --git a/src/examples/elementary/efl_ui_list_example_1.c b/src/examples/elementary/efl_ui_list_example_1.c
index bf22dfb441..cad8e112ad 100644
--- a/src/examples/elementary/efl_ui_list_example_1.c
+++ b/src/examples/elementary/efl_ui_list_example_1.c
@@ -126,8 +126,8 @@ elm_main(int argc EINA_UNUSED, char **argv)
126 priv_d.list = list = efl_add(EFL_UI_LIST_CLASS, wbox); 126 priv_d.list = list = efl_add(EFL_UI_LIST_CLASS, wbox);
127 efl_gfx_hint_weight_set(list, EFL_GFX_HINT_EXPAND, 0.9); 127 efl_gfx_hint_weight_set(list, EFL_GFX_HINT_EXPAND, 0.9);
128 128
129 efl_event_callback_add(list, EFL_UI_EVENT_SELECTED, _list_selected, NULL); 129 efl_event_callback_add(list, EFL_UI_EVENT_SELECTABLE_SELECTED, _list_selected, NULL);
130 efl_event_callback_add(list, EFL_UI_EVENT_UNSELECTED, _list_unselected, NULL); 130 efl_event_callback_add(list, EFL_UI_EVENT_SELECTABLE_UNSELECTED, _list_unselected, NULL);
131 efl_event_callback_add(list, EFL_UI_EVENT_PRESSED, _list_pressed, NULL); 131 efl_event_callback_add(list, EFL_UI_EVENT_PRESSED, _list_pressed, NULL);
132 efl_event_callback_add(list, EFL_UI_EVENT_UNPRESSED, _list_unpressed, NULL); 132 efl_event_callback_add(list, EFL_UI_EVENT_UNPRESSED, _list_unpressed, NULL);
133 efl_event_callback_add(list, EFL_UI_EVENT_LONGPRESSED, _list_longpressed, NULL); 133 efl_event_callback_add(list, EFL_UI_EVENT_LONGPRESSED, _list_longpressed, NULL);
diff --git a/src/lib/efl/interfaces/efl_ui_selectable.eo b/src/lib/efl/interfaces/efl_ui_selectable.eo
index 770e5e2132..a3dd4ac548 100644
--- a/src/lib/efl/interfaces/efl_ui_selectable.eo
+++ b/src/lib/efl/interfaces/efl_ui_selectable.eo
@@ -4,14 +4,14 @@ interface @beta Efl.Ui.Selectable
4 event_prefix: efl_ui; 4 event_prefix: efl_ui;
5 events { 5 events {
6 /* FIXME: Called with multiple types of event_info! */ 6 /* FIXME: Called with multiple types of event_info! */
7 selected: void; [[Called when selected]] 7 selectable,selected: void; [[Called when selected]]
8 /* FIXME: Called with multiple types of event_info! */ 8 /* FIXME: Called with multiple types of event_info! */
9 unselected: void; [[Called when no longer selected]] 9 selectable,unselected: void; [[Called when no longer selected]]
10 selection,paste: void; [[Called when selection is pasted]] 10 selectable,paste: void; [[Called when selection is pasted]]
11 selection,copy: void; [[Called when selection is copied]] 11 selectable,copy: void; [[Called when selection is copied]]
12 selection,cut: void; [[Called when selection is cut]] 12 selectable,cut: void; [[Called when selection is cut]]
13 selection,start: void; [[Called at selection start]] 13 selectable,start: void; [[Called at selection start]]
14 selection,changed: void; [[Called when selection is changed]] 14 selectable,changed: void; [[Called when selection is changed]]
15 selection,cleared: void; [[Called when selection is cleared]] 15 selectable,cleared: void; [[Called when selection is cleared]]
16 } 16 }
17} 17}
diff --git a/src/lib/elementary/efl_ui_grid.c b/src/lib/elementary/efl_ui_grid.c
index 18e9144077..58cacdd6f3 100644
--- a/src/lib/elementary/efl_ui_grid.c
+++ b/src/lib/elementary/efl_ui_grid.c
@@ -902,7 +902,7 @@ _grid_item_selected(void *data, const Efl_Event *event)
902 pd->selected = eina_list_append(pd->selected, item); 902 pd->selected = eina_list_append(pd->selected, item);
903 pd->last_selected = item; 903 pd->last_selected = item;
904 904
905 efl_event_callback_call(obj, EFL_UI_EVENT_SELECTED, item); 905 efl_event_callback_call(obj, EFL_UI_EVENT_SELECTABLE_SELECTED, item);
906} 906}
907 907
908static void 908static void
@@ -915,7 +915,7 @@ _grid_item_unselected(void *data, const Efl_Event *event)
915 pd->selected = eina_list_remove(pd->selected, item); 915 pd->selected = eina_list_remove(pd->selected, item);
916 if (pd->last_selected == item) pd->last_selected = NULL; 916 if (pd->last_selected == item) pd->last_selected = NULL;
917 917
918 efl_event_callback_call(obj, EFL_UI_EVENT_UNSELECTED, item); 918 efl_event_callback_call(obj, EFL_UI_EVENT_SELECTABLE_UNSELECTED, item);
919} 919}
920 920
921static void 921static void
@@ -944,8 +944,8 @@ _grid_item_process(Eo *obj, Efl_Ui_Grid_Data *pd, EINA_UNUSED Efl_Ui_Grid_Item *
944 efl_event_callback_add(it, EFL_UI_EVENT_PRESSED, _grid_item_pressed, obj); 944 efl_event_callback_add(it, EFL_UI_EVENT_PRESSED, _grid_item_pressed, obj);
945 efl_event_callback_add(it, EFL_UI_EVENT_UNPRESSED, _grid_item_unpressed, obj); 945 efl_event_callback_add(it, EFL_UI_EVENT_UNPRESSED, _grid_item_unpressed, obj);
946 efl_event_callback_add(it, EFL_UI_EVENT_LONGPRESSED, _grid_item_longpressed, obj); 946 efl_event_callback_add(it, EFL_UI_EVENT_LONGPRESSED, _grid_item_longpressed, obj);
947 efl_event_callback_add(it, EFL_UI_EVENT_SELECTED, _grid_item_selected, obj); 947 efl_event_callback_add(it, EFL_UI_EVENT_SELECTABLE_SELECTED, _grid_item_selected, obj);
948 efl_event_callback_add(it, EFL_UI_EVENT_UNSELECTED, _grid_item_unselected, obj); 948 efl_event_callback_add(it, EFL_UI_EVENT_SELECTABLE_UNSELECTED, _grid_item_unselected, obj);
949 efl_event_callback_add(it, EFL_EVENT_DEL, _grid_item_deleted, obj); 949 efl_event_callback_add(it, EFL_EVENT_DEL, _grid_item_deleted, obj);
950 950
951 return EINA_TRUE; 951 return EINA_TRUE;
@@ -970,8 +970,8 @@ _grid_item_unpack_internal(Eo *obj, Efl_Ui_Grid_Data *pd, Efl_Ui_Grid_Item *it)
970 efl_event_callback_del(it, EFL_UI_EVENT_PRESSED, _grid_item_pressed, obj); 970 efl_event_callback_del(it, EFL_UI_EVENT_PRESSED, _grid_item_pressed, obj);
971 efl_event_callback_del(it, EFL_UI_EVENT_UNPRESSED, _grid_item_unpressed, obj); 971 efl_event_callback_del(it, EFL_UI_EVENT_UNPRESSED, _grid_item_unpressed, obj);
972 efl_event_callback_del(it, EFL_UI_EVENT_LONGPRESSED, _grid_item_longpressed, obj); 972 efl_event_callback_del(it, EFL_UI_EVENT_LONGPRESSED, _grid_item_longpressed, obj);
973 efl_event_callback_del(it, EFL_UI_EVENT_SELECTED, _grid_item_selected, obj); 973 efl_event_callback_del(it, EFL_UI_EVENT_SELECTABLE_SELECTED, _grid_item_selected, obj);
974 efl_event_callback_del(it, EFL_UI_EVENT_UNSELECTED, _grid_item_unselected, obj); 974 efl_event_callback_del(it, EFL_UI_EVENT_SELECTABLE_UNSELECTED, _grid_item_unselected, obj);
975 efl_event_callback_del(it, EFL_EVENT_DEL, _grid_item_deleted, obj); 975 efl_event_callback_del(it, EFL_EVENT_DEL, _grid_item_deleted, obj);
976} 976}
977 977
diff --git a/src/lib/elementary/efl_ui_item.c b/src/lib/elementary/efl_ui_item.c
index 6070bda7a9..e4d616c2be 100644
--- a/src/lib/elementary/efl_ui_item.c
+++ b/src/lib/elementary/efl_ui_item.c
@@ -27,7 +27,7 @@ _item_select(Eo *obj, Efl_Ui_Item_Data *pd)
27 27
28 pd->selected = EINA_TRUE; 28 pd->selected = EINA_TRUE;
29 edje_object_signal_emit(wd->resize_obj, "efl,state,selected", "efl"); 29 edje_object_signal_emit(wd->resize_obj, "efl,state,selected", "efl");
30 efl_event_callback_call(obj, EFL_UI_EVENT_SELECTED, NULL); 30 efl_event_callback_call(obj, EFL_UI_EVENT_SELECTABLE_SELECTED, NULL);
31} 31}
32 32
33static void 33static void
@@ -38,7 +38,7 @@ _item_unselect(Eo *obj, Efl_Ui_Item_Data *pd)
38 38
39 pd->selected = EINA_FALSE; 39 pd->selected = EINA_FALSE;
40 edje_object_signal_emit(wd->resize_obj, "efl,state,unselected", "efl"); 40 edje_object_signal_emit(wd->resize_obj, "efl,state,unselected", "efl");
41 efl_event_callback_call(obj, EFL_UI_EVENT_UNSELECTED, NULL); 41 efl_event_callback_call(obj, EFL_UI_EVENT_SELECTABLE_UNSELECTED, NULL);
42} 42}
43 43
44/* Mouse Controls */ 44/* Mouse Controls */
diff --git a/src/lib/elementary/efl_ui_list.c b/src/lib/elementary/efl_ui_list.c
index bcaca6e10b..ff08383e39 100644
--- a/src/lib/elementary/efl_ui_list.c
+++ b/src/lib/elementary/efl_ui_list.c
@@ -657,7 +657,7 @@ _list_item_selected(void *data, const Efl_Event *event)
657 pd->selected = eina_list_append(pd->selected, item); 657 pd->selected = eina_list_append(pd->selected, item);
658 pd->last_selected = item; 658 pd->last_selected = item;
659 659
660 efl_event_callback_call(obj, EFL_UI_EVENT_SELECTED, item); 660 efl_event_callback_call(obj, EFL_UI_EVENT_SELECTABLE_SELECTED, item);
661} 661}
662 662
663static void 663static void
@@ -670,7 +670,7 @@ _list_item_unselected(void *data, const Efl_Event *event)
670 pd->selected = eina_list_remove(pd->selected, item); 670 pd->selected = eina_list_remove(pd->selected, item);
671 if (pd->last_selected == item) pd->last_selected = NULL; 671 if (pd->last_selected == item) pd->last_selected = NULL;
672 672
673 efl_event_callback_call(obj, EFL_UI_EVENT_UNSELECTED, item); 673 efl_event_callback_call(obj, EFL_UI_EVENT_SELECTABLE_UNSELECTED, item);
674} 674}
675 675
676static Eina_Bool 676static Eina_Bool
@@ -689,8 +689,8 @@ _list_item_process(Eo *obj, Efl_Ui_List_Data *pd, EINA_UNUSED Efl_Ui_List_Item *
689 efl_event_callback_add(it, EFL_UI_EVENT_PRESSED, _list_item_pressed, obj); 689 efl_event_callback_add(it, EFL_UI_EVENT_PRESSED, _list_item_pressed, obj);
690 efl_event_callback_add(it, EFL_UI_EVENT_UNPRESSED, _list_item_unpressed, obj); 690 efl_event_callback_add(it, EFL_UI_EVENT_UNPRESSED, _list_item_unpressed, obj);
691 efl_event_callback_add(it, EFL_UI_EVENT_LONGPRESSED, _list_item_longpressed, obj); 691 efl_event_callback_add(it, EFL_UI_EVENT_LONGPRESSED, _list_item_longpressed, obj);
692 efl_event_callback_add(it, EFL_UI_EVENT_SELECTED, _list_item_selected, obj); 692 efl_event_callback_add(it, EFL_UI_EVENT_SELECTABLE_SELECTED, _list_item_selected, obj);
693 efl_event_callback_add(it, EFL_UI_EVENT_UNSELECTED, _list_item_unselected, obj); 693 efl_event_callback_add(it, EFL_UI_EVENT_SELECTABLE_UNSELECTED, _list_item_unselected, obj);
694 694
695 return EINA_TRUE; 695 return EINA_TRUE;
696} 696}
@@ -708,8 +708,8 @@ _list_item_clear(Eo *obj, Efl_Ui_List_Data *pd EINA_UNUSED, EINA_UNUSED Efl_Ui_L
708 efl_event_callback_del(it, EFL_UI_EVENT_PRESSED, _list_item_pressed, obj); 708 efl_event_callback_del(it, EFL_UI_EVENT_PRESSED, _list_item_pressed, obj);
709 efl_event_callback_del(it, EFL_UI_EVENT_UNPRESSED, _list_item_unpressed, obj); 709 efl_event_callback_del(it, EFL_UI_EVENT_UNPRESSED, _list_item_unpressed, obj);
710 efl_event_callback_del(it, EFL_UI_EVENT_LONGPRESSED, _list_item_longpressed, obj); 710 efl_event_callback_del(it, EFL_UI_EVENT_LONGPRESSED, _list_item_longpressed, obj);
711 efl_event_callback_del(it, EFL_UI_EVENT_SELECTED, _list_item_selected, obj); 711 efl_event_callback_del(it, EFL_UI_EVENT_SELECTABLE_SELECTED, _list_item_selected, obj);
712 efl_event_callback_del(it, EFL_UI_EVENT_UNSELECTED, _list_item_unselected, obj); 712 efl_event_callback_del(it, EFL_UI_EVENT_SELECTABLE_UNSELECTED, _list_item_unselected, obj);
713} 713}
714 714
715/* Pack APIs */ 715/* Pack APIs */
diff --git a/src/lib/elementary/efl_ui_tab_bar.c b/src/lib/elementary/efl_ui_tab_bar.c
index 077212cb1c..0cc849c8ce 100644
--- a/src/lib/elementary/efl_ui_tab_bar.c
+++ b/src/lib/elementary/efl_ui_tab_bar.c
@@ -187,7 +187,7 @@ _tab_select(Efl_Ui_Tab_Bar_Data *sd, Tab_Info *ti)
187 187
188 index = eina_list_data_idx(sd->tab_infos, ti); 188 index = eina_list_data_idx(sd->tab_infos, ti);
189 189
190 efl_event_callback_call(tp, EFL_UI_EVENT_SELECTED, (void *)(intptr_t)index); 190 efl_event_callback_call(tp, EFL_UI_EVENT_SELECTABLE_SELECTED, (void *)(intptr_t)index);
191 191
192 sd->cur = index; 192 sd->cur = index;
193 } 193 }
diff --git a/src/lib/elementary/efl_ui_tab_pager.c b/src/lib/elementary/efl_ui_tab_pager.c
index 45758cbc98..3edbf1a0f4 100644
--- a/src/lib/elementary/efl_ui_tab_pager.c
+++ b/src/lib/elementary/efl_ui_tab_pager.c
@@ -60,7 +60,7 @@ _efl_ui_tab_pager_tab_bar_set(Eo *obj, Efl_Ui_Tab_Pager_Data *sd, Efl_Canvas_Obj
60{ 60{
61 if (sd->tab_bar != NULL) 61 if (sd->tab_bar != NULL)
62 { 62 {
63 efl_event_callback_del(sd->tab_bar, EFL_UI_EVENT_SELECTED, _tab_select_cb, obj); 63 efl_event_callback_del(sd->tab_bar, EFL_UI_EVENT_SELECTABLE_SELECTED, _tab_select_cb, obj);
64 efl_content_unset(efl_part(obj, "efl.tab_root")); 64 efl_content_unset(efl_part(obj, "efl.tab_root"));
65 efl_del(sd->tab_bar); 65 efl_del(sd->tab_bar);
66 } 66 }
@@ -68,7 +68,7 @@ _efl_ui_tab_pager_tab_bar_set(Eo *obj, Efl_Ui_Tab_Pager_Data *sd, Efl_Canvas_Obj
68 sd->tab_bar = tab_bar; 68 sd->tab_bar = tab_bar;
69 efl_content_set(efl_part(obj, "efl.tab_root"), sd->tab_bar); 69 efl_content_set(efl_part(obj, "efl.tab_root"), sd->tab_bar);
70 70
71 efl_event_callback_add(sd->tab_bar, EFL_UI_EVENT_SELECTED, _tab_select_cb, obj); 71 efl_event_callback_add(sd->tab_bar, EFL_UI_EVENT_SELECTABLE_SELECTED, _tab_select_cb, obj);
72} 72}
73 73
74EOLIAN static Efl_Canvas_Object * 74EOLIAN static Efl_Canvas_Object *
@@ -87,7 +87,7 @@ EOLIAN static void
87_efl_ui_tab_pager_efl_object_destructor(Eo *obj, Efl_Ui_Tab_Pager_Data *sd) 87_efl_ui_tab_pager_efl_object_destructor(Eo *obj, Efl_Ui_Tab_Pager_Data *sd)
88{ 88{
89 if (sd->tab_bar != NULL) 89 if (sd->tab_bar != NULL)
90 efl_event_callback_del(sd->tab_bar, EFL_UI_EVENT_SELECTED, _tab_select_cb, obj); 90 efl_event_callback_del(sd->tab_bar, EFL_UI_EVENT_SELECTABLE_SELECTED, _tab_select_cb, obj);
91 91
92 efl_destructor(efl_super(obj, MY_CLASS)); 92 efl_destructor(efl_super(obj, MY_CLASS));
93} 93}
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index 53dddbeba0..b5a93634f0 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -1217,7 +1217,7 @@ _cut_cb(Eo *obj)
1217 Efl_Text_Cursor_Cursor *start, *end; 1217 Efl_Text_Cursor_Cursor *start, *end;
1218 EFL_UI_TEXT_DATA_GET(obj, sd); 1218 EFL_UI_TEXT_DATA_GET(obj, sd);
1219 1219
1220 efl_event_callback_call(obj, EFL_UI_EVENT_SELECTION_CUT, NULL); 1220 efl_event_callback_call(obj, EFL_UI_EVENT_SELECTABLE_CUT, NULL);
1221 /* Store it */ 1221 /* Store it */
1222 sd->sel_mode = EINA_FALSE; 1222 sd->sel_mode = EINA_FALSE;
1223 if (!_elm_config->desktop_entry) 1223 if (!_elm_config->desktop_entry)
@@ -1246,7 +1246,7 @@ _copy_cb(Eo *obj)
1246{ 1246{
1247 EFL_UI_TEXT_DATA_GET(obj, sd); 1247 EFL_UI_TEXT_DATA_GET(obj, sd);
1248 1248
1249 efl_event_callback_call(obj, EFL_UI_EVENT_SELECTION_COPY, NULL); 1249 efl_event_callback_call(obj, EFL_UI_EVENT_SELECTABLE_COPY, NULL);
1250 sd->sel_mode = EINA_FALSE; 1250 sd->sel_mode = EINA_FALSE;
1251 if (!_elm_config->desktop_entry) 1251 if (!_elm_config->desktop_entry)
1252 { 1252 {
@@ -2437,7 +2437,7 @@ _efl_ui_text_select_none(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd)
2437 edje_object_signal_emit(sd->entry_edje, "efl,state,select,off", "efl"); 2437 edje_object_signal_emit(sd->entry_edje, "efl,state,select,off", "efl");
2438 } 2438 }
2439 if (sd->have_selection) 2439 if (sd->have_selection)
2440 efl_event_callback_call(obj, EFL_UI_EVENT_SELECTION_CLEARED, NULL); 2440 efl_event_callback_call(obj, EFL_UI_EVENT_SELECTABLE_CLEARED, NULL);
2441 2441
2442 sd->have_selection = EINA_FALSE; 2442 sd->have_selection = EINA_FALSE;
2443 _edje_signal_emit(sd, "selection,cleared", "efl.text"); 2443 _edje_signal_emit(sd, "selection,cleared", "efl.text");
diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c
index 5f5a49c760..18615b90b8 100644
--- a/src/lib/elementary/elc_fileselector.c
+++ b/src/lib/elementary/elc_fileselector.c
@@ -1214,7 +1214,7 @@ _on_item_selected(void *data, const Efl_Event *event)
1214 elm_object_text_set(sd->name_entry, it_data->filename); 1214 elm_object_text_set(sd->name_entry, it_data->filename);
1215 1215
1216 _model_event_call 1216 _model_event_call
1217 (data, EFL_UI_EVENT_SELECTED, it_data->model, it_data->path); 1217 (data, EFL_UI_EVENT_SELECTABLE_SELECTED, it_data->model, it_data->path);
1218 } 1218 }
1219 else if (sd->multi && it_data->is_dir && sd->double_tap_navigation) 1219 else if (sd->multi && it_data->is_dir && sd->double_tap_navigation)
1220 { 1220 {
@@ -1466,7 +1466,7 @@ _on_text_activated_set_path_then(void *data, const Eina_Value v, const Eina_Futu
1466 1466
1467 selected: 1467 selected:
1468 if (sd->only_folder) 1468 if (sd->only_folder)
1469 _model_event_call(fs, EFL_UI_EVENT_SELECTED, model, str); 1469 _model_event_call(fs, EFL_UI_EVENT_SELECTABLE_SELECTED, model, str);
1470 1470
1471 end: 1471 end:
1472 _text_activated_free_fs_data(fs); 1472 _text_activated_free_fs_data(fs);
@@ -1606,9 +1606,9 @@ _files_list_add(Evas_Object *obj)
1606 efl_ui_mirrored_automatic_set(li, EINA_FALSE); 1606 efl_ui_mirrored_automatic_set(li, EINA_FALSE);
1607 1607
1608 efl_event_callback_add 1608 efl_event_callback_add
1609 (li, EFL_UI_EVENT_SELECTED, _on_item_selected, obj); 1609 (li, EFL_UI_EVENT_SELECTABLE_SELECTED, _on_item_selected, obj);
1610 efl_event_callback_add 1610 efl_event_callback_add
1611 (li, EFL_UI_EVENT_UNSELECTED, _on_item_unselected, obj); 1611 (li, EFL_UI_EVENT_SELECTABLE_UNSELECTED, _on_item_unselected, obj);
1612 efl_event_callback_add 1612 efl_event_callback_add
1613 (li, ELM_GENLIST_EVENT_ACTIVATED, _on_item_activated, obj); 1613 (li, ELM_GENLIST_EVENT_ACTIVATED, _on_item_activated, obj);
1614 efl_event_callback_add 1614 efl_event_callback_add
@@ -1643,9 +1643,9 @@ _files_grid_add(Evas_Object *obj)
1643 elm_gengrid_align_set(grid, 0.0, 0.0); 1643 elm_gengrid_align_set(grid, 0.0, 0.0);
1644 1644
1645 efl_event_callback_add 1645 efl_event_callback_add
1646 (grid, EFL_UI_EVENT_SELECTED, _on_item_selected, obj); 1646 (grid, EFL_UI_EVENT_SELECTABLE_SELECTED, _on_item_selected, obj);
1647 efl_event_callback_add 1647 efl_event_callback_add
1648 (grid, EFL_UI_EVENT_UNSELECTED, _on_item_unselected, obj); 1648 (grid, EFL_UI_EVENT_SELECTABLE_UNSELECTED, _on_item_unselected, obj);
1649 efl_event_callback_add 1649 efl_event_callback_add
1650 (grid, ELM_GENGRID_EVENT_ACTIVATED, _on_item_activated, obj); 1650 (grid, ELM_GENGRID_EVENT_ACTIVATED, _on_item_activated, obj);
1651 efl_event_callback_add 1651 efl_event_callback_add
@@ -1994,7 +1994,7 @@ _elm_fileselector_efl_object_event_callback_legacy_call(Eo *obj, Elm_Fileselecto
1994 { 1994 {
1995 const Efl_Event_Description *evt_desc = NULL; 1995 const Efl_Event_Description *evt_desc = NULL;
1996 if (strcmp(desc->name, "selected") == 0) 1996 if (strcmp(desc->name, "selected") == 0)
1997 evt_desc = EFL_UI_EVENT_SELECTED; 1997 evt_desc = EFL_UI_EVENT_SELECTABLE_SELECTED;
1998 else if (strcmp(desc->name, "activated") == 0) 1998 else if (strcmp(desc->name, "activated") == 0)
1999 evt_desc = ELM_FILESELECTOR_EVENT_ACTIVATED; 1999 evt_desc = ELM_FILESELECTOR_EVENT_ACTIVATED;
2000 else if (strcmp(desc->name, "directory,open") == 0) 2000 else if (strcmp(desc->name, "directory,open") == 0)
@@ -2009,7 +2009,7 @@ _elm_fileselector_efl_object_event_callback_legacy_call(Eo *obj, Elm_Fileselecto
2009 return _from_legacy_event_call(obj, sd, desc, evt_desc, event_info); 2009 return _from_legacy_event_call(obj, sd, desc, evt_desc, event_info);
2010 } 2010 }
2011 2011
2012 if (desc == EFL_UI_EVENT_SELECTED || 2012 if (desc == EFL_UI_EVENT_SELECTABLE_SELECTED ||
2013 desc == ELM_FILESELECTOR_EVENT_ACTIVATED || 2013 desc == ELM_FILESELECTOR_EVENT_ACTIVATED ||
2014 desc == ELM_FILESELECTOR_EVENT_DIRECTORY_OPEN || 2014 desc == ELM_FILESELECTOR_EVENT_DIRECTORY_OPEN ||
2015 desc == ELM_FILESELECTOR_EVENT_DONE || 2015 desc == ELM_FILESELECTOR_EVENT_DONE ||
diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c
index 2df184ea4a..c5c6edf48b 100644
--- a/src/lib/elementary/elc_fileselector_entry.c
+++ b/src/lib/elementary/elc_fileselector_entry.c
@@ -61,9 +61,9 @@ SIG_FWD(PRESS, ELM_FILESELECTOR_ENTRY_EVENT_PRESS)
61SIG_FWD(LONGPRESSED, EFL_UI_EVENT_LONGPRESSED) 61SIG_FWD(LONGPRESSED, EFL_UI_EVENT_LONGPRESSED)
62SIG_FWD(CLICKED, EFL_UI_EVENT_CLICKED) 62SIG_FWD(CLICKED, EFL_UI_EVENT_CLICKED)
63SIG_FWD(CLICKED_DOUBLE, EFL_UI_EVENT_CLICKED_DOUBLE) 63SIG_FWD(CLICKED_DOUBLE, EFL_UI_EVENT_CLICKED_DOUBLE)
64SIG_FWD(SELECTION_PASTE, EFL_UI_EVENT_SELECTION_PASTE) 64SIG_FWD(SELECTION_PASTE, EFL_UI_EVENT_SELECTABLE_PASTE)
65SIG_FWD(SELECTION_COPY, EFL_UI_EVENT_SELECTION_COPY) 65SIG_FWD(SELECTION_COPY, EFL_UI_EVENT_SELECTABLE_COPY)
66SIG_FWD(SELECTION_CUT, EFL_UI_EVENT_SELECTION_CUT) 66SIG_FWD(SELECTION_CUT, EFL_UI_EVENT_SELECTABLE_CUT)
67SIG_FWD(UNPRESSED, EFL_UI_EVENT_UNPRESSED) 67SIG_FWD(UNPRESSED, EFL_UI_EVENT_UNPRESSED)
68#undef SIG_FWD 68#undef SIG_FWD
69 69
@@ -255,9 +255,9 @@ _elm_fileselector_entry_efl_canvas_group_group_add(Eo *obj, Elm_Fileselector_Ent
255 SIG_FWD(LONGPRESSED, EFL_UI_EVENT_LONGPRESSED); 255 SIG_FWD(LONGPRESSED, EFL_UI_EVENT_LONGPRESSED);
256 SIG_FWD(CLICKED, EFL_UI_EVENT_CLICKED); 256 SIG_FWD(CLICKED, EFL_UI_EVENT_CLICKED);
257 SIG_FWD(CLICKED_DOUBLE, EFL_UI_EVENT_CLICKED_DOUBLE); 257 SIG_FWD(CLICKED_DOUBLE, EFL_UI_EVENT_CLICKED_DOUBLE);
258 SIG_FWD(SELECTION_PASTE, EFL_UI_EVENT_SELECTION_PASTE); 258 SIG_FWD(SELECTION_PASTE, EFL_UI_EVENT_SELECTABLE_PASTE);
259 SIG_FWD(SELECTION_COPY, EFL_UI_EVENT_SELECTION_COPY); 259 SIG_FWD(SELECTION_COPY, EFL_UI_EVENT_SELECTABLE_COPY);
260 SIG_FWD(SELECTION_CUT, EFL_UI_EVENT_SELECTION_CUT); 260 SIG_FWD(SELECTION_CUT, EFL_UI_EVENT_SELECTABLE_CUT);
261#undef SIG_FWD 261#undef SIG_FWD
262 262
263 efl_event_callback_forwarder_add(priv->entry, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_CHANGED, obj); 263 efl_event_callback_forwarder_add(priv->entry, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_CHANGED, obj);
diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c
index 1314ffb1ef..b67d211503 100644
--- a/src/lib/elementary/elc_hoversel.c
+++ b/src/lib/elementary/elc_hoversel.c
@@ -176,7 +176,7 @@ _on_item_clicked(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED)
176 ELM_HOVERSEL_DATA_GET(obj2, sd); 176 ELM_HOVERSEL_DATA_GET(obj2, sd);
177 177
178 if (item->func) item->func((void *)WIDGET_ITEM_DATA_GET(eo_it), obj2, eo_it); 178 if (item->func) item->func((void *)WIDGET_ITEM_DATA_GET(eo_it), obj2, eo_it);
179 efl_event_callback_legacy_call(obj2, EFL_UI_EVENT_SELECTED, eo_it); 179 efl_event_callback_legacy_call(obj2, EFL_UI_EVENT_SELECTABLE_SELECTED, eo_it);
180 180
181 evas_object_event_callback_add(sd->hover, EVAS_CALLBACK_DEL, _auto_update, item); 181 evas_object_event_callback_add(sd->hover, EVAS_CALLBACK_DEL, _auto_update, item);
182 182
diff --git a/src/lib/elementary/elm_actionslider.c b/src/lib/elementary/elm_actionslider.c
index f83bdca156..852a817a06 100644
--- a/src/lib/elementary/elm_actionslider.c
+++ b/src/lib/elementary/elm_actionslider.c
@@ -240,15 +240,15 @@ _button_animator(void *data)
240 if ((!EINA_DBL_EQ(sd->final_position, 0)) && 240 if ((!EINA_DBL_EQ(sd->final_position, 0)) &&
241 (sd->enabled_position & ELM_ACTIONSLIDER_LEFT)) 241 (sd->enabled_position & ELM_ACTIONSLIDER_LEFT))
242 efl_event_callback_legacy_call 242 efl_event_callback_legacy_call
243 (obj, EFL_UI_EVENT_SELECTED, (char *)left); 243 (obj, EFL_UI_EVENT_SELECTABLE_SELECTED, (char *)left);
244 else if ((EINA_DBL_EQ(sd->final_position, 0.5)) && 244 else if ((EINA_DBL_EQ(sd->final_position, 0.5)) &&
245 (sd->enabled_position & ELM_ACTIONSLIDER_CENTER)) 245 (sd->enabled_position & ELM_ACTIONSLIDER_CENTER))
246 efl_event_callback_legacy_call 246 efl_event_callback_legacy_call
247 (obj, EFL_UI_EVENT_SELECTED, (char *)center); 247 (obj, EFL_UI_EVENT_SELECTABLE_SELECTED, (char *)center);
248 else if ((EINA_DBL_EQ(sd->final_position, 1)) && 248 else if ((EINA_DBL_EQ(sd->final_position, 1)) &&
249 (sd->enabled_position & ELM_ACTIONSLIDER_RIGHT)) 249 (sd->enabled_position & ELM_ACTIONSLIDER_RIGHT))
250 efl_event_callback_legacy_call 250 efl_event_callback_legacy_call
251 (obj, EFL_UI_EVENT_SELECTED, (char *)right); 251 (obj, EFL_UI_EVENT_SELECTABLE_SELECTED, (char *)right);
252 252
253 sd->button_animator = NULL; 253 sd->button_animator = NULL;
254 254
@@ -286,7 +286,7 @@ _drag_button_up_cb(void *data,
286 { 286 {
287 sd->final_position = 0; 287 sd->final_position = 0;
288 efl_event_callback_legacy_call 288 efl_event_callback_legacy_call
289 (obj, EFL_UI_EVENT_SELECTED, (char *)left); 289 (obj, EFL_UI_EVENT_SELECTABLE_SELECTED, (char *)left);
290 290
291 return; 291 return;
292 } 292 }
@@ -296,7 +296,7 @@ _drag_button_up_cb(void *data,
296 { 296 {
297 sd->final_position = 0.5; 297 sd->final_position = 0.5;
298 efl_event_callback_legacy_call 298 efl_event_callback_legacy_call
299 (obj, EFL_UI_EVENT_SELECTED, (char *)center); 299 (obj, EFL_UI_EVENT_SELECTABLE_SELECTED, (char *)center);
300 300
301 ecore_animator_del(sd->button_animator); 301 ecore_animator_del(sd->button_animator);
302 sd->button_animator = ecore_evas_animator_add(obj, _button_animator, obj); 302 sd->button_animator = ecore_evas_animator_add(obj, _button_animator, obj);
@@ -310,7 +310,7 @@ _drag_button_up_cb(void *data,
310 { 310 {
311 sd->final_position = 1; 311 sd->final_position = 1;
312 efl_event_callback_legacy_call 312 efl_event_callback_legacy_call
313 (obj, EFL_UI_EVENT_SELECTED, (char *)right); 313 (obj, EFL_UI_EVENT_SELECTABLE_SELECTED, (char *)right);
314 return; 314 return;
315 } 315 }
316 316
diff --git a/src/lib/elementary/elm_color_class.c b/src/lib/elementary/elm_color_class.c
index 6c87d6f6f2..9227794cf0 100644
--- a/src/lib/elementary/elm_color_class.c
+++ b/src/lib/elementary/elm_color_class.c
@@ -743,7 +743,7 @@ elm_color_class_editor_add(Evas_Object *obj)
743 elm_genlist_mode_set(gl, ELM_LIST_COMPRESS); 743 elm_genlist_mode_set(gl, ELM_LIST_COMPRESS);
744 elm_object_part_content_set(ly, "elm.swallow.list", gl); 744 elm_object_part_content_set(ly, "elm.swallow.list", gl);
745 efl_event_callback_add 745 efl_event_callback_add
746 (gl, EFL_UI_EVENT_SELECTED, _colorclass_activate, cc); 746 (gl, EFL_UI_EVENT_SELECTABLE_SELECTED, _colorclass_activate, cc);
747 747
748 cc->reset = bt = elm_button_add(ly); 748 cc->reset = bt = elm_button_add(ly);
749 elm_object_style_set(bt, "colorclass"); 749 elm_object_style_set(bt, "colorclass");
diff --git a/src/lib/elementary/elm_diskselector.c b/src/lib/elementary/elm_diskselector.c
index 373b398dc2..d8ebb9018d 100644
--- a/src/lib/elementary/elm_diskselector.c
+++ b/src/lib/elementary/elm_diskselector.c
@@ -92,7 +92,7 @@ _item_select(Elm_Diskselector_Item_Data *it)
92 92
93 if (it->func) it->func((void *)WIDGET_ITEM_DATA_GET(eo_it), WIDGET(it), eo_it); 93 if (it->func) it->func((void *)WIDGET_ITEM_DATA_GET(eo_it), WIDGET(it), eo_it);
94 efl_event_callback_legacy_call 94 efl_event_callback_legacy_call
95 (WIDGET(it), EFL_UI_EVENT_SELECTED, eo_it); 95 (WIDGET(it), EFL_UI_EVENT_SELECTABLE_SELECTED, eo_it);
96} 96}
97 97
98static int 98static int
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index 0334881fbf..7b41a72017 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -1567,7 +1567,7 @@ _paste_cb(void *data,
1567 1567
1568 if (!sd) return; 1568 if (!sd) return;
1569 efl_event_callback_legacy_call 1569 efl_event_callback_legacy_call
1570 (data, EFL_UI_EVENT_SELECTION_PASTE, NULL); 1570 (data, EFL_UI_EVENT_SELECTABLE_PASTE, NULL);
1571 1571
1572 sd->selection_asked = EINA_TRUE; 1572 sd->selection_asked = EINA_TRUE;
1573 1573
@@ -1622,7 +1622,7 @@ _cut_cb(void *data,
1622 1622
1623 if (!sd) return; 1623 if (!sd) return;
1624 efl_event_callback_legacy_call 1624 efl_event_callback_legacy_call
1625 (data, EFL_UI_EVENT_SELECTION_CUT, NULL); 1625 (data, EFL_UI_EVENT_SELECTABLE_CUT, NULL);
1626 /* Store it */ 1626 /* Store it */
1627 sd->sel_mode = EINA_FALSE; 1627 sd->sel_mode = EINA_FALSE;
1628 if (!_elm_config->desktop_entry) 1628 if (!_elm_config->desktop_entry)
@@ -1646,7 +1646,7 @@ _copy_cb(void *data,
1646 1646
1647 if (!sd) return; 1647 if (!sd) return;
1648 efl_event_callback_legacy_call 1648 efl_event_callback_legacy_call
1649 (data, EFL_UI_EVENT_SELECTION_COPY, NULL); 1649 (data, EFL_UI_EVENT_SELECTABLE_COPY, NULL);
1650 sd->sel_mode = EINA_FALSE; 1650 sd->sel_mode = EINA_FALSE;
1651 if (!_elm_config->desktop_entry) 1651 if (!_elm_config->desktop_entry)
1652 { 1652 {
@@ -2317,7 +2317,7 @@ _entry_selection_start_signal_cb(void *data,
2317 if (entry != data) elm_entry_select_none(entry); 2317 if (entry != data) elm_entry_select_none(entry);
2318 } 2318 }
2319 efl_event_callback_legacy_call 2319 efl_event_callback_legacy_call
2320 (data, EFL_UI_EVENT_SELECTION_START, NULL); 2320 (data, EFL_UI_EVENT_SELECTABLE_START, NULL);
2321 2321
2322 elm_object_focus_set(data, EINA_TRUE); 2322 elm_object_focus_set(data, EINA_TRUE);
2323} 2323}
@@ -2361,7 +2361,7 @@ _entry_selection_changed_signal_cb(void *data,
2361 if (!sd) return; 2361 if (!sd) return;
2362 sd->have_selection = EINA_TRUE; 2362 sd->have_selection = EINA_TRUE;
2363 efl_event_callback_legacy_call 2363 efl_event_callback_legacy_call
2364 (data, EFL_UI_EVENT_SELECTION_CHANGED, NULL); 2364 (data, EFL_UI_EVENT_SELECTABLE_CHANGED, NULL);
2365 // XXX: still try primary selection even if on wl in case it's 2365 // XXX: still try primary selection even if on wl in case it's
2366 // supported 2366 // supported
2367// if (!_entry_win_is_wl(data)) 2367// if (!_entry_win_is_wl(data))
@@ -2384,7 +2384,7 @@ _entry_selection_cleared_signal_cb(void *data,
2384 2384
2385 sd->have_selection = EINA_FALSE; 2385 sd->have_selection = EINA_FALSE;
2386 efl_event_callback_legacy_call 2386 efl_event_callback_legacy_call
2387 (data, EFL_UI_EVENT_SELECTION_CLEARED, NULL); 2387 (data, EFL_UI_EVENT_SELECTABLE_CLEARED, NULL);
2388 // XXX: still try primary selection even if on wl in case it's 2388 // XXX: still try primary selection even if on wl in case it's
2389 // supported 2389 // supported
2390// if (!_entry_win_is_wl(data)) 2390// if (!_entry_win_is_wl(data))
@@ -2425,7 +2425,7 @@ _entry_paste_request_signal_cb(void *data,
2425 // supported 2425 // supported
2426// if ((type == ELM_SEL_TYPE_PRIMARY) && _entry_win_is_wl(data)) return; 2426// if ((type == ELM_SEL_TYPE_PRIMARY) && _entry_win_is_wl(data)) return;
2427 efl_event_callback_legacy_call 2427 efl_event_callback_legacy_call
2428 (data, EFL_UI_EVENT_SELECTION_PASTE, NULL); 2428 (data, EFL_UI_EVENT_SELECTABLE_PASTE, NULL);
2429 2429
2430 top = _entry_win_get(data); 2430 top = _entry_win_get(data);
2431 if (top) 2431 if (top)
@@ -4412,7 +4412,7 @@ _elm_entry_select_none(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd)
4412 } 4412 }
4413 if (sd->have_selection) 4413 if (sd->have_selection)
4414 efl_event_callback_legacy_call 4414 efl_event_callback_legacy_call
4415 (obj, EFL_UI_EVENT_SELECTION_CLEARED, NULL); 4415 (obj, EFL_UI_EVENT_SELECTABLE_CLEARED, NULL);
4416 4416
4417 sd->have_selection = EINA_FALSE; 4417 sd->have_selection = EINA_FALSE;
4418 edje_object_part_text_select_none(sd->entry_edje, "elm.text"); 4418 edje_object_part_text_select_none(sd->entry_edje, "elm.text");
diff --git a/src/lib/elementary/elm_flipselector.c b/src/lib/elementary/elm_flipselector.c
index 98535b4acd..59109dac8f 100644
--- a/src/lib/elementary/elm_flipselector.c
+++ b/src/lib/elementary/elm_flipselector.c
@@ -234,7 +234,7 @@ _on_item_changed(Elm_Flipselector_Data *sd)
234 if (item->func) 234 if (item->func)
235 item->func((void *)WIDGET_ITEM_DATA_GET(eo_item), WIDGET(item), eo_item); 235 item->func((void *)WIDGET_ITEM_DATA_GET(eo_item), WIDGET(item), eo_item);
236 efl_event_callback_legacy_call 236 efl_event_callback_legacy_call
237 (sd->obj, EFL_UI_EVENT_SELECTED, eo_item); 237 (sd->obj, EFL_UI_EVENT_SELECTABLE_SELECTED, eo_item);
238} 238}
239 239
240static void 240static void
diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c
index d1851b184a..07ceb89b7b 100644
--- a/src/lib/elementary/elm_gengrid.c
+++ b/src/lib/elementary/elm_gengrid.c
@@ -722,7 +722,7 @@ _item_unselect(Elm_Gen_Item *it)
722 it->selected = EINA_FALSE; 722 it->selected = EINA_FALSE;
723 sd->selected = eina_list_remove(sd->selected, eo_it); 723 sd->selected = eina_list_remove(sd->selected, eo_it);
724 efl_event_callback_legacy_call 724 efl_event_callback_legacy_call
725 (WIDGET(it), EFL_UI_EVENT_UNSELECTED, eo_it); 725 (WIDGET(it), EFL_UI_EVENT_SELECTABLE_UNSELECTED, eo_it);
726 if (_elm_config->atspi_mode) 726 if (_elm_config->atspi_mode)
727 efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_TYPE_SELECTED, EINA_FALSE); 727 efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_TYPE_SELECTED, EINA_FALSE);
728 } 728 }
@@ -3958,7 +3958,7 @@ _item_select(Elm_Gen_Item *it)
3958 if (it->func.func) it->func.func((void *)it->func.data, WIDGET(it), eo_it); 3958 if (it->func.func) it->func.func((void *)it->func.data, WIDGET(it), eo_it);
3959 if (it->generation == sd->generation) 3959 if (it->generation == sd->generation)
3960 { 3960 {
3961 efl_event_callback_legacy_call(WIDGET(it), EFL_UI_EVENT_SELECTED, eo_it); 3961 efl_event_callback_legacy_call(WIDGET(it), EFL_UI_EVENT_SELECTABLE_SELECTED, eo_it);
3962 if (_elm_config->atspi_mode) 3962 if (_elm_config->atspi_mode)
3963 efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_TYPE_SELECTED, EINA_TRUE); 3963 efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_TYPE_SELECTED, EINA_TRUE);
3964 } 3964 }
diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c
index 2ba846e00d..a42eea90b9 100644
--- a/src/lib/elementary/elm_genlist.c
+++ b/src/lib/elementary/elm_genlist.c
@@ -3932,7 +3932,7 @@ _item_unselect(Elm_Gen_Item *it)
3932 it->selected = EINA_FALSE; 3932 it->selected = EINA_FALSE;
3933 sd->selected = eina_list_remove(sd->selected, EO_OBJ(it)); 3933 sd->selected = eina_list_remove(sd->selected, EO_OBJ(it));
3934 efl_event_callback_legacy_call 3934 efl_event_callback_legacy_call
3935 (WIDGET(it), EFL_UI_EVENT_UNSELECTED, EO_OBJ(it)); 3935 (WIDGET(it), EFL_UI_EVENT_SELECTABLE_UNSELECTED, EO_OBJ(it));
3936 if (_elm_config->atspi_mode) 3936 if (_elm_config->atspi_mode)
3937 efl_access_state_changed_signal_emit(EO_OBJ(it), EFL_ACCESS_STATE_TYPE_SELECTED, EINA_FALSE); 3937 efl_access_state_changed_signal_emit(EO_OBJ(it), EFL_ACCESS_STATE_TYPE_SELECTED, EINA_FALSE);
3938} 3938}
@@ -6116,7 +6116,7 @@ _item_select(Elm_Gen_Item *it)
6116 if (it->func.func) it->func.func((void *)it->func.data, WIDGET(it), eo_it); 6116 if (it->func.func) it->func.func((void *)it->func.data, WIDGET(it), eo_it);
6117 // delete item if it's requested deletion in the above callbacks. 6117 // delete item if it's requested deletion in the above callbacks.
6118 if ((it->base)->on_deletion) goto item_deleted; 6118 if ((it->base)->on_deletion) goto item_deleted;
6119 efl_event_callback_legacy_call(WIDGET(it), EFL_UI_EVENT_SELECTED, eo_it); 6119 efl_event_callback_legacy_call(WIDGET(it), EFL_UI_EVENT_SELECTABLE_SELECTED, eo_it);
6120 if (_elm_config->atspi_mode) 6120 if (_elm_config->atspi_mode)
6121 efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_TYPE_SELECTED, EINA_TRUE); 6121 efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_TYPE_SELECTED, EINA_TRUE);
6122 // delete item if it's requested deletion in the above callbacks. 6122 // delete item if it's requested deletion in the above callbacks.
diff --git a/src/lib/elementary/elm_index.c b/src/lib/elementary/elm_index.c
index 70d2ee0a71..8fa7e8a740 100644
--- a/src/lib/elementary/elm_index.c
+++ b/src/lib/elementary/elm_index.c
@@ -864,7 +864,7 @@ _on_mouse_up(void *data,
864 efl_event_callback_legacy_call 864 efl_event_callback_legacy_call
865 (data, EFL_UI_EVENT_CLICKED, eo_item); 865 (data, EFL_UI_EVENT_CLICKED, eo_item);
866 efl_event_callback_legacy_call 866 efl_event_callback_legacy_call
867 (data, EFL_UI_EVENT_SELECTED, eo_item); 867 (data, EFL_UI_EVENT_SELECTABLE_SELECTED, eo_item);
868 eo_id_item = eo_item; 868 eo_id_item = eo_item;
869 ELM_INDEX_ITEM_DATA_GET(eo_id_item, id_item); 869 ELM_INDEX_ITEM_DATA_GET(eo_id_item, id_item);
870 if (id_item->func) 870 if (id_item->func)
@@ -1299,7 +1299,7 @@ _elm_index_item_selected_set(Eo *eo_it,
1299 efl_event_callback_legacy_call 1299 efl_event_callback_legacy_call
1300 (obj, ELM_INDEX_EVENT_CHANGED, eo_it); 1300 (obj, ELM_INDEX_EVENT_CHANGED, eo_it);
1301 efl_event_callback_legacy_call 1301 efl_event_callback_legacy_call
1302 (obj, EFL_UI_EVENT_SELECTED, eo_it); 1302 (obj, EFL_UI_EVENT_SELECTABLE_SELECTED, eo_it);
1303 ecore_timer_del(sd->delay); 1303 ecore_timer_del(sd->delay);
1304 sd->delay = ecore_timer_add(sd->delay_change_time, 1304 sd->delay = ecore_timer_add(sd->delay_change_time,
1305 _delay_change_cb, obj); 1305 _delay_change_cb, obj);
diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c
index 17b2b93746..5047330de3 100644
--- a/src/lib/elementary/elm_list.c
+++ b/src/lib/elementary/elm_list.c
@@ -1448,7 +1448,7 @@ call:
1448 _elm_list_walk(obj, sd); 1448 _elm_list_walk(obj, sd);
1449 1449
1450 if (it->func) it->func((void *)WIDGET_ITEM_DATA_GET(eo_it), WIDGET(it), eo_it); 1450 if (it->func) it->func((void *)WIDGET_ITEM_DATA_GET(eo_it), WIDGET(it), eo_it);
1451 efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SELECTED, eo_it); 1451 efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SELECTABLE_SELECTED, eo_it);
1452 if (_elm_config->atspi_mode) 1452 if (_elm_config->atspi_mode)
1453 efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_TYPE_SELECTED, EINA_TRUE); 1453 efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_TYPE_SELECTED, EINA_TRUE);
1454 sd->last_selected_item = eo_it; 1454 sd->last_selected_item = eo_it;
@@ -1524,7 +1524,7 @@ _item_unselect(Elm_List_Item_Data *it)
1524 if (!(it->base->disabled || 1524 if (!(it->base->disabled ||
1525 (sd->select_mode == ELM_OBJECT_SELECT_MODE_NONE))) 1525 (sd->select_mode == ELM_OBJECT_SELECT_MODE_NONE)))
1526 efl_event_callback_legacy_call 1526 efl_event_callback_legacy_call
1527 (WIDGET(it), EFL_UI_EVENT_UNSELECTED, EO_OBJ(it)); 1527 (WIDGET(it), EFL_UI_EVENT_SELECTABLE_UNSELECTED, EO_OBJ(it));
1528 if (_elm_config->atspi_mode) 1528 if (_elm_config->atspi_mode)
1529 efl_access_state_changed_signal_emit(EO_OBJ(it), EFL_ACCESS_STATE_TYPE_SELECTED, EINA_FALSE); 1529 efl_access_state_changed_signal_emit(EO_OBJ(it), EFL_ACCESS_STATE_TYPE_SELECTED, EINA_FALSE);
1530 } 1530 }
diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c
index 8affc3c597..9e0358bfd4 100644
--- a/src/lib/elementary/elm_toolbar.c
+++ b/src/lib/elementary/elm_toolbar.c
@@ -178,7 +178,7 @@ _item_unselect(Elm_Toolbar_Item_Data *item)
178 elm_layout_signal_emit(VIEW(item), "elm,state,unselected", "elm"); 178 elm_layout_signal_emit(VIEW(item), "elm,state,unselected", "elm");
179 if (item->icon) 179 if (item->icon)
180 elm_widget_signal_emit(item->icon, "elm,state,unselected", "elm"); 180 elm_widget_signal_emit(item->icon, "elm,state,unselected", "elm");
181 efl_event_callback_legacy_call(WIDGET(item), EFL_UI_EVENT_UNSELECTED, EO_OBJ(item)); 181 efl_event_callback_legacy_call(WIDGET(item), EFL_UI_EVENT_SELECTABLE_UNSELECTED, EO_OBJ(item));
182 if (_elm_config->atspi_mode) 182 if (_elm_config->atspi_mode)
183 efl_access_state_changed_signal_emit(EO_OBJ(item), EFL_ACCESS_STATE_TYPE_SELECTED, EINA_FALSE); 183 efl_access_state_changed_signal_emit(EO_OBJ(item), EFL_ACCESS_STATE_TYPE_SELECTED, EINA_FALSE);
184} 184}
@@ -1094,7 +1094,7 @@ _item_select(Elm_Toolbar_Item_Data *it)
1094 { 1094 {
1095 if (it->func) it->func((void *)(WIDGET_ITEM_DATA_GET(EO_OBJ(it))), WIDGET(it), EO_OBJ(it)); 1095 if (it->func) it->func((void *)(WIDGET_ITEM_DATA_GET(EO_OBJ(it))), WIDGET(it), EO_OBJ(it));
1096 } 1096 }
1097 efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SELECTED, EO_OBJ(it)); 1097 efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SELECTABLE_SELECTED, EO_OBJ(it));
1098 if (_elm_config->atspi_mode) 1098 if (_elm_config->atspi_mode)
1099 efl_access_state_changed_signal_emit(EO_OBJ(it), EFL_ACCESS_STATE_TYPE_SELECTED, EINA_TRUE); 1099 efl_access_state_changed_signal_emit(EO_OBJ(it), EFL_ACCESS_STATE_TYPE_SELECTED, EINA_TRUE);
1100} 1100}