enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

Revert "efl_ui_selectable: namespace events to avoid conflicts" 

Summary:
This reverts commit f629f11bed.

This breaks legacy events. As the selected event is used in legacy
widgets. Also this commits mixed up two different concepts, selection in
a entry etc. and selection of a item.
Depends on D8411

Reviewers: zmike

Reviewed By: zmike

Subscribers: cedric, #reviewers, #committers

Tags: #efl

Differential Revision: https://phab.enlightenment.org/D8412
This commit is contained in:
Marcel Hollerbach 2019-03-19 16:29:39 -04:00 committed by Mike Blumenkrantz
parent 06863ac18e
commit c9cdb916cd
21 changed files with 73 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/examples/elementary/efl_ui_list_example_1.c
View File

@ -125,8 +125,8 @@ elm_main(int argc EINA_UNUSED, char **argv)
priv_d.list = list = efl_add(EFL_UI_LIST_CLASS, wbox); priv_d.list = list = efl_add(EFL_UI_LIST_CLASS, wbox);
efl_gfx_hint_weight_set(list, EFL_GFX_HINT_EXPAND, 0.9); efl_gfx_hint_weight_set(list, EFL_GFX_HINT_EXPAND, 0.9);
efl_event_callback_add(list, EFL_UI_EVENT_SELECTABLE_SELECTED, _list_selected, NULL); efl_event_callback_add(list, EFL_UI_EVENT_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_UNSELECTED, _list_unselected, NULL);
efl_event_callback_add(list, EFL_UI_EVENT_PRESSED, _list_pressed, 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_UNPRESSED, _list_unpressed, NULL);
efl_event_callback_add(list, EFL_UI_EVENT_LONGPRESSED, _list_longpressed, NULL); efl_event_callback_add(list, EFL_UI_EVENT_LONGPRESSED, _list_longpressed, NULL);

16
src/lib/efl/interfaces/efl_ui_selectable.eo
View File

@ -4,14 +4,14 @@ interface @beta Efl.Ui.Selectable
event_prefix: efl_ui; event_prefix: efl_ui;
events { events {
/* FIXME: Called with multiple types of event_info! */ /* FIXME: Called with multiple types of event_info! */
selectable,selected: void; [[Called when selected]] selected: void; [[Called when selected]]
/* FIXME: Called with multiple types of event_info! */ /* FIXME: Called with multiple types of event_info! */
selectable,unselected: void; [[Called when no longer selected]] unselected: void; [[Called when no longer selected]]
selectable,paste: void; [[Called when selection is pasted]] selection,paste: void; [[Called when selection is pasted]]
selectable,copy: void; [[Called when selection is copied]] selection,copy: void; [[Called when selection is copied]]
selectable,cut: void; [[Called when selection is cut]] selection,cut: void; [[Called when selection is cut]]
selectable,start: void; [[Called at selection start]] selection,start: void; [[Called at selection start]]
selectable,changed: void; [[Called when selection is changed]] selection,changed: void; [[Called when selection is changed]]
selectable,cleared: void; [[Called when selection is cleared]] selection,cleared: void; [[Called when selection is cleared]]
} }
} }

12
src/lib/elementary/efl_ui_grid.c
View File

@ -903,7 +903,7 @@ _grid_item_selected(void *data, const Efl_Event *event)
pd->selected = eina_list_append(pd->selected, item); pd->selected = eina_list_append(pd->selected, item);
pd->last_selected = item; pd->last_selected = item;
efl_event_callback_call(obj, EFL_UI_EVENT_SELECTABLE_SELECTED, item); efl_event_callback_call(obj, EFL_UI_EVENT_SELECTED, item);
} }
static void static void
@ -916,7 +916,7 @@ _grid_item_unselected(void *data, const Efl_Event *event)
pd->selected = eina_list_remove(pd->selected, item); pd->selected = eina_list_remove(pd->selected, item);
if (pd->last_selected == item) pd->last_selected = NULL; if (pd->last_selected == item) pd->last_selected = NULL;
efl_event_callback_call(obj, EFL_UI_EVENT_SELECTABLE_UNSELECTED, item); efl_event_callback_call(obj, EFL_UI_EVENT_UNSELECTED, item);
} }
static void static void
@ -945,8 +945,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_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_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_LONGPRESSED, _grid_item_longpressed, obj);
efl_event_callback_add(it, EFL_UI_EVENT_SELECTABLE_SELECTED, _grid_item_selected, obj); efl_event_callback_add(it, EFL_UI_EVENT_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_UI_EVENT_UNSELECTED, _grid_item_unselected, obj);
efl_event_callback_add(it, EFL_EVENT_DEL, _grid_item_deleted, obj); efl_event_callback_add(it, EFL_EVENT_DEL, _grid_item_deleted, obj);
return EINA_TRUE; return EINA_TRUE;
@ -971,8 +971,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_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_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_LONGPRESSED, _grid_item_longpressed, obj);
efl_event_callback_del(it, EFL_UI_EVENT_SELECTABLE_SELECTED, _grid_item_selected, obj); efl_event_callback_del(it, EFL_UI_EVENT_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_UI_EVENT_UNSELECTED, _grid_item_unselected, obj);
efl_event_callback_del(it, EFL_EVENT_DEL, _grid_item_deleted, obj); efl_event_callback_del(it, EFL_EVENT_DEL, _grid_item_deleted, obj);
} }

