summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Levin <avi.levin@samsung.com>2015-05-13 14:34:44 +0300
committerAvi Levin <avi.levin@samsung.com>2015-06-29 17:03:33 +0300
commit60cb698ac9918d0fb068b07fe87efeeb874cb047 (patch)
tree6b74abd68c6d23eab23b09d9330b2fec913fad8e
parentff372b6ac8c07042ae312824059afc13cfcd40db (diff)
elm_list, elm_win: porting evas smart callbacks to eo
-rw-r--r--src/lib/elm_list.c42
-rw-r--r--src/lib/elm_list.eo4
-rw-r--r--src/lib/elm_win.c77
-rw-r--r--src/lib/elm_win.eo1
4 files changed, 72 insertions, 52 deletions
diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index 596e51928..415f2093a 100644
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -607,7 +607,8 @@ static Eina_Bool _key_action_select(Evas_Object *obj, const char *params EINA_UN
607 if (eo_it) 607 if (eo_it)
608 { 608 {
609 ELM_LIST_ITEM_DATA_GET(eo_it, it); 609 ELM_LIST_ITEM_DATA_GET(eo_it, it);
610 evas_object_smart_callback_call(WIDGET(it), SIG_ACTIVATED, eo_it); 610 eo_do(WIDGET(it), eo_event_callback_call
611 (ELM_LIST_EVENT_ACTIVATED, eo_it));
611 } 612 }
612 613
613 return EINA_TRUE; 614 return EINA_TRUE;
@@ -1155,8 +1156,8 @@ _elm_list_item_focused(Elm_Object_Item *eo_it)
1155 focus_raise = edje_object_data_get(VIEW(it), "focusraise"); 1156 focus_raise = edje_object_data_get(VIEW(it), "focusraise");
1156 if ((focus_raise) && (!strcmp(focus_raise, "on"))) 1157 if ((focus_raise) && (!strcmp(focus_raise, "on")))
1157 evas_object_raise(VIEW(it)); 1158 evas_object_raise(VIEW(it));
1158 evas_object_smart_callback_call 1159 eo_do(WIDGET(it), eo_event_callback_call
1159 (WIDGET(it), SIG_ITEM_FOCUSED, eo_it); 1160 (ELM_LIST_EVENT_ITEM_FOCUSED, eo_it));
1160 if (_elm_config->atspi_mode) 1161 if (_elm_config->atspi_mode)
1161 elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE); 1162 elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
1162} 1163}
@@ -1183,7 +1184,7 @@ _elm_list_item_unfocused(Elm_Object_Item *eo_it)
1183 } 1184 }
1184 1185
1185 sd->focused_item = NULL; 1186 sd->focused_item = NULL;
1186 evas_object_smart_callback_call(obj, SIG_ITEM_UNFOCUSED, eo_it); 1187 eo_do(obj, eo_event_callback_call(ELM_LIST_EVENT_ITEM_UNFOCUSED, eo_it));
1187 if (_elm_config->atspi_mode) 1188 if (_elm_config->atspi_mode)
1188 elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_FALSE); 1189 elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_FALSE);
1189} 1190}
@@ -1364,7 +1365,7 @@ _item_highlight(Elm_List_Item_Data *it)
1364 _elm_list_walk(sd); 1365 _elm_list_walk(sd);
1365 1366
1366 edje_object_signal_emit(VIEW(it), "elm,state,selected", "elm"); 1367 edje_object_signal_emit(VIEW(it), "elm,state,selected", "elm");
1367 evas_object_smart_callback_call(obj, SIG_HIGHLIGHTED, EO_OBJ(it)); 1368 eo_do(obj, eo_event_callback_call(ELM_LIST_EVENT_HIGHLIGHTED, EO_OBJ(it)));
1368 select_raise = edje_object_data_get(VIEW(it), "selectraise"); 1369 select_raise = edje_object_data_get(VIEW(it), "selectraise");
1369 if ((select_raise) && (!strcmp(select_raise, "on"))) 1370 if ((select_raise) && (!strcmp(select_raise, "on")))
1370 evas_object_raise(VIEW(it)); 1371 evas_object_raise(VIEW(it));
@@ -1416,7 +1417,7 @@ call:
1416 _elm_list_walk(sd); 1417 _elm_list_walk(sd);
1417 1418
1418 if (it->func) it->func((void *)WIDGET_ITEM_DATA_GET(eo_it), WIDGET(it), eo_it); 1419 if (it->func) it->func((void *)WIDGET_ITEM_DATA_GET(eo_it), WIDGET(it), eo_it);
1419 evas_object_smart_callback_call(obj, SIG_SELECTED, eo_it); 1420 eo_do(obj, eo_event_callback_call(ELM_LIST_EVENT_SELECTED, eo_it));
1420 sd->last_selected_item = eo_it; 1421 sd->last_selected_item = eo_it;
1421 1422
1422 _elm_list_unwalk(obj, sd); 1423 _elm_list_unwalk(obj, sd);
@@ -1441,7 +1442,8 @@ _item_unhighlight(Elm_List_Item_Data *it)
1441 _elm_list_walk(sd); 1442 _elm_list_walk(sd);
1442 1443
1443 edje_object_signal_emit(VIEW(it), "elm,state,unselected", "elm"); 1444 edje_object_signal_emit(VIEW(it), "elm,state,unselected", "elm");
1444 evas_object_smart_callback_call(obj, SIG_UNHIGHLIGHTED, EO_OBJ(it)); 1445 eo_do(obj, eo_event_callback_call
1446 (ELM_LIST_EVENT_UNHIGHLIGHTED, EO_OBJ(it)));
1445 stacking = edje_object_data_get(VIEW(it), "stacking"); 1447 stacking = edje_object_data_get(VIEW(it), "stacking");
1446 select_raise = edje_object_data_get(VIEW(it), "selectraise"); 1448 select_raise = edje_object_data_get(VIEW(it), "selectraise");
1447 if ((select_raise) && (!strcmp(select_raise, "on"))) 1449 if ((select_raise) && (!strcmp(select_raise, "on")))
@@ -1482,7 +1484,8 @@ _item_unselect(Elm_List_Item_Data *it)
1482 sd->selected = eina_list_remove(sd->selected, EO_OBJ(it)); 1484 sd->selected = eina_list_remove(sd->selected, EO_OBJ(it));
1483 if (!(it->base->disabled || 1485 if (!(it->base->disabled ||
1484 (sd->select_mode == ELM_OBJECT_SELECT_MODE_NONE))) 1486 (sd->select_mode == ELM_OBJECT_SELECT_MODE_NONE)))
1485 evas_object_smart_callback_call(WIDGET(it), SIG_UNSELECTED, EO_OBJ(it)); 1487 eo_do(WIDGET(it), eo_event_callback_call
1488 (ELM_LIST_EVENT_UNSELECTED, EO_OBJ(it)));
1486 } 1489 }
1487 1490
1488 _elm_list_unwalk(obj, sd); 1491 _elm_list_unwalk(obj, sd);
@@ -1507,28 +1510,28 @@ static void
1507_edge_left_cb(Evas_Object *obj, 1510_edge_left_cb(Evas_Object *obj,
1508 void *data EINA_UNUSED) 1511 void *data EINA_UNUSED)
1509{ 1512{
1510 evas_object_smart_callback_call(obj, SIG_EDGE_LEFT, NULL); 1513 eo_do(obj, eo_event_callback_call(ELM_LIST_EVENT_EDGE_LEFT, NULL));
1511} 1514}
1512 1515
1513static void 1516static void
1514_edge_right_cb(Evas_Object *obj, 1517_edge_right_cb(Evas_Object *obj,
1515 void *data EINA_UNUSED) 1518 void *data EINA_UNUSED)
1516{ 1519{
1517 evas_object_smart_callback_call(obj, SIG_EDGE_RIGHT, NULL); 1520 eo_do(obj, eo_event_callback_call(ELM_LIST_EVENT_EDGE_RIGHT, NULL));
1518} 1521}
1519 1522
1520static void 1523static void
1521_edge_top_cb(Evas_Object *obj, 1524_edge_top_cb(Evas_Object *obj,
1522 void *data EINA_UNUSED) 1525 void *data EINA_UNUSED)
1523{ 1526{
1524 evas_object_smart_callback_call(obj, SIG_EDGE_TOP, NULL); 1527 eo_do(obj, eo_event_callback_call(ELM_LIST_EVENT_EDGE_TOP, NULL));
1525} 1528}
1526 1529
1527static void 1530static void
1528_edge_bottom_cb(Evas_Object *obj, 1531_edge_bottom_cb(Evas_Object *obj,
1529 void *data EINA_UNUSED) 1532 void *data EINA_UNUSED)
1530{ 1533{
1531 evas_object_smart_callback_call(obj, SIG_EDGE_BOTTOM, NULL); 1534 eo_do(obj, eo_event_callback_call(ELM_LIST_EVENT_EDGE_BOTTOM, NULL));
1532} 1535}
1533 1536
1534static Eina_Bool 1537static Eina_Bool
@@ -1545,7 +1548,8 @@ _long_press_cb(void *data)
1545 if (it->base->disabled) goto end; 1548 if (it->base->disabled) goto end;
1546 1549
1547 sd->longpressed = EINA_TRUE; 1550 sd->longpressed = EINA_TRUE;
1548 evas_object_smart_callback_call(WIDGET(it), SIG_LONGPRESSED, EO_OBJ(it)); 1551 eo_do(WIDGET(it), eo_event_callback_call
1552 (EVAS_CLICKABLE_INTERFACE_EVENT_LONGPRESSED, EO_OBJ(it)));
1549 1553
1550end: 1554end:
1551 return ECORE_CALLBACK_CANCEL; 1555 return ECORE_CALLBACK_CANCEL;
@@ -1569,7 +1573,8 @@ _swipe_do(Elm_List_Item_Data *it)
1569 sum /= sd->movements; 1573 sum /= sd->movements;
1570 if (abs(sum - sd->history[0].x) <= 10) return; 1574 if (abs(sum - sd->history[0].x) <= 10) return;
1571 1575
1572 evas_object_smart_callback_call(WIDGET(it), SIG_SWIPE, EO_OBJ(it)); 1576 eo_do(WIDGET(it), eo_event_callback_call
1577 (ELM_LIST_EVENT_SWIPE, EO_OBJ(it)));
1573} 1578}
1574 1579
1575static void 1580static void
@@ -1694,8 +1699,10 @@ _mouse_down_cb(void *data,
1694 /* Always call the callbacks last - the user may delete our context! */ 1699 /* Always call the callbacks last - the user may delete our context! */
1695 if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK) 1700 if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
1696 { 1701 {
1697 evas_object_smart_callback_call(WIDGET(it), SIG_CLICKED_DOUBLE, EO_OBJ(it)); 1702 eo_do(WIDGET(it), eo_event_callback_call
1698 evas_object_smart_callback_call(WIDGET(it), SIG_ACTIVATED, EO_OBJ(it)); 1703 (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE, EO_OBJ(it)));
1704 eo_do(WIDGET(it), eo_event_callback_call
1705 (ELM_LIST_EVENT_ACTIVATED, EO_OBJ(it)));
1699 } 1706 }
1700 sd->swipe = EINA_FALSE; 1707 sd->swipe = EINA_FALSE;
1701 sd->movements = 0; 1708 sd->movements = 0;
@@ -1728,7 +1735,8 @@ _mouse_up_cb(void *data,
1728 if (dx < 0) dx = -dx; 1735 if (dx < 0) dx = -dx;
1729 if (dy < 0) dy = -dy; 1736 if (dy < 0) dy = -dy;
1730 if ((dx < 5) && (dy < 5)) 1737 if ((dx < 5) && (dy < 5))
1731 evas_object_smart_callback_call(obj, SIG_CLICKED_RIGHT, EO_OBJ(it)); 1738 eo_do(obj, eo_event_callback_call
1739 (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_RIGHT, EO_OBJ(it)));
1732 return; 1740 return;
1733 } 1741 }
1734 1742
diff --git a/src/lib/elm_list.eo b/src/lib/elm_list.eo
index 4bb4dc76d..ff7ae7305 100644
--- a/src/lib/elm_list.eo
+++ b/src/lib/elm_list.eo
@@ -1,6 +1,6 @@
1import elm_general; 1import elm_general;
2 2
3class Elm.List (Elm.Layout, Elm_Interface_Scrollable, 3class Elm.List (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{ 5{
6 eo_prefix: elm_obj_list; 6 eo_prefix: elm_obj_list;
@@ -621,10 +621,8 @@ class Elm.List (Elm.Layout, Elm_Interface_Scrollable,
621 } 621 }
622 events { 622 events {
623 activated; 623 activated;
624 clicked,double;
625 selected; 624 selected;
626 unselected; 625 unselected;
627 longpressed;
628 edge,top; 626 edge,top;
629 edge,bottom; 627 edge,bottom;
630 edge,left; 628 edge,left;
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 47087f66d..e7a7c142e 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -84,8 +84,8 @@ static const Elm_Win_Trap *trap = NULL;
84 { \ 84 { \
85 edje_object_signal_emit(cursd->edje, \ 85 edje_object_signal_emit(cursd->edje, \
86 "elm,action,show_blocker", "elm"); \ 86 "elm,action,show_blocker", "elm"); \
87 evas_object_smart_callback_call(cursd->main_menu, \ 87 eo_do(cursd->main_menu, eo_event_callback_call \
88 "elm,action,block_menu", NULL); \ 88 (ELM_WIN_EVENT_ELM_ACTION_BLOCK_MENU, NULL)); \
89 } \ 89 } \
90 } 90 }
91 91
@@ -776,7 +776,7 @@ _elm_win_move(Ecore_Evas *ee)
776 ecore_evas_geometry_get(ee, &x, &y, NULL, NULL); 776 ecore_evas_geometry_get(ee, &x, &y, NULL, NULL);
777 sd->screen.x = x; 777 sd->screen.x = x;
778 sd->screen.y = y; 778 sd->screen.y = y;
779 evas_object_smart_callback_call(sd->obj, SIG_MOVED, NULL); 779 eo_do(sd->obj, eo_event_callback_call(ELM_WIN_EVENT_MOVED, NULL));
780 evas_nochange_push(evas_object_evas_get(sd->obj)); 780 evas_nochange_push(evas_object_evas_get(sd->obj));
781 evas_object_move(sd->obj, x, y); 781 evas_object_move(sd->obj, x, y);
782 evas_nochange_pop(evas_object_evas_get(sd->obj)); 782 evas_nochange_pop(evas_object_evas_get(sd->obj));
@@ -1044,7 +1044,7 @@ _elm_win_focus_in(Ecore_Evas *ee)
1044 else 1044 else
1045 elm_widget_focus_restore(obj); 1045 elm_widget_focus_restore(obj);
1046 } 1046 }
1047 evas_object_smart_callback_call(obj, SIG_FOCUS_IN, NULL); 1047 eo_do(obj, eo_event_callback_call(ELM_WIN_EVENT_FOCUS_IN, NULL));
1048 sd->focus_highlight.cur.visible = EINA_TRUE; 1048 sd->focus_highlight.cur.visible = EINA_TRUE;
1049 _elm_win_focus_highlight_reconfigure_job_start(sd); 1049 _elm_win_focus_highlight_reconfigure_job_start(sd);
1050 if (sd->frame_obj) 1050 if (sd->frame_obj)
@@ -1076,7 +1076,7 @@ _elm_win_focus_out(Ecore_Evas *ee)
1076 1076
1077 elm_object_focus_set(obj, EINA_FALSE); 1077 elm_object_focus_set(obj, EINA_FALSE);
1078 _elm_widget_top_win_focused_set(obj, EINA_FALSE); 1078 _elm_widget_top_win_focused_set(obj, EINA_FALSE);
1079 evas_object_smart_callback_call(obj, SIG_FOCUS_OUT, NULL); 1079 eo_do(obj, eo_event_callback_call(ELM_WIN_EVENT_FOCUS_OUT, NULL));
1080 sd->focus_highlight.cur.visible = EINA_FALSE; 1080 sd->focus_highlight.cur.visible = EINA_FALSE;
1081 _elm_win_focus_highlight_reconfigure_job_start(sd); 1081 _elm_win_focus_highlight_reconfigure_job_start(sd);
1082 if (sd->frame_obj) 1082 if (sd->frame_obj)
@@ -1182,7 +1182,7 @@ _elm_win_profile_update(Elm_Win_Data *sd)
1182 EINA_LIST_FOREACH(sub, l, ee2) 1182 EINA_LIST_FOREACH(sub, l, ee2)
1183 ecore_evas_window_profile_set(ee2, sd->profile.name); 1183 ecore_evas_window_profile_set(ee2, sd->profile.name);
1184 1184
1185 evas_object_smart_callback_call(sd->obj, SIG_PROFILE_CHANGED, NULL); 1185 eo_do(sd->obj, eo_event_callback_call(ELM_WIN_EVENT_PROFILE_CHANGED, NULL));
1186} 1186}
1187 1187
1188static void 1188static void
@@ -1284,26 +1284,28 @@ _elm_win_state_change(Ecore_Evas *ee)
1284 if ((ch_withdrawn) || (ch_iconified)) 1284 if ((ch_withdrawn) || (ch_iconified))
1285 { 1285 {
1286 if (sd->withdrawn) 1286 if (sd->withdrawn)
1287 evas_object_smart_callback_call(obj, SIG_WITHDRAWN, NULL); 1287 eo_do(obj, eo_event_callback_call(ELM_WIN_EVENT_WITHDRAWN, NULL));
1288 else if (sd->iconified) 1288 else if (sd->iconified)
1289 { 1289 {
1290 evas_object_smart_callback_call(obj, SIG_ICONIFIED, NULL); 1290 eo_do(obj, eo_event_callback_call(ELM_WIN_EVENT_ICONIFIED, NULL));
1291 if (_elm_config->atspi_mode) 1291 if (_elm_config->atspi_mode)
1292 eo_do(obj, eo_event_callback_call(ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_MINIMIZED, NULL)); 1292 eo_do(obj, eo_event_callback_call
1293 (ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_MINIMIZED, NULL));
1293 } 1294 }
1294 else 1295 else
1295 { 1296 {
1296 evas_object_smart_callback_call(obj, SIG_NORMAL, NULL); 1297 eo_do(obj, eo_event_callback_call(ELM_WIN_EVENT_NORMAL, NULL));
1297 if (_elm_config->atspi_mode) 1298 if (_elm_config->atspi_mode)
1298 eo_do(obj, eo_event_callback_call(ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_RESTORED, NULL)); 1299 eo_do(obj, eo_event_callback_call
1300 (ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_RESTORED, NULL));
1299 } 1301 }
1300 } 1302 }
1301 if (ch_sticky) 1303 if (ch_sticky)
1302 { 1304 {
1303 if (sd->sticky) 1305 if (sd->sticky)
1304 evas_object_smart_callback_call(obj, SIG_STICK, NULL); 1306 eo_do(obj, eo_event_callback_call(ELM_WIN_EVENT_STICK, NULL));
1305 else 1307 else
1306 evas_object_smart_callback_call(obj, SIG_UNSTICK, NULL); 1308 eo_do(obj, eo_event_callback_call(ELM_WIN_EVENT_UNSTICK, NULL));
1307 } 1309 }
1308 if (ch_fullscreen) 1310 if (ch_fullscreen)
1309 { 1311 {
@@ -1312,7 +1314,8 @@ _elm_win_state_change(Ecore_Evas *ee)
1312 { 1314 {
1313 int w, h; 1315 int w, h;
1314 1316
1315 evas_object_smart_callback_call(obj, SIG_FULLSCREEN, NULL); 1317 eo_do(obj, eo_event_callback_call
1318 (ELM_WIN_EVENT_FULLSCREEN, NULL));
1316 if (sd->frame_obj) 1319 if (sd->frame_obj)
1317 evas_object_hide(sd->frame_obj); 1320 evas_object_hide(sd->frame_obj);
1318 ecore_evas_geometry_get(sd->ee, NULL, NULL, &w, &h); 1321 ecore_evas_geometry_get(sd->ee, NULL, NULL, &w, &h);
@@ -1320,7 +1323,8 @@ _elm_win_state_change(Ecore_Evas *ee)
1320 } 1323 }
1321 else 1324 else
1322 { 1325 {
1323 evas_object_smart_callback_call(obj, SIG_UNFULLSCREEN, NULL); 1326 eo_do(obj, eo_event_callback_call
1327 (ELM_WIN_EVENT_UNFULLSCREEN, NULL));
1324 if (sd->frame_obj) 1328 if (sd->frame_obj)
1325 evas_object_show(sd->frame_obj); 1329 evas_object_show(sd->frame_obj);
1326 } 1330 }
@@ -1329,15 +1333,17 @@ _elm_win_state_change(Ecore_Evas *ee)
1329 { 1333 {
1330 if (sd->maximized) 1334 if (sd->maximized)
1331 { 1335 {
1332 evas_object_smart_callback_call(obj, SIG_MAXIMIZED, NULL); 1336 eo_do(obj, eo_event_callback_call(ELM_WIN_EVENT_MAXIMIZED, NULL));
1333 if (_elm_config->atspi_mode) 1337 if (_elm_config->atspi_mode)
1334 eo_do(obj, eo_event_callback_call(ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_MAXIMIZED, NULL)); 1338 eo_do(obj, eo_event_callback_call
1339 (ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_MAXIMIZED, NULL));
1335 } 1340 }
1336 else 1341 else
1337 { 1342 {
1338 evas_object_smart_callback_call(obj, SIG_UNMAXIMIZED, NULL); 1343 eo_do(obj, eo_event_callback_call(ELM_WIN_EVENT_UNMAXIMIZED, NULL));
1339 if (_elm_config->atspi_mode) 1344 if (_elm_config->atspi_mode)
1340 eo_do(obj, eo_event_callback_call(ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_RESTORED, NULL)); 1345 eo_do(obj, eo_event_callback_call
1346 (ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_RESTORED, NULL));
1341 } 1347 }
1342 } 1348 }
1343 if (ch_profile) 1349 if (ch_profile)
@@ -1352,8 +1358,10 @@ _elm_win_state_change(Ecore_Evas *ee)
1352 _elm_win_xwin_update(sd); 1358 _elm_win_xwin_update(sd);
1353#endif 1359#endif
1354 elm_widget_orientation_set(obj, sd->rot); 1360 elm_widget_orientation_set(obj, sd->rot);
1355 evas_object_smart_callback_call(obj, SIG_ROTATION_CHANGED, NULL); 1361 eo_do(obj, eo_event_callback_call
1356 evas_object_smart_callback_call(obj, SIG_WM_ROTATION_CHANGED, NULL); 1362 (ELM_WIN_EVENT_ROTATION_CHANGED, NULL));
1363 eo_do(obj, eo_event_callback_call
1364 (ELM_WIN_EVENT_WM_ROTATION_CHANGED, NULL));
1357 } 1365 }
1358} 1366}
1359 1367
@@ -1921,7 +1929,7 @@ _elm_win_evas_object_smart_move(Eo *obj, Elm_Win_Data *sd, Evas_Coord x, Evas_Co
1921 { 1929 {
1922 sd->screen.x = x; 1930 sd->screen.x = x;
1923 sd->screen.y = y; 1931 sd->screen.y = y;
1924 evas_object_smart_callback_call(obj, SIG_MOVED, NULL); 1932 eo_do(obj, eo_event_callback_call(ELM_WIN_EVENT_MOVED, NULL));
1925 } 1933 }
1926 return; 1934 return;
1927 } 1935 }
@@ -1937,7 +1945,7 @@ _elm_win_evas_object_smart_move(Eo *obj, Elm_Win_Data *sd, Evas_Coord x, Evas_Co
1937 { 1945 {
1938 sd->screen.x = x; 1946 sd->screen.x = x;
1939 sd->screen.y = y; 1947 sd->screen.y = y;
1940 evas_object_smart_callback_call(obj, SIG_MOVED, NULL); 1948 eo_do(obj, eo_event_callback_call(ELM_WIN_EVENT_MOVED, NULL));
1941 } 1949 }
1942 if (sd->frame_obj) 1950 if (sd->frame_obj)
1943 { 1951 {
@@ -1991,10 +1999,11 @@ _elm_win_delete_request(Ecore_Evas *ee)
1991 int autodel = sd->autodel; 1999 int autodel = sd->autodel;
1992 sd->autodel_clear = &autodel; 2000 sd->autodel_clear = &autodel;
1993 evas_object_ref(obj); 2001 evas_object_ref(obj);
1994 evas_object_smart_callback_call(obj, SIG_DELETE_REQUEST, NULL); 2002 eo_do(obj, eo_event_callback_call(ELM_WIN_EVENT_DELETE_REQUEST, NULL));
1995 // FIXME: if above callback deletes - then the below will be invalid 2003 // FIXME: if above callback deletes - then the below will be invalid
1996 if (_elm_config->atspi_mode) 2004 if (_elm_config->atspi_mode)
1997 eo_do(obj, eo_event_callback_call(ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_DESTROYED, NULL)); 2005 eo_do(obj, eo_event_callback_call
2006 (ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_DESTROYED, NULL));
1998 if (autodel) evas_object_del(obj); 2007 if (autodel) evas_object_del(obj);
1999 else sd->autodel_clear = NULL; 2008 else sd->autodel_clear = NULL;
2000 evas_object_unref(obj); 2009 evas_object_unref(obj);
@@ -2461,7 +2470,8 @@ _elm_win_property_change(void *data,
2461 if (e->win == sd->x.xwin) 2470 if (e->win == sd->x.xwin)
2462 { 2471 {
2463 sd->indmode = (Elm_Win_Indicator_Mode)ecore_x_e_illume_indicator_state_get(e->win); 2472 sd->indmode = (Elm_Win_Indicator_Mode)ecore_x_e_illume_indicator_state_get(e->win);
2464 evas_object_smart_callback_call(sd->obj, SIG_INDICATOR_PROP_CHANGED, NULL); 2473 eo_do(sd->obj, eo_event_callback_call
2474 (ELM_WIN_EVENT_INDICATOR_PROP_CHANGED, NULL));
2465 } 2475 }
2466 } 2476 }
2467 return ECORE_CALLBACK_PASS_ON; 2477 return ECORE_CALLBACK_PASS_ON;
@@ -2794,7 +2804,7 @@ _elm_win_frame_cb_close(void *data,
2794 int autodel = sd->autodel; 2804 int autodel = sd->autodel;
2795 sd->autodel_clear = &autodel; 2805 sd->autodel_clear = &autodel;
2796 evas_object_ref(win); 2806 evas_object_ref(win);
2797 evas_object_smart_callback_call(win, SIG_DELETE_REQUEST, NULL); 2807 eo_do(win, eo_event_callback_call(ELM_WIN_EVENT_DELETE_REQUEST, NULL));
2798 // FIXME: if above callback deletes - then the below will be invalid 2808 // FIXME: if above callback deletes - then the below will be invalid
2799 if (_elm_config->atspi_mode) 2809 if (_elm_config->atspi_mode)
2800 eo_do(obj, eo_event_callback_call(ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_DESTROYED, NULL)); 2810 eo_do(obj, eo_event_callback_call(ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_DESTROYED, NULL));
@@ -3015,7 +3025,7 @@ _elm_x_io_err(void *data EINA_UNUSED)
3015 Evas_Object *obj; 3025 Evas_Object *obj;
3016 3026
3017 EINA_LIST_FOREACH(_elm_win_list, l, obj) 3027 EINA_LIST_FOREACH(_elm_win_list, l, obj)
3018 evas_object_smart_callback_call(obj, SIG_IOERR, NULL); 3028 eo_do(obj, eo_event_callback_call(ELM_WIN_EVENT_IOERR, NULL));
3019 elm_exit(); 3029 elm_exit();
3020} 3030}
3021#endif 3031#endif
@@ -4585,7 +4595,8 @@ _win_rotate(Evas_Object *obj, Elm_Win_Data *sd, int rotation, Eina_Bool resize)
4585#endif 4595#endif
4586 _elm_win_frame_obj_update(sd); 4596 _elm_win_frame_obj_update(sd);
4587 elm_widget_orientation_set(obj, rotation); 4597 elm_widget_orientation_set(obj, rotation);
4588 evas_object_smart_callback_call(obj, SIG_ROTATION_CHANGED, NULL); 4598 eo_do(obj, eo_event_callback_call
4599 (ELM_WIN_EVENT_ROTATION_CHANGED, NULL));
4589} 4600}
4590 4601
4591EOLIAN static void 4602EOLIAN static void
@@ -4804,7 +4815,8 @@ _elm_win_indicator_mode_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, Elm_Win_Indic
4804 (sd->x.xwin, ECORE_X_ILLUME_INDICATOR_STATE_OFF); 4815 (sd->x.xwin, ECORE_X_ILLUME_INDICATOR_STATE_OFF);
4805 } 4816 }
4806#endif 4817#endif
4807 evas_object_smart_callback_call(obj, SIG_INDICATOR_PROP_CHANGED, NULL); 4818 eo_do(obj, eo_event_callback_call
4819 (ELM_WIN_EVENT_INDICATOR_PROP_CHANGED, NULL));
4808} 4820}
4809 4821
4810EOLIAN static Elm_Win_Indicator_Mode 4822EOLIAN static Elm_Win_Indicator_Mode
@@ -4833,7 +4845,8 @@ _elm_win_indicator_opacity_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, Elm_Win_In
4833 (sd->x.xwin, ECORE_X_ILLUME_INDICATOR_TRANSPARENT); 4845 (sd->x.xwin, ECORE_X_ILLUME_INDICATOR_TRANSPARENT);
4834 } 4846 }
4835#endif 4847#endif
4836 evas_object_smart_callback_call(obj, SIG_INDICATOR_PROP_CHANGED, NULL); 4848 eo_do(obj, eo_event_callback_call
4849 (ELM_WIN_EVENT_INDICATOR_PROP_CHANGED, NULL));
4837} 4850}
4838 4851
4839EOLIAN static Elm_Win_Indicator_Opacity_Mode 4852EOLIAN static Elm_Win_Indicator_Opacity_Mode
@@ -5138,7 +5151,7 @@ _elm_win_theme_internal(Eo *obj, Elm_Win_Data *sd)
5138 edje_object_scale_set(sd->edje, 5151 edje_object_scale_set(sd->edje,
5139 elm_widget_scale_get(obj) * elm_config_scale_get()); 5152 elm_widget_scale_get(obj) * elm_config_scale_get());
5140 5153
5141 evas_object_smart_callback_call(obj, SIG_THEME_CHANGED, NULL); 5154 eo_do(obj, eo_event_callback_call(ELM_WIN_EVENT_THEME_CHANGED, NULL));
5142 eo_do(obj, ret = elm_obj_widget_disable()); 5155 eo_do(obj, ret = elm_obj_widget_disable());
5143 5156
5144 if (!sd->theme_alpha && !sd->application_alpha) 5157 if (!sd->theme_alpha && !sd->application_alpha)
diff --git a/src/lib/elm_win.eo b/src/lib/elm_win.eo
index 6bfa43f58..5528cb6f7 100644
--- a/src/lib/elm_win.eo
+++ b/src/lib/elm_win.eo
@@ -1641,6 +1641,7 @@ class Elm.Win (Elm.Widget, Elm_Interface_Atspi_Window,
1641 wm,rotation,changed; 1641 wm,rotation,changed;
1642 animator,tick; 1642 animator,tick;
1643 theme,changed; 1643 theme,changed;
1644 elm,action,block_menu;
1644 } 1645 }
1645 1646
1646} 1647}