summaryrefslogtreecommitdiff
path: root/legacy/evas/src/lib
diff options
context:
space:
mode:
authorChunEon Park <hermet@hermet.pe.kr>2012-10-24 04:36:02 +0000
committerChunEon Park <hermet@hermet.pe.kr>2012-10-24 04:36:02 +0000
commit0438eb2134a73a92bc3c08af68b95ab742d04389 (patch)
tree7b25b9eaa6d135f0cf5bf4dd5ca981269239f5dc /legacy/evas/src/lib
parent0da512cdcdf2a36ef765d46e78e59910687be469 (diff)
evas/event - refactoring for less code
SVN revision: 78383
Diffstat (limited to 'legacy/evas/src/lib')
-rw-r--r--legacy/evas/src/lib/canvas/evas_events.c207
1 files changed, 85 insertions, 122 deletions
diff --git a/legacy/evas/src/lib/canvas/evas_events.c b/legacy/evas/src/lib/canvas/evas_events.c
index c143e08..0b7d7fd 100644
--- a/legacy/evas/src/lib/canvas/evas_events.c
+++ b/legacy/evas/src/lib/canvas/evas_events.c
@@ -204,6 +204,13 @@ _evas_object_source_event(Evas_Object *eo_obj, Evas *eo_e, Evas_Callback_Type ty
204 evas_object_event_callback_call(src_eo, src, type, ev, event_id); 204 evas_object_event_callback_call(src_eo, src, type, ev, event_id);
205} 205}
206 206
207static inline void
208_evas_event_pass_to_source(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, Evas *eo_e, Evas_Callback_Type type, void *ev, int event_id)
209{
210 if (obj->proxy.is_proxy)
211 _evas_object_source_event(eo_obj, eo_e, type, ev, event_id);
212}
213
207static Eina_List * 214static Eina_List *
208_evas_event_object_list_in_get(Evas *eo_e, Eina_List *in, 215_evas_event_object_list_in_get(Evas *eo_e, Eina_List *in,
209 const Eina_Inlist *list, Evas_Object *stop, 216 const Eina_Inlist *list, Evas_Object *stop,
@@ -465,13 +472,9 @@ _canvas_event_feed_mouse_down(Eo *eo_e, void *_pd, va_list *list)
465 evas_object_event_callback_call(eo_obj, obj, 472 evas_object_event_callback_call(eo_obj, obj,
466 EVAS_CALLBACK_MOUSE_DOWN, &ev, 473 EVAS_CALLBACK_MOUSE_DOWN, &ev,
467 event_id); 474 event_id);
468 //pass event to source 475 _evas_event_pass_to_source(eo_obj, obj, eo_e,
469 if (obj->proxy.is_proxy) 476 EVAS_CALLBACK_MOUSE_DOWN, &ev,
470 { 477 event_id);
471 printf("MOUSE DOWN! %d\n", EVAS_CALLBACK_MOUSE_DOWN);
472 _evas_object_source_event(eo_obj, eo_e, EVAS_CALLBACK_MOUSE_DOWN,
473 &ev, event_id);
474 }
475 } 478 }
476 if (e->delete_me) break; 479 if (e->delete_me) break;
477 if (obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN) 480 if (obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN)
@@ -534,11 +537,9 @@ _post_up_handle(Evas *eo_e, unsigned int timestamp, const void *data)
534 evas_object_event_callback_call(eo_obj, obj, 537 evas_object_event_callback_call(eo_obj, obj,
535 EVAS_CALLBACK_MOUSE_OUT, 538 EVAS_CALLBACK_MOUSE_OUT,
536 &ev, event_id); 539 &ev, event_id);
537 //pass event to source 540 _evas_event_pass_to_source(eo_obj, obj, eo_e,
538 if (obj->proxy.is_proxy) 541 EVAS_CALLBACK_MOUSE_OUT, &ev,
539 _evas_object_source_event(eo_obj, eo_e, 542 event_id);
540 EVAS_CALLBACK_MOUSE_OUT,
541 &ev, event_id);
542 } 543 }
543 } 544 }
544 } 545 }
@@ -582,11 +583,11 @@ _post_up_handle(Evas *eo_e, unsigned int timestamp, const void *data)
582 { 583 {
583 evas_object_event_callback_call(eo_obj_itr, obj_itr, 584 evas_object_event_callback_call(eo_obj_itr, obj_itr,
584 EVAS_CALLBACK_MOUSE_IN, &ev_in, event_id); 585 EVAS_CALLBACK_MOUSE_IN, &ev_in, event_id);
585 //pass event to source 586 _evas_event_pass_to_source(eo_obj_itr, obj_itr,
586 if (obj_itr->proxy.is_proxy) 587 eo_e,
587 _evas_object_source_event(eo_obj_itr, eo_e, 588 EVAS_CALLBACK_MOUSE_IN,
588 EVAS_CALLBACK_MOUSE_IN, 589 &ev, event_id);
589 &ev, event_id); 590
590 } 591 }
591 } 592 }
592 } 593 }
@@ -695,11 +696,9 @@ _canvas_event_feed_mouse_up(Eo *eo_e, void *_pd, va_list *list)
695 evas_object_event_callback_call(eo_obj, obj, 696 evas_object_event_callback_call(eo_obj, obj,
696 EVAS_CALLBACK_MOUSE_UP, 697 EVAS_CALLBACK_MOUSE_UP,
697 &ev, event_id); 698 &ev, event_id);
698 //pass event to source 699 _evas_event_pass_to_source(eo_obj, obj, eo_e,
699 if (obj->proxy.is_proxy) 700 EVAS_CALLBACK_MOUSE_UP,
700 _evas_object_source_event(eo_obj, eo_e, 701 &ev, event_id);
701 EVAS_CALLBACK_MOUSE_UP,
702 &ev, event_id);
703 } 702 }
704 } 703 }
705 if (e->delete_me) break; 704 if (e->delete_me) break;
@@ -821,11 +820,9 @@ _canvas_event_feed_mouse_wheel(Eo *eo_e, void *_pd, va_list *list)
821 evas_object_event_callback_call(eo_obj, obj, 820 evas_object_event_callback_call(eo_obj, obj,
822 EVAS_CALLBACK_MOUSE_WHEEL, &ev, 821 EVAS_CALLBACK_MOUSE_WHEEL, &ev,
823 event_id); 822 event_id);
824 //pass event to source 823 _evas_event_pass_to_source(eo_obj, obj, eo_e,
825 if (obj->proxy.is_proxy) 824 EVAS_CALLBACK_MOUSE_WHEEL,
826 _evas_object_source_event(eo_obj, eo_e, 825 &ev, event_id);
827 EVAS_CALLBACK_MOUSE_WHEEL, &ev,
828 event_id);
829 } 826 }
830 if (e->delete_me) break; 827 if (e->delete_me) break;
831 } 828 }
@@ -931,10 +928,9 @@ _canvas_event_feed_mouse_move(Eo *eo_e, void *_pd, va_list *list)
931 { 928 {
932 evas_object_event_callback_call(eo_obj, obj, 929 evas_object_event_callback_call(eo_obj, obj,
933 EVAS_CALLBACK_MOUSE_MOVE, &ev, event_id); 930 EVAS_CALLBACK_MOUSE_MOVE, &ev, event_id);
934 //pass event to source 931 _evas_event_pass_to_source(eo_obj, obj, eo_e,
935 if (obj->proxy.is_proxy) 932 EVAS_CALLBACK_MOUSE_MOVE,
936 _evas_object_source_event(eo_obj, eo_e, 933 &ev, event_id);
937 EVAS_CALLBACK_MOUSE_MOVE, &ev, event_id);
938 } 934 }
939 } 935 }
940 else 936 else
@@ -996,10 +992,9 @@ _canvas_event_feed_mouse_move(Eo *eo_e, void *_pd, va_list *list)
996 evas_object_event_callback_call(eo_obj, 992 evas_object_event_callback_call(eo_obj,
997 obj, 993 obj,
998 EVAS_CALLBACK_MOUSE_OUT, &ev, event_id); 994 EVAS_CALLBACK_MOUSE_OUT, &ev, event_id);
999 //pass event to source 995 _evas_event_pass_to_source(eo_obj, obj,
1000 if (obj->proxy.is_proxy) 996 eo_e,
1001 _evas_object_source_event(eo_obj, eo_e, 997 EVAS_CALLBACK_MOUSE_OUT, &ev, event_id);
1002 EVAS_CALLBACK_MOUSE_OUT, &ev, event_id);
1003 } 998 }
1004 } 999 }
1005 } 1000 }
@@ -1092,11 +1087,9 @@ _canvas_event_feed_mouse_move(Eo *eo_e, void *_pd, va_list *list)
1092 ev.cur.canvas.y = e->pointer.y; 1087 ev.cur.canvas.y = e->pointer.y;
1093 _evas_event_havemap_adjust(eo_obj, obj, &ev.cur.canvas.x, &ev.cur.canvas.y, obj->mouse_grabbed); 1088 _evas_event_havemap_adjust(eo_obj, obj, &ev.cur.canvas.x, &ev.cur.canvas.y, obj->mouse_grabbed);
1094 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_MOUSE_MOVE, &ev, event_id); 1089 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_MOUSE_MOVE, &ev, event_id);
1095 //pass event to source 1090 _evas_event_pass_to_source(eo_obj, obj, eo_e,
1096 if (obj->proxy.is_proxy) 1091 EVAS_CALLBACK_MOUSE_MOVE, &ev,
1097 _evas_object_source_event(eo_obj, eo_e, 1092 event_id);
1098 EVAS_CALLBACK_MOUSE_MOVE,
1099 &ev, event_id);
1100 } 1093 }
1101 } 1094 }
1102 /* otherwise it has left the object */ 1095 /* otherwise it has left the object */
@@ -1113,11 +1106,9 @@ _canvas_event_feed_mouse_move(Eo *eo_e, void *_pd, va_list *list)
1113 { 1106 {
1114 evas_object_event_callback_call(eo_obj, obj, 1107 evas_object_event_callback_call(eo_obj, obj,
1115 EVAS_CALLBACK_MOUSE_OUT, &ev2, event_id); 1108 EVAS_CALLBACK_MOUSE_OUT, &ev2, event_id);
1116 //pass event to source 1109 _evas_event_pass_to_source(eo_obj, obj, eo_e,
1117 if (obj->proxy.is_proxy) 1110 EVAS_CALLBACK_MOUSE_OUT,
1118 _evas_object_source_event(eo_obj, eo_e, 1111 &ev2, event_id);
1119 EVAS_CALLBACK_MOUSE_OUT,
1120 &ev2, event_id);
1121 } 1112 }
1122 } 1113 }
1123 } 1114 }
@@ -1147,12 +1138,9 @@ _canvas_event_feed_mouse_move(Eo *eo_e, void *_pd, va_list *list)
1147 { 1138 {
1148 evas_object_event_callback_call(eo_obj, obj, 1139 evas_object_event_callback_call(eo_obj, obj,
1149 EVAS_CALLBACK_MOUSE_IN, &ev3, event_id2); 1140 EVAS_CALLBACK_MOUSE_IN, &ev3, event_id2);
1150 //pass event to source 1141 _evas_event_pass_to_source(eo_obj, obj, eo_e,
1151 if (obj->proxy.is_proxy) 1142 EVAS_CALLBACK_MOUSE_IN,
1152 _evas_object_source_event(eo_obj, eo_e, 1143 &ev3, event_id2);
1153 EVAS_CALLBACK_MOUSE_IN,
1154 &ev3, event_id2);
1155
1156 } 1144 }
1157 } 1145 }
1158 } 1146 }
@@ -1289,11 +1277,9 @@ nogrep:
1289 _evas_event_framespace_adjust(eo_obj, &ev.cur.canvas.x, &ev.cur.canvas.y); 1277 _evas_event_framespace_adjust(eo_obj, &ev.cur.canvas.x, &ev.cur.canvas.y);
1290 _evas_event_havemap_adjust(eo_obj, obj, &ev.cur.canvas.x, &ev.cur.canvas.y, obj->mouse_grabbed); 1278 _evas_event_havemap_adjust(eo_obj, obj, &ev.cur.canvas.x, &ev.cur.canvas.y, obj->mouse_grabbed);
1291 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_MOUSE_MOVE, &ev, event_id); 1279 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_MOUSE_MOVE, &ev, event_id);
1292 //pass event to source 1280 _evas_event_pass_to_source(eo_obj, obj, eo_e,
1293 if (obj->proxy.is_proxy) 1281 EVAS_CALLBACK_MOUSE_MOVE,
1294 _evas_object_source_event(eo_obj, eo_e, 1282 &ev, event_id);
1295 EVAS_CALLBACK_MOUSE_MOVE,
1296 &ev, event_id);
1297 } 1283 }
1298 } 1284 }
1299 /* otherwise it has left the object */ 1285 /* otherwise it has left the object */
@@ -1310,11 +1296,9 @@ nogrep:
1310 { 1296 {
1311 evas_object_event_callback_call(eo_obj, obj, 1297 evas_object_event_callback_call(eo_obj, obj,
1312 EVAS_CALLBACK_MOUSE_OUT, &ev2, event_id); 1298 EVAS_CALLBACK_MOUSE_OUT, &ev2, event_id);
1313 //pass event to source 1299 _evas_event_pass_to_source(eo_obj, obj, eo_e,
1314 if (obj->proxy.is_proxy) 1300 EVAS_CALLBACK_MOUSE_OUT,
1315 _evas_object_source_event(eo_obj, eo_e, 1301 &ev2, event_id);
1316 EVAS_CALLBACK_MOUSE_OUT,
1317 &ev2, event_id);
1318 } 1302 }
1319 } 1303 }
1320 } 1304 }
@@ -1344,11 +1328,9 @@ nogrep:
1344 { 1328 {
1345 evas_object_event_callback_call(eo_obj, obj, 1329 evas_object_event_callback_call(eo_obj, obj,
1346 EVAS_CALLBACK_MOUSE_IN, &ev3, event_id2); 1330 EVAS_CALLBACK_MOUSE_IN, &ev3, event_id2);
1347 //pass event to source 1331 _evas_event_pass_to_source(eo_obj, obj, eo_e,
1348 if (obj->proxy.is_proxy) 1332 EVAS_CALLBACK_MOUSE_IN,
1349 _evas_object_source_event(eo_obj, eo_e, 1333 &ev3, event_id2);
1350 EVAS_CALLBACK_MOUSE_IN,
1351 &ev3, event_id2);
1352 } 1334 }
1353 } 1335 }
1354 } 1336 }
@@ -1431,11 +1413,9 @@ _canvas_event_feed_mouse_in(Eo *eo_e, void *_pd, va_list *list)
1431 evas_object_event_callback_call(eo_obj, obj, 1413 evas_object_event_callback_call(eo_obj, obj,
1432 EVAS_CALLBACK_MOUSE_IN, 1414 EVAS_CALLBACK_MOUSE_IN,
1433 &ev, event_id); 1415 &ev, event_id);
1434 //pass event to source 1416 _evas_event_pass_to_source(eo_obj, obj, eo_e,
1435 if (obj->proxy.is_proxy) 1417 EVAS_CALLBACK_MOUSE_IN,
1436 _evas_object_source_event(eo_obj, eo_e, 1418 &ev, event_id);
1437 EVAS_CALLBACK_MOUSE_IN,
1438 &ev, event_id);
1439 } 1419 }
1440 } 1420 }
1441 } 1421 }
@@ -1516,11 +1496,9 @@ _canvas_event_feed_mouse_out(Eo *eo_e, void *_pd, va_list *list)
1516 { 1496 {
1517 evas_object_event_callback_call(eo_obj, obj, 1497 evas_object_event_callback_call(eo_obj, obj,
1518 EVAS_CALLBACK_MOUSE_OUT, &ev, event_id); 1498 EVAS_CALLBACK_MOUSE_OUT, &ev, event_id);
1519 //pass event to source 1499 _evas_event_pass_to_source(eo_obj, obj, eo_e,
1520 if (obj->proxy.is_proxy) 1500 EVAS_CALLBACK_MOUSE_OUT,
1521 _evas_object_source_event(eo_obj, eo_e, 1501 &ev, event_id);
1522 EVAS_CALLBACK_MOUSE_OUT,
1523 &ev, event_id);
1524 } 1502 }
1525 } 1503 }
1526 obj->mouse_grabbed = 0; 1504 obj->mouse_grabbed = 0;
@@ -1640,10 +1618,9 @@ _canvas_event_feed_multi_down(Eo *eo_e, void *_pd, va_list *list)
1640 evas_object_event_callback_call(eo_obj, obj, 1618 evas_object_event_callback_call(eo_obj, obj,
1641 EVAS_CALLBACK_MULTI_DOWN, &ev, 1619 EVAS_CALLBACK_MULTI_DOWN, &ev,
1642 event_id); 1620 event_id);
1643 //pass event to source 1621 _evas_event_pass_to_source(eo_obj, obj, eo_e,
1644 if (obj->proxy.is_proxy) 1622 EVAS_CALLBACK_MULTI_DOWN, &ev,
1645 _evas_object_source_event(eo_obj, eo_e, EVAS_CALLBACK_MULTI_DOWN, 1623 event_id);
1646 &ev, event_id);
1647 } 1624 }
1648 if (e->delete_me) break; 1625 if (e->delete_me) break;
1649 } 1626 }
@@ -1751,10 +1728,8 @@ _canvas_event_feed_multi_up(Eo *eo_e, void *_pd, va_list *list)
1751 evas_object_event_callback_call(eo_obj, obj, 1728 evas_object_event_callback_call(eo_obj, obj,
1752 EVAS_CALLBACK_MULTI_UP, &ev, 1729 EVAS_CALLBACK_MULTI_UP, &ev,
1753 event_id); 1730 event_id);
1754 //pass event to source 1731 _evas_event_pass_to_source(eo_obj, obj, eo_e,
1755 if (obj->proxy.is_proxy) 1732 EVAS_CALLBACK_MULTI_UP, &ev, event_id);
1756 _evas_object_source_event(eo_obj, eo_e, EVAS_CALLBACK_MULTI_UP,
1757 &ev, event_id);
1758 } 1733 }
1759 if (e->delete_me) break; 1734 if (e->delete_me) break;
1760 } 1735 }
@@ -1863,11 +1838,9 @@ _canvas_event_feed_multi_move(Eo *eo_e, void *_pd, va_list *list)
1863 if (y != ev.cur.canvas.y) 1838 if (y != ev.cur.canvas.y)
1864 ev.cur.canvas.ysub = ev.cur.canvas.y; // fixme - lost precision 1839 ev.cur.canvas.ysub = ev.cur.canvas.y; // fixme - lost precision
1865 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_MULTI_MOVE, &ev, event_id); 1840 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_MULTI_MOVE, &ev, event_id);
1866 //pass event to source 1841 _evas_event_pass_to_source(eo_obj, obj, eo_e,
1867 if (obj->proxy.is_proxy) 1842 EVAS_CALLBACK_MULTI_MOVE, &ev,
1868 _evas_object_source_event(eo_obj, eo_e, 1843 event_id);
1869 EVAS_CALLBACK_MULTI_MOVE, &ev,
1870 event_id);
1871 } 1844 }
1872 if (e->delete_me) break; 1845 if (e->delete_me) break;
1873 } 1846 }
@@ -1939,11 +1912,9 @@ _canvas_event_feed_multi_move(Eo *eo_e, void *_pd, va_list *list)
1939 if (y != ev.cur.canvas.y) 1912 if (y != ev.cur.canvas.y)
1940 ev.cur.canvas.ysub = ev.cur.canvas.y; // fixme - lost precision 1913 ev.cur.canvas.ysub = ev.cur.canvas.y; // fixme - lost precision
1941 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_MULTI_MOVE, &ev, event_id); 1914 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_MULTI_MOVE, &ev, event_id);
1942 //pass event to source 1915 _evas_event_pass_to_source(eo_obj, obj, eo_e,
1943 if (obj->proxy.is_proxy) 1916 EVAS_CALLBACK_MULTI_MOVE, &ev,
1944 _evas_object_source_event(eo_obj, eo_e, 1917 event_id);
1945 EVAS_CALLBACK_MULTI_MOVE, &ev,
1946 event_id);
1947 } 1918 }
1948 if (e->delete_me) break; 1919 if (e->delete_me) break;
1949 } 1920 }
@@ -2035,14 +2006,15 @@ _canvas_event_feed_key_down(Eo *eo_e, void *_pd, va_list *list)
2035 Evas_Object_Protected_Data *object_obj = eo_data_get(g->object, EVAS_OBJ_CLASS); 2006 Evas_Object_Protected_Data *object_obj = eo_data_get(g->object, EVAS_OBJ_CLASS);
2036 if (!e->is_frozen && 2007 if (!e->is_frozen &&
2037 !evas_event_freezes_through(g->object, object_obj)) 2008 !evas_event_freezes_through(g->object, object_obj))
2038 evas_object_event_callback_call(g->object, object_obj, 2009 {
2039 EVAS_CALLBACK_KEY_DOWN, 2010 evas_object_event_callback_call(g->object,
2040 &ev, event_id); 2011 object_obj,
2041 //pass event to source 2012 EVAS_CALLBACK_KEY_DOWN, &ev, event_id);
2042 if (object_obj->proxy.is_proxy) 2013 _evas_event_pass_to_source(g->object, object_obj,
2043 _evas_object_source_event(g->object, eo_e, 2014 eo_e,
2044 EVAS_CALLBACK_KEY_DOWN, 2015 EVAS_CALLBACK_KEY_DOWN,
2045 &ev, event_id); 2016 &ev, event_id);
2017 }
2046 if (g->exclusive) exclusive = EINA_TRUE; 2018 if (g->exclusive) exclusive = EINA_TRUE;
2047 } 2019 }
2048 } 2020 }
@@ -2076,12 +2048,9 @@ _canvas_event_feed_key_down(Eo *eo_e, void *_pd, va_list *list)
2076 evas_object_event_callback_call(e->focused, focused_obj, 2048 evas_object_event_callback_call(e->focused, focused_obj,
2077 EVAS_CALLBACK_KEY_DOWN, 2049 EVAS_CALLBACK_KEY_DOWN,
2078 &ev, event_id); 2050 &ev, event_id);
2079 //pass event to source 2051 _evas_event_pass_to_source(e->focused, focused_obj, eo_e,
2080 if (focused_obj->proxy.is_proxy) 2052 EVAS_CALLBACK_KEY_DOWN,
2081 _evas_object_source_event(e->focused, eo_e, 2053 &ev, event_id);
2082 EVAS_CALLBACK_KEY_DOWN,
2083 &ev, event_id);
2084
2085 } 2054 }
2086 } 2055 }
2087 _evas_post_event_callback_call(eo_e, e); 2056 _evas_post_event_callback_call(eo_e, e);
@@ -2161,11 +2130,9 @@ _canvas_event_feed_key_up(Eo *eo_e, void *_pd, va_list *list)
2161 evas_object_event_callback_call(g->object, object_obj, 2130 evas_object_event_callback_call(g->object, object_obj,
2162 EVAS_CALLBACK_KEY_UP, 2131 EVAS_CALLBACK_KEY_UP,
2163 &ev, event_id); 2132 &ev, event_id);
2164 //pass event to source 2133 _evas_event_pass_to_source(g->object, object_obj, eo_e,
2165 if (object_obj->proxy.is_proxy) 2134 EVAS_CALLBACK_KEY_UP,
2166 _evas_object_source_event(g->object, eo_e, 2135 &ev, event_id);
2167 EVAS_CALLBACK_KEY_UP,
2168 &ev, event_id);
2169 } 2136 }
2170 if (g->exclusive) exclusive = EINA_TRUE; 2137 if (g->exclusive) exclusive = EINA_TRUE;
2171 } 2138 }
@@ -2201,11 +2168,9 @@ _canvas_event_feed_key_up(Eo *eo_e, void *_pd, va_list *list)
2201 evas_object_event_callback_call(e->focused, focused_obj, 2168 evas_object_event_callback_call(e->focused, focused_obj,
2202 EVAS_CALLBACK_KEY_UP, 2169 EVAS_CALLBACK_KEY_UP,
2203 &ev, event_id); 2170 &ev, event_id);
2204 //pass event to source 2171 _evas_event_pass_to_source(e->focused, focused_obj, eo_e,
2205 if (focused_obj->proxy.is_proxy) 2172 EVAS_CALLBACK_KEY_UP,
2206 _evas_object_source_event(e->focused, eo_e, 2173 &ev, event_id);
2207 EVAS_CALLBACK_KEY_UP,
2208 &ev, event_id);
2209 } 2174 }
2210 } 2175 }
2211 _evas_post_event_callback_call(eo_e, e); 2176 _evas_post_event_callback_call(eo_e, e);
@@ -2254,10 +2219,8 @@ _canvas_event_feed_hold(Eo *eo_e, void *_pd, va_list *list)
2254 { 2219 {
2255 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_HOLD, 2220 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_HOLD,
2256 &ev, event_id); 2221 &ev, event_id);
2257 //pass event to source 2222 _evas_event_pass_to_source(eo_obj, obj, eo_e, EVAS_CALLBACK_HOLD,
2258 if (obj->proxy.is_proxy) 2223 &ev, event_id);
2259 _evas_object_source_event(eo_obj, eo_e, EVAS_CALLBACK_HOLD, &ev,
2260 event_id);
2261 } 2224 }
2262 if (e->delete_me) break; 2225 if (e->delete_me) break;
2263 } 2226 }