summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Levin <avi.levin@samsung.com>2015-05-04 16:47:57 +0300
committerAvi Levin <avi.levin@samsung.com>2015-06-29 17:03:32 +0300
commitfa37b7fdec66e746c67faddde280b91c63e17977 (patch)
treee786ea9088ade180b06fe7a03a3221d94e52067e
parent238ab8355f37a46db184861d7b82e6b5f32916e1 (diff)
elm_genlist: porting evas smart callbacks to eo
-rw-r--r--src/lib/elm_genlist.c171
-rw-r--r--src/lib/elm_genlist.eo47
2 files changed, 133 insertions, 85 deletions
diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index e2b0e5683..c3df5ebe8 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -599,7 +599,7 @@ _elm_genlist_item_unrealize(Elm_Gen_Item *it,
599 599
600 evas_event_freeze(evas_object_evas_get(WIDGET(it))); 600 evas_event_freeze(evas_object_evas_get(WIDGET(it)));
601 if (!calc) 601 if (!calc)
602 evas_object_smart_callback_call(WIDGET(it), SIG_UNREALIZED, EO_OBJ(it)); 602 eo_do(WIDGET(it), eo_event_callback_call(ELM_GENLIST_EVENT_UNREALIZED, EO_OBJ(it)));
603 ELM_SAFE_FREE(it->long_timer, ecore_timer_del); 603 ELM_SAFE_FREE(it->long_timer, ecore_timer_del);
604 604
605 _view_clear(VIEW(it), &(it->texts), &(it->contents)); 605 _view_clear(VIEW(it), &(it->texts), &(it->contents));
@@ -750,7 +750,8 @@ _calc_job(void *data)
750 { 750 {
751 sd->minw = minw; 751 sd->minw = minw;
752 sd->minh = minh; 752 sd->minh = minh;
753 evas_object_smart_callback_call(sd->pan_obj, "changed", NULL); 753 eo_do(sd->pan_obj, eo_event_callback_call
754 (ELM_PAN_EVENT_CHANGED, NULL));
754 elm_layout_sizing_eval(sd->obj); 755 elm_layout_sizing_eval(sd->obj);
755 if (sd->reorder_it) 756 if (sd->reorder_it)
756 { 757 {
@@ -1113,9 +1114,10 @@ _item_tree_effect_finish(Elm_Genlist_Data *sd)
1113 sd->move_effect_mode = ELM_GENLIST_TREE_EFFECT_NONE; 1114 sd->move_effect_mode = ELM_GENLIST_TREE_EFFECT_NONE;
1114 sd->move_items = eina_list_free(sd->move_items); 1115 sd->move_items = eina_list_free(sd->move_items);
1115 1116
1116 evas_object_smart_callback_call(sd->pan_obj, "changed", NULL); 1117 eo_do(sd->pan_obj, eo_event_callback_call
1117 evas_object_smart_callback_call 1118 (ELM_PAN_EVENT_CHANGED, NULL));
1118 (sd->obj, SIG_TREE_EFFECT_FINISHED, NULL); 1119 eo_do(sd->obj, eo_event_callback_call
1120 (ELM_GENLIST_EVENT_TREE_EFFECT_FINISHED, NULL));
1119 evas_object_smart_changed(sd->pan_obj); 1121 evas_object_smart_changed(sd->pan_obj);
1120 1122
1121 sd->tree_effect_animator = NULL; 1123 sd->tree_effect_animator = NULL;
@@ -1324,8 +1326,8 @@ _elm_genlist_item_index_update(Elm_Gen_Item *it)
1324{ 1326{
1325 if (it->position_update || GL_IT(it)->block->position_update) 1327 if (it->position_update || GL_IT(it)->block->position_update)
1326 { 1328 {
1327 evas_object_smart_callback_call(WIDGET(it), SIG_INDEX_UPDATE, 1329 eo_do(WIDGET(it), eo_event_callback_call
1328 EO_OBJ(it)); 1330 (ELM_GENLIST_EVENT_INDEX_UPDATE, EO_OBJ(it)));
1329 it->position_update = EINA_FALSE; 1331 it->position_update = EINA_FALSE;
1330 } 1332 }
1331} 1333}
@@ -1428,9 +1430,9 @@ _expand_toggle_signal_cb(void *data,
1428 Elm_Gen_Item *it = data; 1430 Elm_Gen_Item *it = data;
1429 1431
1430 if (it->item->expanded) 1432 if (it->item->expanded)
1431 evas_object_smart_callback_call(WIDGET(it), SIG_CONTRACT_REQUEST, EO_OBJ(it)); 1433 eo_do(WIDGET(it), eo_event_callback_call(ELM_GENLIST_EVENT_CONTRACT_REQUEST, EO_OBJ(it)));
1432 else 1434 else
1433 evas_object_smart_callback_call(WIDGET(it), SIG_EXPAND_REQUEST, EO_OBJ(it)); 1435 eo_do(WIDGET(it), eo_event_callback_call(ELM_GENLIST_EVENT_EXPAND_REQUEST, EO_OBJ(it)));
1434} 1436}
1435 1437
1436static void 1438static void
@@ -1442,7 +1444,7 @@ _expand_signal_cb(void *data,
1442 Elm_Gen_Item *it = data; 1444 Elm_Gen_Item *it = data;
1443 1445
1444 if (!it->item->expanded) 1446 if (!it->item->expanded)
1445 evas_object_smart_callback_call(WIDGET(it), SIG_EXPAND_REQUEST, EO_OBJ(it)); 1447 eo_do(WIDGET(it), eo_event_callback_call(ELM_GENLIST_EVENT_EXPAND_REQUEST, EO_OBJ(it)));
1446} 1448}
1447 1449
1448static void 1450static void
@@ -1454,7 +1456,7 @@ _contract_signal_cb(void *data,
1454 Elm_Gen_Item *it = data; 1456 Elm_Gen_Item *it = data;
1455 1457
1456 if (it->item->expanded) 1458 if (it->item->expanded)
1457 evas_object_smart_callback_call(WIDGET(it), SIG_CONTRACT_REQUEST, EO_OBJ(it)); 1459 eo_do(WIDGET(it), eo_event_callback_call(ELM_GENLIST_EVENT_CONTRACT_REQUEST, EO_OBJ(it)));
1458} 1460}
1459 1461
1460//-- item cache handle routine --// 1462//-- item cache handle routine --//
@@ -1908,7 +1910,7 @@ _item_realize(Elm_Gen_Item *it,
1908 1910
1909 } 1911 }
1910 1912
1911 evas_object_smart_callback_call(WIDGET(it), SIG_REALIZED, EO_OBJ(it)); 1913 eo_do(WIDGET(it), eo_event_callback_call(ELM_GENLIST_EVENT_REALIZED, EO_OBJ(it)));
1912 } 1914 }
1913 1915
1914 //Send a signal so that an item changes its style according to its expand depth 1916 //Send a signal so that an item changes its style according to its expand depth
@@ -2643,7 +2645,7 @@ _elm_genlist_item_focused(Elm_Object_Item *eo_it)
2643 } 2645 }
2644 } 2646 }
2645 } 2647 }
2646 evas_object_smart_callback_call(obj, SIG_ITEM_FOCUSED, eo_it); 2648 eo_do(obj, eo_event_callback_call(ELM_GENLIST_EVENT_ITEM_FOCUSED, eo_it));
2647 if (_elm_config->atspi_mode) 2649 if (_elm_config->atspi_mode)
2648 elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE); 2650 elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
2649} 2651}
@@ -2671,7 +2673,7 @@ _elm_genlist_item_unfocused(Elm_Object_Item *eo_it)
2671 } 2673 }
2672 2674
2673 sd->focused_item = NULL; 2675 sd->focused_item = NULL;
2674 evas_object_smart_callback_call(obj, SIG_ITEM_UNFOCUSED, eo_it); 2676 eo_do(obj, eo_event_callback_call(ELM_GENLIST_EVENT_ITEM_UNFOCUSED, eo_it));
2675 if (_elm_config->atspi_mode) 2677 if (_elm_config->atspi_mode)
2676 elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_FALSE); 2678 elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_FALSE);
2677} 2679}
@@ -3026,7 +3028,7 @@ _key_action_select(Evas_Object *obj, const char *params)
3026 if (_item_select(it)) goto deleted; 3028 if (_item_select(it)) goto deleted;
3027 } 3029 }
3028 3030
3029 evas_object_smart_callback_call(WIDGET(it), SIG_ACTIVATED, EO_OBJ(it)); 3031 eo_do(WIDGET(it), eo_event_callback_call(ELM_GENLIST_EVENT_ACTIVATED, EO_OBJ(it)));
3030 3032
3031 return EINA_TRUE; 3033 return EINA_TRUE;
3032 3034
@@ -3365,7 +3367,7 @@ _item_highlight(Elm_Gen_Item *it)
3365 edje_object_signal_emit(VIEW(it), SIGNAL_SELECTED, "elm"); 3367 edje_object_signal_emit(VIEW(it), SIGNAL_SELECTED, "elm");
3366 if (it->deco_all_view) 3368 if (it->deco_all_view)
3367 edje_object_signal_emit(it->deco_all_view, SIGNAL_SELECTED, "elm"); 3369 edje_object_signal_emit(it->deco_all_view, SIGNAL_SELECTED, "elm");
3368 evas_object_smart_callback_call(WIDGET(it), SIG_HIGHLIGHTED, EO_OBJ(it)); 3370 eo_do(WIDGET(it), eo_event_callback_call(ELM_GENLIST_EVENT_HIGHLIGHTED, EO_OBJ(it)));
3369 3371
3370 selectraise = edje_object_data_get(VIEW(it), "selectraise"); 3372 selectraise = edje_object_data_get(VIEW(it), "selectraise");
3371 if ((selectraise) && (!strcmp(selectraise, "on"))) 3373 if ((selectraise) && (!strcmp(selectraise, "on")))
@@ -3386,7 +3388,7 @@ _item_unhighlight(Elm_Gen_Item *it)
3386 if (!it->highlighted) return; 3388 if (!it->highlighted) return;
3387 3389
3388 edje_object_signal_emit(VIEW(it), SIGNAL_UNSELECTED, "elm"); 3390 edje_object_signal_emit(VIEW(it), SIGNAL_UNSELECTED, "elm");
3389 evas_object_smart_callback_call(WIDGET(it), SIG_UNHIGHLIGHTED, EO_OBJ(it)); 3391 eo_do(WIDGET(it), eo_event_callback_call(ELM_GENLIST_EVENT_UNHIGHLIGHTED, EO_OBJ(it)));
3390 if (it->deco_all_view) 3392 if (it->deco_all_view)
3391 edje_object_signal_emit 3393 edje_object_signal_emit
3392 (it->deco_all_view, SIGNAL_UNSELECTED, "elm"); 3394 (it->deco_all_view, SIGNAL_UNSELECTED, "elm");
@@ -3684,7 +3686,8 @@ _item_unselect(Elm_Gen_Item *it)
3684 3686
3685 it->selected = EINA_FALSE; 3687 it->selected = EINA_FALSE;
3686 sd->selected = eina_list_remove(sd->selected, EO_OBJ(it)); 3688 sd->selected = eina_list_remove(sd->selected, EO_OBJ(it));
3687 evas_object_smart_callback_call(WIDGET(it), SIG_UNSELECTED, EO_OBJ(it)); 3689 eo_do(WIDGET(it), eo_event_callback_call
3690 (EVAS_SELECTABLE_INTERFACE_EVENT_UNSELECTED, EO_OBJ(it)));
3688} 3691}
3689 3692
3690static void 3693static void
@@ -3752,7 +3755,8 @@ _item_mouse_move_cb(void *data,
3752 sd->movements++; 3755 sd->movements++;
3753 } 3756 }
3754 ELM_SAFE_FREE(it->long_timer, ecore_timer_del); 3757 ELM_SAFE_FREE(it->long_timer, ecore_timer_del);
3755 evas_object_smart_callback_call(WIDGET(it), SIG_DRAG, eo_it); 3758 eo_do(WIDGET(it), eo_event_callback_call
3759 (EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG, eo_it));
3756 return; 3760 return;
3757 } 3761 }
3758 if ((!it->down) || (sd->longpressed)) 3762 if ((!it->down) || (sd->longpressed))
@@ -3828,31 +3832,31 @@ _item_mouse_move_cb(void *data,
3828 if (dy < 0) 3832 if (dy < 0)
3829 { 3833 {
3830 if (ady > adx) 3834 if (ady > adx)
3831 evas_object_smart_callback_call 3835 eo_do(WIDGET(it), eo_event_callback_call
3832 (WIDGET(it), SIG_DRAG_START_UP, eo_it); 3836 (EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START_UP, eo_it));
3833 else 3837 else
3834 { 3838 {
3835 if (dx < 0) 3839 if (dx < 0)
3836 evas_object_smart_callback_call 3840 eo_do(WIDGET(it), eo_event_callback_call
3837 (WIDGET(it), SIG_DRAG_START_LEFT, eo_it); 3841 (EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START_LEFT, eo_it));
3838 else 3842 else
3839 evas_object_smart_callback_call 3843 eo_do(WIDGET(it), eo_event_callback_call
3840 (WIDGET(it), SIG_DRAG_START_RIGHT, eo_it); 3844 (EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START_RIGHT, eo_it));
3841 } 3845 }
3842 } 3846 }
3843 else 3847 else
3844 { 3848 {
3845 if (ady > adx) 3849 if (ady > adx)
3846 evas_object_smart_callback_call 3850 eo_do(WIDGET(it), eo_event_callback_call
3847 (WIDGET(it), SIG_DRAG_START_DOWN, eo_it); 3851 (EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START_DOWN, eo_it));
3848 else 3852 else
3849 { 3853 {
3850 if (dx < 0) 3854 if (dx < 0)
3851 evas_object_smart_callback_call 3855 eo_do(WIDGET(it), eo_event_callback_call
3852 (WIDGET(it), SIG_DRAG_START_LEFT, eo_it); 3856 (EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START_LEFT, eo_it));
3853 else 3857 else
3854 evas_object_smart_callback_call 3858 eo_do(WIDGET(it), eo_event_callback_call
3855 (WIDGET(it), SIG_DRAG_START_RIGHT, eo_it); 3859 (EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START_RIGHT, eo_it));
3856 } 3860 }
3857 } 3861 }
3858 } 3862 }
@@ -3872,7 +3876,8 @@ _long_press_cb(void *data)
3872 goto end; 3876 goto end;
3873 3877
3874 sd->longpressed = EINA_TRUE; 3878 sd->longpressed = EINA_TRUE;
3875 evas_object_smart_callback_call(WIDGET(it), SIG_LONGPRESSED, EO_OBJ(it)); 3879 eo_do(WIDGET(it), eo_event_callback_call
3880 (EVAS_CLICKABLE_INTERFACE_EVENT_LONGPRESSED, EO_OBJ(it)));
3876 if ((sd->reorder_mode) && !(GL_IT(it)->type & ELM_GENLIST_ITEM_GROUP)) 3881 if ((sd->reorder_mode) && !(GL_IT(it)->type & ELM_GENLIST_ITEM_GROUP))
3877 { 3882 {
3878 sd->reorder_it = it; 3883 sd->reorder_it = it;
@@ -3929,7 +3934,8 @@ _swipe_do(Elm_Gen_Item *it)
3929 3934
3930 sum /= sd->movements; 3935 sum /= sd->movements;
3931 if (abs(sum - sd->history[0].x) <= 10) return; 3936 if (abs(sum - sd->history[0].x) <= 10) return;
3932 evas_object_smart_callback_call(WIDGET(it), SIG_SWIPE, EO_OBJ(it)); 3937 eo_do(WIDGET(it), eo_event_callback_call
3938 (ELM_GENLIST_EVENT_SWIPE, EO_OBJ(it)));
3933} 3939}
3934 3940
3935static Eina_Bool 3941static Eina_Bool
@@ -3984,34 +3990,34 @@ _multi_touch_gesture_eval(Elm_Gen_Item *it)
3984 if ((off_x + off_mx) > (off_y + off_my)) 3990 if ((off_x + off_mx) > (off_y + off_my))
3985 { 3991 {
3986 if ((sd->cur_x > sd->prev_x) && (sd->cur_mx > sd->prev_mx)) 3992 if ((sd->cur_x > sd->prev_x) && (sd->cur_mx > sd->prev_mx))
3987 evas_object_smart_callback_call 3993 eo_do(WIDGET(it), eo_event_callback_call
3988 (WIDGET(it), SIG_MULTI_SWIPE_RIGHT, eo_it); 3994 (ELM_GENLIST_EVENT_MULTI_SWIPE_RIGHT, eo_it));
3989 else if ((sd->cur_x < sd->prev_x) && (sd->cur_mx < sd->prev_mx)) 3995 else if ((sd->cur_x < sd->prev_x) && (sd->cur_mx < sd->prev_mx))
3990 evas_object_smart_callback_call 3996 eo_do(WIDGET(it), eo_event_callback_call
3991 (WIDGET(it), SIG_MULTI_SWIPE_LEFT, eo_it); 3997 (ELM_GENLIST_EVENT_MULTI_SWIPE_LEFT, eo_it));
3992 else if (abs(sd->cur_x - sd->cur_mx) > 3998 else if (abs(sd->cur_x - sd->cur_mx) >
3993 abs(sd->prev_x - sd->prev_mx)) 3999 abs(sd->prev_x - sd->prev_mx))
3994 evas_object_smart_callback_call 4000 eo_do(WIDGET(it), eo_event_callback_call
3995 (WIDGET(it), SIG_MULTI_PINCH_OUT, eo_it); 4001 (ELM_GENLIST_EVENT_MULTI_PINCH_OUT, eo_it));
3996 else 4002 else
3997 evas_object_smart_callback_call 4003 eo_do(WIDGET(it), eo_event_callback_call
3998 (WIDGET(it), SIG_MULTI_PINCH_IN, eo_it); 4004 (ELM_GENLIST_EVENT_MULTI_PINCH_IN, eo_it));
3999 } 4005 }
4000 else 4006 else
4001 { 4007 {
4002 if ((sd->cur_y > sd->prev_y) && (sd->cur_my > sd->prev_my)) 4008 if ((sd->cur_y > sd->prev_y) && (sd->cur_my > sd->prev_my))
4003 evas_object_smart_callback_call 4009 eo_do(WIDGET(it), eo_event_callback_call
4004 (WIDGET(it), SIG_MULTI_SWIPE_DOWN, eo_it); 4010 (ELM_GENLIST_EVENT_MULTI_SWIPE_DOWN, eo_it));
4005 else if ((sd->cur_y < sd->prev_y) && (sd->cur_my < sd->prev_my)) 4011 else if ((sd->cur_y < sd->prev_y) && (sd->cur_my < sd->prev_my))
4006 evas_object_smart_callback_call 4012 eo_do(WIDGET(it), eo_event_callback_call
4007 (WIDGET(it), SIG_MULTI_SWIPE_UP, eo_it); 4013 (ELM_GENLIST_EVENT_MULTI_SWIPE_UP, eo_it));
4008 else if (abs(sd->cur_y - sd->cur_my) > 4014 else if (abs(sd->cur_y - sd->cur_my) >
4009 abs(sd->prev_y - sd->prev_my)) 4015 abs(sd->prev_y - sd->prev_my))
4010 evas_object_smart_callback_call 4016 eo_do(WIDGET(it), eo_event_callback_call
4011 (WIDGET(it), SIG_MULTI_PINCH_OUT, eo_it); 4017 (ELM_GENLIST_EVENT_MULTI_PINCH_OUT, eo_it));
4012 else 4018 else
4013 evas_object_smart_callback_call 4019 eo_do(WIDGET(it), eo_event_callback_call
4014 (WIDGET(it), SIG_MULTI_PINCH_IN, eo_it); 4020 (ELM_GENLIST_EVENT_MULTI_PINCH_IN, eo_it));
4015 } 4021 }
4016 } 4022 }
4017 4023
@@ -4044,7 +4050,8 @@ _item_multi_down_cb(void *data,
4044 if (it->dragging) 4050 if (it->dragging)
4045 { 4051 {
4046 it->dragging = EINA_FALSE; 4052 it->dragging = EINA_FALSE;
4047 evas_object_smart_callback_call(WIDGET(it), SIG_DRAG_STOP, EO_OBJ(it)); 4053 eo_do(WIDGET(it), eo_event_callback_call
4054 (EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_STOP, EO_OBJ(it)));
4048 } 4055 }
4049 ELM_SAFE_FREE(it->item->swipe_timer, ecore_timer_del); 4056 ELM_SAFE_FREE(it->item->swipe_timer, ecore_timer_del);
4050 if (sd->on_hold) 4057 if (sd->on_hold)
@@ -4155,10 +4162,13 @@ _item_mouse_down_cb(void *data,
4155 _item_highlight(it); 4162 _item_highlight(it);
4156 if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK) 4163 if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
4157 { 4164 {
4158 evas_object_smart_callback_call(WIDGET(it), SIG_CLICKED_DOUBLE, eo_it); 4165 eo_do(WIDGET(it), eo_event_callback_call
4159 evas_object_smart_callback_call(WIDGET(it), SIG_ACTIVATED, eo_it); 4166 (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE, eo_it));
4167 eo_do(WIDGET(it), eo_event_callback_call
4168 (ELM_GENLIST_EVENT_ACTIVATED, eo_it));
4160 } 4169 }
4161 evas_object_smart_callback_call(WIDGET(it), SIG_PRESSED, eo_it); 4170 eo_do(WIDGET(it), eo_event_callback_call
4171 (EVAS_CLICKABLE_INTERFACE_EVENT_PRESSED, eo_it));
4162} 4172}
4163 4173
4164static Item_Block * 4174static Item_Block *
@@ -4632,7 +4642,7 @@ _item_move_after(Elm_Gen_Item *it,
4632 if (after->item->group_item) it->item->group_item = after->item->group_item; 4642 if (after->item->group_item) it->item->group_item = after->item->group_item;
4633 _item_queue(sd, it, NULL); 4643 _item_queue(sd, it, NULL);
4634 4644
4635 evas_object_smart_callback_call(WIDGET(it), SIG_MOVED_AFTER, EO_OBJ(it)); 4645 eo_do(WIDGET(it), eo_event_callback_call(ELM_GENLIST_EVENT_MOVED_AFTER, EO_OBJ(it)));
4636} 4646}
4637 4647
4638static void 4648static void
@@ -4710,7 +4720,7 @@ _item_move_before(Elm_Gen_Item *it,
4710 it->item->group_item = before->item->group_item; 4720 it->item->group_item = before->item->group_item;
4711 _item_queue(sd, it, NULL); 4721 _item_queue(sd, it, NULL);
4712 4722
4713 evas_object_smart_callback_call(WIDGET(it), SIG_MOVED_BEFORE, EO_OBJ(it)); 4723 eo_do(WIDGET(it), eo_event_callback_call(ELM_GENLIST_EVENT_MOVED_BEFORE, EO_OBJ(it)));
4714} 4724}
4715 4725
4716static void 4726static void
@@ -4733,7 +4743,8 @@ _item_mouse_up_cb(void *data,
4733 if (dx < 0) dx = -dx; 4743 if (dx < 0) dx = -dx;
4734 if (dy < 0) dy = -dy; 4744 if (dy < 0) dy = -dy;
4735 if ((dx < 5) && (dy < 5)) 4745 if ((dx < 5) && (dy < 5))
4736 evas_object_smart_callback_call(WIDGET(it), SIG_CLICKED_RIGHT, EO_OBJ(it)); 4746 eo_do(WIDGET(it), eo_event_callback_call
4747 (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_RIGHT, EO_OBJ(it)));
4737 return; 4748 return;
4738 } 4749 }
4739 4750
@@ -4742,7 +4753,7 @@ _item_mouse_up_cb(void *data,
4742 ELM_GENLIST_DATA_GET_FROM_ITEM(it, sd); 4753 ELM_GENLIST_DATA_GET_FROM_ITEM(it, sd);
4743 4754
4744 sd->mouse_down = EINA_FALSE; 4755 sd->mouse_down = EINA_FALSE;
4745 evas_object_smart_callback_call(WIDGET(it), SIG_RELEASED, EO_OBJ(it)); 4756 eo_do(WIDGET(it), eo_event_callback_call(ELM_GENLIST_EVENT_RELEASED, EO_OBJ(it)));
4746 if (sd->multi_touched) 4757 if (sd->multi_touched)
4747 { 4758 {
4748 if ((!sd->multi) && (!it->selected) && (it->highlighted)) 4759 if ((!sd->multi) && (!it->selected) && (it->highlighted))
@@ -4758,7 +4769,8 @@ _item_mouse_up_cb(void *data,
4758 if (it->dragging) 4769 if (it->dragging)
4759 { 4770 {
4760 it->dragging = EINA_FALSE; 4771 it->dragging = EINA_FALSE;
4761 evas_object_smart_callback_call(WIDGET(it), SIG_DRAG_STOP, EO_OBJ(it)); 4772 eo_do(WIDGET(it), eo_event_callback_call
4773 (EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_STOP, EO_OBJ(it)));
4762 dragged = 1; 4774 dragged = 1;
4763 } 4775 }
4764 ELM_SAFE_FREE(it->item->swipe_timer, ecore_timer_del); 4776 ELM_SAFE_FREE(it->item->swipe_timer, ecore_timer_del);
@@ -4788,7 +4800,7 @@ _item_mouse_up_cb(void *data,
4788 _item_move_before(sd->reorder_it, sd->reorder_rel); 4800 _item_move_before(sd->reorder_it, sd->reorder_rel);
4789 else 4801 else
4790 _item_move_after(sd->reorder_it, sd->reorder_rel); 4802 _item_move_after(sd->reorder_it, sd->reorder_rel);
4791 evas_object_smart_callback_call(WIDGET(it), SIG_MOVED, EO_OBJ(it)); 4803 eo_do(WIDGET(it), eo_event_callback_call(ELM_GENLIST_EVENT_MOVED, EO_OBJ(it)));
4792 } 4804 }
4793 else 4805 else
4794 { 4806 {
@@ -5201,105 +5213,105 @@ static void
5201_scroll_animate_start_cb(Evas_Object *obj, 5213_scroll_animate_start_cb(Evas_Object *obj,
5202 void *data EINA_UNUSED) 5214 void *data EINA_UNUSED)
5203{ 5215{
5204 evas_object_smart_callback_call(obj, SIG_SCROLL_ANIM_START, NULL); 5216 eo_do(obj, eo_event_callback_call(EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_START, NULL));
5205} 5217}
5206 5218
5207static void 5219static void
5208_scroll_animate_stop_cb(Evas_Object *obj, 5220_scroll_animate_stop_cb(Evas_Object *obj,
5209 void *data EINA_UNUSED) 5221 void *data EINA_UNUSED)
5210{ 5222{
5211 evas_object_smart_callback_call(obj, SIG_SCROLL_ANIM_STOP, NULL); 5223 eo_do(obj, eo_event_callback_call(EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_STOP, NULL));
5212} 5224}
5213 5225
5214static void 5226static void
5215_scroll_drag_start_cb(Evas_Object *obj, 5227_scroll_drag_start_cb(Evas_Object *obj,
5216 void *data EINA_UNUSED) 5228 void *data EINA_UNUSED)
5217{ 5229{
5218 evas_object_smart_callback_call(obj, SIG_SCROLL_DRAG_START, NULL); 5230 eo_do(obj, eo_event_callback_call(EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START, NULL));
5219} 5231}
5220 5232
5221static void 5233static void
5222_scroll_cb(Evas_Object *obj, 5234_scroll_cb(Evas_Object *obj,
5223 void *data EINA_UNUSED) 5235 void *data EINA_UNUSED)
5224{ 5236{
5225 evas_object_smart_callback_call(obj, SIG_SCROLL, NULL); 5237 eo_do(obj, eo_event_callback_call(EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL, NULL));
5226} 5238}
5227 5239
5228static void 5240static void
5229_scroll_drag_stop_cb(Evas_Object *obj, 5241_scroll_drag_stop_cb(Evas_Object *obj,
5230 void *data EINA_UNUSED) 5242 void *data EINA_UNUSED)
5231{ 5243{
5232 evas_object_smart_callback_call(obj, SIG_SCROLL_DRAG_STOP, NULL); 5244 eo_do(obj, eo_event_callback_call(EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_STOP, NULL));
5233} 5245}
5234 5246
5235static void 5247static void
5236_edge_left_cb(Evas_Object *obj, 5248_edge_left_cb(Evas_Object *obj,
5237 void *data EINA_UNUSED) 5249 void *data EINA_UNUSED)
5238{ 5250{
5239 evas_object_smart_callback_call(obj, SIG_EDGE_LEFT, NULL); 5251 eo_do(obj, eo_event_callback_call(ELM_GENLIST_EVENT_EDGE_LEFT, NULL));
5240} 5252}
5241 5253
5242static void 5254static void
5243_edge_right_cb(Evas_Object *obj, 5255_edge_right_cb(Evas_Object *obj,
5244 void *data EINA_UNUSED) 5256 void *data EINA_UNUSED)
5245{ 5257{
5246 evas_object_smart_callback_call(obj, SIG_EDGE_RIGHT, NULL); 5258 eo_do(obj, eo_event_callback_call(ELM_GENLIST_EVENT_EDGE_RIGHT, NULL));
5247} 5259}
5248 5260
5249static void 5261static void
5250_edge_top_cb(Evas_Object *obj, 5262_edge_top_cb(Evas_Object *obj,
5251 void *data EINA_UNUSED) 5263 void *data EINA_UNUSED)
5252{ 5264{
5253 evas_object_smart_callback_call(obj, SIG_EDGE_TOP, NULL); 5265 eo_do(obj, eo_event_callback_call(ELM_GENLIST_EVENT_EDGE_TOP, NULL));
5254} 5266}
5255 5267
5256static void 5268static void
5257_edge_bottom_cb(Evas_Object *obj, 5269_edge_bottom_cb(Evas_Object *obj,
5258 void *data EINA_UNUSED) 5270 void *data EINA_UNUSED)
5259{ 5271{
5260 evas_object_smart_callback_call(obj, SIG_EDGE_BOTTOM, NULL); 5272 eo_do(obj, eo_event_callback_call(ELM_GENLIST_EVENT_EDGE_BOTTOM, NULL));
5261} 5273}
5262 5274
5263static void 5275static void
5264_vbar_drag_cb(Evas_Object *obj, 5276_vbar_drag_cb(Evas_Object *obj,
5265 void *data EINA_UNUSED) 5277 void *data EINA_UNUSED)
5266{ 5278{
5267 evas_object_smart_callback_call(obj, SIG_VBAR_DRAG, NULL); 5279 eo_do(obj, eo_event_callback_call(ELM_GENLIST_EVENT_VBAR_DRAG, NULL));
5268} 5280}
5269 5281
5270static void 5282static void
5271_vbar_press_cb(Evas_Object *obj, 5283_vbar_press_cb(Evas_Object *obj,
5272 void *data EINA_UNUSED) 5284 void *data EINA_UNUSED)
5273{ 5285{
5274 evas_object_smart_callback_call(obj, SIG_VBAR_PRESS, NULL); 5286 eo_do(obj, eo_event_callback_call(ELM_GENLIST_EVENT_VBAR_PRESS, NULL));
5275} 5287}
5276 5288
5277static void 5289static void
5278_vbar_unpress_cb(Evas_Object *obj, 5290_vbar_unpress_cb(Evas_Object *obj,
5279 void *data EINA_UNUSED) 5291 void *data EINA_UNUSED)
5280{ 5292{
5281 evas_object_smart_callback_call(obj, SIG_VBAR_UNPRESS, NULL); 5293 eo_do(obj, eo_event_callback_call(ELM_GENLIST_EVENT_VBAR_UNPRESS, NULL));
5282} 5294}
5283 5295
5284static void 5296static void
5285_hbar_drag_cb(Evas_Object *obj, 5297_hbar_drag_cb(Evas_Object *obj,
5286 void *data EINA_UNUSED) 5298 void *data EINA_UNUSED)
5287{ 5299{
5288 evas_object_smart_callback_call(obj, SIG_HBAR_DRAG, NULL); 5300 eo_do(obj, eo_event_callback_call(ELM_GENLIST_EVENT_HBAR_DRAG, NULL));
5289} 5301}
5290 5302
5291static void 5303static void
5292_hbar_press_cb(Evas_Object *obj, 5304_hbar_press_cb(Evas_Object *obj,
5293 void *data EINA_UNUSED) 5305 void *data EINA_UNUSED)
5294{ 5306{
5295 evas_object_smart_callback_call(obj, SIG_HBAR_PRESS, NULL); 5307 eo_do(obj, eo_event_callback_call(ELM_GENLIST_EVENT_HBAR_PRESS, NULL));
5296} 5308}
5297 5309
5298static void 5310static void
5299_hbar_unpress_cb(Evas_Object *obj, 5311_hbar_unpress_cb(Evas_Object *obj,
5300 void *data EINA_UNUSED) 5312 void *data EINA_UNUSED)
5301{ 5313{
5302 evas_object_smart_callback_call(obj, SIG_HBAR_UNPRESS, NULL); 5314 eo_do(obj, eo_event_callback_call(ELM_GENLIST_EVENT_HBAR_UNPRESS, NULL));
5303} 5315}
5304 5316
5305static void 5317static void
@@ -5673,7 +5685,8 @@ _internal_elm_genlist_clear(Evas_Object *obj)
5673 if (sd->pan_obj) 5685 if (sd->pan_obj)
5674 { 5686 {
5675 evas_object_size_hint_min_set(sd->pan_obj, sd->minw, sd->minh); 5687 evas_object_size_hint_min_set(sd->pan_obj, sd->minw, sd->minh);
5676 evas_object_smart_callback_call(sd->pan_obj, "changed", NULL); 5688 eo_do(sd->pan_obj, eo_event_callback_call
5689 (ELM_PAN_EVENT_CHANGED, NULL));
5677 } 5690 }
5678 elm_layout_sizing_eval(sd->obj); 5691 elm_layout_sizing_eval(sd->obj);
5679 eo_do(obj, elm_interface_scrollable_content_region_show(0, 0, 0, 0)); 5692 eo_do(obj, elm_interface_scrollable_content_region_show(0, 0, 0, 0));
@@ -5735,7 +5748,7 @@ _item_select(Elm_Gen_Item *it)
5735 if (it->func.func) it->func.func((void *)it->func.data, WIDGET(it), eo_it); 5748 if (it->func.func) it->func.func((void *)it->func.data, WIDGET(it), eo_it);
5736 // delete item if it's requested deletion in the above callbacks. 5749 // delete item if it's requested deletion in the above callbacks.
5737 if ((it->base)->on_deletion) goto item_deleted; 5750 if ((it->base)->on_deletion) goto item_deleted;
5738 evas_object_smart_callback_call(WIDGET(it), SIG_SELECTED, eo_it); 5751 eo_do(WIDGET(it), eo_event_callback_call(EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, eo_it));
5739 // delete item if it's requested deletion in the above callbacks. 5752 // delete item if it's requested deletion in the above callbacks.
5740 if ((it->base)->on_deletion) goto item_deleted; 5753 if ((it->base)->on_deletion) goto item_deleted;
5741 it->walking--; 5754 it->walking--;
@@ -6709,7 +6722,8 @@ _elm_genlist_item_expanded_set(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it, Eina_B
6709 sd->move_effect_mode = ELM_GENLIST_TREE_EFFECT_EXPAND; 6722 sd->move_effect_mode = ELM_GENLIST_TREE_EFFECT_EXPAND;
6710 if (it->realized) 6723 if (it->realized)
6711 edje_object_signal_emit(VIEW(it), SIGNAL_EXPANDED, "elm"); 6724 edje_object_signal_emit(VIEW(it), SIGNAL_EXPANDED, "elm");
6712 evas_object_smart_callback_call(WIDGET(it), SIG_EXPANDED, EO_OBJ(it)); 6725 eo_do(WIDGET(it), eo_event_callback_call
6726 (ELM_GENLIST_EVENT_EXPANDED, EO_OBJ(it)));
6713 sd->auto_scroll_enabled = EINA_TRUE; 6727 sd->auto_scroll_enabled = EINA_TRUE;
6714 } 6728 }
6715 else 6729 else
@@ -6717,7 +6731,8 @@ _elm_genlist_item_expanded_set(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it, Eina_B
6717 sd->move_effect_mode = ELM_GENLIST_TREE_EFFECT_CONTRACT; 6731 sd->move_effect_mode = ELM_GENLIST_TREE_EFFECT_CONTRACT;
6718 if (it->realized) 6732 if (it->realized)
6719 edje_object_signal_emit(VIEW(it), SIGNAL_CONTRACTED, "elm"); 6733 edje_object_signal_emit(VIEW(it), SIGNAL_CONTRACTED, "elm");
6720 evas_object_smart_callback_call(WIDGET(it), SIG_CONTRACTED, EO_OBJ(it)); 6734 eo_do(WIDGET(it), eo_event_callback_call
6735 (ELM_GENLIST_EVENT_CONTRACTED, EO_OBJ(it)));
6721 sd->auto_scroll_enabled = EINA_FALSE; 6736 sd->auto_scroll_enabled = EINA_FALSE;
6722 } 6737 }
6723} 6738}
diff --git a/src/lib/elm_genlist.eo b/src/lib/elm_genlist.eo
index c003f92a2..732ca8902 100644
--- a/src/lib/elm_genlist.eo
+++ b/src/lib/elm_genlist.eo
@@ -1,7 +1,8 @@
1import elm_general; 1import elm_general;
2 2
3class Elm.Genlist (Elm.Layout, Elm_Interface_Scrollable, Evas.Clickable_Interface, 3class Elm.Genlist (Elm.Layout, Elm_Interface_Scrollable, Evas.Clickable_Interface,
4 Elm_Interface_Atspi_Widget_Action, Elm_Interface_Atspi_Selection) 4 Elm_Interface_Atspi_Widget_Action, Elm_Interface_Atspi_Selection,
5 Evas.Selectable_Interface)
5{ 6{
6 eo_prefix: elm_obj_genlist; 7 eo_prefix: elm_obj_genlist;
7 methods { 8 methods {
@@ -741,12 +742,44 @@ class Elm.Genlist (Elm.Layout, Elm_Interface_Scrollable, Evas.Clickable_Interfac
741 Elm_Interface_Atspi_Selection.clear; 742 Elm_Interface_Atspi_Selection.clear;
742 } 743 }
743 events { 744 events {
744 language,changed; 745 language,changed;
745 access,changed; 746 access,changed;
746 focused; 747 focused;
747 unfocused; 748 unfocused;
748 item,focused; 749 item,focused;
749 item,unfocused; 750 item,unfocused;
751 vbar,drag;
752 vbar,press;
753 vbar,unpress;
754 hbar,drag;
755 hbar,press;
756 hbar,unpress;
757 edge,top;
758 edge,bottom;
759 edge,left;
760 edge,right;
761 moved;
762 moved,before;
763 moved,after;
764 swipe;
765 multi,pinch,in;
766 multi,pinch,out;
767 multi,swipe,down;
768 multi,swipe,up;
769 multi,swipe,right;
770 multi,swipe,left;
771 released;
772 activated;
773 highlighted;
774 unhighlighted;
775 realized;
776 unrealized;
777 contract,request;
778 expand,request;
779 contracted;
780 expanded;
781 index,update;
782 tree,effect,finished;
750 } 783 }
751 784
752} 785}