4
src/lib/elementary/efl_ui_item.c
View File

@ -27,7 +27,7 @@ _item_select(Eo *obj, Efl_Ui_Item_Data *pd)
pd->selected = EINA_TRUE; pd->selected = EINA_TRUE;
edje_object_signal_emit(wd->resize_obj, "efl,state,selected", "efl"); edje_object_signal_emit(wd->resize_obj, "efl,state,selected", "efl");
efl_event_callback_call(obj, EFL_UI_EVENT_SELECTABLE_SELECTED, NULL); efl_event_callback_call(obj, EFL_UI_EVENT_SELECTED, NULL);
} }
static void static void
@ -38,7 +38,7 @@ _item_unselect(Eo *obj, Efl_Ui_Item_Data *pd)
pd->selected = EINA_FALSE; pd->selected = EINA_FALSE;
edje_object_signal_emit(wd->resize_obj, "efl,state,unselected", "efl"); edje_object_signal_emit(wd->resize_obj, "efl,state,unselected", "efl");
efl_event_callback_call(obj, EFL_UI_EVENT_SELECTABLE_UNSELECTED, NULL); efl_event_callback_call(obj, EFL_UI_EVENT_UNSELECTED, NULL);
} }
/* Mouse Controls */ /* Mouse Controls */

12
src/lib/elementary/efl_ui_list.c
View File

@ -657,7 +657,7 @@ _list_item_selected(void *data, const Efl_Event *event)
pd->selected = eina_list_append(pd->selected, item); pd->selected = eina_list_append(pd->selected, item);
pd->last_selected = item; pd->last_selected = item;
efl_event_callback_call(obj, EFL_UI_EVENT_SELECTABLE_SELECTED, item); efl_event_callback_call(obj, EFL_UI_EVENT_SELECTED, item);
} }
static void static void
@ -670,7 +670,7 @@ _list_item_unselected(void *data, const Efl_Event *event)
pd->selected = eina_list_remove(pd->selected, item); pd->selected = eina_list_remove(pd->selected, item);
if (pd->last_selected == item) pd->last_selected = NULL; if (pd->last_selected == item) pd->last_selected = NULL;
efl_event_callback_call(obj, EFL_UI_EVENT_SELECTABLE_UNSELECTED, item); efl_event_callback_call(obj, EFL_UI_EVENT_UNSELECTED, item);
} }
static Eina_Bool 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_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_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_LONGPRESSED, _list_item_longpressed, obj);
efl_event_callback_add(it, EFL_UI_EVENT_SELECTABLE_SELECTED, _list_item_selected, obj); efl_event_callback_add(it, EFL_UI_EVENT_SELECTED, _list_item_selected, obj);
efl_event_callback_add(it, EFL_UI_EVENT_SELECTABLE_UNSELECTED, _list_item_unselected, obj); efl_event_callback_add(it, EFL_UI_EVENT_UNSELECTED, _list_item_unselected, obj);
return EINA_TRUE; 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_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_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_LONGPRESSED, _list_item_longpressed, obj);
efl_event_callback_del(it, EFL_UI_EVENT_SELECTABLE_SELECTED, _list_item_selected, obj); efl_event_callback_del(it, EFL_UI_EVENT_SELECTED, _list_item_selected, obj);
efl_event_callback_del(it, EFL_UI_EVENT_SELECTABLE_UNSELECTED, _list_item_unselected, obj); efl_event_callback_del(it, EFL_UI_EVENT_UNSELECTED, _list_item_unselected, obj);
} }
/* Pack APIs */ /* Pack APIs */

2
src/lib/elementary/efl_ui_tab_bar.c
View File

@ -187,7 +187,7 @@ _tab_select(Efl_Ui_Tab_Bar_Data *sd, Tab_Info *ti)
index = eina_list_data_idx(sd->tab_infos, ti); index = eina_list_data_idx(sd->tab_infos, ti);
efl_event_callback_call(tp, EFL_UI_EVENT_SELECTABLE_SELECTED, (void *)(intptr_t)index); efl_event_callback_call(tp, EFL_UI_EVENT_SELECTED, (void *)(intptr_t)index);
sd->cur = index; sd->cur = index;
} }

6
src/lib/elementary/efl_ui_tab_pager.c
View File

