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) priv_d.list = list = efl_add(EFL_UI_LIST_CLASS, wbox); efl_gfx_hint_weight_set(list, EFL_GFX_HINT_EXPAND, 0.9); - efl_event_callback_add(list, EFL_UI_EVENT_SELECTED, _list_selected, NULL); - efl_event_callback_add(list, EFL_UI_EVENT_UNSELECTED, _list_unselected, NULL); + efl_event_callback_add(list, EFL_UI_EVENT_SELECTABLE_SELECTED, _list_selected, NULL); + efl_event_callback_add(list, EFL_UI_EVENT_SELECTABLE_UNSELECTED, _list_unselected, NULL); efl_event_callback_add(list, EFL_UI_EVENT_PRESSED, _list_pressed, NULL); efl_event_callback_add(list, EFL_UI_EVENT_UNPRESSED, _list_unpressed, NULL); 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 event_prefix: efl_ui; events { /* FIXME: Called with multiple types of event_info! */ - selected: void; [[Called when selected]] + selectable,selected: void; [[Called when selected]] /* FIXME: Called with multiple types of event_info! */ - unselected: void; [[Called when no longer selected]] - selection,paste: void; [[Called when selection is pasted]] - selection,copy: void; [[Called when selection is copied]] - selection,cut: void; [[Called when selection is cut]] - selection,start: void; [[Called at selection start]] - selection,changed: void; [[Called when selection is changed]] - selection,cleared: void; [[Called when selection is cleared]] + selectable,unselected: void; [[Called when no longer selected]] + selectable,paste: void; [[Called when selection is pasted]] + selectable,copy: void; [[Called when selection is copied]] + selectable,cut: void; [[Called when selection is cut]] + selectable,start: void; [[Called at selection start]] + selectable,changed: void; [[Called when selection is changed]] + selectable,cleared: void; [[Called when selection is cleared]] } } 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) pd->selected = eina_list_append(pd->selected, item); pd->last_selected = item; - efl_event_callback_call(obj, EFL_UI_EVENT_SELECTED, item); + efl_event_callback_call(obj, EFL_UI_EVENT_SELECTABLE_SELECTED, item); } static void @@ -915,7 +915,7 @@ _grid_item_unselected(void *data, const Efl_Event *event) pd->selected = eina_list_remove(pd->selected, item); if (pd->last_selected == item) pd->last_selected = NULL; - efl_event_callback_call(obj, EFL_UI_EVENT_UNSELECTED, item); + efl_event_callback_call(obj, EFL_UI_EVENT_SELECTABLE_UNSELECTED, item); } static void @@ -944,8 +944,8 @@ _grid_item_process(Eo *obj, Efl_Ui_Grid_Data *pd, EINA_UNUSED Efl_Ui_Grid_Item * efl_event_callback_add(it, EFL_UI_EVENT_PRESSED, _grid_item_pressed, obj); efl_event_callback_add(it, EFL_UI_EVENT_UNPRESSED, _grid_item_unpressed, obj); efl_event_callback_add(it, EFL_UI_EVENT_LONGPRESSED, _grid_item_longpressed, obj); - efl_event_callback_add(it, EFL_UI_EVENT_SELECTED, _grid_item_selected, obj); - efl_event_callback_add(it, EFL_UI_EVENT_UNSELECTED, _grid_item_unselected, obj); + efl_event_callback_add(it, EFL_UI_EVENT_SELECTABLE_SELECTED, _grid_item_selected, obj); + efl_event_callback_add(it, EFL_UI_EVENT_SELECTABLE_UNSELECTED, _grid_item_unselected, obj); efl_event_callback_add(it, EFL_EVENT_DEL, _grid_item_deleted, obj); return EINA_TRUE; @@ -970,8 +970,8 @@ _grid_item_unpack_internal(Eo *obj, Efl_Ui_Grid_Data *pd, Efl_Ui_Grid_Item *it) efl_event_callback_del(it, EFL_UI_EVENT_PRESSED, _grid_item_pressed, obj); efl_event_callback_del(it, EFL_UI_EVENT_UNPRESSED, _grid_item_unpressed, obj); efl_event_callback_del(it, EFL_UI_EVENT_LONGPRESSED, _grid_item_longpressed, obj); - efl_event_callback_del(it, EFL_UI_EVENT_SELECTED, _grid_item_selected, obj); - efl_event_callback_del(it, EFL_UI_EVENT_UNSELECTED, _grid_item_unselected, obj); + efl_event_callback_del(it, EFL_UI_EVENT_SELECTABLE_SELECTED, _grid_item_selected, obj); + efl_event_callback_del(it, EFL_UI_EVENT_SELECTABLE_UNSELECTED, _grid_item_unselected, obj); efl_event_callback_del(it, EFL_EVENT_DEL, _grid_item_deleted, obj); } 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) pd->selected = EINA_TRUE; edje_object_signal_emit(wd->resize_obj, "efl,state,selected", "efl"); - efl_event_callback_call(obj, EFL_UI_EVENT_SELECTED, NULL); + efl_event_callback_call(obj, EFL_UI_EVENT_SELECTABLE_SELECTED, NULL); } static void @@ -38,7 +38,7 @@ _item_unselect(Eo *obj, Efl_Ui_Item_Data *pd) pd->selected = EINA_FALSE; edje_object_signal_emit(wd->resize_obj, "efl,state,unselected", "efl"); - efl_event_callback_call(obj, EFL_UI_EVENT_UNSELECTED, NULL); + efl_event_callback_call(obj, EFL_UI_EVENT_SELECTABLE_UNSELECTED, NULL); } /* 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) pd->selected = eina_list_append(pd->selected, item); pd->last_selected = item; - efl_event_callback_call(obj, EFL_UI_EVENT_SELECTED, item); + efl_event_callback_call(obj, EFL_UI_EVENT_SELECTABLE_SELECTED, item); } static void @@ -670,7 +670,7 @@ _list_item_unselected(void *data, const Efl_Event *event) pd->selected = eina_list_remove(pd->selected, item); if (pd->last_selected == item) pd->last_selected = NULL; - efl_event_callback_call(obj, EFL_UI_EVENT_UNSELECTED, item); + efl_event_callback_call(obj, EFL_UI_EVENT_SELECTABLE_UNSELECTED, item); } static Eina_Bool @@ -689,8 +689,8 @@ _list_item_process(Eo *obj, Efl_Ui_List_Data *pd, EINA_UNUSED Efl_Ui_List_Item * efl_event_callback_add(it, EFL_UI_EVENT_PRESSED, _list_item_pressed, obj); efl_event_callback_add(it, EFL_UI_EVENT_UNPRESSED, _list_item_unpressed, obj); efl_event_callback_add(it, EFL_UI_EVENT_LONGPRESSED, _list_item_longpressed, obj); - efl_event_callback_add(it, EFL_UI_EVENT_SELECTED, _list_item_selected, obj); - efl_event_callback_add(it, EFL_UI_EVENT_UNSELECTED, _list_item_unselected, obj); + efl_event_callback_add(it, EFL_UI_EVENT_SELECTABLE_SELECTED, _list_item_selected, obj); + efl_event_callback_add(it, EFL_UI_EVENT_SELECTABLE_UNSELECTED, _list_item_unselected, obj); return EINA_TRUE; } @@ -708,8 +708,8 @@ _list_item_clear(Eo *obj, Efl_Ui_List_Data *pd EINA_UNUSED, EINA_UNUSED Efl_Ui_L efl_event_callback_del(it, EFL_UI_EVENT_PRESSED, _list_item_pressed, obj); efl_event_callback_del(it, EFL_UI_EVENT_UNPRESSED, _list_item_unpressed, obj); efl_event_callback_del(it, EFL_UI_EVENT_LONGPRESSED, _list_item_longpressed, obj); - efl_event_callback_del(it, EFL_UI_EVENT_SELECTED, _list_item_selected, obj); - efl_event_callback_del(it, EFL_UI_EVENT_UNSELECTED, _list_item_unselected, obj); + efl_event_callback_del(it, EFL_UI_EVENT_SELECTABLE_SELECTED, _list_item_selected, obj); + efl_event_callback_del(it, EFL_UI_EVENT_SELECTABLE_UNSELECTED, _list_item_unselected, obj); } /* 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) index = eina_list_data_idx(sd->tab_infos, ti); - efl_event_callback_call(tp, EFL_UI_EVENT_SELECTED, (void *)(intptr_t)index); + efl_event_callback_call(tp, EFL_UI_EVENT_SELECTABLE_SELECTED, (void *)(intptr_t)index); sd->cur = index; } 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 { if (sd->tab_bar != NULL) { - efl_event_callback_del(sd->tab_bar, EFL_UI_EVENT_SELECTED, _tab_select_cb, obj); + efl_event_callback_del(sd->tab_bar, EFL_UI_EVENT_SELECTABLE_SELECTED, _tab_select_cb, obj); efl_content_unset(efl_part(obj, "efl.tab_root")); efl_del(sd->tab_bar); } @@ -68,7 +68,7 @@ _efl_ui_tab_pager_tab_bar_set(Eo *obj, Efl_Ui_Tab_Pager_Data *sd, Efl_Canvas_Obj sd->tab_bar = tab_bar; efl_content_set(efl_part(obj, "efl.tab_root"), sd->tab_bar); - efl_event_callback_add(sd->tab_bar, EFL_UI_EVENT_SELECTED, _tab_select_cb, obj); + efl_event_callback_add(sd->tab_bar, EFL_UI_EVENT_SELECTABLE_SELECTED, _tab_select_cb, obj); } EOLIAN static Efl_Canvas_Object * @@ -87,7 +87,7 @@ EOLIAN static void _efl_ui_tab_pager_efl_object_destructor(Eo *obj, Efl_Ui_Tab_Pager_Data *sd) { if (sd->tab_bar != NULL) - efl_event_callback_del(sd->tab_bar, EFL_UI_EVENT_SELECTED, _tab_select_cb, obj); + efl_event_callback_del(sd->tab_bar, EFL_UI_EVENT_SELECTABLE_SELECTED, _tab_select_cb, obj); efl_destructor(efl_super(obj, MY_CLASS)); } 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) Efl_Text_Cursor_Cursor *start, *end; EFL_UI_TEXT_DATA_GET(obj, sd); - efl_event_callback_call(obj, EFL_UI_EVENT_SELECTION_CUT, NULL); + efl_event_callback_call(obj, EFL_UI_EVENT_SELECTABLE_CUT, NULL); /* Store it */ sd->sel_mode = EINA_FALSE; if (!_elm_config->desktop_entry) @@ -1246,7 +1246,7 @@ _copy_cb(Eo *obj) { EFL_UI_TEXT_DATA_GET(obj, sd); - efl_event_callback_call(obj, EFL_UI_EVENT_SELECTION_COPY, NULL); + efl_event_callback_call(obj, EFL_UI_EVENT_SELECTABLE_COPY, NULL); sd->sel_mode = EINA_FALSE; if (!_elm_config->desktop_entry) { @@ -2437,7 +2437,7 @@ _efl_ui_text_select_none(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd) edje_object_signal_emit(sd->entry_edje, "efl,state,select,off", "efl"); } if (sd->have_selection) - efl_event_callback_call(obj, EFL_UI_EVENT_SELECTION_CLEARED, NULL); + efl_event_callback_call(obj, EFL_UI_EVENT_SELECTABLE_CLEARED, NULL); sd->have_selection = EINA_FALSE; _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) elm_object_text_set(sd->name_entry, it_data->filename); _model_event_call - (data, EFL_UI_EVENT_SELECTED, it_data->model, it_data->path); + (data, EFL_UI_EVENT_SELECTABLE_SELECTED, it_data->model, it_data->path); } else if (sd->multi && it_data->is_dir && sd->double_tap_navigation) { @@ -1466,7 +1466,7 @@ _on_text_activated_set_path_then(void *data, const Eina_Value v, const Eina_Futu selected: if (sd->only_folder) - _model_event_call(fs, EFL_UI_EVENT_SELECTED, model, str); + _model_event_call(fs, EFL_UI_EVENT_SELECTABLE_SELECTED, model, str); end: _text_activated_free_fs_data(fs); @@ -1606,9 +1606,9 @@ _files_list_add(Evas_Object *obj) efl_ui_mirrored_automatic_set(li, EINA_FALSE); efl_event_callback_add - (li, EFL_UI_EVENT_SELECTED, _on_item_selected, obj); + (li, EFL_UI_EVENT_SELECTABLE_SELECTED, _on_item_selected, obj); efl_event_callback_add - (li, EFL_UI_EVENT_UNSELECTED, _on_item_unselected, obj); + (li, EFL_UI_EVENT_SELECTABLE_UNSELECTED, _on_item_unselected, obj); efl_event_callback_add (li, ELM_GENLIST_EVENT_ACTIVATED, _on_item_activated, obj); efl_event_callback_add @@ -1643,9 +1643,9 @@ _files_grid_add(Evas_Object *obj) elm_gengrid_align_set(grid, 0.0, 0.0); efl_event_callback_add - (grid, EFL_UI_EVENT_SELECTED, _on_item_selected, obj); + (grid, EFL_UI_EVENT_SELECTABLE_SELECTED, _on_item_selected, obj); efl_event_callback_add - (grid, EFL_UI_EVENT_UNSELECTED, _on_item_unselected, obj); + (grid, EFL_UI_EVENT_SELECTABLE_UNSELECTED, _on_item_unselected, obj); efl_event_callback_add (grid, ELM_GENGRID_EVENT_ACTIVATED, _on_item_activated, obj); efl_event_callback_add @@ -1994,7 +1994,7 @@ _elm_fileselector_efl_object_event_callback_legacy_call(Eo *obj, Elm_Fileselecto { const Efl_Event_Description *evt_desc = NULL; if (strcmp(desc->name, "selected") == 0) - evt_desc = EFL_UI_EVENT_SELECTED; + evt_desc = EFL_UI_EVENT_SELECTABLE_SELECTED; else if (strcmp(desc->name, "activated") == 0) evt_desc = ELM_FILESELECTOR_EVENT_ACTIVATED; else if (strcmp(desc->name, "directory,open") == 0) @@ -2009,7 +2009,7 @@ _elm_fileselector_efl_object_event_callback_legacy_call(Eo *obj, Elm_Fileselecto return _from_legacy_event_call(obj, sd, desc, evt_desc, event_info); } - if (desc == EFL_UI_EVENT_SELECTED || + if (desc == EFL_UI_EVENT_SELECTABLE_SELECTED || desc == ELM_FILESELECTOR_EVENT_ACTIVATED || desc == ELM_FILESELECTOR_EVENT_DIRECTORY_OPEN || 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) SIG_FWD(LONGPRESSED, EFL_UI_EVENT_LONGPRESSED) SIG_FWD(CLICKED, EFL_UI_EVENT_CLICKED) SIG_FWD(CLICKED_DOUBLE, EFL_UI_EVENT_CLICKED_DOUBLE) -SIG_FWD(SELECTION_PASTE, EFL_UI_EVENT_SELECTION_PASTE) -SIG_FWD(SELECTION_COPY, EFL_UI_EVENT_SELECTION_COPY) -SIG_FWD(SELECTION_CUT, EFL_UI_EVENT_SELECTION_CUT) +SIG_FWD(SELECTION_PASTE, EFL_UI_EVENT_SELECTABLE_PASTE) +SIG_FWD(SELECTION_COPY, EFL_UI_EVENT_SELECTABLE_COPY) +SIG_FWD(SELECTION_CUT, EFL_UI_EVENT_SELECTABLE_CUT) SIG_FWD(UNPRESSED, EFL_UI_EVENT_UNPRESSED) #undef SIG_FWD @@ -255,9 +255,9 @@ _elm_fileselector_entry_efl_canvas_group_group_add(Eo *obj, Elm_Fileselector_Ent SIG_FWD(LONGPRESSED, EFL_UI_EVENT_LONGPRESSED); SIG_FWD(CLICKED, EFL_UI_EVENT_CLICKED); SIG_FWD(CLICKED_DOUBLE, EFL_UI_EVENT_CLICKED_DOUBLE); - SIG_FWD(SELECTION_PASTE, EFL_UI_EVENT_SELECTION_PASTE); - SIG_FWD(SELECTION_COPY, EFL_UI_EVENT_SELECTION_COPY); - SIG_FWD(SELECTION_CUT, EFL_UI_EVENT_SELECTION_CUT); + SIG_FWD(SELECTION_PASTE, EFL_UI_EVENT_SELECTABLE_PASTE); + SIG_FWD(SELECTION_COPY, EFL_UI_EVENT_SELECTABLE_COPY); + SIG_FWD(SELECTION_CUT, EFL_UI_EVENT_SELECTABLE_CUT); #undef SIG_FWD 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) ELM_HOVERSEL_DATA_GET(obj2, sd); if (item->func) item->func((void *)WIDGET_ITEM_DATA_GET(eo_it), obj2, eo_it); - efl_event_callback_legacy_call(obj2, EFL_UI_EVENT_SELECTED, eo_it); + efl_event_callback_legacy_call(obj2, EFL_UI_EVENT_SELECTABLE_SELECTED, eo_it); evas_object_event_callback_add(sd->hover, EVAS_CALLBACK_DEL, _auto_update, item); 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) if ((!EINA_DBL_EQ(sd->final_position, 0)) && (sd->enabled_position & ELM_ACTIONSLIDER_LEFT)) efl_event_callback_legacy_call - (obj, EFL_UI_EVENT_SELECTED, (char *)left); + (obj, EFL_UI_EVENT_SELECTABLE_SELECTED, (char *)left); else if ((EINA_DBL_EQ(sd->final_position, 0.5)) && (sd->enabled_position & ELM_ACTIONSLIDER_CENTER)) efl_event_callback_legacy_call - (obj, EFL_UI_EVENT_SELECTED, (char *)center); + (obj, EFL_UI_EVENT_SELECTABLE_SELECTED, (char *)center); else if ((EINA_DBL_EQ(sd->final_position, 1)) && (sd->enabled_position & ELM_ACTIONSLIDER_RIGHT)) efl_event_callback_legacy_call - (obj, EFL_UI_EVENT_SELECTED, (char *)right); + (obj, EFL_UI_EVENT_SELECTABLE_SELECTED, (char *)right); sd->button_animator = NULL; @@ -286,7 +286,7 @@ _drag_button_up_cb(void *data, { sd->final_position = 0; efl_event_callback_legacy_call - (obj, EFL_UI_EVENT_SELECTED, (char *)left); + (obj, EFL_UI_EVENT_SELECTABLE_SELECTED, (char *)left); return; } @@ -296,7 +296,7 @@ _drag_button_up_cb(void *data, { sd->final_position = 0.5; efl_event_callback_legacy_call - (obj, EFL_UI_EVENT_SELECTED, (char *)center); + (obj, EFL_UI_EVENT_SELECTABLE_SELECTED, (char *)center); ecore_animator_del(sd->button_animator); sd->button_animator = ecore_evas_animator_add(obj, _button_animator, obj); @@ -310,7 +310,7 @@ _drag_button_up_cb(void *data, { sd->final_position = 1; efl_event_callback_legacy_call - (obj, EFL_UI_EVENT_SELECTED, (char *)right); + (obj, EFL_UI_EVENT_SELECTABLE_SELECTED, (char *)right); return; } 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) elm_genlist_mode_set(gl, ELM_LIST_COMPRESS); elm_object_part_content_set(ly, "elm.swallow.list", gl); efl_event_callback_add - (gl, EFL_UI_EVENT_SELECTED, _colorclass_activate, cc); + (gl, EFL_UI_EVENT_SELECTABLE_SELECTED, _colorclass_activate, cc); cc->reset = bt = elm_button_add(ly); 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) if (it->func) it->func((void *)WIDGET_ITEM_DATA_GET(eo_it), WIDGET(it), eo_it); efl_event_callback_legacy_call - (WIDGET(it), EFL_UI_EVENT_SELECTED, eo_it); + (WIDGET(it), EFL_UI_EVENT_SELECTABLE_SELECTED, eo_it); } static 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, if (!sd) return; efl_event_callback_legacy_call - (data, EFL_UI_EVENT_SELECTION_PASTE, NULL); + (data, EFL_UI_EVENT_SELECTABLE_PASTE, NULL); sd->selection_asked = EINA_TRUE; @@ -1622,7 +1622,7 @@ _cut_cb(void *data, if (!sd) return; efl_event_callback_legacy_call - (data, EFL_UI_EVENT_SELECTION_CUT, NULL); + (data, EFL_UI_EVENT_SELECTABLE_CUT, NULL); /* Store it */ sd->sel_mode = EINA_FALSE; if (!_elm_config->desktop_entry) @@ -1646,7 +1646,7 @@ _copy_cb(void *data, if (!sd) return; efl_event_callback_legacy_call - (data, EFL_UI_EVENT_SELECTION_COPY, NULL); + (data, EFL_UI_EVENT_SELECTABLE_COPY, NULL); sd->sel_mode = EINA_FALSE; if (!_elm_config->desktop_entry) { @@ -2317,7 +2317,7 @@ _entry_selection_start_signal_cb(void *data, if (entry != data) elm_entry_select_none(entry); } efl_event_callback_legacy_call - (data, EFL_UI_EVENT_SELECTION_START, NULL); + (data, EFL_UI_EVENT_SELECTABLE_START, NULL); elm_object_focus_set(data, EINA_TRUE); } @@ -2361,7 +2361,7 @@ _entry_selection_changed_signal_cb(void *data, if (!sd) return; sd->have_selection = EINA_TRUE; efl_event_callback_legacy_call - (data, EFL_UI_EVENT_SELECTION_CHANGED, NULL); + (data, EFL_UI_EVENT_SELECTABLE_CHANGED, NULL); // XXX: still try primary selection even if on wl in case it's // supported // if (!_entry_win_is_wl(data)) @@ -2384,7 +2384,7 @@ _entry_selection_cleared_signal_cb(void *data, sd->have_selection = EINA_FALSE; efl_event_callback_legacy_call - (data, EFL_UI_EVENT_SELECTION_CLEARED, NULL); + (data, EFL_UI_EVENT_SELECTABLE_CLEARED, NULL); // XXX: still try primary selection even if on wl in case it's // supported // if (!_entry_win_is_wl(data)) @@ -2425,7 +2425,7 @@ _entry_paste_request_signal_cb(void *data, // supported // if ((type == ELM_SEL_TYPE_PRIMARY) && _entry_win_is_wl(data)) return; efl_event_callback_legacy_call - (data, EFL_UI_EVENT_SELECTION_PASTE, NULL); + (data, EFL_UI_EVENT_SELECTABLE_PASTE, NULL); top = _entry_win_get(data); if (top) @@ -4412,7 +4412,7 @@ _elm_entry_select_none(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd) } if (sd->have_selection) efl_event_callback_legacy_call - (obj, EFL_UI_EVENT_SELECTION_CLEARED, NULL); + (obj, EFL_UI_EVENT_SELECTABLE_CLEARED, NULL); sd->have_selection = EINA_FALSE; 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) if (item->func) item->func((void *)WIDGET_ITEM_DATA_GET(eo_item), WIDGET(item), eo_item); efl_event_callback_legacy_call - (sd->obj, EFL_UI_EVENT_SELECTED, eo_item); + (sd->obj, EFL_UI_EVENT_SELECTABLE_SELECTED, eo_item); } static 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) it->selected = EINA_FALSE; sd->selected = eina_list_remove(sd->selected, eo_it); efl_event_callback_legacy_call - (WIDGET(it), EFL_UI_EVENT_UNSELECTED, eo_it); + (WIDGET(it), EFL_UI_EVENT_SELECTABLE_UNSELECTED, eo_it); if (_elm_config->atspi_mode) efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_TYPE_SELECTED, EINA_FALSE); } @@ -3958,7 +3958,7 @@ _item_select(Elm_Gen_Item *it) if (it->func.func) it->func.func((void *)it->func.data, WIDGET(it), eo_it); if (it->generation == sd->generation) { - efl_event_callback_legacy_call(WIDGET(it), EFL_UI_EVENT_SELECTED, eo_it); + efl_event_callback_legacy_call(WIDGET(it), EFL_UI_EVENT_SELECTABLE_SELECTED, eo_it); if (_elm_config->atspi_mode) efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_TYPE_SELECTED, EINA_TRUE); } 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) it->selected = EINA_FALSE; sd->selected = eina_list_remove(sd->selected, EO_OBJ(it)); efl_event_callback_legacy_call - (WIDGET(it), EFL_UI_EVENT_UNSELECTED, EO_OBJ(it)); + (WIDGET(it), EFL_UI_EVENT_SELECTABLE_UNSELECTED, EO_OBJ(it)); if (_elm_config->atspi_mode) efl_access_state_changed_signal_emit(EO_OBJ(it), EFL_ACCESS_STATE_TYPE_SELECTED, EINA_FALSE); } @@ -6116,7 +6116,7 @@ _item_select(Elm_Gen_Item *it) if (it->func.func) it->func.func((void *)it->func.data, WIDGET(it), eo_it); // delete item if it's requested deletion in the above callbacks. if ((it->base)->on_deletion) goto item_deleted; - efl_event_callback_legacy_call(WIDGET(it), EFL_UI_EVENT_SELECTED, eo_it); + efl_event_callback_legacy_call(WIDGET(it), EFL_UI_EVENT_SELECTABLE_SELECTED, eo_it); if (_elm_config->atspi_mode) efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_TYPE_SELECTED, EINA_TRUE); // 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, efl_event_callback_legacy_call (data, EFL_UI_EVENT_CLICKED, eo_item); efl_event_callback_legacy_call - (data, EFL_UI_EVENT_SELECTED, eo_item); + (data, EFL_UI_EVENT_SELECTABLE_SELECTED, eo_item); eo_id_item = eo_item; ELM_INDEX_ITEM_DATA_GET(eo_id_item, id_item); if (id_item->func) @@ -1299,7 +1299,7 @@ _elm_index_item_selected_set(Eo *eo_it, efl_event_callback_legacy_call (obj, ELM_INDEX_EVENT_CHANGED, eo_it); efl_event_callback_legacy_call - (obj, EFL_UI_EVENT_SELECTED, eo_it); + (obj, EFL_UI_EVENT_SELECTABLE_SELECTED, eo_it); ecore_timer_del(sd->delay); sd->delay = ecore_timer_add(sd->delay_change_time, _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: _elm_list_walk(obj, sd); if (it->func) it->func((void *)WIDGET_ITEM_DATA_GET(eo_it), WIDGET(it), eo_it); - efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SELECTED, eo_it); + efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SELECTABLE_SELECTED, eo_it); if (_elm_config->atspi_mode) efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_TYPE_SELECTED, EINA_TRUE); sd->last_selected_item = eo_it; @@ -1524,7 +1524,7 @@ _item_unselect(Elm_List_Item_Data *it) if (!(it->base->disabled || (sd->select_mode == ELM_OBJECT_SELECT_MODE_NONE))) efl_event_callback_legacy_call - (WIDGET(it), EFL_UI_EVENT_UNSELECTED, EO_OBJ(it)); + (WIDGET(it), EFL_UI_EVENT_SELECTABLE_UNSELECTED, EO_OBJ(it)); if (_elm_config->atspi_mode) efl_access_state_changed_signal_emit(EO_OBJ(it), EFL_ACCESS_STATE_TYPE_SELECTED, EINA_FALSE); } 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) elm_layout_signal_emit(VIEW(item), "elm,state,unselected", "elm"); if (item->icon) elm_widget_signal_emit(item->icon, "elm,state,unselected", "elm"); - efl_event_callback_legacy_call(WIDGET(item), EFL_UI_EVENT_UNSELECTED, EO_OBJ(item)); + efl_event_callback_legacy_call(WIDGET(item), EFL_UI_EVENT_SELECTABLE_UNSELECTED, EO_OBJ(item)); if (_elm_config->atspi_mode) efl_access_state_changed_signal_emit(EO_OBJ(item), EFL_ACCESS_STATE_TYPE_SELECTED, EINA_FALSE); } @@ -1094,7 +1094,7 @@ _item_select(Elm_Toolbar_Item_Data *it) { if (it->func) it->func((void *)(WIDGET_ITEM_DATA_GET(EO_OBJ(it))), WIDGET(it), EO_OBJ(it)); } - efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SELECTED, EO_OBJ(it)); + efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SELECTABLE_SELECTED, EO_OBJ(it)); if (_elm_config->atspi_mode) efl_access_state_changed_signal_emit(EO_OBJ(it), EFL_ACCESS_STATE_TYPE_SELECTED, EINA_TRUE); }