summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Levin <avi.levin@samsung.com>2015-05-03 14:28:16 +0300
committerAvi Levin <avi.levin@samsung.com>2015-06-29 17:03:30 +0300
commit78ed50afbcf1f43dcf73aea4f7a87040d67f426e (patch)
tree3b87ac671a1bbb0008bbb4e6de12e71af7cd6fe4
parent5098a4f24bd8cc2bcbc1b99a8a19f29013441aff (diff)
etc_ctxpopup, elm_gengrid, elm_notify: porting evas smart callbacks to eo
-rw-r--r--src/lib/elc_ctxpopup.c4
-rw-r--r--src/lib/elm_ctxpopup.eo5
-rw-r--r--src/lib/elm_gengrid.c118
-rw-r--r--src/lib/elm_gengrid.eo18
-rw-r--r--src/lib/elm_list.eo2
-rw-r--r--src/lib/elm_notify.c4
-rw-r--r--src/lib/elm_widget.eo3
7 files changed, 93 insertions, 61 deletions
diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c
index f5e674054..90b375770 100644
--- a/src/lib/elc_ctxpopup.c
+++ b/src/lib/elc_ctxpopup.c
@@ -708,7 +708,7 @@ _on_parent_resize(void *data,
708 sd->dir = ELM_CTXPOPUP_DIRECTION_UNKNOWN; 708 sd->dir = ELM_CTXPOPUP_DIRECTION_UNKNOWN;
709 709
710 evas_object_hide(data); 710 evas_object_hide(data);
711 evas_object_smart_callback_call(data, SIG_DISMISSED, NULL); 711 eo_do(data, eo_event_callback_call(ELM_CTXPOPUP_EVENT_DISMISSED, NULL));
712 } 712 }
713 else 713 else
714 { 714 {
@@ -1020,7 +1020,7 @@ _hide_finished_cb(void *data,
1020 const char *source EINA_UNUSED) 1020 const char *source EINA_UNUSED)
1021{ 1021{
1022 evas_object_hide(data); 1022 evas_object_hide(data);
1023 evas_object_smart_callback_call(data, SIG_DISMISSED, NULL); 1023 eo_do(data, eo_event_callback_call(ELM_CTXPOPUP_EVENT_DISMISSED, NULL));
1024} 1024}
1025 1025
1026static void 1026static void
diff --git a/src/lib/elm_ctxpopup.eo b/src/lib/elm_ctxpopup.eo
index 903f6b97f..098150a86 100644
--- a/src/lib/elm_ctxpopup.eo
+++ b/src/lib/elm_ctxpopup.eo
@@ -265,10 +265,7 @@ class Elm.Ctxpopup (Elm.Layout, Elm_Interface_Atspi_Widget_Action)
265 Elm_Interface_Atspi_Widget_Action.elm_actions.get; 265 Elm_Interface_Atspi_Widget_Action.elm_actions.get;
266 } 266 }
267 events { 267 events {
268 language,changed; 268 dismissed;
269 access,changed;
270 focused;
271 unfocused;
272 } 269 }
273 270
274} 271}
diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index faef8a147..05be5e0a5 100644
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -482,7 +482,8 @@ _calc_job(void *data)
482 { 482 {
483 sd->minh = minh; 483 sd->minh = minh;
484 sd->minw = minw; 484 sd->minw = minw;
485 evas_object_smart_callback_call(sd->pan_obj, "changed", NULL); 485 eo_do(sd->pan_obj, eo_event_callback_call
486 (ELM_INTERFACE_SCROLLABLE_EVENT_CHANGED, NULL));
486 } 487 }
487 488
488 sd->nmax = nmax; 489 sd->nmax = nmax;
@@ -533,7 +534,8 @@ _item_unselect(Elm_Gen_Item *it)
533 { 534 {
534 it->selected = EINA_FALSE; 535 it->selected = EINA_FALSE;
535 sd->selected = eina_list_remove(sd->selected, eo_it); 536 sd->selected = eina_list_remove(sd->selected, eo_it);
536 evas_object_smart_callback_call(WIDGET(it), SIG_UNSELECTED, eo_it); 537 eo_do(WIDGET(it), eo_event_callback_call
538 (ELM_GENGRID_EVENT_UNSELECTED, eo_it));
537 } 539 }
538} 540}
539 541
@@ -587,7 +589,7 @@ _item_mouse_move_cb(void *data,
587 if ((it->dragging) && (it->down)) 589 if ((it->dragging) && (it->down))
588 { 590 {
589 ELM_SAFE_FREE(it->long_timer, ecore_timer_del); 591 ELM_SAFE_FREE(it->long_timer, ecore_timer_del);
590 evas_object_smart_callback_call(WIDGET(it), SIG_DRAG, eo_it); 592 eo_do(WIDGET(it), eo_event_callback_call(EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG, eo_it));
591 return; 593 return;
592 } 594 }
593 595
@@ -636,17 +638,17 @@ _item_mouse_move_cb(void *data,
636 638
637 if ((adx > minw) || (ady > minh)) 639 if ((adx > minw) || (ady > minh))
638 { 640 {
639 const char *left_drag, *right_drag; 641 const Eo_Event_Description *left_drag, *right_drag;
640 642
641 if (!elm_widget_mirrored_get(WIDGET(it))) 643 if (!elm_widget_mirrored_get(WIDGET(it)))
642 { 644 {
643 left_drag = SIG_DRAG_START_LEFT; 645 left_drag = EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START_LEFT;
644 right_drag = SIG_DRAG_START_RIGHT; 646 right_drag = EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START_RIGHT;
645 } 647 }
646 else 648 else
647 { 649 {
648 left_drag = SIG_DRAG_START_RIGHT; 650 left_drag = EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START_RIGHT;
649 right_drag = SIG_DRAG_START_LEFT; 651 right_drag = EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START_LEFT;
650 } 652 }
651 653
652 it->dragging = 1; 654 it->dragging = 1;
@@ -660,26 +662,25 @@ _item_mouse_move_cb(void *data,
660 if (dy < 0) 662 if (dy < 0)
661 { 663 {
662 if (ady > adx) 664 if (ady > adx)
663 evas_object_smart_callback_call 665 eo_do(WIDGET(it), eo_event_callback_call
664 (WIDGET(it), SIG_DRAG_START_UP, eo_it); 666 (EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START_UP, eo_it));
665 else 667 else
666 { 668 {
667 if (dx < 0) 669 if (dx < 0)
668 evas_object_smart_callback_call(WIDGET(it), left_drag, eo_it); 670 eo_do(WIDGET(it), eo_event_callback_call(left_drag, eo_it));
669 } 671 }
670 } 672 }
671 else 673 else
672 { 674 {
673 if (ady > adx) 675 if (ady > adx)
674 evas_object_smart_callback_call 676 eo_do(WIDGET(it), eo_event_callback_call
675 (WIDGET(it), SIG_DRAG_START_DOWN, eo_it); 677 (EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START_DOWN, eo_it));
676 else 678 else
677 { 679 {
678 if (dx < 0) 680 if (dx < 0)
679 evas_object_smart_callback_call(WIDGET(it), left_drag, eo_it); 681 eo_do(WIDGET(it), eo_event_callback_call(left_drag, eo_it));
680 else 682 else
681 evas_object_smart_callback_call 683 eo_do(WIDGET(it), eo_event_callback_call(right_drag, eo_it));
682 (WIDGET(it), right_drag, eo_it);
683 } 684 }
684 } 685 }
685 } 686 }
@@ -696,7 +697,8 @@ _long_press_cb(void *data)
696 if (eo_do_ret(EO_OBJ(it), tmp, elm_wdg_item_disabled_get()) || (it->dragging)) 697 if (eo_do_ret(EO_OBJ(it), tmp, elm_wdg_item_disabled_get()) || (it->dragging))
697 return ECORE_CALLBACK_CANCEL; 698 return ECORE_CALLBACK_CANCEL;
698 sd->longpressed = EINA_TRUE; 699 sd->longpressed = EINA_TRUE;
699 evas_object_smart_callback_call(WIDGET(it), SIG_LONGPRESSED, EO_OBJ(it)); 700 eo_do(WIDGET(it), eo_event_callback_call
701 (EVAS_CLICKABLE_INTERFACE_EVENT_LONGPRESSED, EO_OBJ(it)));
700 702
701 if (sd->reorder_mode) 703 if (sd->reorder_mode)
702 { 704 {
@@ -726,7 +728,8 @@ _item_highlight(Elm_Gen_Item *it)
726 return; 728 return;
727 729
728 edje_object_signal_emit(VIEW(it), "elm,state,selected", "elm"); 730 edje_object_signal_emit(VIEW(it), "elm,state,selected", "elm");
729 evas_object_smart_callback_call(WIDGET(it), SIG_HIGHLIGHTED, EO_OBJ(it)); 731 eo_do(WIDGET(it), eo_event_callback_call
732 (ELM_GENGRID_EVENT_HIGHLIGHTED, EO_OBJ(it)));
730 733
731 selectraise = edje_object_data_get(VIEW(it), "selectraise"); 734 selectraise = edje_object_data_get(VIEW(it), "selectraise");
732 if ((selectraise) && (!strcmp(selectraise, "on"))) 735 if ((selectraise) && (!strcmp(selectraise, "on")))
@@ -792,11 +795,13 @@ _item_mouse_down_cb(void *data,
792 it->highlight_cb(it); 795 it->highlight_cb(it);
793 if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK) 796 if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
794 { 797 {
795 evas_object_smart_callback_call(WIDGET(it), SIG_CLICKED_DOUBLE, EO_OBJ(it)); 798 eo_do(WIDGET(it), eo_event_callback_call
796 evas_object_smart_callback_call(WIDGET(it), SIG_ACTIVATED, EO_OBJ(it)); 799 (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE, EO_OBJ(it)));
800 eo_do(WIDGET(it), eo_event_callback_call
801 (ELM_GENGRID_EVENT_ACTIVATED, EO_OBJ(it)));
797 } 802 }
798 803
799 evas_object_smart_callback_call(WIDGET(it), SIG_PRESSED, EO_OBJ(it)); 804 eo_do(WIDGET(it), eo_event_callback_call(EVAS_CLICKABLE_INTERFACE_EVENT_PRESSED, EO_OBJ(it)));
800 ELM_SAFE_FREE(it->long_timer, ecore_timer_del); 805 ELM_SAFE_FREE(it->long_timer, ecore_timer_del);
801 if (it->realized) 806 if (it->realized)
802 it->long_timer = ecore_timer_add 807 it->long_timer = ecore_timer_add
@@ -1001,7 +1006,7 @@ _elm_gengrid_item_unrealize(Elm_Gen_Item *it,
1001 1006
1002 evas_event_freeze(evas_object_evas_get(WIDGET(it))); 1007 evas_event_freeze(evas_object_evas_get(WIDGET(it)));
1003 if (!calc) 1008 if (!calc)
1004 evas_object_smart_callback_call(WIDGET(it), SIG_UNREALIZED, EO_OBJ(it)); 1009 eo_do(WIDGET(it), eo_event_callback_call(ELM_GENGRID_EVENT_UNREALIZED, EO_OBJ(it)));
1005 ELM_SAFE_FREE(it->long_timer, ecore_timer_del); 1010 ELM_SAFE_FREE(it->long_timer, ecore_timer_del);
1006 1011
1007 _view_clear(VIEW(it), &(it->texts), &(it->contents)); 1012 _view_clear(VIEW(it), &(it->texts), &(it->contents));
@@ -1040,7 +1045,8 @@ _item_mouse_up_cb(void *data,
1040 if (dx < 0) dx = -dx; 1045 if (dx < 0) dx = -dx;
1041 if (dy < 0) dy = -dy; 1046 if (dy < 0) dy = -dy;
1042 if ((dx < 5) && (dy < 5)) 1047 if ((dx < 5) && (dy < 5))
1043 evas_object_smart_callback_call(WIDGET(it), SIG_CLICKED_RIGHT, EO_OBJ(it)); 1048 eo_do(WIDGET(it), eo_event_callback_call
1049 (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_RIGHT, EO_OBJ(it)));
1044 return; 1050 return;
1045 } 1051 }
1046 1052
@@ -1052,20 +1058,22 @@ _item_mouse_up_cb(void *data,
1052 sd->on_hold = EINA_TRUE; 1058 sd->on_hold = EINA_TRUE;
1053 else sd->on_hold = EINA_FALSE; 1059 else sd->on_hold = EINA_FALSE;
1054 1060
1055 evas_object_smart_callback_call(WIDGET(it), SIG_RELEASED, eo_it); 1061 eo_do(WIDGET(it), eo_event_callback_call
1062 (ELM_GENGRID_EVENT_RELEASED, eo_it));
1056 ELM_SAFE_FREE(it->long_timer, ecore_timer_del); 1063 ELM_SAFE_FREE(it->long_timer, ecore_timer_del);
1057 if (it->dragging) 1064 if (it->dragging)
1058 { 1065 {
1059 it->dragging = EINA_FALSE; 1066 it->dragging = EINA_FALSE;
1060 evas_object_smart_callback_call(WIDGET(it), SIG_DRAG_STOP, eo_it); 1067 eo_do(WIDGET(it), eo_event_callback_call
1068 (EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_STOP, eo_it));
1061 dragged = EINA_TRUE; 1069 dragged = EINA_TRUE;
1062 } 1070 }
1063 1071
1064 if ((sd->reorder_mode) && 1072 if ((sd->reorder_mode) &&
1065 (sd->reorder_it)) 1073 (sd->reorder_it))
1066 { 1074 {
1067 evas_object_smart_callback_call 1075 eo_do (WIDGET(it), eo_event_callback_call
1068 (WIDGET(it), SIG_MOVED, EO_OBJ(sd->reorder_it)); 1076 (ELM_WIDGET_EVENT_MOVED, EO_OBJ(sd->reorder_it)));
1069 sd->reorder_it = NULL; 1077 sd->reorder_it = NULL;
1070 sd->move_effect_enabled = EINA_FALSE; 1078 sd->move_effect_enabled = EINA_FALSE;
1071 ecore_job_del(sd->calc_job); 1079 ecore_job_del(sd->calc_job);
@@ -1189,7 +1197,8 @@ _elm_gengrid_item_index_update(Elm_Gen_Item *it)
1189{ 1197{
1190 if (it->position_update) 1198 if (it->position_update)
1191 { 1199 {
1192 evas_object_smart_callback_call(WIDGET(it), SIG_INDEX_UPDATE, EO_OBJ(it)); 1200 eo_do(WIDGET(it), eo_event_callback_call
1201 (ELM_GENGRID_EVENT_INDEX_UPDATE, EO_OBJ(it)));
1193 it->position_update = EINA_FALSE; 1202 it->position_update = EINA_FALSE;
1194 } 1203 }
1195} 1204}
@@ -1624,7 +1633,8 @@ _item_place(Elm_Gen_Item *it,
1624 if (!was_realized) 1633 if (!was_realized)
1625 { 1634 {
1626 _elm_gengrid_item_index_update(it); 1635 _elm_gengrid_item_index_update(it);
1627 evas_object_smart_callback_call(WIDGET(it), SIG_REALIZED, EO_OBJ(it)); 1636 eo_do(WIDGET(it), eo_event_callback_call
1637 (ELM_GENGRID_EVENT_REALIZED, EO_OBJ(it)));
1628 } 1638 }
1629 if (it->parent) 1639 if (it->parent)
1630 { 1640 {
@@ -1822,7 +1832,8 @@ _group_item_place(Elm_Gengrid_Pan_Data *psd)
1822 if (!was_realized) 1832 if (!was_realized)
1823 { 1833 {
1824 _elm_gengrid_item_index_update(it); 1834 _elm_gengrid_item_index_update(it);
1825 evas_object_smart_callback_call(WIDGET(it), SIG_REALIZED, EO_OBJ(it)); 1835 eo_do(WIDGET(it), eo_event_callback_call
1836 (ELM_GENGRID_EVENT_REALIZED, EO_OBJ(it)));
1826 } 1837 }
1827 evas_object_move 1838 evas_object_move
1828 (VIEW(it), GG_IT(it)->gx, 1839 (VIEW(it), GG_IT(it)->gx,
@@ -1910,8 +1921,8 @@ _elm_gengrid_pan_evas_object_smart_calculate(Eo *obj EINA_UNUSED, Elm_Gengrid_Pa
1910 sd->move_effect_enabled = EINA_FALSE; 1921 sd->move_effect_enabled = EINA_FALSE;
1911 } 1922 }
1912 1923
1913 evas_object_smart_callback_call 1924 eo_do(psd->wobj, eo_event_callback_call
1914 (psd->wobj, SIG_CHANGED, NULL); 1925 (ELM_INTERFACE_SCROLLABLE_EVENT_CHANGED, NULL));
1915 1926
1916 if (sd->focused_item) 1927 if (sd->focused_item)
1917 _elm_widget_focus_highlight_start(psd->wobj); 1928 _elm_widget_focus_highlight_start(psd->wobj);
@@ -2006,7 +2017,7 @@ _elm_gengrid_item_focused(Elm_Object_Item *eo_it)
2006 sd->focused_item = eo_it; 2017 sd->focused_item = eo_it;
2007 2018
2008 if (it->realized) _elm_gengrid_item_focus_raise(it); 2019 if (it->realized) _elm_gengrid_item_focus_raise(it);
2009 evas_object_smart_callback_call(obj, SIG_ITEM_FOCUSED, eo_it); 2020 eo_do(obj, eo_event_callback_call(ELM_GENGRID_EVENT_ITEM_FOCUSED, eo_it));
2010 if (_elm_config->atspi_mode) 2021 if (_elm_config->atspi_mode)
2011 elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE); 2022 elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
2012} 2023}
@@ -2036,7 +2047,7 @@ _elm_gengrid_item_unfocused(Elm_Object_Item *eo_it)
2036 } 2047 }
2037 2048
2038 sd->focused_item = NULL; 2049 sd->focused_item = NULL;
2039 evas_object_smart_callback_call(obj, SIG_ITEM_UNFOCUSED, eo_it); 2050 eo_do(obj, eo_event_callback_call(ELM_GENGRID_EVENT_ITEM_UNFOCUSED, eo_it));
2040 if (_elm_config->atspi_mode) 2051 if (_elm_config->atspi_mode)
2041 elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_FALSE); 2052 elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_FALSE);
2042} 2053}
@@ -2781,10 +2792,10 @@ _item_move_cb(void *data, double pos)
2781 _free_reorder_normal_data(sd->reorder.data); 2792 _free_reorder_normal_data(sd->reorder.data);
2782 elm_gengrid_item_show(EO_OBJ(sd->reorder.it1), 2793 elm_gengrid_item_show(EO_OBJ(sd->reorder.it1),
2783 ELM_GENGRID_ITEM_SCROLLTO_IN); 2794 ELM_GENGRID_ITEM_SCROLLTO_IN);
2784 evas_object_smart_callback_call(sd->obj, SIG_ITEM_REORDER_STOP, 2795 eo_do(sd->obj, eo_event_callback_call
2785 EO_OBJ(sd->reorder.it1)); 2796 (ELM_GENGRID_EVENT_ITEM_REORDER_ANIM_STOP, EO_OBJ(sd->reorder.it1)));
2786 evas_object_smart_callback_call(sd->obj, SIG_MOVED, 2797 eo_do(sd->obj, eo_event_callback_call
2787 EO_OBJ(sd->reorder.it1)); 2798 (ELM_WIDGET_EVENT_MOVED, EO_OBJ(sd->reorder.it1)));
2788 sd->reorder.running = EINA_FALSE; 2799 sd->reorder.running = EINA_FALSE;
2789 } 2800 }
2790 _elm_widget_focus_highlight_start(sd->obj); 2801 _elm_widget_focus_highlight_start(sd->obj);
@@ -2911,8 +2922,8 @@ _swap_items(Elm_Object_Item *eo_it1, Elm_Object_Item *eo_it2, Elm_Focus_Directio
2911 evas_object_raise(VIEW(rnd->corner_item)); 2922 evas_object_raise(VIEW(rnd->corner_item));
2912 } 2923 }
2913 evas_object_raise(VIEW(it1)); 2924 evas_object_raise(VIEW(it1));
2914 evas_object_smart_callback_call(sd->obj, SIG_ITEM_REORDER_START, 2925 eo_do(sd->obj, eo_event_callback_call
2915 EO_OBJ(sd->reorder.it1)); 2926 (ELM_GENGRID_EVENT_ITEM_REORDER_ANIM_START, EO_OBJ(sd->reorder.it1)));
2916 //TODO: Add elm config for time 2927 //TODO: Add elm config for time
2917 ecore_animator_timeline_add(0.3, _item_move_cb, sd); 2928 ecore_animator_timeline_add(0.3, _item_move_cb, sd);
2918} 2929}
@@ -3405,7 +3416,7 @@ _key_action_select(Evas_Object *obj, const char *params)
3405 } 3416 }
3406 3417
3407 if (!sd->multi) 3418 if (!sd->multi)
3408 evas_object_smart_callback_call(WIDGET(it), SIG_ACTIVATED, eo_it); 3419 eo_do(WIDGET(it), eo_event_callback_call(ELM_GENGRID_EVENT_ACTIVATED, eo_it));
3409 3420
3410 return EINA_TRUE; 3421 return EINA_TRUE;
3411} 3422}
@@ -3697,70 +3708,70 @@ static void
3697_scroll_animate_start_cb(Evas_Object *obj, 3708_scroll_animate_start_cb(Evas_Object *obj,
3698 void *data EINA_UNUSED) 3709 void *data EINA_UNUSED)
3699{ 3710{
3700 evas_object_smart_callback_call(obj, SIG_SCROLL_ANIM_START, NULL); 3711 eo_do(obj, eo_event_callback_call(EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_START, NULL));
3701} 3712}
3702 3713
3703static void 3714static void
3704_scroll_animate_stop_cb(Evas_Object *obj, 3715_scroll_animate_stop_cb(Evas_Object *obj,
3705 void *data EINA_UNUSED) 3716 void *data EINA_UNUSED)
3706{ 3717{
3707 evas_object_smart_callback_call(obj, SIG_SCROLL_ANIM_STOP, NULL); 3718 eo_do(obj, eo_event_callback_call(EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_STOP, NULL));
3708} 3719}
3709 3720
3710static void 3721static void
3711_scroll_drag_start_cb(Evas_Object *obj, 3722_scroll_drag_start_cb(Evas_Object *obj,
3712 void *data EINA_UNUSED) 3723 void *data EINA_UNUSED)
3713{ 3724{
3714 evas_object_smart_callback_call(obj, SIG_SCROLL_DRAG_START, NULL); 3725 eo_do(obj, eo_event_callback_call(EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_START, NULL));
3715} 3726}
3716 3727
3717static void 3728static void
3718_scroll_drag_stop_cb(Evas_Object *obj, 3729_scroll_drag_stop_cb(Evas_Object *obj,
3719 void *data EINA_UNUSED) 3730 void *data EINA_UNUSED)
3720{ 3731{
3721 evas_object_smart_callback_call(obj, SIG_SCROLL_DRAG_STOP, NULL); 3732 eo_do(obj, eo_event_callback_call(EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_STOP, NULL));
3722} 3733}
3723 3734
3724static void 3735static void
3725_edge_left_cb(Evas_Object *obj, 3736_edge_left_cb(Evas_Object *obj,
3726 void *data EINA_UNUSED) 3737 void *data EINA_UNUSED)
3727{ 3738{
3728 evas_object_smart_callback_call(obj, SIG_EDGE_LEFT, NULL); 3739 eo_do(obj, eo_event_callback_call(ELM_GENGRID_EVENT_EDGE_LEFT, NULL));
3729} 3740}
3730 3741
3731static void 3742static void
3732_edge_right_cb(Evas_Object *obj, 3743_edge_right_cb(Evas_Object *obj,
3733 void *data EINA_UNUSED) 3744 void *data EINA_UNUSED)
3734{ 3745{
3735 evas_object_smart_callback_call(obj, SIG_EDGE_RIGHT, NULL); 3746 eo_do(obj, eo_event_callback_call(ELM_GENGRID_EVENT_EDGE_RIGHT, NULL));
3736} 3747}
3737 3748
3738static void 3749static void
3739_edge_top_cb(Evas_Object *obj, 3750_edge_top_cb(Evas_Object *obj,
3740 void *data EINA_UNUSED) 3751 void *data EINA_UNUSED)
3741{ 3752{
3742 evas_object_smart_callback_call(obj, SIG_EDGE_TOP, NULL); 3753 eo_do(obj, eo_event_callback_call(ELM_GENGRID_EVENT_EDGE_TOP, NULL));
3743} 3754}
3744 3755
3745static void 3756static void
3746_edge_bottom_cb(Evas_Object *obj, 3757_edge_bottom_cb(Evas_Object *obj,
3747 void *data EINA_UNUSED) 3758 void *data EINA_UNUSED)
3748{ 3759{
3749 evas_object_smart_callback_call(obj, SIG_EDGE_BOTTOM, NULL); 3760 eo_do(obj, eo_event_callback_call(ELM_GENGRID_EVENT_EDGE_BOTTOM, NULL));
3750} 3761}
3751 3762
3752static void 3763static void
3753_scroll_page_change_cb(Evas_Object *obj, 3764_scroll_page_change_cb(Evas_Object *obj,
3754 void *data EINA_UNUSED) 3765 void *data EINA_UNUSED)
3755{ 3766{
3756 evas_object_smart_callback_call(obj, SIG_SCROLL_PAGE_CHANGE, NULL); 3767 eo_do(obj, eo_event_callback_call(ELM_GENGRID_EVENT_SCROLL_PAGE_CHANGED, NULL));
3757} 3768}
3758 3769
3759static void 3770static void
3760_scroll_cb(Evas_Object *obj, 3771_scroll_cb(Evas_Object *obj,
3761 void *data EINA_UNUSED) 3772 void *data EINA_UNUSED)
3762{ 3773{
3763 evas_object_smart_callback_call(obj, SIG_SCROLL, NULL); 3774 eo_do(obj, eo_event_callback_call(EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL, NULL));
3764} 3775}
3765 3776
3766static int 3777static int
@@ -3933,7 +3944,8 @@ _internal_elm_gengrid_clear(Evas_Object *obj,
3933 if (sd->pan_obj) 3944 if (sd->pan_obj)
3934 { 3945 {
3935 evas_object_size_hint_min_set(sd->pan_obj, sd->minw, sd->minh); 3946 evas_object_size_hint_min_set(sd->pan_obj, sd->minw, sd->minh);
3936 evas_object_smart_callback_call(sd->pan_obj, "changed", NULL); 3947 eo_do(sd->pan_obj, eo_event_callback_call
3948 (ELM_INTERFACE_SCROLLABLE_EVENT_CHANGED, NULL));
3937 } 3949 }
3938 eo_do(obj, elm_interface_scrollable_content_region_show(0, 0, 0, 0)); 3950 eo_do(obj, elm_interface_scrollable_content_region_show(0, 0, 0, 0));
3939 evas_event_thaw(evas_object_evas_get(obj)); 3951 evas_event_thaw(evas_object_evas_get(obj));
@@ -3967,7 +3979,7 @@ _item_select(Elm_Gen_Item *it)
3967 if (it->func.func) it->func.func((void *)it->func.data, WIDGET(it), eo_it); 3979 if (it->func.func) it->func.func((void *)it->func.data, WIDGET(it), eo_it);
3968 if (it->generation == sd->generation) 3980 if (it->generation == sd->generation)
3969 { 3981 {
3970 evas_object_smart_callback_call(WIDGET(it), SIG_SELECTED, eo_it); 3982 eo_do(WIDGET(it), eo_event_callback_call(ELM_GENGRID_EVENT_SELECTED, eo_it));
3971 elm_object_item_focus_set(eo_it, EINA_TRUE); 3983 elm_object_item_focus_set(eo_it, EINA_TRUE);
3972 } 3984 }
3973 3985
diff --git a/src/lib/elm_gengrid.eo b/src/lib/elm_gengrid.eo
index 1eb7deee8..5351978de 100644
--- a/src/lib/elm_gengrid.eo
+++ b/src/lib/elm_gengrid.eo
@@ -722,6 +722,24 @@ class Elm.Gengrid (Elm.Layout, Elm_Interface_Scrollable,
722 access,changed; 722 access,changed;
723 focused; 723 focused;
724 unfocused; 724 unfocused;
725 realized;
726 unrealized;
727 index,update;
728 scroll,page,changed;
729 edge,bottom;
730 edge,top;
731 edge,right;
732 edge,left;
733 item,focused;
734 item,unfocused;
735 item,reorder,anim,start;
736 item,reorder,anim,stop;
737 activated;
738 highlighted;
739 unhighlighted;
740 selected;
741 unselected;
742 released;
725 } 743 }
726 744
727} 745}
diff --git a/src/lib/elm_list.eo b/src/lib/elm_list.eo
index fd28c6857..4bb4dc76d 100644
--- a/src/lib/elm_list.eo
+++ b/src/lib/elm_list.eo
@@ -634,6 +634,8 @@ class Elm.List (Elm.Layout, Elm_Interface_Scrollable,
634 unhighlighted; 634 unhighlighted;
635 item,focused; 635 item,focused;
636 item,unfocused; 636 item,unfocused;
637 item,reorder,anim,start;
638 item,reorder,anim,stop;
637 language,changed; 639 language,changed;
638 access,changed; 640 access,changed;
639 focused; 641 focused;
diff --git a/src/lib/elm_notify.c b/src/lib/elm_notify.c
index 53305bdea..6fd416633 100644
--- a/src/lib/elm_notify.c
+++ b/src/lib/elm_notify.c
@@ -233,7 +233,7 @@ _block_area_clicked_cb(void *data,
233 const char *emission EINA_UNUSED, 233 const char *emission EINA_UNUSED,
234 const char *source EINA_UNUSED) 234 const char *source EINA_UNUSED)
235{ 235{
236 evas_object_smart_callback_call(data, SIG_BLOCK_CLICKED, NULL); 236 eo_do(data, eo_event_callback_call(ELM_NOTIFY_EVENT_BLOCK_CLICKED, NULL));
237} 237}
238 238
239EOLIAN static void 239EOLIAN static void
@@ -273,7 +273,7 @@ _timer_cb(void *data)
273 { 273 {
274 evas_object_hide(obj); 274 evas_object_hide(obj);
275 } 275 }
276 evas_object_smart_callback_call(obj, SIG_TIMEOUT, NULL); 276 eo_do(obj, eo_event_callback_call(ELM_NOTIFY_EVENT_TIMEOUT, NULL));
277 277
278end: 278end:
279 return ECORE_CALLBACK_CANCEL; 279 return ECORE_CALLBACK_CANCEL;
diff --git a/src/lib/elm_widget.eo b/src/lib/elm_widget.eo
index 1093e073b..e45bd5f49 100644
--- a/src/lib/elm_widget.eo
+++ b/src/lib/elm_widget.eo
@@ -838,4 +838,7 @@ abstract Elm.Widget (Evas.Object_Smart, Elm_Interface_Atspi_Accessible, Elm_Inte
838 Elm_Interface_Atspi_Accessible.relation_set.get; 838 Elm_Interface_Atspi_Accessible.relation_set.get;
839 Elm_Interface_Atspi_Component.focus_grab; 839 Elm_Interface_Atspi_Component.focus_grab;
840 } 840 }
841 events {
842 moved;
843 }
841} 844}