@ -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) if (sd->tab_bar != NULL)
{ {
efl_event_callback_del(sd->tab_bar, EFL_UI_EVENT_SELECTABLE_SELECTED, _tab_select_cb, obj); efl_event_callback_del(sd->tab_bar, EFL_UI_EVENT_SELECTED, _tab_select_cb, obj);
efl_content_unset(efl_part(obj, "efl.tab_root")); efl_content_unset(efl_part(obj, "efl.tab_root"));
efl_del(sd->tab_bar); 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; sd->tab_bar = tab_bar;
efl_content_set(efl_part(obj, "efl.tab_root"), sd->tab_bar); efl_content_set(efl_part(obj, "efl.tab_root"), sd->tab_bar);
efl_event_callback_add(sd->tab_bar, EFL_UI_EVENT_SELECTABLE_SELECTED, _tab_select_cb, obj); efl_event_callback_add(sd->tab_bar, EFL_UI_EVENT_SELECTED, _tab_select_cb, obj);
} }
EOLIAN static Efl_Canvas_Object * 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) _efl_ui_tab_pager_efl_object_destructor(Eo *obj, Efl_Ui_Tab_Pager_Data *sd)
{ {
if (sd->tab_bar != NULL) if (sd->tab_bar != NULL)
efl_event_callback_del(sd->tab_bar, EFL_UI_EVENT_SELECTABLE_SELECTED, _tab_select_cb, obj); efl_event_callback_del(sd->tab_bar, EFL_UI_EVENT_SELECTED, _tab_select_cb, obj);
efl_destructor(efl_super(obj, MY_CLASS)); efl_destructor(efl_super(obj, MY_CLASS));
} }

6
src/lib/elementary/efl_ui_text.c
View File

@ -1217,7 +1217,7 @@ _cut_cb(Eo *obj)
Efl_Text_Cursor_Cursor *start, *end; Efl_Text_Cursor_Cursor *start, *end;
EFL_UI_TEXT_DATA_GET(obj, sd); EFL_UI_TEXT_DATA_GET(obj, sd);
efl_event_callback_call(obj, EFL_UI_EVENT_SELECTABLE_CUT, NULL); efl_event_callback_call(obj, EFL_UI_EVENT_SELECTION_CUT, NULL);
/* Store it */ /* Store it */
sd->sel_mode = EINA_FALSE; sd->sel_mode = EINA_FALSE;
if (!_elm_config->desktop_entry) if (!_elm_config->desktop_entry)
@ -1246,7 +1246,7 @@ _copy_cb(Eo *obj)
{ {
EFL_UI_TEXT_DATA_GET(obj, sd); EFL_UI_TEXT_DATA_GET(obj, sd);
efl_event_callback_call(obj, EFL_UI_EVENT_SELECTABLE_COPY, NULL); efl_event_callback_call(obj, EFL_UI_EVENT_SELECTION_COPY, NULL);
sd->sel_mode = EINA_FALSE; sd->sel_mode = EINA_FALSE;
if (!_elm_config->desktop_entry) 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"); edje_object_signal_emit(sd->entry_edje, "efl,state,select,off", "efl");
} }
if (sd->have_selection) if (sd->have_selection)
efl_event_callback_call(obj, EFL_UI_EVENT_SELECTABLE_CLEARED, NULL); efl_event_callback_call(obj, EFL_UI_EVENT_SELECTION_CLEARED, NULL);
sd->have_selection = EINA_FALSE; sd->have_selection = EINA_FALSE;
_edje_signal_emit(sd, "selection,cleared", "efl.text"); _edje_signal_emit(sd, "selection,cleared", "efl.text");

16
src/lib/elementary/elc_fileselector.c
View File

