summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-08-19 13:33:11 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-08-26 10:18:01 +0900
commit608da266345c003c3f629980db8e2c2d3eb9d303 (patch)
treefadd547ff0f44ddf82304a68ec77d1c9893e369a /src
parent049a5ddb44de2d55bc565ac2d3943f0ed5352071 (diff)
evas events: Simplify event counter
Simplify code: _evas_object_event_new() event_id = _evas_event_counter Into: event_id = _evas_object_event_new()
Diffstat (limited to 'src')
-rw-r--r--src/lib/evas/canvas/evas_callbacks.c2
-rw-r--r--src/lib/evas/canvas/evas_events.c73
-rw-r--r--src/lib/evas/canvas/evas_focus.c4
-rw-r--r--src/lib/evas/canvas/evas_object_inform.c32
-rw-r--r--src/lib/evas/canvas/evas_object_main.c9
-rw-r--r--src/lib/evas/include/evas_inline.x4
6 files changed, 41 insertions, 83 deletions
diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c
index de8d566..7ecd550 100644
--- a/src/lib/evas/canvas/evas_callbacks.c
+++ b/src/lib/evas/canvas/evas_callbacks.c
@@ -7,8 +7,6 @@
7#define EFL_INTERNAL_UNSTABLE 7#define EFL_INTERNAL_UNSTABLE
8#include "interfaces/efl_common_internal.h" 8#include "interfaces/efl_common_internal.h"
9 9
10int _evas_event_counter = 0;
11
12EVAS_MEMPOOL(_mp_pc); 10EVAS_MEMPOOL(_mp_pc);
13 11
14extern Eina_Hash* signals_hash_table; 12extern Eina_Hash* signals_hash_table;
diff --git a/src/lib/evas/canvas/evas_events.c b/src/lib/evas/canvas/evas_events.c
index 50e17c2..d4ae909 100644
--- a/src/lib/evas/canvas/evas_events.c
+++ b/src/lib/evas/canvas/evas_events.c
@@ -6,6 +6,8 @@
6#define EFL_INTERNAL_UNSTABLE 6#define EFL_INTERNAL_UNSTABLE
7#include "interfaces/efl_common_internal.h" 7#include "interfaces/efl_common_internal.h"
8 8
9int _evas_event_counter = 0;
10
9static Eina_List * 11static Eina_List *
10_evas_event_object_list_in_get(Evas *eo_e, Eina_List *in, 12_evas_event_object_list_in_get(Evas *eo_e, Eina_List *in,
11 const Eina_Inlist *list, Evas_Object *stop, 13 const Eina_Inlist *list, Evas_Object *stop,
@@ -578,8 +580,7 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e,
578 } 580 }
579 eina_list_free(copy); 581 eina_list_free(copy);
580 582
581 _evas_object_event_new(); 583 int event_id2 = _evas_object_event_new();
582 int event_id2 = _evas_event_counter;
583 EINA_LIST_FOREACH(ins, l, eo_child) 584 EINA_LIST_FOREACH(ins, l, eo_child)
584 { 585 {
585 child = efl_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS); 586 child = efl_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
@@ -858,9 +859,8 @@ _evas_event_source_multi_move_events(Evas_Object_Protected_Data *obj, Evas_Publi
858 ev->source = obj->object; 859 ev->source = obj->object;
859 ev->action = EFL_POINTER_ACTION_UP; 860 ev->action = EFL_POINTER_ACTION_UP;
860 861
861 /* FIXME: Why a new event id here? Other 'source' events keep the same id. */ 862 /* Why a new event id here? Other 'source' events keep the same id. */
862 _evas_object_event_new(); 863 event_id = _evas_object_event_new();
863 event_id = _evas_event_counter;
864 864
865 if (e->pointer.mouse_grabbed > 0) 865 if (e->pointer.mouse_grabbed > 0)
866 { 866 {
@@ -1224,8 +1224,7 @@ _canvas_event_feed_mouse_down_internal(Evas_Public_Data *e, Efl_Event_Pointer_Da
1224 e->last_timestamp = ev->timestamp; 1224 e->last_timestamp = ev->timestamp;
1225 eo_e = e->evas; 1225 eo_e = e->evas;
1226 1226
1227 _evas_object_event_new(); 1227 event_id = _evas_object_event_new();
1228 event_id = _evas_event_counter;
1229 1228
1230 ev->cur.x = e->pointer.x; 1229 ev->cur.x = e->pointer.x;
1231 ev->cur.y = e->pointer.y; 1230 ev->cur.y = e->pointer.y;
@@ -1304,10 +1303,9 @@ _post_up_handle(Evas_Public_Data *e, Efl_Event_Pointer *parent_ev)
1304 Evas_Object *eo_obj; 1303 Evas_Object *eo_obj;
1305 Evas *eo_e = e->evas; 1304 Evas *eo_e = e->evas;
1306 int post_called = 0; 1305 int post_called = 0;
1307 int event_id = 0; 1306 int event_id;
1308 1307
1309 _evas_object_event_new(); 1308 event_id = _evas_object_event_new();
1310 event_id = _evas_event_counter;
1311 1309
1312 /* Duplicating UP event */ 1310 /* Duplicating UP event */
1313 evt = efl_event_dup(parent_ev); 1311 evt = efl_event_dup(parent_ev);
@@ -1349,9 +1347,7 @@ _post_up_handle(Evas_Public_Data *e, Efl_Event_Pointer *parent_ev)
1349 { 1347 {
1350 Evas_Object *eo_obj_itr; 1348 Evas_Object *eo_obj_itr;
1351 1349
1352 _evas_object_event_new(); 1350 event_id = _evas_object_event_new();
1353 event_id = _evas_event_counter;
1354
1355 ev->action = EFL_POINTER_ACTION_IN; 1351 ev->action = EFL_POINTER_ACTION_IN;
1356 1352
1357 EINA_LIST_FOREACH(ins, l, eo_obj_itr) 1353 EINA_LIST_FOREACH(ins, l, eo_obj_itr)
@@ -1424,8 +1420,7 @@ _canvas_event_feed_mouse_up_internal(Evas_Public_Data *e, Efl_Event_Pointer_Data
1424 e->last_timestamp = ev->timestamp; 1420 e->last_timestamp = ev->timestamp;
1425 eo_e = e->evas; 1421 eo_e = e->evas;
1426 1422
1427 _evas_object_event_new(); 1423 event_id = _evas_object_event_new();
1428 event_id = _evas_event_counter;
1429 1424
1430 ev->cur.x = e->pointer.x; 1425 ev->cur.x = e->pointer.x;
1431 ev->cur.y = e->pointer.y; 1426 ev->cur.y = e->pointer.y;
@@ -1617,8 +1612,7 @@ _canvas_event_feed_mouse_wheel_internal(Eo *eo_e, Efl_Event_Pointer_Data *pe)
1617 if (e->is_frozen) return; 1612 if (e->is_frozen) return;
1618 e->last_timestamp = pe->timestamp; 1613 e->last_timestamp = pe->timestamp;
1619 1614
1620 _evas_object_event_new(); 1615 event_id = _evas_object_event_new();
1621 event_id = _evas_event_counter;
1622 1616
1623 evt = efl_event_dup(pe->eo); 1617 evt = efl_event_dup(pe->eo);
1624 ev = efl_data_scope_get(evt, EFL_EVENT_POINTER_CLASS); 1618 ev = efl_data_scope_get(evt, EFL_EVENT_POINTER_CLASS);
@@ -1725,8 +1719,7 @@ _canvas_event_feed_mouse_move_internal(Evas_Public_Data *e, Efl_Event_Pointer_Da
1725 /* Send normal mouse move events */ 1719 /* Send normal mouse move events */
1726 ev->action = EFL_POINTER_ACTION_MOVE; 1720 ev->action = EFL_POINTER_ACTION_MOVE;
1727 1721
1728 _evas_object_event_new(); 1722 event_id = _evas_object_event_new();
1729 event_id = _evas_event_counter;
1730 1723
1731 /* go thru old list of in objects */ 1724 /* go thru old list of in objects */
1732 copy = evas_event_list_copy(e->pointer.object.in); 1725 copy = evas_event_list_copy(e->pointer.object.in);
@@ -1771,8 +1764,7 @@ _canvas_event_feed_mouse_move_internal(Evas_Public_Data *e, Efl_Event_Pointer_Da
1771 /* Send mouse out events */ 1764 /* Send mouse out events */
1772 ev->action = EFL_POINTER_ACTION_OUT; 1765 ev->action = EFL_POINTER_ACTION_OUT;
1773 1766
1774 _evas_object_event_new(); 1767 event_id = _evas_object_event_new();
1775 event_id = _evas_event_counter;
1776 1768
1777 EINA_LIST_FREE(outs, eo_obj) 1769 EINA_LIST_FREE(outs, eo_obj)
1778 { 1770 {
@@ -1797,8 +1789,7 @@ _canvas_event_feed_mouse_move_internal(Evas_Public_Data *e, Efl_Event_Pointer_Da
1797 { 1789 {
1798 Eina_List *ins; 1790 Eina_List *ins;
1799 1791
1800 _evas_object_event_new(); 1792 event_id = _evas_object_event_new();
1801 event_id = _evas_event_counter;
1802 1793
1803 /* get all new in objects */ 1794 /* get all new in objects */
1804 ins = evas_event_objects_event_list(eo_e, NULL, x, y); 1795 ins = evas_event_objects_event_list(eo_e, NULL, x, y);
@@ -1856,8 +1847,7 @@ _canvas_event_feed_mouse_move_internal(Evas_Public_Data *e, Efl_Event_Pointer_Da
1856 _evas_post_event_callback_call(eo_e, e); 1847 _evas_post_event_callback_call(eo_e, e);
1857 1848
1858 /* new event id for mouse in */ 1849 /* new event id for mouse in */
1859 _evas_object_event_new(); 1850 event_id = _evas_object_event_new();
1860 event_id = _evas_event_counter;
1861 1851
1862 /* go thru our current list of ins */ 1852 /* go thru our current list of ins */
1863 EINA_LIST_FOREACH(ins, l, eo_obj) 1853 EINA_LIST_FOREACH(ins, l, eo_obj)
@@ -1903,8 +1893,7 @@ nogrep:
1903 Eina_List *ins = NULL, *newin = NULL, *lst = NULL; 1893 Eina_List *ins = NULL, *newin = NULL, *lst = NULL;
1904 Evas_Object *eo_below_obj; 1894 Evas_Object *eo_below_obj;
1905 1895
1906 _evas_object_event_new(); 1896 event_id = _evas_object_event_new();
1907 event_id = _evas_event_counter;
1908 1897
1909 /* go thru old list of in objects */ 1898 /* go thru old list of in objects */
1910 copy = evas_event_list_copy(e->pointer.object.in); 1899 copy = evas_event_list_copy(e->pointer.object.in);
@@ -1988,8 +1977,7 @@ nogrep:
1988 eina_list_free(copy); 1977 eina_list_free(copy);
1989 _evas_post_event_callback_call(eo_e, e); 1978 _evas_post_event_callback_call(eo_e, e);
1990 1979
1991 _evas_object_event_new(); 1980 event_id = _evas_object_event_new();
1992 event_id = _evas_event_counter;
1993 1981
1994 /* go thru our current list of ins */ 1982 /* go thru our current list of ins */
1995 EINA_LIST_FOREACH(newin, l, eo_obj) 1983 EINA_LIST_FOREACH(newin, l, eo_obj)
@@ -2086,8 +2074,7 @@ _canvas_event_feed_mouse_in_internal(Evas *eo_e, Efl_Event_Pointer_Data *ev)
2086 ev->event_flags = e->default_event_flags; 2074 ev->event_flags = e->default_event_flags;
2087 if (ev->device) efl_ref(ev->device); 2075 if (ev->device) efl_ref(ev->device);
2088 2076
2089 _evas_object_event_new(); 2077 event_id = _evas_object_event_new();
2090 event_id = _evas_event_counter;
2091 2078
2092 _evas_walk(e); 2079 _evas_walk(e);
2093 /* get new list of ins */ 2080 /* get new list of ins */
@@ -2134,8 +2121,7 @@ _canvas_event_feed_mouse_out_internal(Evas *eo_e, Efl_Event_Pointer_Data *ev)
2134 if (e->is_frozen) return; 2121 if (e->is_frozen) return;
2135 e->last_timestamp = ev->timestamp; 2122 e->last_timestamp = ev->timestamp;
2136 2123
2137 _evas_object_event_new(); 2124 event_id = _evas_object_event_new();
2138 event_id = _evas_event_counter;
2139 2125
2140 ev->action = EFL_POINTER_ACTION_OUT; 2126 ev->action = EFL_POINTER_ACTION_OUT;
2141 ev->pressed_buttons = e->pointer.button; 2127 ev->pressed_buttons = e->pointer.button;
@@ -2232,8 +2218,7 @@ _canvas_event_feed_multi_down_internal(Evas_Public_Data *e, Efl_Event_Pointer_Da
2232 if (e->is_frozen) return; 2218 if (e->is_frozen) return;
2233 e->last_timestamp = ev->timestamp; 2219 e->last_timestamp = ev->timestamp;
2234 2220
2235 _evas_object_event_new(); 2221 event_id = _evas_object_event_new();
2236 event_id = _evas_event_counter;
2237 2222
2238 point = ev->cur; 2223 point = ev->cur;
2239 ev->action = EFL_POINTER_ACTION_DOWN; 2224 ev->action = EFL_POINTER_ACTION_DOWN;
@@ -2299,8 +2284,7 @@ _canvas_event_feed_multi_up_internal(Evas_Public_Data *e, Efl_Event_Pointer_Data
2299 if (e->is_frozen) return; 2284 if (e->is_frozen) return;
2300 e->last_timestamp = ev->timestamp; 2285 e->last_timestamp = ev->timestamp;
2301 2286
2302 _evas_object_event_new(); 2287 event_id = _evas_object_event_new();
2303 event_id = _evas_event_counter;
2304 2288
2305 point = ev->cur; 2289 point = ev->cur;
2306 ev->action = EFL_POINTER_ACTION_UP; 2290 ev->action = EFL_POINTER_ACTION_UP;
@@ -2442,8 +2426,7 @@ _canvas_event_feed_multi_move_internal(Evas_Public_Data *e, Efl_Event_Pointer_Da
2442 if (!e || !ev) return; 2426 if (!e || !ev) return;
2443 2427
2444 eo_e = e->evas; 2428 eo_e = e->evas;
2445 _evas_object_event_new(); 2429 event_id = _evas_object_event_new();
2446 event_id = _evas_event_counter;
2447 2430
2448 if (e->is_frozen) return; 2431 if (e->is_frozen) return;
2449 e->last_timestamp = ev->timestamp; 2432 e->last_timestamp = ev->timestamp;
@@ -2580,8 +2563,7 @@ _canvas_event_feed_key_down_internal(Evas_Public_Data *e, Efl_Event_Key_Data *ev
2580 e->last_timestamp = ev->timestamp; 2563 e->last_timestamp = ev->timestamp;
2581 _evas_walk(e); 2564 _evas_walk(e);
2582 2565
2583 _evas_object_event_new(); 2566 event_id = _evas_object_event_new();
2584 event_id = _evas_event_counter;
2585 2567
2586 ev->modifiers = &(e->modifiers); 2568 ev->modifiers = &(e->modifiers);
2587 ev->locks = &(e->locks); 2569 ev->locks = &(e->locks);
@@ -2668,8 +2650,7 @@ _canvas_event_feed_key_up_internal(Evas_Public_Data *e, Efl_Event_Key_Data *ev)
2668 e->last_timestamp = ev->timestamp; 2650 e->last_timestamp = ev->timestamp;
2669 _evas_walk(e); 2651 _evas_walk(e);
2670 2652
2671 _evas_object_event_new(); 2653 event_id = _evas_object_event_new();
2672 event_id = _evas_event_counter;
2673 2654
2674 ev->modifiers = &(e->modifiers); 2655 ev->modifiers = &(e->modifiers);
2675 ev->locks = &(e->locks); 2656 ev->locks = &(e->locks);
@@ -2825,8 +2806,7 @@ evas_event_feed_hold(Eo *eo_e, int hold, unsigned int timestamp, const void *dat
2825 if (e->is_frozen) return; 2806 if (e->is_frozen) return;
2826 e->last_timestamp = timestamp; 2807 e->last_timestamp = timestamp;
2827 2808
2828 _evas_object_event_new(); 2809 event_id = _evas_object_event_new();
2829 event_id = _evas_event_counter;
2830 2810
2831 evt = efl_event_instance_get(EFL_EVENT_HOLD_CLASS, eo_e, (void **) &ev); 2811 evt = efl_event_instance_get(EFL_EVENT_HOLD_CLASS, eo_e, (void **) &ev);
2832 if (!ev) return; 2812 if (!ev) return;
@@ -2871,9 +2851,8 @@ _canvas_event_feed_axis_update_internal(Evas *eo_e, Evas_Public_Data *e, unsigne
2871 if (e->is_frozen) return; 2851 if (e->is_frozen) return;
2872 e->last_timestamp = timestamp; 2852 e->last_timestamp = timestamp;
2873 2853
2874 _evas_object_event_new(); 2854 event_id = _evas_object_event_new();
2875 2855
2876 event_id = _evas_event_counter;
2877 ev.data = (void *)data; 2856 ev.data = (void *)data;
2878 ev.timestamp = timestamp; 2857 ev.timestamp = timestamp;
2879 ev.device = device; 2858 ev.device = device;
diff --git a/src/lib/evas/canvas/evas_focus.c b/src/lib/evas/canvas/evas_focus.c
index 1d9be29..7b89670 100644
--- a/src/lib/evas/canvas/evas_focus.c
+++ b/src/lib/evas/canvas/evas_focus.c
@@ -16,9 +16,7 @@ _efl_canvas_object_key_focus_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Ei
16 return; 16 return;
17 MAGIC_CHECK_END(); 17 MAGIC_CHECK_END();
18 18
19 _evas_object_event_new(); 19 event_id = _evas_object_event_new();
20
21 event_id = _evas_event_counter;
22 if (obj->focused == focus) goto end; 20 if (obj->focused == focus) goto end;
23 if (evas_object_intercept_call_focus_set(eo_obj, obj, focus)) goto end; 21 if (evas_object_intercept_call_focus_set(eo_obj, obj, focus)) goto end;
24 if (focus) 22 if (focus)
diff --git a/src/lib/evas/canvas/evas_object_inform.c b/src/lib/evas/canvas/evas_object_inform.c
index cdce47f..9d77ad9 100644
--- a/src/lib/evas/canvas/evas_object_inform.c
+++ b/src/lib/evas/canvas/evas_object_inform.c
@@ -7,9 +7,8 @@ void
7evas_object_inform_call_show(Evas_Object *eo_obj) 7evas_object_inform_call_show(Evas_Object *eo_obj)
8{ 8{
9 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 9 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
10 _evas_object_event_new();
11 10
12 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_SHOW, NULL, _evas_event_counter, NULL, NULL); 11 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_SHOW, NULL, _evas_object_event_new(), NULL, NULL);
13 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas); 12 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas);
14} 13}
15 14
@@ -17,18 +16,15 @@ void
17evas_object_inform_call_hide(Evas_Object *eo_obj) 16evas_object_inform_call_hide(Evas_Object *eo_obj)
18{ 17{
19 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 18 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
20 _evas_object_event_new();
21 19
22 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_HIDE, NULL, _evas_event_counter, NULL, NULL); 20 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_HIDE, NULL, _evas_object_event_new(), NULL, NULL);
23 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas); 21 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas);
24} 22}
25 23
26void 24void
27evas_object_inform_call_move(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj) 25evas_object_inform_call_move(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
28{ 26{
29 _evas_object_event_new(); 27 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_MOVE, NULL, _evas_object_event_new(), NULL, NULL);
30
31 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_MOVE, NULL, _evas_event_counter, NULL, NULL);
32 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas); 28 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas);
33} 29}
34 30
@@ -36,9 +32,7 @@ void
36evas_object_inform_call_resize(Evas_Object *eo_obj) 32evas_object_inform_call_resize(Evas_Object *eo_obj)
37{ 33{
38 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 34 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
39 _evas_object_event_new(); 35 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_RESIZE, NULL, _evas_object_event_new(), NULL, NULL);
40
41 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_RESIZE, NULL, _evas_event_counter, NULL, NULL);
42 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas); 36 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas);
43} 37}
44 38
@@ -46,9 +40,7 @@ void
46evas_object_inform_call_restack(Evas_Object *eo_obj) 40evas_object_inform_call_restack(Evas_Object *eo_obj)
47{ 41{
48 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 42 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
49 _evas_object_event_new(); 43 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_RESTACK, NULL, _evas_object_event_new(), NULL, NULL);
50
51 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_RESTACK, NULL, _evas_event_counter, NULL, NULL);
52 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas); 44 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas);
53} 45}
54 46
@@ -56,9 +48,7 @@ void
56evas_object_inform_call_changed_size_hints(Evas_Object *eo_obj) 48evas_object_inform_call_changed_size_hints(Evas_Object *eo_obj)
57{ 49{
58 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 50 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
59 _evas_object_event_new(); 51 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, NULL, _evas_object_event_new(), NULL, NULL);
60
61 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, NULL, _evas_event_counter, NULL, NULL);
62 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas); 52 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas);
63} 53}
64 54
@@ -71,9 +61,8 @@ evas_object_inform_call_image_preloaded(Evas_Object *eo_obj)
71 if (!_evas_object_image_preloading_get(eo_obj)) return; 61 if (!_evas_object_image_preloading_get(eo_obj)) return;
72 _evas_object_image_preloading_check(eo_obj); 62 _evas_object_image_preloading_check(eo_obj);
73 _evas_object_image_preloading_set(eo_obj, 0); 63 _evas_object_image_preloading_set(eo_obj, 0);
74 _evas_object_event_new();
75 64
76 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_IMAGE_PRELOADED, NULL, _evas_event_counter, NULL, NULL); 65 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_IMAGE_PRELOADED, NULL, _evas_object_event_new(), NULL, NULL);
77 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas); 66 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas);
78} 67}
79 68
@@ -81,9 +70,7 @@ void
81evas_object_inform_call_image_unloaded(Evas_Object *eo_obj) 70evas_object_inform_call_image_unloaded(Evas_Object *eo_obj)
82{ 71{
83 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 72 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
84 _evas_object_event_new(); 73 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_IMAGE_UNLOADED, NULL, _evas_object_event_new(), NULL, NULL);
85
86 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_IMAGE_UNLOADED, NULL, _evas_event_counter, NULL, NULL);
87 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas); 74 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas);
88} 75}
89 76
@@ -91,7 +78,6 @@ void
91evas_object_inform_call_image_resize(Evas_Object *eo_obj) 78evas_object_inform_call_image_resize(Evas_Object *eo_obj)
92{ 79{
93 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 80 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
94 _evas_object_event_new(); 81 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_IMAGE_RESIZE, NULL, _evas_object_event_new(), NULL, NULL);
95 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_IMAGE_RESIZE, NULL, _evas_event_counter, NULL, NULL);
96 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas); 82 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas);
97} 83}
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index 6af0303..2f95012 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -755,13 +755,11 @@ _efl_canvas_object_efl_object_destructor(Eo *eo_obj, Evas_Object_Protected_Data
755 obj->focused = EINA_FALSE; 755 obj->focused = EINA_FALSE;
756 if ((obj->layer) && (obj->layer->evas)) 756 if ((obj->layer) && (obj->layer->evas))
757 obj->layer->evas->focused = NULL; 757 obj->layer->evas->focused = NULL;
758 _evas_object_event_new(); 758 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_FOCUS_OUT, NULL, _evas_object_event_new(), NULL, NULL);
759 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_FOCUS_OUT, NULL, _evas_event_counter, NULL, NULL);
760 if ((obj->layer) && (obj->layer->evas)) 759 if ((obj->layer) && (obj->layer->evas))
761 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas); 760 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas);
762 } 761 }
763 _evas_object_event_new(); 762 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_DEL, NULL, _evas_object_event_new(), NULL, NULL);
764 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_DEL, NULL, _evas_event_counter, NULL, NULL);
765 if ((obj->layer) && (obj->layer->evas)) 763 if ((obj->layer) && (obj->layer->evas))
766 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas); 764 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas);
767 if ((obj->mouse_grabbed > 0) && (obj->layer) && (obj->layer->evas)) 765 if ((obj->mouse_grabbed > 0) && (obj->layer) && (obj->layer->evas))
@@ -819,8 +817,7 @@ _efl_canvas_object_efl_object_destructor(Eo *eo_obj, Evas_Object_Protected_Data
819 817
820 evas_object_map_set(eo_obj, NULL); 818 evas_object_map_set(eo_obj, NULL);
821 if (obj->is_smart) evas_object_smart_del(eo_obj); 819 if (obj->is_smart) evas_object_smart_del(eo_obj);
822 _evas_object_event_new(); 820 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_FREE, NULL, _evas_object_event_new(), NULL, NULL);
823 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_FREE, NULL, _evas_event_counter, NULL, NULL);
824 if ((obj->layer) && (obj->layer->evas)) 821 if ((obj->layer) && (obj->layer->evas))
825 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas); 822 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas);
826 evas_object_smart_cleanup(eo_obj); 823 evas_object_smart_cleanup(eo_obj);
diff --git a/src/lib/evas/include/evas_inline.x b/src/lib/evas/include/evas_inline.x
index 9794d99..1906fbc 100644
--- a/src/lib/evas/include/evas_inline.x
+++ b/src/lib/evas/include/evas_inline.x
@@ -16,10 +16,10 @@ _evas_render_can_map(Evas_Object_Protected_Data *obj)
16 return obj->func->can_map(obj->object); 16 return obj->func->can_map(obj->object);
17} 17}
18 18
19static inline void 19static inline int
20_evas_object_event_new(void) 20_evas_object_event_new(void)
21{ 21{
22 _evas_event_counter++; 22 return (++_evas_event_counter);
23} 23}
24 24
25static inline int 25static inline int