@ -1215,7 +1215,7 @@ _on_item_selected(void *data, const Efl_Event *event)
elm_object_text_set(sd->name_entry, it_data->filename); elm_object_text_set(sd->name_entry, it_data->filename);
_model_event_call _model_event_call
(data, EFL_UI_EVENT_SELECTABLE_SELECTED, it_data->model, it_data->path); (data, EFL_UI_EVENT_SELECTED, it_data->model, it_data->path);
} }
else if (sd->multi && it_data->is_dir && sd->double_tap_navigation) else if (sd->multi && it_data->is_dir && sd->double_tap_navigation)
{ {
@ -1467,7 +1467,7 @@ _on_text_activated_set_path_then(void *data, const Eina_Value v, const Eina_Futu
selected: selected:
if (sd->only_folder) if (sd->only_folder)
_model_event_call(fs, EFL_UI_EVENT_SELECTABLE_SELECTED, model, str); _model_event_call(fs, EFL_UI_EVENT_SELECTED, model, str);
end: end:
_text_activated_free_fs_data(fs); _text_activated_free_fs_data(fs);
@ -1607,9 +1607,9 @@ _files_list_add(Evas_Object *obj)
efl_ui_mirrored_automatic_set(li, EINA_FALSE); efl_ui_mirrored_automatic_set(li, EINA_FALSE);
efl_event_callback_add efl_event_callback_add
(li, EFL_UI_EVENT_SELECTABLE_SELECTED, _on_item_selected, obj); (li, EFL_UI_EVENT_SELECTED, _on_item_selected, obj);
efl_event_callback_add efl_event_callback_add
(li, EFL_UI_EVENT_SELECTABLE_UNSELECTED, _on_item_unselected, obj); (li, EFL_UI_EVENT_UNSELECTED, _on_item_unselected, obj);
efl_event_callback_add efl_event_callback_add
(li, ELM_GENLIST_EVENT_ACTIVATED, _on_item_activated, obj); (li, ELM_GENLIST_EVENT_ACTIVATED, _on_item_activated, obj);
efl_event_callback_add efl_event_callback_add
@ -1644,9 +1644,9 @@ _files_grid_add(Evas_Object *obj)
elm_gengrid_align_set(grid, 0.0, 0.0); elm_gengrid_align_set(grid, 0.0, 0.0);
efl_event_callback_add efl_event_callback_add
(grid, EFL_UI_EVENT_SELECTABLE_SELECTED, _on_item_selected, obj); (grid, EFL_UI_EVENT_SELECTED, _on_item_selected, obj);
efl_event_callback_add efl_event_callback_add
(grid, EFL_UI_EVENT_SELECTABLE_UNSELECTED, _on_item_unselected, obj); (grid, EFL_UI_EVENT_UNSELECTED, _on_item_unselected, obj);
efl_event_callback_add efl_event_callback_add
(grid, ELM_GENGRID_EVENT_ACTIVATED, _on_item_activated, obj); (grid, ELM_GENGRID_EVENT_ACTIVATED, _on_item_activated, obj);
efl_event_callback_add efl_event_callback_add
@ -1995,7 +1995,7 @@ _elm_fileselector_efl_object_event_callback_legacy_call(Eo *obj, Elm_Fileselecto
{ {
const Efl_Event_Description *evt_desc = NULL; const Efl_Event_Description *evt_desc = NULL;
if (strcmp(desc->name, "selected") == 0) if (strcmp(desc->name, "selected") == 0)
evt_desc = EFL_UI_EVENT_SELECTABLE_SELECTED; evt_desc = EFL_UI_EVENT_SELECTED;
else if (strcmp(desc->name, "activated") == 0) else if (strcmp(desc->name, "activated") == 0)
evt_desc = ELM_FILESELECTOR_EVENT_ACTIVATED; evt_desc = ELM_FILESELECTOR_EVENT_ACTIVATED;
else if (strcmp(desc->name, "directory,open") == 0) else if (strcmp(desc->name, "directory,open") == 0)
@ -2010,7 +2010,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); return _from_legacy_event_call(obj, sd, desc, evt_desc, event_info);
} }
if (desc == EFL_UI_EVENT_SELECTABLE_SELECTED || if (desc == EFL_UI_EVENT_SELECTED ||
desc == ELM_FILESELECTOR_EVENT_ACTIVATED || desc == ELM_FILESELECTOR_EVENT_ACTIVATED ||
desc == ELM_FILESELECTOR_EVENT_DIRECTORY_OPEN || desc == ELM_FILESELECTOR_EVENT_DIRECTORY_OPEN ||
desc == ELM_FILESELECTOR_EVENT_DONE || desc == ELM_FILESELECTOR_EVENT_DONE ||

12
src/lib/elementary/elc_fileselector_entry.c
View File

@ -61,9 +61,9 @@ SIG_FWD(PRESS, ELM_FILESELECTOR_ENTRY_EVENT_PRESS)
SIG_FWD(LONGPRESSED, EFL_UI_EVENT_LONGPRESSED) SIG_FWD(LONGPRESSED, EFL_UI_EVENT_LONGPRESSED)
SIG_FWD(CLICKED, EFL_UI_EVENT_CLICKED) SIG_FWD(CLICKED, EFL_UI_EVENT_CLICKED)
SIG_FWD(CLICKED_DOUBLE, EFL_UI_EVENT_CLICKED_DOUBLE) SIG_FWD(CLICKED_DOUBLE, EFL_UI_EVENT_CLICKED_DOUBLE)
SIG_FWD(SELECTION_PASTE, EFL_UI_EVENT_SELECTABLE_PASTE) SIG_FWD(SELECTION_PASTE, EFL_UI_EVENT_SELECTION_PASTE)
SIG_FWD(SELECTION_COPY, EFL_UI_EVENT_SELECTABLE_COPY) SIG_FWD(SELECTION_COPY, EFL_UI_EVENT_SELECTION_COPY)
SIG_FWD(SELECTION_CUT, EFL_UI_EVENT_SELECTABLE_CUT) SIG_FWD(SELECTION_CUT, EFL_UI_EVENT_SELECTION_CUT)
SIG_FWD(UNPRESSED, EFL_UI_EVENT_UNPRESSED) SIG_FWD(UNPRESSED, EFL_UI_EVENT_UNPRESSED)
#undef SIG_FWD #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(LONGPRESSED, EFL_UI_EVENT_LONGPRESSED);
SIG_FWD(CLICKED, EFL_UI_EVENT_CLICKED); SIG_FWD(CLICKED, EFL_UI_EVENT_CLICKED);
SIG_FWD(CLICKED_DOUBLE, EFL_UI_EVENT_CLICKED_DOUBLE); SIG_FWD(CLICKED_DOUBLE, EFL_UI_EVENT_CLICKED_DOUBLE);
SIG_FWD(SELECTION_PASTE, EFL_UI_EVENT_SELECTABLE_PASTE); SIG_FWD(SELECTION_PASTE, EFL_UI_EVENT_SELECTION_PASTE);
SIG_FWD(SELECTION_COPY, EFL_UI_EVENT_SELECTABLE_COPY); SIG_FWD(SELECTION_COPY, EFL_UI_EVENT_SELECTION_COPY);
SIG_FWD(SELECTION_CUT, EFL_UI_EVENT_SELECTABLE_CUT); SIG_FWD(SELECTION_CUT, EFL_UI_EVENT_SELECTION_CUT);
#undef SIG_FWD #undef SIG_FWD
efl_event_callback_forwarder_add(priv->entry, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_CHANGED, obj); efl_event_callback_forwarder_add(priv->entry, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_CHANGED, obj);

2
src/lib/elementary/elc_hoversel.c
View File

@ -176,7 +176,7 @@ _on_item_clicked(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED)
ELM_HOVERSEL_DATA_GET(obj2, sd); ELM_HOVERSEL_DATA_GET(obj2, sd);
if (item->func) item->func((void *)WIDGET_ITEM_DATA_GET(eo_it), obj2, eo_it); if (item->func) item->func((void *)WIDGET_ITEM_DATA_GET(eo_it), obj2, eo_it);
efl_event_callback_legacy_call(obj2, EFL_UI_EVENT_SELECTABLE_SELECTED, eo_it); efl_event_callback_legacy_call(obj2, EFL_UI_EVENT_SELECTED, eo_it);
evas_object_event_callback_add(sd->hover, EVAS_CALLBACK_DEL, _auto_update, item); evas_object_event_callback_add(sd->hover, EVAS_CALLBACK_DEL, _auto_update, item);

12
src/lib/elementary/elm_actionslider.c
View File

@ -240,15 +240,15 @@ _button_animator(void *data)
if ((!EINA_DBL_EQ(sd->final_position, 0)) && if ((!EINA_DBL_EQ(sd->final_position, 0)) &&
(sd->enabled_position & ELM_ACTIONSLIDER_LEFT)) (sd->enabled_position & ELM_ACTIONSLIDER_LEFT))
efl_event_callback_legacy_call efl_event_callback_legacy_call
(obj, EFL_UI_EVENT_SELECTABLE_SELECTED, (char *)left); (obj, EFL_UI_EVENT_SELECTED, (char *)left);
else if ((EINA_DBL_EQ(sd->final_position, 0.5)) && else if ((EINA_DBL_EQ(sd->final_position, 0.5)) &&
(sd->enabled_position & ELM_ACTIONSLIDER_CENTER)) (sd->enabled_position & ELM_ACTIONSLIDER_CENTER))
efl_event_callback_legacy_call efl_event_callback_legacy_call
(obj, EFL_UI_EVENT_SELECTABLE_SELECTED, (char *)center); (obj, EFL_UI_EVENT_SELECTED, (char *)center);
else if ((EINA_DBL_EQ(sd->final_position, 1)) && else if ((EINA_DBL_EQ(sd->final_position, 1)) &&
(sd->enabled_position & ELM_ACTIONSLIDER_RIGHT)) (sd->enabled_position & ELM_ACTIONSLIDER_RIGHT))
efl_event_callback_legacy_call efl_event_callback_legacy_call
(obj, EFL_UI_EVENT_SELECTABLE_SELECTED, (char *)right); (obj, EFL_UI_EVENT_SELECTED, (char *)right);
sd->button_animator = NULL; sd->button_animator = NULL;
@ -286,7 +286,7 @@ _drag_button_up_cb(void *data,
{ {
sd->final_position = 0; sd->final_position = 0;
efl_event_callback_legacy_call efl_event_callback_legacy_call
(obj, EFL_UI_EVENT_SELECTABLE_SELECTED, (char *)left); (obj, EFL_UI_EVENT_SELECTED, (char *)left);
return; return;
} }
@ -296,7 +296,7 @@ _drag_button_up_cb(void *data,
{ {
sd->final_position = 0.5; sd->final_position = 0.5;
efl_event_callback_legacy_call efl_event_callback_legacy_call
(obj, EFL_UI_EVENT_SELECTABLE_SELECTED, (char *)center); (obj, EFL_UI_EVENT_SELECTED, (char *)center);
ecore_animator_del(sd->button_animator); ecore_animator_del(sd->button_animator);
sd->button_animator = ecore_evas_animator_add(obj, _button_animator, obj); 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; sd->final_position = 1;
efl_event_callback_legacy_call efl_event_callback_legacy_call
(obj, EFL_UI_EVENT_SELECTABLE_SELECTED, (char *)right); (obj, EFL_UI_EVENT_SELECTED, (char *)right);
return; return;
} }

2
src/lib/elementary/elm_color_class.c
View File

@ -743,7 +743,7 @@ elm_color_class_editor_add(Evas_Object *obj)
elm_genlist_mode_set(gl, ELM_LIST_COMPRESS); elm_genlist_mode_set(gl, ELM_LIST_COMPRESS);
elm_object_part_content_set(ly, "elm.swallow.list", gl); elm_object_part_content_set(ly, "elm.swallow.list", gl);
efl_event_callback_add efl_event_callback_add
(gl, EFL_UI_EVENT_SELECTABLE_SELECTED, _colorclass_activate, cc); (gl, EFL_UI_EVENT_SELECTED, _colorclass_activate, cc);
cc->reset = bt = elm_button_add(ly); cc->reset = bt = elm_button_add(ly);
elm_object_style_set(bt, "colorclass"); elm_object_style_set(bt, "colorclass");

2
src/lib/elementary/elm_diskselector.c
View File

@ -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); if (it->func) it->func((void *)WIDGET_ITEM_DATA_GET(eo_it), WIDGET(it), eo_it);
efl_event_callback_legacy_call efl_event_callback_legacy_call
(WIDGET(it), EFL_UI_EVENT_SELECTABLE_SELECTED, eo_it); (WIDGET(it), EFL_UI_EVENT_SELECTED, eo_it);
} }
static int static int

16
src/lib/elementary/elm_entry.c
View File

@ -1568,7 +1568,7 @@ _paste_cb(void *data,
if (!sd) return; if (!sd) return;
efl_event_callback_legacy_call efl_event_callback_legacy_call
(data, EFL_UI_EVENT_SELECTABLE_PASTE, NULL); (data, EFL_UI_EVENT_SELECTION_PASTE, NULL);
sd->selection_asked = EINA_TRUE; sd->selection_asked = EINA_TRUE;
@ -1623,7 +1623,7 @@ _cut_cb(void *data,
if (!sd) return; if (!sd) return;
efl_event_callback_legacy_call efl_event_callback_legacy_call
(data, EFL_UI_EVENT_SELECTABLE_CUT, NULL); (data, EFL_UI_EVENT_SELECTION_CUT, NULL);
/* Store it */ /* Store it */
sd->sel_mode = EINA_FALSE; sd->sel_mode = EINA_FALSE;
if (!_elm_config->desktop_entry) if (!_elm_config->desktop_entry)
@ -1647,7 +1647,7 @@ _copy_cb(void *data,
if (!sd) return; if (!sd) return;
efl_event_callback_legacy_call efl_event_callback_legacy_call
(data, EFL_UI_EVENT_SELECTABLE_COPY, NULL); (data, EFL_UI_EVENT_SELECTION_COPY, NULL);
sd->sel_mode = EINA_FALSE; sd->sel_mode = EINA_FALSE;
if (!_elm_config->desktop_entry) if (!_elm_config->desktop_entry)
{ {
@ -2318,7 +2318,7 @@ _entry_selection_start_signal_cb(void *data,
if (entry != data) elm_entry_select_none(entry); if (entry != data) elm_entry_select_none(entry);
} }
efl_event_callback_legacy_call efl_event_callback_legacy_call
(data, EFL_UI_EVENT_SELECTABLE_START, NULL); (data, EFL_UI_EVENT_SELECTION_START, NULL);
elm_object_focus_set(data, EINA_TRUE); elm_object_focus_set(data, EINA_TRUE);
} }
@ -2362,7 +2362,7 @@ _entry_selection_changed_signal_cb(void *data,
if (!sd) return; if (!sd) return;
sd->have_selection = EINA_TRUE; sd->have_selection = EINA_TRUE;
efl_event_callback_legacy_call efl_event_callback_legacy_call
(data, EFL_UI_EVENT_SELECTABLE_CHANGED, NULL); (data, EFL_UI_EVENT_SELECTION_CHANGED, NULL);
// XXX: still try primary selection even if on wl in case it's // XXX: still try primary selection even if on wl in case it's
// supported // supported
// if (!_entry_win_is_wl(data)) // if (!_entry_win_is_wl(data))
@ -2385,7 +2385,7 @@ _entry_selection_cleared_signal_cb(void *data,
sd->have_selection = EINA_FALSE; sd->have_selection = EINA_FALSE;
efl_event_callback_legacy_call efl_event_callback_legacy_call
(data, EFL_UI_EVENT_SELECTABLE_CLEARED, NULL); (data, EFL_UI_EVENT_SELECTION_CLEARED, NULL);
// XXX: still try primary selection even if on wl in case it's // XXX: still try primary selection even if on wl in case it's
// supported // supported
// if (!_entry_win_is_wl(data)) // if (!_entry_win_is_wl(data))
@ -2426,7 +2426,7 @@ _entry_paste_request_signal_cb(void *data,
// supported // supported
// if ((type == ELM_SEL_TYPE_PRIMARY) && _entry_win_is_wl(data)) return; // if ((type == ELM_SEL_TYPE_PRIMARY) && _entry_win_is_wl(data)) return;
efl_event_callback_legacy_call efl_event_callback_legacy_call
(data, EFL_UI_EVENT_SELECTABLE_PASTE, NULL); (data, EFL_UI_EVENT_SELECTION_PASTE, NULL);
top = _entry_win_get(data); top = _entry_win_get(data);
if (top) if (top)
@ -4413,7 +4413,7 @@ _elm_entry_select_none(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd)
} }
if (sd->have_selection) if (sd->have_selection)
efl_event_callback_legacy_call efl_event_callback_legacy_call
(obj, EFL_UI_EVENT_SELECTABLE_CLEARED, NULL); (obj, EFL_UI_EVENT_SELECTION_CLEARED, NULL);
sd->have_selection = EINA_FALSE; sd->have_selection = EINA_FALSE;
edje_object_part_text_select_none(sd->entry_edje, "elm.text"); edje_object_part_text_select_none(sd->entry_edje, "elm.text");

2
src/lib/elementary/elm_flipselector.c
View File

@ -234,7 +234,7 @@ _on_item_changed(Elm_Flipselector_Data *sd)
if (item->func) if (item->func)
item->func((void *)WIDGET_ITEM_DATA_GET(eo_item), WIDGET(item), eo_item); item->func((void *)WIDGET_ITEM_DATA_GET(eo_item), WIDGET(item), eo_item);
efl_event_callback_legacy_call efl_event_callback_legacy_call
(sd->obj, EFL_UI_EVENT_SELECTABLE_SELECTED, eo_item); (sd->obj, EFL_UI_EVENT_SELECTED, eo_item);
} }
static void static void

4
src/lib/elementary/elm_gengrid.c
View File

@ -722,7 +722,7 @@ _item_unselect(Elm_Gen_Item *it)
it->selected = EINA_FALSE; it->selected = EINA_FALSE;
sd->selected = eina_list_remove(sd->selected, eo_it); sd->selected = eina_list_remove(sd->selected, eo_it);
efl_event_callback_legacy_call efl_event_callback_legacy_call
(WIDGET(it), EFL_UI_EVENT_SELECTABLE_UNSELECTED, eo_it); (WIDGET(it), EFL_UI_EVENT_UNSELECTED, eo_it);
if (_elm_config->atspi_mode) if (_elm_config->atspi_mode)
efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_TYPE_SELECTED, EINA_FALSE); 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->func.func) it->func.func((void *)it->func.data, WIDGET(it), eo_it);
if (it->generation == sd->generation) if (it->generation == sd->generation)
{ {
efl_event_callback_legacy_call(WIDGET(it), EFL_UI_EVENT_SELECTABLE_SELECTED, eo_it); efl_event_callback_legacy_call(WIDGET(it), EFL_UI_EVENT_SELECTED, eo_it);
if (_elm_config->atspi_mode) if (_elm_config->atspi_mode)
efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_TYPE_SELECTED, EINA_TRUE); efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_TYPE_SELECTED, EINA_TRUE);
} }

4
src/lib/elementary/elm_genlist.c
View File

@ -3932,7 +3932,7 @@ _item_unselect(Elm_Gen_Item *it)
it->selected = EINA_FALSE; it->selected = EINA_FALSE;
sd->selected = eina_list_remove(sd->selected, EO_OBJ(it)); sd->selected = eina_list_remove(sd->selected, EO_OBJ(it));
efl_event_callback_legacy_call efl_event_callback_legacy_call
(WIDGET(it), EFL_UI_EVENT_SELECTABLE_UNSELECTED, EO_OBJ(it)); (WIDGET(it), EFL_UI_EVENT_UNSELECTED, EO_OBJ(it));
if (_elm_config->atspi_mode) if (_elm_config->atspi_mode)
efl_access_state_changed_signal_emit(EO_OBJ(it), EFL_ACCESS_STATE_TYPE_SELECTED, EINA_FALSE); 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); 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. // delete item if it's requested deletion in the above callbacks.
if ((it->base)->on_deletion) goto item_deleted; if ((it->base)->on_deletion) goto item_deleted;
efl_event_callback_legacy_call(WIDGET(it), EFL_UI_EVENT_SELECTABLE_SELECTED, eo_it); efl_event_callback_legacy_call(WIDGET(it), EFL_UI_EVENT_SELECTED, eo_it);
if (_elm_config->atspi_mode) if (_elm_config->atspi_mode)
efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_TYPE_SELECTED, EINA_TRUE); 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. // delete item if it's requested deletion in the above callbacks.

4
src/lib/elementary/elm_index.c
View File

@ -864,7 +864,7 @@ _on_mouse_up(void *data,
efl_event_callback_legacy_call efl_event_callback_legacy_call
(data, EFL_UI_EVENT_CLICKED, eo_item); (data, EFL_UI_EVENT_CLICKED, eo_item);
efl_event_callback_legacy_call efl_event_callback_legacy_call
(data, EFL_UI_EVENT_SELECTABLE_SELECTED, eo_item); (data, EFL_UI_EVENT_SELECTED, eo_item);
eo_id_item = eo_item; eo_id_item = eo_item;
ELM_INDEX_ITEM_DATA_GET(eo_id_item, id_item); ELM_INDEX_ITEM_DATA_GET(eo_id_item, id_item);
if (id_item->func) if (id_item->func)
@ -1299,7 +1299,7 @@ _elm_index_item_selected_set(Eo *eo_it,
efl_event_callback_legacy_call efl_event_callback_legacy_call
(obj, ELM_INDEX_EVENT_CHANGED, eo_it); (obj, ELM_INDEX_EVENT_CHANGED, eo_it);
efl_event_callback_legacy_call efl_event_callback_legacy_call
(obj, EFL_UI_EVENT_SELECTABLE_SELECTED, eo_it); (obj, EFL_UI_EVENT_SELECTED, eo_it);
ecore_timer_del(sd->delay); ecore_timer_del(sd->delay);
sd->delay = ecore_timer_add(sd->delay_change_time, sd->delay = ecore_timer_add(sd->delay_change_time,
_delay_change_cb, obj); _delay_change_cb, obj);

4
src/lib/elementary/elm_list.c
View File

@ -1448,7 +1448,7 @@ call:
_elm_list_walk(obj, sd); _elm_list_walk(obj, sd);
if (it->func) it->func((void *)WIDGET_ITEM_DATA_GET(eo_it), WIDGET(it), eo_it); 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_SELECTABLE_SELECTED, eo_it); efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SELECTED, eo_it);
if (_elm_config->atspi_mode) if (_elm_config->atspi_mode)
efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_TYPE_SELECTED, EINA_TRUE); efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_TYPE_SELECTED, EINA_TRUE);
sd->last_selected_item = eo_it; sd->last_selected_item = eo_it;
@ -1524,7 +1524,7 @@ _item_unselect(Elm_List_Item_Data *it)
if (!(it->base->disabled || if (!(it->base->disabled ||
(sd->select_mode == ELM_OBJECT_SELECT_MODE_NONE))) (sd->select_mode == ELM_OBJECT_SELECT_MODE_NONE)))
efl_event_callback_legacy_call efl_event_callback_legacy_call
(WIDGET(it), EFL_UI_EVENT_SELECTABLE_UNSELECTED, EO_OBJ(it)); (WIDGET(it), EFL_UI_EVENT_UNSELECTED, EO_OBJ(it));
if (_elm_config->atspi_mode) if (_elm_config->atspi_mode)
efl_access_state_changed_signal_emit(EO_OBJ(it), EFL_ACCESS_STATE_TYPE_SELECTED, EINA_FALSE); efl_access_state_changed_signal_emit(EO_OBJ(it), EFL_ACCESS_STATE_TYPE_SELECTED, EINA_FALSE);
} }

4
src/lib/elementary/elm_toolbar.c
View File

@ -178,7 +178,7 @@ _item_unselect(Elm_Toolbar_Item_Data *item)
elm_layout_signal_emit(VIEW(item), "elm,state,unselected", "elm"); elm_layout_signal_emit(VIEW(item), "elm,state,unselected", "elm");
if (item->icon) if (item->icon)
elm_widget_signal_emit(item->icon, "elm,state,unselected", "elm"); elm_widget_signal_emit(item->icon, "elm,state,unselected", "elm");
efl_event_callback_legacy_call(WIDGET(item), EFL_UI_EVENT_SELECTABLE_UNSELECTED, EO_OBJ(item)); efl_event_callback_legacy_call(WIDGET(item), EFL_UI_EVENT_UNSELECTED, EO_OBJ(item));
if (_elm_config->atspi_mode) if (_elm_config->atspi_mode)
efl_access_state_changed_signal_emit(EO_OBJ(item), EFL_ACCESS_STATE_TYPE_SELECTED, EINA_FALSE); 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)); 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_SELECTABLE_SELECTED, EO_OBJ(it)); efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SELECTED, EO_OBJ(it));
if (_elm_config->atspi_mode) if (_elm_config->atspi_mode)
efl_access_state_changed_signal_emit(EO_OBJ(it), EFL_ACCESS_STATE_TYPE_SELECTED, EINA_TRUE); efl_access_state_changed_signal_emit(EO_OBJ(it), EFL_ACCESS_STATE_TYPE_SELECTED, EINA_TRUE);
} }