summaryrefslogtreecommitdiff
path: root/src/lib/evas
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-05-02 14:17:19 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-05-02 14:17:19 +0900
commitb64a2994b3b277cbe7fce17d7ee275fd0d78c925 (patch)
tree3fd83519240da48e2355dfc6caa2415a2a77e282 /src/lib/evas
parentaf401b408343b57ced7f98eaded1e4c59337d0aa (diff)
Revert "Efl: replace eo_data_get for objects data referencing."
This reverts commit 654a3f5f94c2464b8563d27da94a78398c112962.
Diffstat (limited to 'src/lib/evas')
-rw-r--r--src/lib/evas/canvas/evas_callbacks.c32
-rw-r--r--src/lib/evas/canvas/evas_clip.c4
-rw-r--r--src/lib/evas/canvas/evas_device.c14
-rw-r--r--src/lib/evas/canvas/evas_events.c158
-rw-r--r--src/lib/evas/canvas/evas_font_dir.c16
-rw-r--r--src/lib/evas/canvas/evas_gl.c3
-rw-r--r--src/lib/evas/canvas/evas_key_grab.c4
-rw-r--r--src/lib/evas/canvas/evas_layer.c21
-rw-r--r--src/lib/evas/canvas/evas_map.c16
-rw-r--r--src/lib/evas/canvas/evas_object_box.c2
-rw-r--r--src/lib/evas/canvas/evas_object_grid.c4
-rw-r--r--src/lib/evas/canvas/evas_object_image.c190
-rw-r--r--src/lib/evas/canvas/evas_object_inform.c16
-rw-r--r--src/lib/evas/canvas/evas_object_intercept.c74
-rw-r--r--src/lib/evas/canvas/evas_object_line.c22
-rw-r--r--src/lib/evas/canvas/evas_object_main.c34
-rw-r--r--src/lib/evas/canvas/evas_object_polygon.c24
-rw-r--r--src/lib/evas/canvas/evas_object_rectangle.c10
-rw-r--r--src/lib/evas/canvas/evas_object_smart.c136
-rw-r--r--src/lib/evas/canvas/evas_object_smart_clipped.c2
-rw-r--r--src/lib/evas/canvas/evas_object_table.c2
-rw-r--r--src/lib/evas/canvas/evas_object_text.c60
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c136
-rw-r--r--src/lib/evas/canvas/evas_object_textgrid.c40
-rw-r--r--src/lib/evas/canvas/evas_out.c4
-rw-r--r--src/lib/evas/canvas/evas_render.c139
-rw-r--r--src/lib/evas/canvas/evas_stack.c4
-rw-r--r--src/lib/evas/canvas/evas_touch_point.c6
-rw-r--r--src/lib/evas/include/evas_inline.x6
29 files changed, 575 insertions, 604 deletions
diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c
index 34bceae..4bda335 100644
--- a/src/lib/evas/canvas/evas_callbacks.c
+++ b/src/lib/evas/canvas/evas_callbacks.c
@@ -140,7 +140,7 @@ _evas_post_event_callback_call(Evas *eo_e, Evas_Public_Data *e)
140void 140void
141_evas_post_event_callback_free(Evas *eo_e) 141_evas_post_event_callback_free(Evas *eo_e)
142{ 142{
143 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 143 Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS);
144 Evas_Post_Callback *pc; 144 Evas_Post_Callback *pc;
145 145
146 EINA_LIST_FREE(e->post_events, pc) 146 EINA_LIST_FREE(e->post_events, pc)
@@ -203,7 +203,7 @@ void
203evas_object_event_callback_all_del(Evas_Object *eo_obj) 203evas_object_event_callback_all_del(Evas_Object *eo_obj)
204{ 204{
205 Evas_Func_Node *fn; 205 Evas_Func_Node *fn;
206 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 206 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
207 207
208 if (!obj) return; 208 if (!obj) return;
209 if (!obj->callbacks) return; 209 if (!obj->callbacks) return;
@@ -215,7 +215,7 @@ void
215evas_object_event_callback_cleanup(Evas_Object *eo_obj) 215evas_object_event_callback_cleanup(Evas_Object *eo_obj)
216{ 216{
217 /* MEM OK */ 217 /* MEM OK */
218 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 218 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
219 if (!obj) return; 219 if (!obj) return;
220 if (!obj->callbacks) return; 220 if (!obj->callbacks) return;
221 evas_event_callback_list_post_free(&obj->callbacks->callbacks); 221 evas_event_callback_list_post_free(&obj->callbacks->callbacks);
@@ -226,7 +226,7 @@ evas_object_event_callback_cleanup(Evas_Object *eo_obj)
226void 226void
227evas_event_callback_all_del(Evas *eo_e) 227evas_event_callback_all_del(Evas *eo_e)
228{ 228{
229 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 229 Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS);
230 Evas_Func_Node *fn; 230 Evas_Func_Node *fn;
231 231
232 if (!e) return; 232 if (!e) return;
@@ -238,7 +238,7 @@ evas_event_callback_all_del(Evas *eo_e)
238void 238void
239evas_event_callback_cleanup(Evas *eo_e) 239evas_event_callback_cleanup(Evas *eo_e)
240{ 240{
241 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 241 Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS);
242 /* MEM OK */ 242 /* MEM OK */
243 if (!e) return; 243 if (!e) return;
244 if (!e->callbacks) return; 244 if (!e->callbacks) return;
@@ -250,7 +250,7 @@ evas_event_callback_cleanup(Evas *eo_e)
250void 250void
251evas_event_callback_call(Evas *eo_e, Evas_Callback_Type type, void *event_info) 251evas_event_callback_call(Evas *eo_e, Evas_Callback_Type type, void *event_info)
252{ 252{
253 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 253 Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS);
254 Eina_Inlist **l_mod = NULL, *l; 254 Eina_Inlist **l_mod = NULL, *l;
255 255
256 if (!e) return; 256 if (!e) return;
@@ -386,7 +386,7 @@ evas_object_event_callback_call(Evas_Object *eo_obj, Evas_Object_Protected_Data
386 if ((obj->smart.parent) && (type != EVAS_CALLBACK_FREE) && 386 if ((obj->smart.parent) && (type != EVAS_CALLBACK_FREE) &&
387 (type <= EVAS_CALLBACK_KEY_UP)) 387 (type <= EVAS_CALLBACK_KEY_UP))
388 { 388 {
389 Evas_Object_Protected_Data *smart_parent = eo_data_scope_get(obj->smart.parent, EVAS_OBJ_CLASS); 389 Evas_Object_Protected_Data *smart_parent = eo_data_get(obj->smart.parent, EVAS_OBJ_CLASS);
390 evas_object_event_callback_call(obj->smart.parent, smart_parent, type, event_info, event_id); 390 evas_object_event_callback_call(obj->smart.parent, smart_parent, type, event_info, event_id);
391 } 391 }
392 } 392 }
@@ -416,7 +416,7 @@ evas_object_event_callback_add(Evas_Object *eo_obj, Evas_Callback_Type type, Eva
416EAPI void 416EAPI void
417evas_object_event_callback_priority_add(Evas_Object *eo_obj, Evas_Callback_Type type, Evas_Callback_Priority priority, Evas_Object_Event_Cb func, const void *data) 417evas_object_event_callback_priority_add(Evas_Object *eo_obj, Evas_Callback_Type type, Evas_Callback_Priority priority, Evas_Object_Event_Cb func, const void *data)
418{ 418{
419 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 419 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
420 /* MEM OK */ 420 /* MEM OK */
421 Evas_Func_Node *fn; 421 Evas_Func_Node *fn;
422 422
@@ -458,7 +458,7 @@ evas_object_event_callback_del(Evas_Object *eo_obj, Evas_Callback_Type type, Eva
458 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 458 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
459 return NULL; 459 return NULL;
460 MAGIC_CHECK_END(); 460 MAGIC_CHECK_END();
461 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 461 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
462 462
463 if (!obj) return NULL; 463 if (!obj) return NULL;
464 if (!func) return NULL; 464 if (!func) return NULL;
@@ -491,7 +491,7 @@ evas_object_event_callback_del_full(Evas_Object *eo_obj, Evas_Callback_Type type
491 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 491 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
492 return NULL; 492 return NULL;
493 MAGIC_CHECK_END(); 493 MAGIC_CHECK_END();
494 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 494 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
495 495
496 if (!obj) return NULL; 496 if (!obj) return NULL;
497 if (!func) return NULL; 497 if (!func) return NULL;
@@ -525,7 +525,7 @@ evas_event_callback_add(Evas *eo_e, Evas_Callback_Type type, Evas_Event_Cb func,
525EAPI void 525EAPI void
526evas_event_callback_priority_add(Evas *eo_e, Evas_Callback_Type type, Evas_Callback_Priority priority, Evas_Event_Cb func, const void *data) 526evas_event_callback_priority_add(Evas *eo_e, Evas_Callback_Type type, Evas_Callback_Priority priority, Evas_Event_Cb func, const void *data)
527{ 527{
528 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 528 Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS);
529 /* MEM OK */ 529 /* MEM OK */
530 Evas_Func_Node *fn; 530 Evas_Func_Node *fn;
531 531
@@ -560,7 +560,7 @@ evas_event_callback_priority_add(Evas *eo_e, Evas_Callback_Type type, Evas_Callb
560EAPI void * 560EAPI void *
561evas_event_callback_del(Evas *eo_e, Evas_Callback_Type type, Evas_Event_Cb func) 561evas_event_callback_del(Evas *eo_e, Evas_Callback_Type type, Evas_Event_Cb func)
562{ 562{
563 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 563 Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS);
564 /* MEM OK */ 564 /* MEM OK */
565 Evas_Func_Node *fn; 565 Evas_Func_Node *fn;
566 566
@@ -599,7 +599,7 @@ evas_event_callback_del_full(Evas *eo_e, Evas_Callback_Type type, Evas_Event_Cb
599 MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS); 599 MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS);
600 return NULL; 600 return NULL;
601 MAGIC_CHECK_END(); 601 MAGIC_CHECK_END();
602 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 602 Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS);
603 603
604 if (!e) return NULL; 604 if (!e) return NULL;
605 if (!func) return NULL; 605 if (!func) return NULL;
@@ -632,7 +632,7 @@ evas_post_event_callback_push(Evas *eo_e, Evas_Object_Event_Post_Cb func, const
632 return; 632 return;
633 MAGIC_CHECK_END(); 633 MAGIC_CHECK_END();
634 634
635 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 635 Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS);
636 if (!e) return; 636 if (!e) return;
637 EVAS_MEMPOOL_INIT(_mp_pc, "evas_post_callback", Evas_Post_Callback, 64, ); 637 EVAS_MEMPOOL_INIT(_mp_pc, "evas_post_callback", Evas_Post_Callback, 64, );
638 pc = EVAS_MEMPOOL_ALLOC(_mp_pc, Evas_Post_Callback); 638 pc = EVAS_MEMPOOL_ALLOC(_mp_pc, Evas_Post_Callback);
@@ -655,7 +655,7 @@ evas_post_event_callback_remove(Evas *eo_e, Evas_Object_Event_Post_Cb func)
655 return; 655 return;
656 MAGIC_CHECK_END(); 656 MAGIC_CHECK_END();
657 657
658 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 658 Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS);
659 if (!e) return; 659 if (!e) return;
660 EINA_LIST_FOREACH(e->post_events, l, pc) 660 EINA_LIST_FOREACH(e->post_events, l, pc)
661 { 661 {
@@ -677,7 +677,7 @@ evas_post_event_callback_remove_full(Evas *eo_e, Evas_Object_Event_Post_Cb func,
677 return; 677 return;
678 MAGIC_CHECK_END(); 678 MAGIC_CHECK_END();
679 679
680 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 680 Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS);
681 if (!e) return; 681 if (!e) return;
682 EINA_LIST_FOREACH(e->post_events, l, pc) 682 EINA_LIST_FOREACH(e->post_events, l, pc)
683 { 683 {
diff --git a/src/lib/evas/canvas/evas_clip.c b/src/lib/evas/canvas/evas_clip.c
index 1d98dc9..2256e36 100644
--- a/src/lib/evas/canvas/evas_clip.c
+++ b/src/lib/evas/canvas/evas_clip.c
@@ -162,7 +162,7 @@ evas_object_mapped_clip_across_mark(Evas_Object *eo_obj, Evas_Object_Protected_D
162 if (obj->smart.parent) 162 if (obj->smart.parent)
163 { 163 {
164 Evas_Object_Protected_Data *smart_parent_obj = 164 Evas_Object_Protected_Data *smart_parent_obj =
165 eo_data_scope_get(obj->smart.parent, EVAS_OBJ_CLASS); 165 eo_data_get(obj->smart.parent, EVAS_OBJ_CLASS);
166 evas_object_child_map_across_mark 166 evas_object_child_map_across_mark
167 (eo_obj, obj, smart_parent_obj->map->cur.map_parent, 0); 167 (eo_obj, obj, smart_parent_obj->map->cur.map_parent, 0);
168 } 168 }
@@ -204,7 +204,7 @@ _clip_set(Eo *eo_obj, void *_pd, va_list *list)
204 return; 204 return;
205 MAGIC_CHECK_END(); 205 MAGIC_CHECK_END();
206 206
207 clip = eo_data_scope_get(eo_clip, EVAS_OBJ_CLASS); 207 clip = eo_data_get(eo_clip, EVAS_OBJ_CLASS);
208 if (obj->cur->clipper && obj->cur->clipper->object == eo_clip) return; 208 if (obj->cur->clipper && obj->cur->clipper->object == eo_clip) return;
209 if (eo_obj == eo_clip) 209 if (eo_obj == eo_clip)
210 { 210 {
diff --git a/src/lib/evas/canvas/evas_device.c b/src/lib/evas/canvas/evas_device.c
index 091c23a..8ad4642 100644
--- a/src/lib/evas/canvas/evas_device.c
+++ b/src/lib/evas/canvas/evas_device.c
@@ -14,7 +14,7 @@ evas_device_add(Evas *eo_e)
14 dev->magic = MAGIC_DEV; 14 dev->magic = MAGIC_DEV;
15 dev->evas = eo_e; 15 dev->evas = eo_e;
16 dev->ref = 1; 16 dev->ref = 1;
17 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 17 Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS);
18 e->devices = eina_list_append(e->devices, dev); 18 e->devices = eina_list_append(e->devices, dev);
19 evas_event_callback_call(eo_e, EVAS_CALLBACK_DEVICE_CHANGED, dev); 19 evas_event_callback_call(eo_e, EVAS_CALLBACK_DEVICE_CHANGED, dev);
20 return dev; 20 return dev;
@@ -54,7 +54,7 @@ evas_device_push(Evas *eo_e, Evas_Device *dev)
54 MAGIC_CHECK(dev, Evas_Device, MAGIC_DEV); 54 MAGIC_CHECK(dev, Evas_Device, MAGIC_DEV);
55 return; 55 return;
56 MAGIC_CHECK_END(); 56 MAGIC_CHECK_END();
57 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 57 Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS);
58 if (!e->cur_device) 58 if (!e->cur_device)
59 { 59 {
60 e->cur_device = eina_array_new(4); 60 e->cur_device = eina_array_new(4);
@@ -72,7 +72,7 @@ evas_device_pop(Evas *eo_e)
72 MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS); 72 MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS);
73 return; 73 return;
74 MAGIC_CHECK_END(); 74 MAGIC_CHECK_END();
75 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 75 Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS);
76 dev = eina_array_pop(e->cur_device); 76 dev = eina_array_pop(e->cur_device);
77 if (dev) _evas_device_unref(dev); 77 if (dev) _evas_device_unref(dev);
78} 78}
@@ -90,7 +90,7 @@ evas_device_list(Evas *eo_e, const Evas_Device *dev)
90 MAGIC_CHECK_END(); 90 MAGIC_CHECK_END();
91 } 91 }
92 if (dev) return dev->children; 92 if (dev) return dev->children;
93 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 93 Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS);
94 return e->devices; 94 return e->devices;
95} 95}
96 96
@@ -138,7 +138,7 @@ evas_device_parent_set(Evas_Device *dev, Evas_Device *parent)
138 MAGIC_CHECK(dev, Evas_Device, MAGIC_DEV); 138 MAGIC_CHECK(dev, Evas_Device, MAGIC_DEV);
139 return; 139 return;
140 MAGIC_CHECK_END(); 140 MAGIC_CHECK_END();
141 Evas_Public_Data *e = eo_data_scope_get(dev->evas, EVAS_CLASS); 141 Evas_Public_Data *e = eo_data_get(dev->evas, EVAS_CLASS);
142 if (parent) 142 if (parent)
143 { 143 {
144 MAGIC_CHECK(parent, Evas_Device, MAGIC_DEV); 144 MAGIC_CHECK(parent, Evas_Device, MAGIC_DEV);
@@ -239,7 +239,7 @@ _evas_device_cleanup(Evas *eo_e)
239{ 239{
240 Evas_Device *dev; 240 Evas_Device *dev;
241 241
242 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 242 Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS);
243 if (e->cur_device) 243 if (e->cur_device)
244 { 244 {
245 while ((dev = eina_array_pop(e->cur_device))) 245 while ((dev = eina_array_pop(e->cur_device)))
@@ -258,7 +258,7 @@ _evas_device_top_get(const Evas *eo_e)
258{ 258{
259 int num; 259 int num;
260 260
261 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 261 Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS);
262 if (!e->cur_device) return NULL; 262 if (!e->cur_device) return NULL;
263 num = eina_array_count(e->cur_device); 263 num = eina_array_count(e->cur_device);
264 if (num < 1) return NULL; 264 if (num < 1) return NULL;
diff --git a/src/lib/evas/canvas/evas_events.c b/src/lib/evas/canvas/evas_events.c
index 7f71dda..a1cc7ae 100644
--- a/src/lib/evas/canvas/evas_events.c
+++ b/src/lib/evas/canvas/evas_events.c
@@ -15,7 +15,7 @@ _evas_event_havemap_adjust(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Protecte
15{ 15{
16 if (obj->smart.parent) 16 if (obj->smart.parent)
17 { 17 {
18 Evas_Object_Protected_Data *smart_parent_obj = eo_data_scope_get(obj->smart.parent, EVAS_OBJ_CLASS); 18 Evas_Object_Protected_Data *smart_parent_obj = eo_data_get(obj->smart.parent, EVAS_OBJ_CLASS);
19 _evas_event_havemap_adjust(obj->smart.parent, smart_parent_obj, x, y, mouse_grabbed); 19 _evas_event_havemap_adjust(obj->smart.parent, smart_parent_obj, x, y, mouse_grabbed);
20 } 20 }
21 21
@@ -34,7 +34,7 @@ _evas_event_havemap_adjust(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Protecte
34static void 34static void
35_evas_event_framespace_adjust(Evas_Object *eo_obj, Evas_Coord *x, Evas_Coord *y) 35_evas_event_framespace_adjust(Evas_Object *eo_obj, Evas_Coord *x, Evas_Coord *y)
36{ 36{
37 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 37 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
38 Evas_Public_Data *evas; 38 Evas_Public_Data *evas;
39 39
40 evas = obj->layer->evas; 40 evas = obj->layer->evas;
@@ -190,10 +190,10 @@ _transform_to_src_space(Evas_Object_Protected_Data *obj, Evas_Object_Protected_D
190static void 190static void
191_evas_event_source_mouse_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mouse_Down *ev, int event_id) 191_evas_event_source_mouse_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mouse_Down *ev, int event_id)
192{ 192{
193 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 193 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
194 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); 194 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
195 Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJ_CLASS); 195 Evas_Object_Protected_Data *src = eo_data_get(eo_src, EVAS_OBJ_CLASS);
196 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 196 Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS);
197 Evas_Coord_Point canvas = ev->canvas; 197 Evas_Coord_Point canvas = ev->canvas;
198 Evas_Object_Protected_Data *child; 198 Evas_Object_Protected_Data *child;
199 Evas_Object *eo_child; 199 Evas_Object *eo_child;
@@ -230,7 +230,7 @@ _evas_event_source_mouse_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event
230 230
231 EINA_LIST_FOREACH(src->proxy->src_event_in, l, eo_child) 231 EINA_LIST_FOREACH(src->proxy->src_event_in, l, eo_child)
232 { 232 {
233 child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); 233 child = eo_data_get(eo_child, EVAS_OBJ_CLASS);
234 if ((child->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) || 234 if ((child->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) ||
235 (child->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN)) 235 (child->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN))
236 { 236 {
@@ -249,7 +249,7 @@ _evas_event_source_mouse_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event
249 copy = evas_event_list_copy(src->proxy->src_event_in); 249 copy = evas_event_list_copy(src->proxy->src_event_in);
250 EINA_LIST_FOREACH(copy, l, eo_child) 250 EINA_LIST_FOREACH(copy, l, eo_child)
251 { 251 {
252 child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); 252 child = eo_data_get(eo_child, EVAS_OBJ_CLASS);
253 ev->canvas = point; 253 ev->canvas = point;
254 _evas_event_framespace_adjust(eo_child, &ev->canvas.x, 254 _evas_event_framespace_adjust(eo_child, &ev->canvas.x,
255 &ev->canvas.y); 255 &ev->canvas.y);
@@ -270,10 +270,10 @@ _evas_event_source_mouse_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event
270static void 270static void
271_evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mouse_Move *ev, int event_id) 271_evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mouse_Move *ev, int event_id)
272{ 272{
273 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 273 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
274 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); 274 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
275 Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJ_CLASS); 275 Evas_Object_Protected_Data *src = eo_data_get(eo_src, EVAS_OBJ_CLASS);
276 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 276 Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS);
277 Evas_Coord_Point canvas = ev->cur.canvas; 277 Evas_Coord_Point canvas = ev->cur.canvas;
278 278
279 if (obj->delete_me || src->delete_me || e->is_frozen) return; 279 if (obj->delete_me || src->delete_me || e->is_frozen) return;
@@ -294,7 +294,7 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event
294 Eina_List *copy = evas_event_list_copy(src->proxy->src_event_in); 294 Eina_List *copy = evas_event_list_copy(src->proxy->src_event_in);
295 EINA_LIST_FOREACH(copy, l, eo_child) 295 EINA_LIST_FOREACH(copy, l, eo_child)
296 { 296 {
297 child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); 297 child = eo_data_get(eo_child, EVAS_OBJ_CLASS);
298 298
299 if ((evas_object_clippers_is_visible(eo_child, child) || 299 if ((evas_object_clippers_is_visible(eo_child, child) ||
300 child->mouse_grabbed) && 300 child->mouse_grabbed) &&
@@ -323,7 +323,7 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event
323 { 323 {
324 eo_child = outs->data; 324 eo_child = outs->data;
325 outs = eina_list_remove(outs, eo_child); 325 outs = eina_list_remove(outs, eo_child);
326 child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); 326 child = eo_data_get(eo_child, EVAS_OBJ_CLASS);
327 if ((child->mouse_grabbed == 0) && (!e->delete_me)) 327 if ((child->mouse_grabbed == 0) && (!e->delete_me))
328 { 328 {
329 if (child->mouse_in) continue; 329 if (child->mouse_in) continue;
@@ -358,7 +358,7 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event
358 358
359 EINA_LIST_FOREACH(copy, l, eo_child) 359 EINA_LIST_FOREACH(copy, l, eo_child)
360 { 360 {
361 child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); 361 child = eo_data_get(eo_child, EVAS_OBJ_CLASS);
362 362
363 ev->cur.canvas = point; 363 ev->cur.canvas = point;
364 364
@@ -406,7 +406,7 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event
406 int event_id2 = _evas_event_counter; 406 int event_id2 = _evas_event_counter;
407 EINA_LIST_FOREACH(ins, l, eo_child) 407 EINA_LIST_FOREACH(ins, l, eo_child)
408 { 408 {
409 child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); 409 child = eo_data_get(eo_child, EVAS_OBJ_CLASS);
410 if (!eina_list_data_find(src->proxy->src_event_in, eo_child)) 410 if (!eina_list_data_find(src->proxy->src_event_in, eo_child))
411 { 411 {
412 if (!child->mouse_in) 412 if (!child->mouse_in)
@@ -445,10 +445,10 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event
445static void 445static void
446_evas_event_source_mouse_up_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mouse_Up *ev, int event_id) 446_evas_event_source_mouse_up_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mouse_Up *ev, int event_id)
447{ 447{
448 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 448 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
449 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); 449 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
450 Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJ_CLASS); 450 Evas_Object_Protected_Data *src = eo_data_get(eo_src, EVAS_OBJ_CLASS);
451 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 451 Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS);
452 Evas_Coord_Point canvas = ev->canvas; 452 Evas_Coord_Point canvas = ev->canvas;
453 453
454 if (obj->delete_me || src->delete_me || e->is_frozen) return; 454 if (obj->delete_me || src->delete_me || e->is_frozen) return;
@@ -466,7 +466,7 @@ _evas_event_source_mouse_up_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_M
466 EINA_LIST_FOREACH(copy, l, eo_child) 466 EINA_LIST_FOREACH(copy, l, eo_child)
467 { 467 {
468 if (src->delete_me) return; 468 if (src->delete_me) return;
469 child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); 469 child = eo_data_get(eo_child, EVAS_OBJ_CLASS);
470 if ((child->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) && 470 if ((child->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) &&
471 (child->mouse_grabbed > 0)) 471 (child->mouse_grabbed > 0))
472 { 472 {
@@ -497,9 +497,9 @@ _evas_event_source_mouse_up_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_M
497static void 497static void
498_evas_event_source_hold_events(Evas_Object *eo_obj, Evas *eo_e EINA_UNUSED, void *ev, int event_id) 498_evas_event_source_hold_events(Evas_Object *eo_obj, Evas *eo_e EINA_UNUSED, void *ev, int event_id)
499{ 499{
500 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 500 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
501 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); 501 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
502 Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJ_CLASS); 502 Evas_Object_Protected_Data *src = eo_data_get(eo_src, EVAS_OBJ_CLASS);
503 503
504 if (obj->layer->evas->is_frozen) return; 504 if (obj->layer->evas->is_frozen) return;
505 505
@@ -509,7 +509,7 @@ _evas_event_source_hold_events(Evas_Object *eo_obj, Evas *eo_e EINA_UNUSED, void
509 EINA_LIST_FOREACH(src->proxy->src_event_in, l, child_eo) 509 EINA_LIST_FOREACH(src->proxy->src_event_in, l, child_eo)
510 { 510 {
511 if (src->delete_me) return; 511 if (src->delete_me) return;
512 child = eo_data_scope_get(child_eo, EVAS_OBJ_CLASS); 512 child = eo_data_get(child_eo, EVAS_OBJ_CLASS);
513 evas_object_event_callback_call(child_eo, child, EVAS_CALLBACK_HOLD, ev, 513 evas_object_event_callback_call(child_eo, child, EVAS_CALLBACK_HOLD, ev,
514 event_id); 514 event_id);
515 if (src->layer->evas->delete_me) break; 515 if (src->layer->evas->delete_me) break;
@@ -519,10 +519,10 @@ _evas_event_source_hold_events(Evas_Object *eo_obj, Evas *eo_e EINA_UNUSED, void
519static void 519static void
520_evas_event_source_wheel_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mouse_Wheel *ev, int event_id) 520_evas_event_source_wheel_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mouse_Wheel *ev, int event_id)
521{ 521{
522 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 522 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
523 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); 523 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
524 Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJ_CLASS); 524 Evas_Object_Protected_Data *src = eo_data_get(eo_src, EVAS_OBJ_CLASS);
525 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 525 Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS);
526 Evas_Coord_Point canvas = ev->canvas; 526 Evas_Coord_Point canvas = ev->canvas;
527 527
528 if (obj->delete_me || src->delete_me || obj->layer->evas->is_frozen) return; 528 if (obj->delete_me || src->delete_me || obj->layer->evas->is_frozen) return;
@@ -538,7 +538,7 @@ _evas_event_source_wheel_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mous
538 EINA_LIST_FOREACH(copy, l, eo_child) 538 EINA_LIST_FOREACH(copy, l, eo_child)
539 { 539 {
540 if (src->delete_me) return; 540 if (src->delete_me) return;
541 child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); 541 child = eo_data_get(eo_child, EVAS_OBJ_CLASS);
542 ev->canvas = point; 542 ev->canvas = point;
543 _evas_event_havemap_adjust(eo_child, child, 543 _evas_event_havemap_adjust(eo_child, child,
544 &ev->canvas.x, 544 &ev->canvas.x,
@@ -555,10 +555,10 @@ _evas_event_source_wheel_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mous
555static void 555static void
556_evas_event_source_multi_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Multi_Down *ev, int event_id) 556_evas_event_source_multi_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Multi_Down *ev, int event_id)
557{ 557{
558 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 558 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
559 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); 559 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
560 Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJ_CLASS); 560 Evas_Object_Protected_Data *src = eo_data_get(eo_src, EVAS_OBJ_CLASS);
561 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 561 Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS);
562 Evas_Coord_Precision_Point canvas = ev->canvas; 562 Evas_Coord_Precision_Point canvas = ev->canvas;
563 563
564 if (obj->delete_me || src->delete_me || obj->layer->evas->is_frozen) return; 564 if (obj->delete_me || src->delete_me || obj->layer->evas->is_frozen) return;
@@ -575,7 +575,7 @@ _evas_event_source_multi_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event
575 575
576 EINA_LIST_FOREACH(src->proxy->src_event_in, l, eo_child) 576 EINA_LIST_FOREACH(src->proxy->src_event_in, l, eo_child)
577 { 577 {
578 child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); 578 child = eo_data_get(eo_child, EVAS_OBJ_CLASS);
579 if (child->pointer_mode != EVAS_OBJECT_POINTER_MODE_NOGRAB) 579 if (child->pointer_mode != EVAS_OBJECT_POINTER_MODE_NOGRAB)
580 { 580 {
581 child->mouse_grabbed += (addgrab + 1); 581 child->mouse_grabbed += (addgrab + 1);
@@ -593,7 +593,7 @@ _evas_event_source_multi_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event
593 &ev->canvas.x, 593 &ev->canvas.x,
594 &ev->canvas.y, 594 &ev->canvas.y,
595 child->mouse_grabbed); 595 child->mouse_grabbed);
596 child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); 596 child = eo_data_get(eo_child, EVAS_OBJ_CLASS);
597 evas_object_event_callback_call(eo_child, child, 597 evas_object_event_callback_call(eo_child, child,
598 EVAS_CALLBACK_MULTI_DOWN, ev, event_id); 598 EVAS_CALLBACK_MULTI_DOWN, ev, event_id);
599 if (e->delete_me) break; 599 if (e->delete_me) break;
@@ -606,10 +606,10 @@ _evas_event_source_multi_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event
606static void 606static void
607_evas_event_source_multi_up_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Multi_Up *ev, int event_id) 607_evas_event_source_multi_up_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Multi_Up *ev, int event_id)
608{ 608{
609 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 609 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
610 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); 610 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
611 Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJ_CLASS); 611 Evas_Object_Protected_Data *src = eo_data_get(eo_src, EVAS_OBJ_CLASS);
612 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 612 Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS);
613 Evas_Coord_Precision_Point canvas = ev->canvas; 613 Evas_Coord_Precision_Point canvas = ev->canvas;
614 614
615 if (obj->delete_me || src->delete_me || obj->layer->evas->is_frozen) return; 615 if (obj->delete_me || src->delete_me || obj->layer->evas->is_frozen) return;
@@ -627,7 +627,7 @@ _evas_event_source_multi_up_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_M
627 EINA_LIST_FOREACH(copy, l, eo_child) 627 EINA_LIST_FOREACH(copy, l, eo_child)
628 { 628 {
629 ev->canvas = point; 629 ev->canvas = point;
630 child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); 630 child = eo_data_get(eo_child, EVAS_OBJ_CLASS);
631 if ((child->pointer_mode != EVAS_OBJECT_POINTER_MODE_NOGRAB) && 631 if ((child->pointer_mode != EVAS_OBJECT_POINTER_MODE_NOGRAB) &&
632 (child->mouse_grabbed > 0)) 632 (child->mouse_grabbed > 0))
633 { 633 {
@@ -650,10 +650,10 @@ _evas_event_source_multi_up_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_M
650static void 650static void
651_evas_event_source_multi_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Multi_Move *ev, int event_id) 651_evas_event_source_multi_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Multi_Move *ev, int event_id)
652{ 652{
653 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 653 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
654 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); 654 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
655 Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJ_CLASS); 655 Evas_Object_Protected_Data *src = eo_data_get(eo_src, EVAS_OBJ_CLASS);
656 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 656 Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS);
657 Evas_Coord_Precision_Point canvas = ev->cur.canvas; 657 Evas_Coord_Precision_Point canvas = ev->cur.canvas;
658 658
659 if (obj->delete_me || src->delete_me || e->is_frozen) return; 659 if (obj->delete_me || src->delete_me || e->is_frozen) return;
@@ -675,7 +675,7 @@ _evas_event_source_multi_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event
675 Eina_List *copy = evas_event_list_copy(src->proxy->src_event_in); 675 Eina_List *copy = evas_event_list_copy(src->proxy->src_event_in);
676 EINA_LIST_FOREACH(copy, l, eo_child) 676 EINA_LIST_FOREACH(copy, l, eo_child)
677 { 677 {
678 child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); 678 child = eo_data_get(eo_child, EVAS_OBJ_CLASS);
679 if (((evas_object_clippers_is_visible(eo_child, child)) || 679 if (((evas_object_clippers_is_visible(eo_child, child)) ||
680 ((child->mouse_grabbed) && 680 ((child->mouse_grabbed) &&
681 (!evas_event_passes_through(eo_child, child)) && 681 (!evas_event_passes_through(eo_child, child)) &&
@@ -687,7 +687,7 @@ _evas_event_source_multi_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event
687 &ev->cur.canvas.x, 687 &ev->cur.canvas.x,
688 &ev->cur.canvas.y, 688 &ev->cur.canvas.y,
689 child->mouse_grabbed); 689 child->mouse_grabbed);
690 child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); 690 child = eo_data_get(eo_child, EVAS_OBJ_CLASS);
691 evas_object_event_callback_call(eo_child, child, 691 evas_object_event_callback_call(eo_child, child,
692 EVAS_CALLBACK_MULTI_MOVE, ev, 692 EVAS_CALLBACK_MULTI_MOVE, ev,
693 event_id); 693 event_id);
@@ -710,7 +710,7 @@ _evas_event_source_multi_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event
710 Eina_List *copy = evas_event_list_copy(src->proxy->src_event_in); 710 Eina_List *copy = evas_event_list_copy(src->proxy->src_event_in);
711 EINA_LIST_FOREACH(copy, l, eo_child) 711 EINA_LIST_FOREACH(copy, l, eo_child)
712 { 712 {
713 child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); 713 child = eo_data_get(eo_child, EVAS_OBJ_CLASS);
714 ev->cur.canvas = point; 714 ev->cur.canvas = point;
715 715
716 if (evas_object_is_in_output_rect(eo_child, child, 716 if (evas_object_is_in_output_rect(eo_child, child,
@@ -730,7 +730,7 @@ _evas_event_source_multi_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event
730 &ev->cur.canvas.x, 730 &ev->cur.canvas.x,
731 &ev->cur.canvas.y, 731 &ev->cur.canvas.y,
732 child->mouse_grabbed); 732 child->mouse_grabbed);
733 child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); 733 child = eo_data_get(eo_child, EVAS_OBJ_CLASS);
734 evas_object_event_callback_call(eo_child, child, 734 evas_object_event_callback_call(eo_child, child,
735 EVAS_CALLBACK_MULTI_MOVE, ev, 735 EVAS_CALLBACK_MULTI_MOVE, ev,
736 event_id); 736 event_id);
@@ -757,10 +757,10 @@ _evas_event_source_multi_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event
757static void 757static void
758_evas_event_source_mouse_in_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mouse_In *ev, int event_id) 758_evas_event_source_mouse_in_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mouse_In *ev, int event_id)
759{ 759{
760 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 760 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
761 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); 761 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
762 Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJ_CLASS); 762 Evas_Object_Protected_Data *src = eo_data_get(eo_src, EVAS_OBJ_CLASS);
763 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 763 Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS);
764 Evas_Coord_Point canvas = ev->canvas; 764 Evas_Coord_Point canvas = ev->canvas;
765 Evas_Object *eo_child; 765 Evas_Object *eo_child;
766 Eina_List *ins = NULL; 766 Eina_List *ins = NULL;
@@ -785,7 +785,7 @@ _evas_event_source_mouse_in_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_
785 point = ev->canvas; 785 point = ev->canvas;
786 EINA_LIST_FOREACH(ins, l, eo_child) 786 EINA_LIST_FOREACH(ins, l, eo_child)
787 { 787 {
788 Evas_Object_Protected_Data *child = eo_data_scope_get(eo_child, 788 Evas_Object_Protected_Data *child = eo_data_get(eo_child,
789 EVAS_OBJ_CLASS); 789 EVAS_OBJ_CLASS);
790 if (!eina_list_data_find(src->proxy->src_event_in, eo_child)) 790 if (!eina_list_data_find(src->proxy->src_event_in, eo_child))
791 { 791 {
@@ -817,10 +817,10 @@ _evas_event_source_mouse_in_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_
817static void 817static void
818_evas_event_source_mouse_out_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mouse_Out *ev, int event_id) 818_evas_event_source_mouse_out_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mouse_Out *ev, int event_id)
819{ 819{
820 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 820 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
821 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); 821 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
822 Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJ_CLASS); 822 Evas_Object_Protected_Data *src = eo_data_get(eo_src, EVAS_OBJ_CLASS);
823 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 823 Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS);
824 Evas_Coord_Point canvas = ev->canvas; 824 Evas_Coord_Point canvas = ev->canvas;
825 Evas_Object *eo_child; 825 Evas_Object *eo_child;
826 Eina_List *l; 826 Eina_List *l;
@@ -838,7 +838,7 @@ _evas_event_source_mouse_out_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_
838 838
839 EINA_LIST_FOREACH(copy, l, eo_child) 839 EINA_LIST_FOREACH(copy, l, eo_child)
840 { 840 {
841 Evas_Object_Protected_Data *child = eo_data_scope_get(eo_child, 841 Evas_Object_Protected_Data *child = eo_data_get(eo_child,
842 EVAS_OBJ_CLASS); 842 EVAS_OBJ_CLASS);
843 if (!child->mouse_in) continue; 843 if (!child->mouse_in) continue;
844 child->mouse_in = 0; 844 child->mouse_in = 0;
@@ -876,7 +876,7 @@ _evas_event_object_list_in_get(Evas *eo_e, Eina_List *in,
876Eina_List * 876Eina_List *
877evas_event_objects_event_list(Evas *eo_e, Evas_Object *stop, int x, int y) 877evas_event_objects_event_list(Evas *eo_e, Evas_Object *stop, int x, int y)
878{ 878{
879 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 879 Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS);
880 Evas_Layer *lay; 880 Evas_Layer *lay;
881 Eina_List *in = NULL; 881 Eina_List *in = NULL;
882 882
@@ -1021,7 +1021,7 @@ evas_event_thaw_eval(Evas *eo_e)
1021 MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS); 1021 MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS);
1022 return; 1022 return;
1023 MAGIC_CHECK_END(); 1023 MAGIC_CHECK_END();
1024 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 1024 Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS);
1025 if (0 == evas_event_freeze_get(eo_e)) 1025 if (0 == evas_event_freeze_get(eo_e))
1026 { 1026 {
1027 _canvas_event_thaw_eval_internal(eo_e, e); 1027 _canvas_event_thaw_eval_internal(eo_e, e);
@@ -1100,7 +1100,7 @@ _canvas_event_feed_mouse_down(Eo *eo_e, void *_pd, va_list *list)
1100 copy = evas_event_list_copy(e->pointer.object.in); 1100 copy = evas_event_list_copy(e->pointer.object.in);
1101 EINA_LIST_FOREACH(copy, l, eo_obj) 1101 EINA_LIST_FOREACH(copy, l, eo_obj)
1102 { 1102 {
1103 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1103 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
1104 if ((obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) || 1104 if ((obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) ||
1105 (obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN)) 1105 (obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN))
1106 { 1106 {
@@ -1115,7 +1115,7 @@ _canvas_event_feed_mouse_down(Eo *eo_e, void *_pd, va_list *list)
1115 } 1115 }
1116 EINA_LIST_FOREACH(copy, l, eo_obj) 1116 EINA_LIST_FOREACH(copy, l, eo_obj)
1117 { 1117 {
1118 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1118 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
1119 if (obj->delete_me) continue; 1119 if (obj->delete_me) continue;
1120 ev.canvas.x = e->pointer.x; 1120 ev.canvas.x = e->pointer.x;
1121 ev.canvas.y = e->pointer.y; 1121 ev.canvas.y = e->pointer.y;
@@ -1144,7 +1144,7 @@ _canvas_event_feed_mouse_down(Eo *eo_e, void *_pd, va_list *list)
1144static int 1144static int
1145_post_up_handle(Evas *eo_e, unsigned int timestamp, const void *data) 1145_post_up_handle(Evas *eo_e, unsigned int timestamp, const void *data)
1146{ 1146{
1147 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 1147 Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS);
1148 Eina_List *l, *copy, *ins, *ll; 1148 Eina_List *l, *copy, *ins, *ll;
1149 Evas_Event_Mouse_Out ev; 1149 Evas_Event_Mouse_Out ev;
1150 Evas_Object *eo_obj; 1150 Evas_Object *eo_obj;
@@ -1173,7 +1173,7 @@ _post_up_handle(Evas *eo_e, unsigned int timestamp, const void *data)
1173 copy = evas_event_list_copy(e->pointer.object.in); 1173 copy = evas_event_list_copy(e->pointer.object.in);
1174 EINA_LIST_FOREACH(copy, ll, eo_obj) 1174 EINA_LIST_FOREACH(copy, ll, eo_obj)
1175 { 1175 {
1176 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1176 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
1177 if ((!eina_list_data_find(ins, eo_obj)) || (!e->pointer.inside)) 1177 if ((!eina_list_data_find(ins, eo_obj)) || (!e->pointer.inside))
1178 { 1178 {
1179 if (!obj->mouse_in) continue; 1179 if (!obj->mouse_in) continue;
@@ -1220,7 +1220,7 @@ _post_up_handle(Evas *eo_e, unsigned int timestamp, const void *data)
1220 1220
1221 EINA_LIST_FOREACH(ins, l, eo_obj_itr) 1221 EINA_LIST_FOREACH(ins, l, eo_obj_itr)
1222 { 1222 {
1223 Evas_Object_Protected_Data *obj_itr = eo_data_scope_get(eo_obj_itr, EVAS_OBJ_CLASS); 1223 Evas_Object_Protected_Data *obj_itr = eo_data_get(eo_obj_itr, EVAS_OBJ_CLASS);
1224 if (!eina_list_data_find(e->pointer.object.in, eo_obj_itr)) 1224 if (!eina_list_data_find(e->pointer.object.in, eo_obj_itr))
1225 { 1225 {
1226 if (obj_itr->mouse_in) continue; 1226 if (obj_itr->mouse_in) continue;
@@ -1328,7 +1328,7 @@ _canvas_event_feed_mouse_up(Eo *eo_e, void *_pd, va_list *list)
1328 copy = evas_event_list_copy(e->pointer.object.in); 1328 copy = evas_event_list_copy(e->pointer.object.in);
1329 EINA_LIST_FOREACH(copy, l, eo_obj) 1329 EINA_LIST_FOREACH(copy, l, eo_obj)
1330 { 1330 {
1331 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1331 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
1332 if ((obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) && 1332 if ((obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) &&
1333 (obj->mouse_grabbed > 0)) 1333 (obj->mouse_grabbed > 0))
1334 { 1334 {
@@ -1464,7 +1464,7 @@ _canvas_event_feed_mouse_wheel(Eo *eo_e, void *_pd, va_list *list)
1464 1464
1465 EINA_LIST_FOREACH(copy, l, eo_obj) 1465 EINA_LIST_FOREACH(copy, l, eo_obj)
1466 { 1466 {
1467 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1467 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
1468 if (!evas_event_freezes_through(eo_obj, obj)) 1468 if (!evas_event_freezes_through(eo_obj, obj))
1469 { 1469 {
1470 ev.canvas.x = e->pointer.x; 1470 ev.canvas.x = e->pointer.x;
@@ -1563,7 +1563,7 @@ _canvas_event_feed_mouse_move(Eo *eo_e, void *_pd, va_list *list)
1563 copy = evas_event_list_copy(e->pointer.object.in); 1563 copy = evas_event_list_copy(e->pointer.object.in);
1564 EINA_LIST_FOREACH(copy, l, eo_obj) 1564 EINA_LIST_FOREACH(copy, l, eo_obj)
1565 { 1565 {
1566 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1566 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
1567 if ((!e->is_frozen) && 1567 if ((!e->is_frozen) &&
1568 (evas_object_clippers_is_visible(eo_obj, obj) || 1568 (evas_object_clippers_is_visible(eo_obj, obj) ||
1569 obj->mouse_grabbed) && 1569 obj->mouse_grabbed) &&
@@ -1632,7 +1632,7 @@ _canvas_event_feed_mouse_move(Eo *eo_e, void *_pd, va_list *list)
1632 Evas_Object *eo_obj; 1632 Evas_Object *eo_obj;
1633 eo_obj = outs->data; 1633 eo_obj = outs->data;
1634 outs = eina_list_remove(outs, eo_obj); 1634 outs = eina_list_remove(outs, eo_obj);
1635 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1635 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
1636 if ((obj->mouse_grabbed == 0) && (!e->delete_me)) 1636 if ((obj->mouse_grabbed == 0) && (!e->delete_me))
1637 { 1637 {
1638 if (!obj->mouse_in) continue; 1638 if (!obj->mouse_in) continue;
@@ -1719,7 +1719,7 @@ _canvas_event_feed_mouse_move(Eo *eo_e, void *_pd, va_list *list)
1719 copy = evas_event_list_copy(e->pointer.object.in); 1719 copy = evas_event_list_copy(e->pointer.object.in);
1720 EINA_LIST_FOREACH(copy, l, eo_obj) 1720 EINA_LIST_FOREACH(copy, l, eo_obj)
1721 { 1721 {
1722 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1722 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
1723 /* if its under the pointer and its visible and its in the new */ 1723 /* if its under the pointer and its visible and its in the new */
1724 /* in list */ 1724 /* in list */
1725 // FIXME: i don't think we need this 1725 // FIXME: i don't think we need this
@@ -1783,7 +1783,7 @@ _canvas_event_feed_mouse_move(Eo *eo_e, void *_pd, va_list *list)
1783 /* go thru our current list of ins */ 1783 /* go thru our current list of ins */
1784 EINA_LIST_FOREACH(ins, l, eo_obj) 1784 EINA_LIST_FOREACH(ins, l, eo_obj)
1785 { 1785 {
1786 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1786 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
1787 /* if its not in the old list of ins send an enter event */ 1787 /* if its not in the old list of ins send an enter event */
1788 if (!eina_list_data_find(e->pointer.object.in, eo_obj)) 1788 if (!eina_list_data_find(e->pointer.object.in, eo_obj))
1789 { 1789 {
@@ -1898,7 +1898,7 @@ nogrep:
1898 eo_below_obj = evas_object_below_get(nogrep_obj); 1898 eo_below_obj = evas_object_below_get(nogrep_obj);
1899 if (eo_below_obj) 1899 if (eo_below_obj)
1900 { 1900 {
1901 Evas_Object_Protected_Data *below_obj = eo_data_scope_get(eo_below_obj, EVAS_OBJ_CLASS); 1901 Evas_Object_Protected_Data *below_obj = eo_data_get(eo_below_obj, EVAS_OBJ_CLASS);
1902 ins = _evas_event_object_list_raw_in_get(eo_e, NULL, 1902 ins = _evas_event_object_list_raw_in_get(eo_e, NULL,
1903 EINA_INLIST_GET(below_obj), NULL, 1903 EINA_INLIST_GET(below_obj), NULL,
1904 e->pointer.x, e->pointer.y, 1904 e->pointer.x, e->pointer.y,
@@ -1916,7 +1916,7 @@ nogrep:
1916 1916
1917 EINA_LIST_FOREACH(lst, l, eo_obj) 1917 EINA_LIST_FOREACH(lst, l, eo_obj)
1918 { 1918 {
1919 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1919 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
1920 /* if its under the pointer and its visible and its in the new */ 1920 /* if its under the pointer and its visible and its in the new */
1921 /* in list */ 1921 /* in list */
1922 // FIXME: i don't think we need this 1922 // FIXME: i don't think we need this
@@ -1976,7 +1976,7 @@ nogrep:
1976 /* go thru our current list of ins */ 1976 /* go thru our current list of ins */
1977 EINA_LIST_FOREACH(newin, l, eo_obj) 1977 EINA_LIST_FOREACH(newin, l, eo_obj)
1978 { 1978 {
1979 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1979 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
1980 /* if its not in the old list of ins send an enter event */ 1980 /* if its not in the old list of ins send an enter event */
1981 if (!eina_list_data_find(e->pointer.object.in, eo_obj)) 1981 if (!eina_list_data_find(e->pointer.object.in, eo_obj))
1982 { 1982 {
@@ -2060,7 +2060,7 @@ _canvas_event_feed_mouse_in(Eo *eo_e, void *_pd, va_list *list)
2060 ins = evas_event_objects_event_list(eo_e, NULL, e->pointer.x, e->pointer.y); 2060 ins = evas_event_objects_event_list(eo_e, NULL, e->pointer.x, e->pointer.y);
2061 EINA_LIST_FOREACH(ins, l, eo_obj) 2061 EINA_LIST_FOREACH(ins, l, eo_obj)
2062 { 2062 {
2063 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 2063 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
2064 if (!eina_list_data_find(e->pointer.object.in, eo_obj)) 2064 if (!eina_list_data_find(e->pointer.object.in, eo_obj))
2065 { 2065 {
2066 if (obj->mouse_in) continue; 2066 if (obj->mouse_in) continue;
@@ -2138,7 +2138,7 @@ _canvas_event_feed_mouse_out(Eo *eo_e, void *_pd, va_list *list)
2138 copy = evas_event_list_copy(e->pointer.object.in); 2138 copy = evas_event_list_copy(e->pointer.object.in);
2139 EINA_LIST_FOREACH(copy, l, eo_obj) 2139 EINA_LIST_FOREACH(copy, l, eo_obj)
2140 { 2140 {
2141 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 2141 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
2142 if (!obj->mouse_in) continue; 2142 if (!obj->mouse_in) continue;
2143 obj->mouse_in = 0; 2143 obj->mouse_in = 0;
2144 if (!obj->delete_me) 2144 if (!obj->delete_me)
@@ -2245,7 +2245,7 @@ _canvas_event_feed_multi_down(Eo *eo_e, void *_pd, va_list *list)
2245 copy = evas_event_list_copy(e->pointer.object.in); 2245 copy = evas_event_list_copy(e->pointer.object.in);
2246 EINA_LIST_FOREACH(copy, l, eo_obj) 2246 EINA_LIST_FOREACH(copy, l, eo_obj)
2247 { 2247 {
2248 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 2248 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
2249 if (obj->pointer_mode != EVAS_OBJECT_POINTER_MODE_NOGRAB) 2249 if (obj->pointer_mode != EVAS_OBJECT_POINTER_MODE_NOGRAB)
2250 { 2250 {
2251 obj->mouse_grabbed += addgrab + 1; 2251 obj->mouse_grabbed += addgrab + 1;
@@ -2254,7 +2254,7 @@ _canvas_event_feed_multi_down(Eo *eo_e, void *_pd, va_list *list)
2254 } 2254 }
2255 EINA_LIST_FOREACH(copy, l, eo_obj) 2255 EINA_LIST_FOREACH(copy, l, eo_obj)
2256 { 2256 {
2257 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 2257 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
2258 ev.canvas.x = x; 2258 ev.canvas.x = x;
2259 ev.canvas.y = y; 2259 ev.canvas.y = y;
2260 ev.canvas.xsub = fx; 2260 ev.canvas.xsub = fx;
@@ -2355,7 +2355,7 @@ _canvas_event_feed_multi_up(Eo *eo_e, void *_pd, va_list *list)
2355 copy = evas_event_list_copy(e->pointer.object.in); 2355 copy = evas_event_list_copy(e->pointer.object.in);
2356 EINA_LIST_FOREACH(copy, l, eo_obj) 2356 EINA_LIST_FOREACH(copy, l, eo_obj)
2357 { 2357 {
2358 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 2358 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
2359 ev.canvas.x = x; 2359 ev.canvas.x = x;
2360 ev.canvas.y = y; 2360 ev.canvas.y = y;
2361 ev.canvas.xsub = fx; 2361 ev.canvas.xsub = fx;
@@ -2463,7 +2463,7 @@ _canvas_event_feed_multi_move(Eo *eo_e, void *_pd, va_list *list)
2463 copy = evas_event_list_copy(e->pointer.object.in); 2463 copy = evas_event_list_copy(e->pointer.object.in);
2464 EINA_LIST_FOREACH(copy, l, eo_obj) 2464 EINA_LIST_FOREACH(copy, l, eo_obj)
2465 { 2465 {
2466 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 2466 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
2467 if ((evas_object_clippers_is_visible(eo_obj, obj) || 2467 if ((evas_object_clippers_is_visible(eo_obj, obj) ||
2468 obj->mouse_grabbed) && 2468 obj->mouse_grabbed) &&
2469 (!evas_event_passes_through(eo_obj, obj)) && 2469 (!evas_event_passes_through(eo_obj, obj)) &&
@@ -2531,7 +2531,7 @@ _canvas_event_feed_multi_move(Eo *eo_e, void *_pd, va_list *list)
2531 copy = evas_event_list_copy(e->pointer.object.in); 2531 copy = evas_event_list_copy(e->pointer.object.in);
2532 EINA_LIST_FOREACH(copy, l, eo_obj) 2532 EINA_LIST_FOREACH(copy, l, eo_obj)
2533 { 2533 {
2534 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 2534 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
2535 /* if its under the pointer and its visible and its in the new */ 2535 /* if its under the pointer and its visible and its in the new */
2536 /* in list */ 2536 /* in list */
2537 // FIXME: i don't think we need this 2537 // FIXME: i don't think we need this
@@ -2651,7 +2651,7 @@ _canvas_event_feed_key_down(Eo *eo_e, void *_pd, va_list *list)
2651 { 2651 {
2652 if (!(e->modifiers.mask & g->not_modifiers)) 2652 if (!(e->modifiers.mask & g->not_modifiers))
2653 { 2653 {
2654 Evas_Object_Protected_Data *object_obj = eo_data_scope_get(g->object, EVAS_OBJ_CLASS); 2654 Evas_Object_Protected_Data *object_obj = eo_data_get(g->object, EVAS_OBJ_CLASS);
2655 if (!e->is_frozen && 2655 if (!e->is_frozen &&
2656 !evas_event_freezes_through(g->object, object_obj)) 2656 !evas_event_freezes_through(g->object, object_obj))
2657 { 2657 {
@@ -2676,7 +2676,7 @@ _canvas_event_feed_key_down(Eo *eo_e, void *_pd, va_list *list)
2676 l = eina_list_next(l); 2676 l = eina_list_next(l);
2677 if (g->delete_me) 2677 if (g->delete_me)
2678 { 2678 {
2679 Evas_Object_Protected_Data *g_object_obj = eo_data_scope_get(g->object, EVAS_OBJ_CLASS); 2679 Evas_Object_Protected_Data *g_object_obj = eo_data_get(g->object, EVAS_OBJ_CLASS);
2680 evas_key_grab_free(g->object, g_object_obj, g->keyname, 2680 evas_key_grab_free(g->object, g_object_obj, g->keyname,
2681 g->modifiers, g->not_modifiers); 2681 g->modifiers, g->not_modifiers);
2682 } 2682 }
@@ -2686,7 +2686,7 @@ _canvas_event_feed_key_down(Eo *eo_e, void *_pd, va_list *list)
2686 } 2686 }
2687 if ((e->focused) && (!exclusive)) 2687 if ((e->focused) && (!exclusive))
2688 { 2688 {
2689 Evas_Object_Protected_Data *focused_obj = eo_data_scope_get(e->focused, EVAS_OBJ_CLASS); 2689 Evas_Object_Protected_Data *focused_obj = eo_data_get(e->focused, EVAS_OBJ_CLASS);
2690 if (!e->is_frozen && !evas_event_freezes_through(e->focused, focused_obj)) 2690 if (!e->is_frozen && !evas_event_freezes_through(e->focused, focused_obj))
2691 evas_object_event_callback_call(e->focused, focused_obj, 2691 evas_object_event_callback_call(e->focused, focused_obj,
2692 EVAS_CALLBACK_KEY_DOWN, 2692 EVAS_CALLBACK_KEY_DOWN,
@@ -2763,7 +2763,7 @@ _canvas_event_feed_key_up(Eo *eo_e, void *_pd, va_list *list)
2763 (g->not_modifiers == ~e->modifiers.mask))) && 2763 (g->not_modifiers == ~e->modifiers.mask))) &&
2764 (!strcmp(keyname, g->keyname))) 2764 (!strcmp(keyname, g->keyname)))
2765 { 2765 {
2766 Evas_Object_Protected_Data *object_obj = eo_data_scope_get(g->object, EVAS_OBJ_CLASS); 2766 Evas_Object_Protected_Data *object_obj = eo_data_get(g->object, EVAS_OBJ_CLASS);
2767 if (!e->is_frozen && 2767 if (!e->is_frozen &&
2768 !evas_event_freezes_through(g->object, object_obj)) 2768 !evas_event_freezes_through(g->object, object_obj))
2769 { 2769 {
@@ -2789,7 +2789,7 @@ _canvas_event_feed_key_up(Eo *eo_e, void *_pd, va_list *list)
2789 if (gr->delete_me) 2789 if (gr->delete_me)
2790 { 2790 {
2791 Evas_Object_Protected_Data *gr_object_obj = 2791 Evas_Object_Protected_Data *gr_object_obj =
2792 eo_data_scope_get(gr->object, EVAS_OBJ_CLASS); 2792 eo_data_get(gr->object, EVAS_OBJ_CLASS);
2793 evas_key_grab_free(gr->object, gr_object_obj, gr->keyname, 2793 evas_key_grab_free(gr->object, gr_object_obj, gr->keyname,
2794 gr->modifiers, gr->not_modifiers); 2794 gr->modifiers, gr->not_modifiers);
2795 } 2795 }
@@ -2799,7 +2799,7 @@ _canvas_event_feed_key_up(Eo *eo_e, void *_pd, va_list *list)
2799 } 2799 }
2800 if ((e->focused) && (!exclusive)) 2800 if ((e->focused) && (!exclusive))
2801 { 2801 {
2802 Evas_Object_Protected_Data *focused_obj = eo_data_scope_get(e->focused, EVAS_OBJ_CLASS); 2802 Evas_Object_Protected_Data *focused_obj = eo_data_get(e->focused, EVAS_OBJ_CLASS);
2803 if (!e->is_frozen && !evas_event_freezes_through(e->focused, focused_obj)) 2803 if (!e->is_frozen && !evas_event_freezes_through(e->focused, focused_obj))
2804 evas_object_event_callback_call(e->focused, focused_obj, 2804 evas_object_event_callback_call(e->focused, focused_obj,
2805 EVAS_CALLBACK_KEY_UP, 2805 EVAS_CALLBACK_KEY_UP,
@@ -2846,7 +2846,7 @@ _canvas_event_feed_hold(Eo *eo_e, void *_pd, va_list *list)
2846 copy = evas_event_list_copy(e->pointer.object.in); 2846 copy = evas_event_list_copy(e->pointer.object.in);
2847 EINA_LIST_FOREACH(copy, l, eo_obj) 2847 EINA_LIST_FOREACH(copy, l, eo_obj)
2848 { 2848 {
2849 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 2849 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
2850 if ( !evas_event_freezes_through(eo_obj, obj)) 2850 if ( !evas_event_freezes_through(eo_obj, obj))
2851 { 2851 {
2852 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_HOLD, 2852 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_HOLD,
diff --git a/src/lib/evas/canvas/evas_font_dir.c b/src/lib/evas/canvas/evas_font_dir.c
index cf68563..bb6d36f 100644
--- a/src/lib/evas/canvas/evas_font_dir.c
+++ b/src/lib/evas/canvas/evas_font_dir.c
@@ -115,7 +115,7 @@ void
115evas_fonts_zero_free(Evas *eo_evas) 115evas_fonts_zero_free(Evas *eo_evas)
116{ 116{
117 Fndat *fd; 117 Fndat *fd;
118 Evas_Public_Data *evas = eo_data_scope_get(eo_evas, EVAS_CLASS); 118 Evas_Public_Data *evas = eo_data_get(eo_evas, EVAS_CLASS);
119 119
120 EINA_LIST_FREE(fonts_zero, fd) 120 EINA_LIST_FREE(fonts_zero, fd)
121 { 121 {
@@ -134,7 +134,7 @@ void
134evas_fonts_zero_pressure(Evas *eo_evas) 134evas_fonts_zero_pressure(Evas *eo_evas)
135{ 135{
136 Fndat *fd; 136 Fndat *fd;
137 Evas_Public_Data *evas = eo_data_scope_get(eo_evas, EVAS_CLASS); 137 Evas_Public_Data *evas = eo_data_get(eo_evas, EVAS_CLASS);
138 138
139 while (fonts_zero 139 while (fonts_zero
140 && eina_list_count(fonts_zero) > 4) /* 4 is arbitrary */ 140 && eina_list_count(fonts_zero) > 4) /* 4 is arbitrary */
@@ -162,7 +162,7 @@ evas_font_free(Evas *eo_evas, void *font)
162{ 162{
163 Eina_List *l; 163 Eina_List *l;
164 Fndat *fd; 164 Fndat *fd;
165 Evas_Public_Data *evas = eo_data_scope_get(eo_evas, EVAS_CLASS); 165 Evas_Public_Data *evas = eo_data_get(eo_evas, EVAS_CLASS);
166 166
167 EINA_LIST_FOREACH(fonts_cache, l, fd) 167 EINA_LIST_FOREACH(fonts_cache, l, fd)
168 { 168 {
@@ -203,7 +203,7 @@ static Evas_Font_Set *
203evas_load_fontconfig(Evas *eo_evas, FcFontSet *set, int size, 203evas_load_fontconfig(Evas *eo_evas, FcFontSet *set, int size,
204 Font_Rend_Flags wanted_rend) 204 Font_Rend_Flags wanted_rend)
205{ 205{
206 Evas_Public_Data *evas = eo_data_scope_get(eo_evas, EVAS_CLASS); 206 Evas_Public_Data *evas = eo_data_get(eo_evas, EVAS_CLASS);
207 Evas_Font_Set *font = NULL; 207 Evas_Font_Set *font = NULL;
208 int i; 208 int i;
209 209
@@ -461,7 +461,7 @@ evas_font_name_parse(Evas_Font_Description *fdesc, const char *name)
461void * 461void *
462evas_font_load(Evas *eo_evas, Evas_Font_Description *fdesc, const char *source, Evas_Font_Size size) 462evas_font_load(Evas *eo_evas, Evas_Font_Description *fdesc, const char *source, Evas_Font_Size size)
463{ 463{
464 Evas_Public_Data *evas = eo_data_scope_get(eo_evas, EVAS_CLASS); 464 Evas_Public_Data *evas = eo_data_get(eo_evas, EVAS_CLASS);
465#ifdef HAVE_FONTCONFIG 465#ifdef HAVE_FONTCONFIG
466 FcPattern *p_nm = NULL; 466 FcPattern *p_nm = NULL;
467 FcFontSet *set = NULL; 467 FcFontSet *set = NULL;
@@ -756,7 +756,7 @@ evas_font_load(Evas *eo_evas, Evas_Font_Description *fdesc, const char *source,
756void 756void
757evas_font_load_hinting_set(Evas *eo_evas, void *font, int hinting) 757evas_font_load_hinting_set(Evas *eo_evas, void *font, int hinting)
758{ 758{
759 Evas_Public_Data *evas = eo_data_scope_get(eo_evas, EVAS_CLASS); 759 Evas_Public_Data *evas = eo_data_get(eo_evas, EVAS_CLASS);
760 evas->engine.func->font_hinting_set(evas->engine.data.output, font, 760 evas->engine.func->font_hinting_set(evas->engine.data.output, font,
761 hinting); 761 hinting);
762} 762}
@@ -764,7 +764,7 @@ evas_font_load_hinting_set(Evas *eo_evas, void *font, int hinting)
764Eina_List * 764Eina_List *
765evas_font_dir_available_list(const Evas *eo_evas) 765evas_font_dir_available_list(const Evas *eo_evas)
766{ 766{
767 const Evas_Public_Data *evas = eo_data_scope_get(eo_evas, EVAS_CLASS); 767 const Evas_Public_Data *evas = eo_data_get(eo_evas, EVAS_CLASS);
768 Eina_List *l; 768 Eina_List *l;
769 Eina_List *ll; 769 Eina_List *ll;
770 Eina_List *available = NULL; 770 Eina_List *available = NULL;
@@ -1252,7 +1252,7 @@ _canvas_font_path_list(Eo *eo_e EINA_UNUSED, void *_pd, va_list *list)
1252void 1252void
1253evas_font_object_rehint(Evas_Object *eo_obj) 1253evas_font_object_rehint(Evas_Object *eo_obj)
1254{ 1254{
1255 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1255 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
1256 if (obj->is_smart) 1256 if (obj->is_smart)
1257 { 1257 {
1258 EINA_INLIST_FOREACH(evas_object_smart_members_get_direct(eo_obj), obj) 1258 EINA_INLIST_FOREACH(evas_object_smart_members_get_direct(eo_obj), obj)
diff --git a/src/lib/evas/canvas/evas_gl.c b/src/lib/evas/canvas/evas_gl.c
index 14a4dd6..faf5280 100644
--- a/src/lib/evas/canvas/evas_gl.c
+++ b/src/lib/evas/canvas/evas_gl.c
@@ -35,7 +35,7 @@ evas_gl_new(Evas *e)
35 if (!evas_gl) return NULL; 35 if (!evas_gl) return NULL;
36 36
37 evas_gl->magic = MAGIC_EVAS_GL; 37 evas_gl->magic = MAGIC_EVAS_GL;
38 evas_gl->evas = eo_data_ref(e, EVAS_CLASS); 38 evas_gl->evas = eo_data_get(e, EVAS_CLASS);
39 39
40 if (!evas_gl->evas->engine.func->gl_context_create) 40 if (!evas_gl->evas->engine.func->gl_context_create)
41 { 41 {
@@ -63,7 +63,6 @@ evas_gl_free(Evas_GL *evas_gl)
63 while (evas_gl->contexts) 63 while (evas_gl->contexts)
64 evas_gl_context_destroy(evas_gl, evas_gl->contexts->data); 64 evas_gl_context_destroy(evas_gl, evas_gl->contexts->data);
65 65
66 eo_data_unref(evas_gl->evas->evas, evas_gl->evas);
67 evas_gl->magic = 0; 66 evas_gl->magic = 0;
68 free(evas_gl); 67 free(evas_gl);
69} 68}
diff --git a/src/lib/evas/canvas/evas_key_grab.c b/src/lib/evas/canvas/evas_key_grab.c
index 202c9bf..9f65c04 100644
--- a/src/lib/evas/canvas/evas_key_grab.c
+++ b/src/lib/evas/canvas/evas_key_grab.c
@@ -125,7 +125,7 @@ evas_key_grab_free(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, const c
125 125
126 g = evas_key_grab_find(eo_obj, obj, keyname, modifiers, not_modifiers, 0); 126 g = evas_key_grab_find(eo_obj, obj, keyname, modifiers, not_modifiers, 0);
127 if (!g) return; 127 if (!g) return;
128 Evas_Object_Protected_Data *g_object = eo_data_scope_get(g->object, EVAS_OBJ_CLASS); 128 Evas_Object_Protected_Data *g_object = eo_data_get(g->object, EVAS_OBJ_CLASS);
129 g_object->grabs = eina_list_remove(g_object->grabs, g); 129 g_object->grabs = eina_list_remove(g_object->grabs, g);
130 obj->layer->evas->grabs = eina_list_remove(obj->layer->evas->grabs, g); 130 obj->layer->evas->grabs = eina_list_remove(obj->layer->evas->grabs, g);
131 if (g->keyname) free(g->keyname); 131 if (g->keyname) free(g->keyname);
@@ -200,7 +200,7 @@ _key_ungrab(Eo *eo_obj, void *_pd, va_list *list)
200 Evas_Object_Protected_Data *obj = _pd; 200 Evas_Object_Protected_Data *obj = _pd;
201 g = evas_key_grab_find(eo_obj, obj, keyname, modifiers, not_modifiers, 0); 201 g = evas_key_grab_find(eo_obj, obj, keyname, modifiers, not_modifiers, 0);
202 if (!g) return; 202 if (!g) return;
203 Evas_Object_Protected_Data *g_object = eo_data_scope_get(g->object, EVAS_OBJ_CLASS); 203 Evas_Object_Protected_Data *g_object = eo_data_get(g->object, EVAS_OBJ_CLASS);
204 if (g_object->layer->evas->walking_grabs) 204 if (g_object->layer->evas->walking_grabs)
205 { 205 {
206 if (!g->delete_me) 206 if (!g->delete_me)
diff --git a/src/lib/evas/canvas/evas_layer.c b/src/lib/evas/canvas/evas_layer.c
index b30ba66..38a0c9e 100644
--- a/src/lib/evas/canvas/evas_layer.c
+++ b/src/lib/evas/canvas/evas_layer.c
@@ -4,7 +4,7 @@
4static void _evas_layer_free(Evas_Layer *lay); 4static void _evas_layer_free(Evas_Layer *lay);
5 5
6void 6void
7evas_object_inject(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, Evas *e) 7evas_object_inject(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Evas *e)
8{ 8{
9 Evas_Layer *lay; 9 Evas_Layer *lay;
10 10
@@ -18,7 +18,6 @@ evas_object_inject(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, Evas *e
18 lay->layer = obj->cur->layer; 18 lay->layer = obj->cur->layer;
19 evas_layer_add(lay); 19 evas_layer_add(lay);
20 } 20 }
21 eo_data_ref(eo_obj, NULL);
22 lay->objects = (Evas_Object_Protected_Data *)eina_inlist_append(EINA_INLIST_GET(lay->objects), EINA_INLIST_GET(obj)); 21 lay->objects = (Evas_Object_Protected_Data *)eina_inlist_append(EINA_INLIST_GET(lay->objects), EINA_INLIST_GET(obj));
23 lay->usage++; 22 lay->usage++;
24 obj->layer = lay; 23 obj->layer = lay;
@@ -26,11 +25,10 @@ evas_object_inject(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, Evas *e
26} 25}
27 26
28void 27void
29evas_object_release(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, int clean_layer) 28evas_object_release(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, int clean_layer)
30{ 29{
31 if (!obj->in_layer) return; 30 if (!obj->in_layer) return;
32 obj->layer->objects = (Evas_Object_Protected_Data *)eina_inlist_remove(EINA_INLIST_GET(obj->layer->objects), EINA_INLIST_GET(obj)); 31 obj->layer->objects = (Evas_Object_Protected_Data *)eina_inlist_remove(EINA_INLIST_GET(obj->layer->objects), EINA_INLIST_GET(obj));
33 eo_data_unref(eo_obj, obj);
34 obj->layer->usage--; 32 obj->layer->usage--;
35 if (clean_layer) 33 if (clean_layer)
36 { 34 {
@@ -47,7 +45,7 @@ evas_object_release(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, int cl
47Evas_Layer * 45Evas_Layer *
48evas_layer_new(Evas *eo_e) 46evas_layer_new(Evas *eo_e)
49{ 47{
50 Evas_Public_Data *e = eo_data_ref(eo_e, EVAS_CLASS); 48 Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS);
51 Evas_Layer *lay; 49 Evas_Layer *lay;
52 50
53 lay = calloc(1, sizeof(Evas_Layer)); 51 lay = calloc(1, sizeof(Evas_Layer));
@@ -89,7 +87,7 @@ evas_layer_free_objects(Evas_Layer *lay)
89void 87void
90evas_layer_clean(Evas *eo_e) 88evas_layer_clean(Evas *eo_e)
91{ 89{
92 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 90 Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS);
93 Evas_Layer *tmp; 91 Evas_Layer *tmp;
94 92
95 while (e->layers) 93 while (e->layers)
@@ -103,7 +101,7 @@ evas_layer_clean(Evas *eo_e)
103Evas_Layer * 101Evas_Layer *
104evas_layer_find(Evas *eo_e, short layer_num) 102evas_layer_find(Evas *eo_e, short layer_num)
105{ 103{
106 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 104 Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS);
107 Evas_Layer *layer; 105 Evas_Layer *layer;
108 106
109 EINA_INLIST_FOREACH(e->layers, layer) 107 EINA_INLIST_FOREACH(e->layers, layer)
@@ -138,16 +136,13 @@ evas_layer_del(Evas_Layer *lay)
138 136
139 e = lay->evas; 137 e = lay->evas;
140 e->layers = (Evas_Layer *)eina_inlist_remove(EINA_INLIST_GET(e->layers), EINA_INLIST_GET(lay)); 138 e->layers = (Evas_Layer *)eina_inlist_remove(EINA_INLIST_GET(e->layers), EINA_INLIST_GET(lay));
141
142 eo_data_unref(e->evas, e);
143 lay->evas = NULL;
144} 139}
145 140
146static void 141static void
147_evas_object_layer_set_child(Evas_Object *eo_obj, Evas_Object *par, short l) 142_evas_object_layer_set_child(Evas_Object *eo_obj, Evas_Object *par, short l)
148{ 143{
149 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 144 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
150 Evas_Object_Protected_Data *par_obj = eo_data_scope_get(par, EVAS_OBJ_CLASS); 145 Evas_Object_Protected_Data *par_obj = eo_data_get(par, EVAS_OBJ_CLASS);
151 146
152 if (obj->delete_me) return; 147 if (obj->delete_me) return;
153 if (obj->cur->layer == l) return; 148 if (obj->cur->layer == l) return;
@@ -262,7 +257,7 @@ _layer_get(Eo *eo_obj EINA_UNUSED, void *_obj, va_list *list)
262 const Evas_Object_Protected_Data *obj = _obj; 257 const Evas_Object_Protected_Data *obj = _obj;
263 if (obj->smart.parent) 258 if (obj->smart.parent)
264 { 259 {
265 Evas_Object_Protected_Data *smart_parent_obj = eo_data_scope_get(obj->smart.parent, EVAS_OBJ_CLASS); 260 Evas_Object_Protected_Data *smart_parent_obj = eo_data_get(obj->smart.parent, EVAS_OBJ_CLASS);
266 *layer = smart_parent_obj->cur->layer; 261 *layer = smart_parent_obj->cur->layer;
267 } 262 }
268 *layer = obj->cur->layer; 263 *layer = obj->cur->layer;
diff --git a/src/lib/evas/canvas/evas_map.c b/src/lib/evas/canvas/evas_map.c
index d2b7e09..e85e6cb 100644
--- a/src/lib/evas/canvas/evas_map.c
+++ b/src/lib/evas/canvas/evas_map.c
@@ -6,7 +6,7 @@ static void
6_evas_map_calc_geom_change(Evas_Object *eo_obj) 6_evas_map_calc_geom_change(Evas_Object *eo_obj)
7{ 7{
8 int is, was = 0; 8 int is, was = 0;
9 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 9 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
10 if (!obj) return; 10 if (!obj) return;
11 evas_object_change(eo_obj, obj); 11 evas_object_change(eo_obj, obj);
12 evas_object_clip_dirty(eo_obj, obj); 12 evas_object_clip_dirty(eo_obj, obj);
@@ -37,7 +37,7 @@ _evas_map_calc_map_geometry(Evas_Object *eo_obj)
37 const Evas_Map_Point *p, *p_end; 37 const Evas_Map_Point *p, *p_end;
38 Eina_Bool ch = EINA_FALSE; 38 Eina_Bool ch = EINA_FALSE;
39 39
40 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 40 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
41 if (!obj) return; 41 if (!obj) return;
42 if (!obj->map->cur.map) return; 42 if (!obj->map->cur.map) return;
43 // WARN: Do not merge below code to SLP until it is fixed. 43 // WARN: Do not merge below code to SLP until it is fixed.
@@ -173,7 +173,7 @@ _evas_map_free(Evas_Object *eo_obj, Evas_Map *m)
173{ 173{
174 if (eo_obj) 174 if (eo_obj)
175 { 175 {
176 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 176 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
177 if ((obj) && (obj->map->spans)) 177 if ((obj) && (obj->map->spans))
178 { 178 {
179 obj->layer->evas->engine.func->image_map_clean(obj->layer->evas->engine.data.output, obj->map->spans); 179 obj->layer->evas->engine.func->image_map_clean(obj->layer->evas->engine.data.output, obj->map->spans);
@@ -416,7 +416,7 @@ _evas_object_map_parent_check(Evas_Object *eo_parent)
416 const Evas_Object_Protected_Data *o; 416 const Evas_Object_Protected_Data *o;
417 417
418 if (!eo_parent) return EINA_FALSE; 418 if (!eo_parent) return EINA_FALSE;
419 Evas_Object_Protected_Data *parent = eo_data_scope_get(eo_parent, EVAS_OBJ_CLASS); 419 Evas_Object_Protected_Data *parent = eo_data_get(eo_parent, EVAS_OBJ_CLASS);
420 if (!parent) return EINA_FALSE; 420 if (!parent) return EINA_FALSE;
421 list = evas_object_smart_members_get_direct(parent->smart.parent); 421 list = evas_object_smart_members_get_direct(parent->smart.parent);
422 EINA_INLIST_FOREACH(list, o) 422 EINA_INLIST_FOREACH(list, o)
@@ -495,7 +495,7 @@ _map_enable_set(Eo *eo_obj, void *_pd, va_list *list)
495 Evas_Object_Protected_Data *parents = NULL; 495 Evas_Object_Protected_Data *parents = NULL;
496 for (eo_parents = obj->smart.parent; eo_parents; eo_parents = parents->smart.parent) 496 for (eo_parents = obj->smart.parent; eo_parents; eo_parents = parents->smart.parent)
497 { 497 {
498 parents = eo_data_scope_get(eo_parents, EVAS_OBJ_CLASS); 498 parents = eo_data_get(eo_parents, EVAS_OBJ_CLASS);
499 if (parents) 499 if (parents)
500 parents->child_has_map = EINA_TRUE; 500 parents->child_has_map = EINA_TRUE;
501 } 501 }
@@ -844,7 +844,7 @@ evas_map_util_points_populate_from_object_full(Evas_Map *m, const Evas_Object *e
844 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 844 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
845 return; 845 return;
846 MAGIC_CHECK_END(); 846 MAGIC_CHECK_END();
847 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 847 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
848 848
849 if (!obj) return; 849 if (!obj) return;
850 if (m->count != 4) 850 if (m->count != 4)
@@ -866,7 +866,7 @@ evas_map_util_points_populate_from_object(Evas_Map *m, const Evas_Object *eo_obj
866 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 866 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
867 return; 867 return;
868 MAGIC_CHECK_END(); 868 MAGIC_CHECK_END();
869 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 869 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
870 870
871 if (!obj) return; 871 if (!obj) return;
872 if (m->count != 4) 872 if (m->count != 4)
@@ -1223,7 +1223,7 @@ evas_object_map_update(Evas_Object *eo_obj,
1223 int imagew, int imageh, 1223 int imagew, int imageh,
1224 int uvw, int uvh) 1224 int uvw, int uvh)
1225{ 1225{
1226 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1226 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
1227 const Evas_Map_Point *p, *p_end; 1227 const Evas_Map_Point *p, *p_end;
1228 RGBA_Map_Point *pts, *pt; 1228 RGBA_Map_Point *pts, *pt;
1229 1229
diff --git a/src/lib/evas/canvas/evas_object_box.c b/src/lib/evas/canvas/evas_object_box.c
index a07bd7b..47f04e9 100644
--- a/src/lib/evas/canvas/evas_object_box.c
+++ b/src/lib/evas/canvas/evas_object_box.c
@@ -46,7 +46,7 @@ static const Evas_Smart_Cb_Description _signals[] =
46static void _sizing_eval(Evas_Object *obj); 46static void _sizing_eval(Evas_Object *obj);
47 47
48#define EVAS_OBJECT_BOX_DATA_GET(o, ptr) \ 48#define EVAS_OBJECT_BOX_DATA_GET(o, ptr) \
49 Evas_Object_Box_Data *ptr = eo_data_scope_get(o, MY_CLASS) 49 Evas_Object_Box_Data *ptr = eo_data_get(o, MY_CLASS)
50 50
51#define EVAS_OBJECT_BOX_DATA_GET_OR_RETURN(o, ptr) \ 51#define EVAS_OBJECT_BOX_DATA_GET_OR_RETURN(o, ptr) \
52 EVAS_OBJECT_BOX_DATA_GET(o, ptr); \ 52 EVAS_OBJECT_BOX_DATA_GET(o, ptr); \
diff --git a/src/lib/evas/canvas/evas_object_grid.c b/src/lib/evas/canvas/evas_object_grid.c
index f2a5779..7fe2042 100644
--- a/src/lib/evas/canvas/evas_object_grid.c
+++ b/src/lib/evas/canvas/evas_object_grid.c
@@ -47,7 +47,7 @@ struct _Evas_Object_Grid_Accessor
47}; 47};
48 48
49#define EVAS_OBJECT_GRID_DATA_GET(o, ptr) \ 49#define EVAS_OBJECT_GRID_DATA_GET(o, ptr) \
50 Evas_Object_Grid_Data *ptr = eo_data_scope_get(o, MY_CLASS) 50 Evas_Object_Grid_Data *ptr = eo_data_get(o, MY_CLASS)
51 51
52#define EVAS_OBJECT_GRID_DATA_GET_OR_RETURN(o, ptr) \ 52#define EVAS_OBJECT_GRID_DATA_GET_OR_RETURN(o, ptr) \
53 EVAS_OBJECT_GRID_DATA_GET(o, ptr); \ 53 EVAS_OBJECT_GRID_DATA_GET(o, ptr); \
@@ -170,7 +170,7 @@ _evas_object_grid_smart_add(Evas_Object *o)
170 priv = evas_object_smart_data_get(o); 170 priv = evas_object_smart_data_get(o);
171 if (!priv) 171 if (!priv)
172 { 172 {
173 priv = eo_data_ref(o, MY_CLASS); 173 priv = eo_data_get(o, MY_CLASS);
174 evas_object_smart_data_set(o, priv); 174 evas_object_smart_data_set(o, priv);
175 } 175 }
176 176
diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c
index 61ee9e0..c7e86e1 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -296,7 +296,7 @@ _init_cow(Eo *eo_obj)
296static void 296static void
297_constructor(Eo *eo_obj, void *class_data, va_list *list EINA_UNUSED) 297_constructor(Eo *eo_obj, void *class_data, va_list *list EINA_UNUSED)
298{ 298{
299 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 299 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
300 Evas_Object_Image *o = class_data; 300 Evas_Object_Image *o = class_data;
301 Evas *eo_e = evas_object_evas_get(eo_parent_get(eo_obj)); 301 Evas *eo_e = evas_object_evas_get(eo_parent_get(eo_obj));
302 Evas_Colorspace cspace; 302 Evas_Colorspace cspace;
@@ -331,7 +331,7 @@ evas_object_image_add(Evas *eo_e)
331 MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS); 331 MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS);
332 return NULL; 332 return NULL;
333 MAGIC_CHECK_END(); 333 MAGIC_CHECK_END();
334 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 334 Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS);
335 EINA_SAFETY_ON_NULL_RETURN_VAL(e, NULL); 335 EINA_SAFETY_ON_NULL_RETURN_VAL(e, NULL);
336 EINA_SAFETY_ON_NULL_RETURN_VAL(e->engine.func, NULL); 336 EINA_SAFETY_ON_NULL_RETURN_VAL(e->engine.func, NULL);
337 Evas_Object *eo_obj = eo_add(EVAS_OBJ_IMAGE_CLASS, eo_e); 337 Evas_Object *eo_obj = eo_add(EVAS_OBJ_IMAGE_CLASS, eo_e);
@@ -354,7 +354,7 @@ _cleanup_tmpf(Evas_Object *eo_obj)
354#ifdef HAVE_SYS_MMAN_H 354#ifdef HAVE_SYS_MMAN_H
355 Evas_Object_Image *o; 355 Evas_Object_Image *o;
356 356
357 o = eo_data_scope_get(eo_obj, MY_CLASS); 357 o = eo_data_get(eo_obj, MY_CLASS);
358 if (!o->pixels->tmpf) return; 358 if (!o->pixels->tmpf) return;
359#ifdef __linux__ 359#ifdef __linux__
360#else 360#else
@@ -382,7 +382,7 @@ _create_tmpf(Evas_Object *eo_obj, void *data, int size, char *format EINA_UNUSED
382 void *dst; 382 void *dst;
383 int fd = -1; 383 int fd = -1;
384 384
385 o = eo_data_scope_get(eo_obj, MY_CLASS); 385 o = eo_data_get(eo_obj, MY_CLASS);
386#ifdef __linux__ 386#ifdef __linux__
387 snprintf(buf, sizeof(buf), "/dev/shm/.evas-tmpf-%i-%p-%i-XXXXXX", 387 snprintf(buf, sizeof(buf), "/dev/shm/.evas-tmpf-%i-%p-%i-XXXXXX",
388 (int)getpid(), data, (int)size); 388 (int)getpid(), data, (int)size);
@@ -495,7 +495,7 @@ evas_object_image_file_set(Evas_Object *eo_obj, const char *file, const char *ke
495static void 495static void
496_image_file_set(Eo *eo_obj, void *_pd, va_list *list) 496_image_file_set(Eo *eo_obj, void *_pd, va_list *list)
497{ 497{
498 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 498 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
499 Evas_Object_Image *o = _pd; 499 Evas_Object_Image *o = _pd;
500 Evas_Image_Load_Opts lo; 500 Evas_Image_Load_Opts lo;
501 Eina_Bool resize_call = EINA_FALSE; 501 Eina_Bool resize_call = EINA_FALSE;
@@ -655,7 +655,7 @@ static void
655_image_source_set(Eo *eo_obj, void *_pd, va_list *list) 655_image_source_set(Eo *eo_obj, void *_pd, va_list *list)
656{ 656{
657 Evas_Object_Image *o = _pd; 657 Evas_Object_Image *o = _pd;
658 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 658 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
659 659
660 Evas_Object *eo_src = va_arg(*list, Evas_Object *); 660 Evas_Object *eo_src = va_arg(*list, Evas_Object *);
661 Eina_Bool *result = va_arg(*list, Eina_Bool *); 661 Eina_Bool *result = va_arg(*list, Eina_Bool *);
@@ -668,7 +668,7 @@ _image_source_set(Eo *eo_obj, void *_pd, va_list *list)
668 } 668 }
669 if (eo_src) 669 if (eo_src)
670 { 670 {
671 Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJ_CLASS); 671 Evas_Object_Protected_Data *src = eo_data_get(eo_src, EVAS_OBJ_CLASS);
672 if (src->delete_me) 672 if (src->delete_me)
673 { 673 {
674 WRN("Setting object %p to deleted image source %p", eo_src, eo_obj); 674 WRN("Setting object %p to deleted image source %p", eo_src, eo_obj);
@@ -759,7 +759,7 @@ _image_source_clip_set(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
759 759
760 if (!o->cur->source) return; 760 if (!o->cur->source) return;
761 761
762 src_obj = eo_data_scope_get(o->cur->source, EVAS_OBJ_CLASS); 762 src_obj = eo_data_get(o->cur->source, EVAS_OBJ_CLASS);
763 evas_object_change(o->cur->source, src_obj); 763 evas_object_change(o->cur->source, src_obj);
764} 764}
765 765
@@ -799,7 +799,7 @@ _image_source_events_set(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
799{ 799{
800 Evas_Object_Image *o = _pd; 800 Evas_Object_Image *o = _pd;
801 Eina_Bool source_events = va_arg(*list, int); 801 Eina_Bool source_events = va_arg(*list, int);
802 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 802 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
803 803
804 source_events = !!source_events; 804 source_events = !!source_events;
805 if (obj->proxy->src_events == source_events) return; 805 if (obj->proxy->src_events == source_events) return;
@@ -829,7 +829,7 @@ evas_object_image_source_events_get(const Evas_Object *eo_obj)
829static void 829static void
830_image_source_events_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list) 830_image_source_events_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list)
831{ 831{
832 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 832 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
833 Eina_Bool *source_events = va_arg(*list, Eina_Bool *); 833 Eina_Bool *source_events = va_arg(*list, Eina_Bool *);
834 if (!source_events) return; 834 if (!source_events) return;
835 *source_events = obj->proxy->src_events; 835 *source_events = obj->proxy->src_events;
@@ -878,7 +878,7 @@ _image_source_visible_set(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
878 if (!o->cur->source) return; 878 if (!o->cur->source) return;
879 879
880 visible = !!visible; 880 visible = !!visible;
881 src_obj = eo_data_scope_get(o->cur->source, EVAS_OBJ_CLASS); 881 src_obj = eo_data_get(o->cur->source, EVAS_OBJ_CLASS);
882 if (src_obj->proxy->src_invisible == !visible) return; 882 if (src_obj->proxy->src_invisible == !visible) return;
883 883
884 EINA_COW_WRITE_BEGIN(evas_object_proxy_cow, src_obj->proxy, Evas_Object_Proxy_Data, proxy_write) 884 EINA_COW_WRITE_BEGIN(evas_object_proxy_cow, src_obj->proxy, Evas_Object_Proxy_Data, proxy_write)
@@ -915,7 +915,7 @@ _image_source_visible_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
915 915
916 if (!visible) return; 916 if (!visible) return;
917 if (!o->cur->source) *visible = EINA_FALSE; 917 if (!o->cur->source) *visible = EINA_FALSE;
918 src_obj = eo_data_scope_get(o->cur->source, EVAS_OBJ_CLASS); 918 src_obj = eo_data_get(o->cur->source, EVAS_OBJ_CLASS);
919 if (src_obj) *visible = !src_obj->proxy->src_invisible; 919 if (src_obj) *visible = !src_obj->proxy->src_invisible;
920 else *visible = EINA_FALSE; 920 else *visible = EINA_FALSE;
921} 921}
@@ -932,7 +932,7 @@ evas_object_image_border_set(Evas_Object *eo_obj, int l, int r, int t, int b)
932static void 932static void
933_image_border_set(Eo *eo_obj, void *_pd, va_list *list) 933_image_border_set(Eo *eo_obj, void *_pd, va_list *list)
934{ 934{
935 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 935 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
936 Evas_Object_Image *o = _pd; 936 Evas_Object_Image *o = _pd;
937 937
938 int l = va_arg(*list, int); 938 int l = va_arg(*list, int);
@@ -1008,7 +1008,7 @@ _image_border_center_fill_set(Eo *eo_obj, void *_pd, va_list *list)
1008 EINA_COW_IMAGE_STATE_WRITE_END(o, state_write); 1008 EINA_COW_IMAGE_STATE_WRITE_END(o, state_write);
1009 1009
1010 o->changed = EINA_TRUE; 1010 o->changed = EINA_TRUE;
1011 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1011 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
1012 evas_object_change(eo_obj, obj); 1012 evas_object_change(eo_obj, obj);
1013} 1013}
1014 1014
@@ -1108,7 +1108,7 @@ _image_border_scale_set(Eo *eo_obj, void *_pd, va_list *list)
1108 EINA_COW_IMAGE_STATE_WRITE_END(o, state_write); 1108 EINA_COW_IMAGE_STATE_WRITE_END(o, state_write);
1109 1109
1110 o->changed = EINA_TRUE; 1110 o->changed = EINA_TRUE;
1111 obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1111 obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
1112 evas_object_change(eo_obj, obj); 1112 evas_object_change(eo_obj, obj);
1113} 1113}
1114 1114
@@ -1172,7 +1172,7 @@ _image_fill_set(Eo *eo_obj, void *_pd, va_list *list)
1172 EINA_COW_IMAGE_STATE_WRITE_END(o, state_write); 1172 EINA_COW_IMAGE_STATE_WRITE_END(o, state_write);
1173 1173
1174 o->changed = EINA_TRUE; 1174 o->changed = EINA_TRUE;
1175 obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1175 obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
1176 evas_object_change(eo_obj, obj); 1176 evas_object_change(eo_obj, obj);
1177} 1177}
1178 1178
@@ -1229,7 +1229,7 @@ _image_fill_spread_set(Eo *eo_obj, void *_pd, va_list *list)
1229 EINA_COW_IMAGE_STATE_WRITE_END(o, state_write); 1229 EINA_COW_IMAGE_STATE_WRITE_END(o, state_write);
1230 1230
1231 o->changed = EINA_TRUE; 1231 o->changed = EINA_TRUE;
1232 obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1232 obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
1233 evas_object_change(eo_obj, obj); 1233 evas_object_change(eo_obj, obj);
1234} 1234}
1235 1235
@@ -1264,7 +1264,7 @@ evas_object_image_size_set(Evas_Object *eo_obj, int w, int h)
1264static void 1264static void
1265_image_size_set(Eo *eo_obj, void *_pd, va_list *list) 1265_image_size_set(Eo *eo_obj, void *_pd, va_list *list)
1266{ 1266{
1267 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1267 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
1268 int w = va_arg(*list, int); 1268 int w = va_arg(*list, int);
1269 int h = va_arg(*list, int); 1269 int h = va_arg(*list, int);
1270 1270
@@ -1406,7 +1406,7 @@ evas_object_image_data_convert(Evas_Object *eo_obj, Evas_Colorspace to_cspace)
1406static void 1406static void
1407_image_data_convert(Eo *eo_obj, void *_pd, va_list *list) 1407_image_data_convert(Eo *eo_obj, void *_pd, va_list *list)
1408{ 1408{
1409 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1409 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
1410 Evas_Object_Image *o = _pd; 1410 Evas_Object_Image *o = _pd;
1411 Evas_Colorspace to_cspace = va_arg(*list, Evas_Colorspace); 1411 Evas_Colorspace to_cspace = va_arg(*list, Evas_Colorspace);
1412 void **ret_data = va_arg(*list, void **); 1412 void **ret_data = va_arg(*list, void **);
@@ -1446,7 +1446,7 @@ evas_object_image_data_set(Evas_Object *eo_obj, void *data)
1446static void 1446static void
1447_image_data_set(Eo *eo_obj, void *_pd, va_list *list) 1447_image_data_set(Eo *eo_obj, void *_pd, va_list *list)
1448{ 1448{
1449 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1449 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
1450 Evas_Object_Image *o = _pd; 1450 Evas_Object_Image *o = _pd;
1451 void *p_data; 1451 void *p_data;
1452 Eina_Bool resize_call = EINA_FALSE; 1452 Eina_Bool resize_call = EINA_FALSE;
@@ -1563,7 +1563,7 @@ _image_data_get(Eo *eo_obj, void *_pd, va_list *list)
1563 return; 1563 return;
1564 } 1564 }
1565 1565
1566 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1566 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
1567 1567
1568 if (for_writing) evas_render_rendering_wait(obj->layer->evas); 1568 if (for_writing) evas_render_rendering_wait(obj->layer->evas);
1569 1569
@@ -1637,7 +1637,7 @@ _image_preload_internal(Eo *eo_obj, void *_pd, Eina_Bool cancel)
1637 } 1637 }
1638 // FIXME: if already busy preloading, then dont request again until 1638 // FIXME: if already busy preloading, then dont request again until
1639 // preload done 1639 // preload done
1640 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1640 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
1641 if (cancel) 1641 if (cancel)
1642 { 1642 {
1643 if (o->preloading) 1643 if (o->preloading)
@@ -1684,7 +1684,7 @@ evas_object_image_data_copy_set(Evas_Object *eo_obj, void *data)
1684static void 1684static void
1685_image_data_copy_set(Eo *eo_obj, void *_pd, va_list *list) 1685_image_data_copy_set(Eo *eo_obj, void *_pd, va_list *list)
1686{ 1686{
1687 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1687 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
1688 Evas_Object_Image *o = _pd; 1688 Evas_Object_Image *o = _pd;
1689 void *data = va_arg(*list, void *); 1689 void *data = va_arg(*list, void *);
1690 1690
@@ -1786,7 +1786,7 @@ _image_data_update_add(Eo *eo_obj, void *_pd, va_list *list)
1786 } 1786 }
1787 1787
1788 o->changed = EINA_TRUE; 1788 o->changed = EINA_TRUE;
1789 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1789 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
1790 evas_object_change(eo_obj, obj); 1790 evas_object_change(eo_obj, obj);
1791} 1791}
1792 1792
@@ -1802,7 +1802,7 @@ evas_object_image_alpha_set(Evas_Object *eo_obj, Eina_Bool has_alpha)
1802static void 1802static void
1803_image_alpha_set(Eo *eo_obj, void *_pd, va_list *list) 1803_image_alpha_set(Eo *eo_obj, void *_pd, va_list *list)
1804{ 1804{
1805 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1805 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
1806 Evas_Object_Image *o = _pd; 1806 Evas_Object_Image *o = _pd;
1807 Eina_Bool has_alpha = va_arg(*list, int); 1807 Eina_Bool has_alpha = va_arg(*list, int);
1808 1808
@@ -1899,7 +1899,7 @@ _image_smooth_scale_set(Eo *eo_obj, void *_pd, va_list *list)
1899 EINA_COW_IMAGE_STATE_WRITE_END(o, state_write); 1899 EINA_COW_IMAGE_STATE_WRITE_END(o, state_write);
1900 1900
1901 o->changed = EINA_TRUE; 1901 o->changed = EINA_TRUE;
1902 obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1902 obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
1903 evas_object_change(eo_obj, obj); 1903 evas_object_change(eo_obj, obj);
1904} 1904}
1905 1905
@@ -1934,7 +1934,7 @@ evas_object_image_reload(Evas_Object *eo_obj)
1934static void 1934static void
1935_image_reload(Eo *eo_obj, void *_pd, va_list *list EINA_UNUSED) 1935_image_reload(Eo *eo_obj, void *_pd, va_list *list EINA_UNUSED)
1936{ 1936{
1937 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1937 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
1938 Evas_Object_Image *o = _pd; 1938 Evas_Object_Image *o = _pd;
1939 1939
1940 if ((o->preloading) && (o->engine_data)) 1940 if ((o->preloading) && (o->engine_data))
@@ -1987,7 +1987,7 @@ static void _image_save(Eo *eo_obj, void *_pd, va_list *list)
1987 RGBA_Image *im; 1987 RGBA_Image *im;
1988 Evas_Object_Image *o = _pd; 1988 Evas_Object_Image *o = _pd;
1989 if (!o->engine_data) return; 1989 if (!o->engine_data) return;
1990 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1990 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
1991 o->engine_data = obj->layer->evas->engine.func->image_data_get(obj->layer->evas->engine.data.output, o->engine_data, 0, &data, &o->load_error); 1991 o->engine_data = obj->layer->evas->engine.func->image_data_get(obj->layer->evas->engine.data.output, o->engine_data, 0, &data, &o->load_error);
1992 if (flags) 1992 if (flags)
1993 { 1993 {
@@ -2051,7 +2051,7 @@ evas_object_image_pixels_import(Evas_Object *eo_obj, Evas_Pixel_Import_Source *p
2051static void 2051static void
2052_image_pixels_import(Eo *eo_obj, void *_pd, va_list *list) 2052_image_pixels_import(Eo *eo_obj, void *_pd, va_list *list)
2053{ 2053{
2054 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 2054 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
2055 Evas_Object_Image *o = _pd; 2055 Evas_Object_Image *o = _pd;
2056 2056
2057 Evas_Pixel_Import_Source *pixels = va_arg(*list, Evas_Pixel_Import_Source *); 2057 Evas_Pixel_Import_Source *pixels = va_arg(*list, Evas_Pixel_Import_Source *);
@@ -2160,7 +2160,7 @@ static void
2160_image_pixels_dirty_set(Eo *eo_obj, void *_pd, va_list *list) 2160_image_pixels_dirty_set(Eo *eo_obj, void *_pd, va_list *list)
2161{ 2161{
2162 Eina_Bool dirty = va_arg(*list, int); 2162 Eina_Bool dirty = va_arg(*list, int);
2163 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 2163 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
2164 Evas_Object_Image *o = _pd; 2164 Evas_Object_Image *o = _pd;
2165 2165
2166 if (dirty) o->dirty_pixels = EINA_TRUE; 2166 if (dirty) o->dirty_pixels = EINA_TRUE;
@@ -2213,7 +2213,7 @@ _image_load_dpi_set(Eo *eo_obj, void *_pd, va_list *list)
2213 2213
2214 if (o->cur->file) 2214 if (o->cur->file)
2215 { 2215 {
2216 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 2216 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
2217 evas_object_image_unload(eo_obj, 0); 2217 evas_object_image_unload(eo_obj, 0);
2218 evas_object_inform_call_image_unloaded(eo_obj); 2218 evas_object_inform_call_image_unloaded(eo_obj);
2219 evas_object_image_load(eo_obj); 2219 evas_object_image_load(eo_obj);
@@ -2269,7 +2269,7 @@ _image_load_size_set(Eo *eo_obj, void *_pd, va_list *list)
2269 2269
2270 if (o->cur->file) 2270 if (o->cur->file)
2271 { 2271 {
2272 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 2272 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
2273 evas_object_image_unload(eo_obj, 0); 2273 evas_object_image_unload(eo_obj, 0);
2274 evas_object_inform_call_image_unloaded(eo_obj); 2274 evas_object_inform_call_image_unloaded(eo_obj);
2275 evas_object_image_load(eo_obj); 2275 evas_object_image_load(eo_obj);
@@ -2322,7 +2322,7 @@ _image_load_scale_down_set(Eo *eo_obj, void *_pd, va_list *list)
2322 2322
2323 if (o->cur->file) 2323 if (o->cur->file)
2324 { 2324 {
2325 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 2325 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
2326 evas_object_image_unload(eo_obj, 0); 2326 evas_object_image_unload(eo_obj, 0);
2327 evas_object_inform_call_image_unloaded(eo_obj); 2327 evas_object_inform_call_image_unloaded(eo_obj);
2328 evas_object_image_load(eo_obj); 2328 evas_object_image_load(eo_obj);
@@ -2383,7 +2383,7 @@ _image_load_region_set(Eo *eo_obj, void *_pd, va_list *list)
2383 2383
2384 if (o->cur->file) 2384 if (o->cur->file)
2385 { 2385 {
2386 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 2386 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
2387 evas_object_image_unload(eo_obj, 0); 2387 evas_object_image_unload(eo_obj, 0);
2388 evas_object_inform_call_image_unloaded(eo_obj); 2388 evas_object_inform_call_image_unloaded(eo_obj);
2389 evas_object_image_load(eo_obj); 2389 evas_object_image_load(eo_obj);
@@ -2470,7 +2470,7 @@ static void
2470_image_colorspace_set(Eo *eo_obj, void *_pd, va_list *list) 2470_image_colorspace_set(Eo *eo_obj, void *_pd, va_list *list)
2471{ 2471{
2472 Evas_Colorspace cspace = va_arg(*list, Evas_Colorspace); 2472 Evas_Colorspace cspace = va_arg(*list, Evas_Colorspace);
2473 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 2473 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
2474 Evas_Object_Image *o = _pd; 2474 Evas_Object_Image *o = _pd;
2475 2475
2476 _evas_object_image_cleanup(eo_obj, obj, o); 2476 _evas_object_image_cleanup(eo_obj, obj, o);
@@ -2515,7 +2515,7 @@ static void
2515_image_video_surface_set(Eo *eo_obj, void *_pd, va_list *list) 2515_image_video_surface_set(Eo *eo_obj, void *_pd, va_list *list)
2516{ 2516{
2517 Evas_Video_Surface *surf = va_arg(*list, Evas_Video_Surface *); 2517 Evas_Video_Surface *surf = va_arg(*list, Evas_Video_Surface *);
2518 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 2518 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
2519 Evas_Object_Image *o = _pd; 2519 Evas_Object_Image *o = _pd;
2520 2520
2521 _evas_object_image_cleanup(eo_obj, obj, o); 2521 _evas_object_image_cleanup(eo_obj, obj, o);
@@ -2604,7 +2604,7 @@ _image_native_surface_set(Eo *eo_obj, void *_pd, va_list *list)
2604{ 2604{
2605 Evas_Native_Surface *surf = va_arg(*list, Evas_Native_Surface *); 2605 Evas_Native_Surface *surf = va_arg(*list, Evas_Native_Surface *);
2606 2606
2607 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 2607 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
2608 Evas_Object_Image *o = _pd; 2608 Evas_Object_Image *o = _pd;
2609 2609
2610 evas_render_rendering_wait(obj->layer->evas); 2610 evas_render_rendering_wait(obj->layer->evas);
@@ -2633,7 +2633,7 @@ _image_native_surface_get(Eo *eo_obj, void *_pd, va_list *list)
2633{ 2633{
2634 Evas_Native_Surface **surf = va_arg(*list, Evas_Native_Surface **); 2634 Evas_Native_Surface **surf = va_arg(*list, Evas_Native_Surface **);
2635 2635
2636 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 2636 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
2637 const Evas_Object_Image *o = _pd; 2637 const Evas_Object_Image *o = _pd;
2638 2638
2639 *surf = 2639 *surf =
@@ -2654,7 +2654,7 @@ static void
2654_image_scale_hint_set(Eo *eo_obj, void *_pd, va_list *list) 2654_image_scale_hint_set(Eo *eo_obj, void *_pd, va_list *list)
2655{ 2655{
2656 Evas_Object_Image *o = _pd; 2656 Evas_Object_Image *o = _pd;
2657 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 2657 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
2658 Evas_Image_Scale_Hint hint = va_arg(*list, Evas_Image_Scale_Hint); 2658 Evas_Image_Scale_Hint hint = va_arg(*list, Evas_Image_Scale_Hint);
2659 if (o->scale_hint == hint) return; 2659 if (o->scale_hint == hint) return;
2660 o->scale_hint = hint; 2660 o->scale_hint = hint;
@@ -2714,7 +2714,7 @@ static void
2714_image_content_hint_set(Eo *eo_obj, void *_pd, va_list *list) 2714_image_content_hint_set(Eo *eo_obj, void *_pd, va_list *list)
2715{ 2715{
2716 Evas_Object_Image *o = _pd; 2716 Evas_Object_Image *o = _pd;
2717 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 2717 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
2718 Evas_Image_Content_Hint hint = va_arg(*list, Evas_Image_Content_Hint); 2718 Evas_Image_Content_Hint hint = va_arg(*list, Evas_Image_Content_Hint);
2719 if (o->content_hint == hint) return; 2719 if (o->content_hint == hint) return;
2720 o->content_hint = hint; 2720 o->content_hint = hint;
@@ -2790,7 +2790,7 @@ evas_object_image_region_support_get(const Evas_Object *eo_obj)
2790static void 2790static void
2791_image_region_support_get(Eo *eo_obj, void *_pd, va_list *list) 2791_image_region_support_get(Eo *eo_obj, void *_pd, va_list *list)
2792{ 2792{
2793 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 2793 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
2794 const Evas_Object_Image *o = _pd; 2794 const Evas_Object_Image *o = _pd;
2795 2795
2796 Eina_Bool *region = va_arg(*list, Eina_Bool *); 2796 Eina_Bool *region = va_arg(*list, Eina_Bool *);
@@ -2815,7 +2815,7 @@ static void
2815_image_animated_get(Eo *eo_obj, void *_pd, va_list *list) 2815_image_animated_get(Eo *eo_obj, void *_pd, va_list *list)
2816{ 2816{
2817 Eina_Bool *animated = va_arg(*list, Eina_Bool *); 2817 Eina_Bool *animated = va_arg(*list, Eina_Bool *);
2818 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 2818 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
2819 const Evas_Object_Image *o = _pd; 2819 const Evas_Object_Image *o = _pd;
2820 2820
2821 *animated = 2821 *animated =
@@ -2843,7 +2843,7 @@ _image_animated_frame_count_get(Eo *eo_obj, void *_pd, va_list *list)
2843 *frame_count = -1; 2843 *frame_count = -1;
2844 2844
2845 if (!evas_object_image_animated_get(eo_obj)) return; 2845 if (!evas_object_image_animated_get(eo_obj)) return;
2846 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 2846 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
2847 2847
2848 if (obj->layer->evas->engine.func->image_animated_frame_count_get) 2848 if (obj->layer->evas->engine.func->image_animated_frame_count_get)
2849 *frame_count = obj->layer->evas->engine.func->image_animated_frame_count_get(obj->layer->evas->engine.data.output, o->engine_data); 2849 *frame_count = obj->layer->evas->engine.func->image_animated_frame_count_get(obj->layer->evas->engine.data.output, o->engine_data);
@@ -2864,7 +2864,7 @@ static void
2864_image_animated_loop_type_get(Eo *eo_obj, void *_pd, va_list *list) 2864_image_animated_loop_type_get(Eo *eo_obj, void *_pd, va_list *list)
2865{ 2865{
2866 const Evas_Object_Image *o = _pd; 2866 const Evas_Object_Image *o = _pd;
2867 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 2867 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
2868 2868
2869 Evas_Image_Animated_Loop_Hint *hint = va_arg(*list, Evas_Image_Animated_Loop_Hint *); 2869 Evas_Image_Animated_Loop_Hint *hint = va_arg(*list, Evas_Image_Animated_Loop_Hint *);
2870 *hint = EVAS_IMAGE_ANIMATED_HINT_NONE; 2870 *hint = EVAS_IMAGE_ANIMATED_HINT_NONE;
@@ -2889,7 +2889,7 @@ static void
2889_image_animated_loop_count_get(Eo *eo_obj, void *_pd, va_list *list) 2889_image_animated_loop_count_get(Eo *eo_obj, void *_pd, va_list *list)
2890{ 2890{
2891 const Evas_Object_Image *o = _pd; 2891 const Evas_Object_Image *o = _pd;
2892 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 2892 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
2893 2893
2894 int *loop_count = va_arg(*list, int *); 2894 int *loop_count = va_arg(*list, int *);
2895 *loop_count = -1; 2895 *loop_count = -1;
@@ -2915,7 +2915,7 @@ evas_object_image_animated_frame_duration_get(const Evas_Object *eo_obj, int sta
2915static void 2915static void
2916_image_animated_frame_duration_get(Eo *eo_obj, void *_pd, va_list *list) 2916_image_animated_frame_duration_get(Eo *eo_obj, void *_pd, va_list *list)
2917{ 2917{
2918 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 2918 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
2919 const Evas_Object_Image *o = _pd; 2919 const Evas_Object_Image *o = _pd;
2920 int frame_count = 0; 2920 int frame_count = 0;
2921 2921
@@ -2945,7 +2945,7 @@ evas_object_image_animated_frame_set(Evas_Object *eo_obj, int frame_index)
2945static void 2945static void
2946_image_animated_frame_set(Eo *eo_obj, void *_pd, va_list *list) 2946_image_animated_frame_set(Eo *eo_obj, void *_pd, va_list *list)
2947{ 2947{
2948 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 2948 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
2949 Evas_Object_Image *o = _pd; 2949 Evas_Object_Image *o = _pd;
2950 int frame_count = 0; 2950 int frame_count = 0;
2951 2951
@@ -3030,7 +3030,7 @@ _canvas_image_cache_reload(Eo *eo_e, void *_pd, va_list *list EINA_UNUSED)
3030 { 3030 {
3031 if (eo_isa(obj->object, MY_CLASS)) 3031 if (eo_isa(obj->object, MY_CLASS))
3032 { 3032 {
3033 Evas_Object_Image *o = eo_data_scope_get(obj->object, MY_CLASS); 3033 Evas_Object_Image *o = eo_data_get(obj->object, MY_CLASS);
3034 evas_object_image_load(obj->object); 3034 evas_object_image_load(obj->object);
3035 o->changed = EINA_TRUE; 3035 o->changed = EINA_TRUE;
3036 evas_object_change(obj->object, obj); 3036 evas_object_change(obj->object, obj);
@@ -3112,14 +3112,14 @@ _canvas_image_max_size_get(Eo *eo_e EINA_UNUSED, void *_pd, va_list *list)
3112static void 3112static void
3113_proxy_unset(Evas_Object *proxy) 3113_proxy_unset(Evas_Object *proxy)
3114{ 3114{
3115 Evas_Object_Image *o = eo_data_scope_get(proxy, MY_CLASS); 3115 Evas_Object_Image *o = eo_data_get(proxy, MY_CLASS);
3116 Evas_Object_Protected_Data *cur_source; 3116 Evas_Object_Protected_Data *cur_source;
3117 Evas_Object_Protected_Data *cur_proxy; 3117 Evas_Object_Protected_Data *cur_proxy;
3118 3118
3119 if (!o->cur->source) return; 3119 if (!o->cur->source) return;
3120 3120
3121 cur_source = eo_data_scope_get(o->cur->source, EVAS_OBJ_CLASS); 3121 cur_source = eo_data_get(o->cur->source, EVAS_OBJ_CLASS);
3122 cur_proxy = eo_data_scope_get(proxy, EVAS_OBJ_CLASS); 3122 cur_proxy = eo_data_get(proxy, EVAS_OBJ_CLASS);
3123 3123
3124 EINA_COW_WRITE_BEGIN(evas_object_proxy_cow, cur_source->proxy, Evas_Object_Proxy_Data, proxy_source_write) 3124 EINA_COW_WRITE_BEGIN(evas_object_proxy_cow, cur_source->proxy, Evas_Object_Proxy_Data, proxy_source_write)
3125 { 3125 {
@@ -3162,9 +3162,9 @@ _proxy_unset(Evas_Object *proxy)
3162static void 3162static void
3163_proxy_set(Evas_Object *eo_proxy, Evas_Object *eo_src) 3163_proxy_set(Evas_Object *eo_proxy, Evas_Object *eo_src)
3164{ 3164{
3165 Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJ_CLASS); 3165 Evas_Object_Protected_Data *src = eo_data_get(eo_src, EVAS_OBJ_CLASS);
3166 Evas_Object_Protected_Data *proxy = eo_data_scope_get(eo_proxy, EVAS_OBJ_CLASS); 3166 Evas_Object_Protected_Data *proxy = eo_data_get(eo_proxy, EVAS_OBJ_CLASS);
3167 Evas_Object_Image *o = eo_data_scope_get(eo_proxy, MY_CLASS); 3167 Evas_Object_Image *o = eo_data_get(eo_proxy, MY_CLASS);
3168 3168
3169 evas_object_image_file_set(eo_proxy, NULL, NULL); 3169 evas_object_image_file_set(eo_proxy, NULL, NULL);
3170 3170
@@ -3195,12 +3195,12 @@ _proxy_error(Evas_Object *eo_proxy, void *context, void *output, void *surface,
3195 int x, int y, Eina_Bool do_async) 3195 int x, int y, Eina_Bool do_async)
3196{ 3196{
3197 Evas_Func *func; 3197 Evas_Func *func;
3198 Evas_Object_Image *o = eo_data_scope_get(eo_proxy, MY_CLASS); 3198 Evas_Object_Image *o = eo_data_get(eo_proxy, MY_CLASS);
3199 3199
3200 if (!o->proxyerror) printf("Err: Argh! Recursive proxies.\n"); 3200 if (!o->proxyerror) printf("Err: Argh! Recursive proxies.\n");
3201 o->proxyerror = 1; 3201 o->proxyerror = 1;
3202 3202
3203 Evas_Object_Protected_Data *proxy = eo_data_scope_get(eo_proxy, EVAS_OBJ_CLASS); 3203 Evas_Object_Protected_Data *proxy = eo_data_get(eo_proxy, EVAS_OBJ_CLASS);
3204 func = proxy->layer->evas->engine.func; 3204 func = proxy->layer->evas->engine.func;
3205 func->context_color_set(output, context, 0, 0, 0, 255); 3205 func->context_color_set(output, context, 0, 0, 0, 255);
3206 func->context_multiplier_unset(output, context); 3206 func->context_multiplier_unset(output, context);
@@ -3256,14 +3256,14 @@ _proxy_subrender_recurse(Evas_Object *eo_obj, Evas_Object *clip, void *output, v
3256static void 3256static void
3257_proxy_subrender(Evas *eo_e, Evas_Object *eo_source, Evas_Object *eo_proxy, Eina_Bool do_async) 3257_proxy_subrender(Evas *eo_e, Evas_Object *eo_source, Evas_Object *eo_proxy, Eina_Bool do_async)
3258{ 3258{
3259 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 3259 Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS);
3260 Evas_Object_Protected_Data *source; 3260 Evas_Object_Protected_Data *source;
3261 void *ctx; 3261 void *ctx;
3262/* Evas_Object *eo_obj2, *clip;*/ 3262/* Evas_Object *eo_obj2, *clip;*/
3263 int w, h; 3263 int w, h;
3264 3264
3265 if (!eo_source) return; 3265 if (!eo_source) return;
3266 source = eo_data_scope_get(eo_source, EVAS_OBJ_CLASS); 3266 source = eo_data_get(eo_source, EVAS_OBJ_CLASS);
3267 3267
3268 w = source->cur->geometry.w; 3268 w = source->cur->geometry.w;
3269 h = source->cur->geometry.h; 3269 h = source->cur->geometry.h;
@@ -3352,11 +3352,11 @@ evas_object_image_unload(Evas_Object *eo_obj, Eina_Bool dirty)
3352 Evas_Object_Image *o; 3352 Evas_Object_Image *o;
3353 Eina_Bool resize_call = EINA_FALSE; 3353 Eina_Bool resize_call = EINA_FALSE;
3354 3354
3355 o = eo_data_scope_get(eo_obj, MY_CLASS); 3355 o = eo_data_get(eo_obj, MY_CLASS);
3356 if ((!o->cur->file) || 3356 if ((!o->cur->file) ||
3357 (o->pixels_checked_out > 0)) return; 3357 (o->pixels_checked_out > 0)) return;
3358 3358
3359 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 3359 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
3360 if (dirty) 3360 if (dirty)
3361 { 3361 {
3362 if (o->engine_data) 3362 if (o->engine_data)
@@ -3397,12 +3397,12 @@ evas_object_image_unload(Evas_Object *eo_obj, Eina_Bool dirty)
3397static void 3397static void
3398evas_object_image_load(Evas_Object *eo_obj) 3398evas_object_image_load(Evas_Object *eo_obj)
3399{ 3399{
3400 Evas_Object_Image *o = eo_data_scope_get(eo_obj, MY_CLASS); 3400 Evas_Object_Image *o = eo_data_get(eo_obj, MY_CLASS);
3401 Evas_Image_Load_Opts lo; 3401 Evas_Image_Load_Opts lo;
3402 3402
3403 if (o->engine_data) return; 3403 if (o->engine_data) return;
3404 3404
3405 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 3405 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
3406 lo.scale_down_by = o->load_opts->scale_down_by; 3406 lo.scale_down_by = o->load_opts->scale_down_by;
3407 lo.dpi = o->load_opts->dpi; 3407 lo.dpi = o->load_opts->dpi;
3408 lo.w = o->load_opts->w; 3408 lo.w = o->load_opts->w;
@@ -3512,7 +3512,7 @@ evas_object_image_figure_y_fill(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Pro
3512static void 3512static void
3513evas_object_image_init(Evas_Object *eo_obj) 3513evas_object_image_init(Evas_Object *eo_obj)
3514{ 3514{
3515 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 3515 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
3516 /* set up methods (compulsory) */ 3516 /* set up methods (compulsory) */
3517 obj->func = &object_func; 3517 obj->func = &object_func;
3518 obj->type = o_type; 3518 obj->type = o_type;
@@ -3521,7 +3521,7 @@ evas_object_image_init(Evas_Object *eo_obj)
3521static void 3521static void
3522_destructor(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) 3522_destructor(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
3523{ 3523{
3524 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 3524 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
3525 3525
3526 evas_object_image_video_surface_set(eo_obj, NULL); 3526 evas_object_image_video_surface_set(eo_obj, NULL);
3527 evas_object_image_free(eo_obj, obj); 3527 evas_object_image_free(eo_obj, obj);
@@ -3535,7 +3535,7 @@ _evas_object_image_free(Evas_Object *obj)
3535 3535
3536 if (!eo_isa(obj, MY_CLASS)) return ; 3536 if (!eo_isa(obj, MY_CLASS)) return ;
3537 3537
3538 o = eo_data_scope_get(obj, MY_CLASS); 3538 o = eo_data_get(obj, MY_CLASS);
3539 3539
3540 eina_cow_free(evas_object_image_load_opts_cow, o->load_opts); 3540 eina_cow_free(evas_object_image_load_opts_cow, o->load_opts);
3541 o->load_opts = &default_load_opts; 3541 o->load_opts = &default_load_opts;
@@ -3550,7 +3550,7 @@ _evas_object_image_free(Evas_Object *obj)
3550static void 3550static void
3551evas_object_image_free(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj) 3551evas_object_image_free(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
3552{ 3552{
3553 Evas_Object_Image *o = eo_data_scope_get(eo_obj, MY_CLASS); 3553 Evas_Object_Image *o = eo_data_get(eo_obj, MY_CLASS);
3554 Eina_Rectangle *r; 3554 Eina_Rectangle *r;
3555 3555
3556 /* free obj */ 3556 /* free obj */
@@ -3645,7 +3645,7 @@ evas_draw_image_map_async_check(Evas_Object_Protected_Data *obj,
3645static void 3645static void
3646evas_object_image_render(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, void *output, void *context, void *surface, int x, int y, Eina_Bool do_async) 3646evas_object_image_render(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, void *output, void *context, void *surface, int x, int y, Eina_Bool do_async)
3647{ 3647{
3648 Evas_Object_Image *o = eo_data_scope_get(eo_obj, MY_CLASS); 3648 Evas_Object_Image *o = eo_data_get(eo_obj, MY_CLASS);
3649 int imagew, imageh, uvw, uvh; 3649 int imagew, imageh, uvw, uvh;
3650 void *pixels; 3650 void *pixels;
3651 3651
@@ -3707,7 +3707,7 @@ evas_object_image_render(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, v
3707 3707
3708 Evas_Object_Protected_Data *source = 3708 Evas_Object_Protected_Data *source =
3709 (o->cur->source ? 3709 (o->cur->source ?
3710 eo_data_scope_get(o->cur->source, EVAS_OBJ_CLASS): 3710 eo_data_get(o->cur->source, EVAS_OBJ_CLASS):
3711 NULL); 3711 NULL);
3712 if (!o->cur->source) 3712 if (!o->cur->source)
3713 { 3713 {
@@ -3726,10 +3726,10 @@ evas_object_image_render(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, v
3726 uvh = imageh; 3726 uvh = imageh;
3727 } 3727 }
3728 else if (source->type == o_type && 3728 else if (source->type == o_type &&
3729 ((Evas_Object_Image *)eo_data_scope_get(o->cur->source, MY_CLASS))->engine_data) 3729 ((Evas_Object_Image *)eo_data_get(o->cur->source, MY_CLASS))->engine_data)
3730 { 3730 {
3731 Evas_Object_Image *oi; 3731 Evas_Object_Image *oi;
3732 oi = eo_data_scope_get(o->cur->source, MY_CLASS); 3732 oi = eo_data_get(o->cur->source, MY_CLASS);
3733 pixels = oi->engine_data; 3733 pixels = oi->engine_data;
3734 imagew = oi->cur->image.w; 3734 imagew = oi->cur->image.w;
3735 imageh = oi->cur->image.h; 3735 imageh = oi->cur->image.h;
@@ -4036,7 +4036,7 @@ evas_object_image_render(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, v
4036static void 4036static void
4037evas_object_image_render_pre(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj) 4037evas_object_image_render_pre(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
4038{ 4038{
4039 Evas_Object_Image *o = eo_data_scope_get(eo_obj, MY_CLASS); 4039 Evas_Object_Image *o = eo_data_get(eo_obj, MY_CLASS);
4040 int is_v = 0, was_v = 0; 4040 int is_v = 0, was_v = 0;
4041 4041
4042 /* dont pre-render the obj twice! */ 4042 /* dont pre-render the obj twice! */
@@ -4067,7 +4067,7 @@ evas_object_image_render_pre(Evas_Object *eo_obj, Evas_Object_Protected_Data *ob
4067 /* Proxy: Do it early */ 4067 /* Proxy: Do it early */
4068 if (o->cur->source) 4068 if (o->cur->source)
4069 { 4069 {
4070 Evas_Object_Protected_Data *source = eo_data_scope_get(o->cur->source, EVAS_OBJ_CLASS); 4070 Evas_Object_Protected_Data *source = eo_data_get(o->cur->source, EVAS_OBJ_CLASS);
4071 if (source->proxy->redraw || source->changed) 4071 if (source->proxy->redraw || source->changed)
4072 { 4072 {
4073 /* XXX: Do I need to sort out the map here? */ 4073 /* XXX: Do I need to sort out the map here? */
@@ -4322,7 +4322,7 @@ evas_object_image_render_pre(Evas_Object *eo_obj, Evas_Object_Protected_Data *ob
4322static void 4322static void
4323evas_object_image_render_post(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj EINA_UNUSED) 4323evas_object_image_render_post(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj EINA_UNUSED)
4324{ 4324{
4325 Evas_Object_Image *o = eo_data_scope_get(eo_obj, MY_CLASS); 4325 Evas_Object_Image *o = eo_data_get(eo_obj, MY_CLASS);
4326 Eina_Rectangle *r; 4326 Eina_Rectangle *r;
4327 4327
4328 /* this moves the current data to the previous state parts of the object */ 4328 /* this moves the current data to the previous state parts of the object */
@@ -4349,21 +4349,21 @@ evas_object_image_render_post(Evas_Object *eo_obj, Evas_Object_Protected_Data *o
4349 4349
4350static unsigned int evas_object_image_id_get(Evas_Object *eo_obj) 4350static unsigned int evas_object_image_id_get(Evas_Object *eo_obj)
4351{ 4351{
4352 Evas_Object_Image *o = eo_data_scope_get(eo_obj, MY_CLASS); 4352 Evas_Object_Image *o = eo_data_get(eo_obj, MY_CLASS);
4353 if (!o) return 0; 4353 if (!o) return 0;
4354 return MAGIC_OBJ_IMAGE; 4354 return MAGIC_OBJ_IMAGE;
4355} 4355}
4356 4356
4357static unsigned int evas_object_image_visual_id_get(Evas_Object *eo_obj) 4357static unsigned int evas_object_image_visual_id_get(Evas_Object *eo_obj)
4358{ 4358{
4359 Evas_Object_Image *o = eo_data_scope_get(eo_obj, MY_CLASS); 4359 Evas_Object_Image *o = eo_data_get(eo_obj, MY_CLASS);
4360 if (!o) return 0; 4360 if (!o) return 0;
4361 return MAGIC_OBJ_IMAGE; 4361 return MAGIC_OBJ_IMAGE;
4362} 4362}
4363 4363
4364static void *evas_object_image_engine_data_get(Evas_Object *eo_obj) 4364static void *evas_object_image_engine_data_get(Evas_Object *eo_obj)
4365{ 4365{
4366 Evas_Object_Image *o = eo_data_scope_get(eo_obj, MY_CLASS); 4366 Evas_Object_Image *o = eo_data_get(eo_obj, MY_CLASS);
4367 if (!o) return NULL; 4367 if (!o) return NULL;
4368 return o->engine_data; 4368 return o->engine_data;
4369} 4369}
@@ -4375,7 +4375,7 @@ evas_object_image_is_opaque(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj
4375 /* currently fully opaque over the entire rectangle it occupies */ 4375 /* currently fully opaque over the entire rectangle it occupies */
4376/* disable caching due tyo maps screwing with this 4376/* disable caching due tyo maps screwing with this
4377 o->cur.opaque_valid = 0;*/ 4377 o->cur.opaque_valid = 0;*/
4378 Evas_Object_Image *o = eo_data_scope_get(eo_obj, MY_CLASS); 4378 Evas_Object_Image *o = eo_data_get(eo_obj, MY_CLASS);
4379 4379
4380 if (o->cur->opaque_valid) 4380 if (o->cur->opaque_valid)
4381 { 4381 {
@@ -4404,7 +4404,7 @@ evas_object_image_is_opaque(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj
4404 // FIXME: use proxy 4404 // FIXME: use proxy
4405 if (o->cur->source) 4405 if (o->cur->source)
4406 { 4406 {
4407 Evas_Object_Protected_Data *cur_source = eo_data_scope_get(o->cur->source, EVAS_OBJ_CLASS); 4407 Evas_Object_Protected_Data *cur_source = eo_data_get(o->cur->source, EVAS_OBJ_CLASS);
4408 EINA_COW_IMAGE_STATE_WRITE_BEGIN(o, state_write) 4408 EINA_COW_IMAGE_STATE_WRITE_BEGIN(o, state_write)
4409 { 4409 {
4410 state_write->opaque = evas_object_is_opaque(o->cur->source, cur_source); 4410 state_write->opaque = evas_object_is_opaque(o->cur->source, cur_source);
@@ -4475,7 +4475,7 @@ evas_object_image_is_opaque(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj
4475static int 4475static int
4476evas_object_image_was_opaque(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj) 4476evas_object_image_was_opaque(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
4477{ 4477{
4478 Evas_Object_Image *o = eo_data_scope_get(eo_obj, MY_CLASS); 4478 Evas_Object_Image *o = eo_data_get(eo_obj, MY_CLASS);
4479 4479
4480 /* this returns 1 if the internal object data implies that the object was */ 4480 /* this returns 1 if the internal object data implies that the object was */
4481 /* previously fully opaque over the entire rectangle it occupies */ 4481 /* previously fully opaque over the entire rectangle it occupies */
@@ -4578,7 +4578,7 @@ evas_object_image_was_opaque(Evas_Object *eo_obj, Evas_Object_Protected_Data *ob
4578static int 4578static int
4579evas_object_image_is_inside(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, Evas_Coord px, Evas_Coord py) 4579evas_object_image_is_inside(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, Evas_Coord px, Evas_Coord py)
4580{ 4580{
4581 Evas_Object_Image *o = eo_data_scope_get(eo_obj, MY_CLASS); 4581 Evas_Object_Image *o = eo_data_get(eo_obj, MY_CLASS);
4582 int imagew, imageh, uvw, uvh; 4582 int imagew, imageh, uvw, uvh;
4583 void *pixels; 4583 void *pixels;
4584 Evas_Func *eng = obj->layer->evas->engine.func; 4584 Evas_Func *eng = obj->layer->evas->engine.func;
@@ -4589,7 +4589,7 @@ evas_object_image_is_inside(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj
4589 */ 4589 */
4590 Evas_Object_Protected_Data *source = 4590 Evas_Object_Protected_Data *source =
4591 (o->cur->source ? 4591 (o->cur->source ?
4592 eo_data_scope_get(o->cur->source, EVAS_OBJ_CLASS): 4592 eo_data_get(o->cur->source, EVAS_OBJ_CLASS):
4593 NULL); 4593 NULL);
4594 if (!o->cur->source) 4594 if (!o->cur->source)
4595 { 4595 {
@@ -4608,10 +4608,10 @@ evas_object_image_is_inside(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj
4608 uvh = imageh; 4608 uvh = imageh;
4609 } 4609 }
4610 else if (source->type == o_type && 4610 else if (source->type == o_type &&
4611 ((Evas_Object_Image *)eo_data_scope_get(o->cur->source, MY_CLASS))->engine_data) 4611 ((Evas_Object_Image *)eo_data_get(o->cur->source, MY_CLASS))->engine_data)
4612 { 4612 {
4613 Evas_Object_Image *oi; 4613 Evas_Object_Image *oi;
4614 oi = eo_data_scope_get(o->cur->source, MY_CLASS); 4614 oi = eo_data_get(o->cur->source, MY_CLASS);
4615 pixels = oi->engine_data; 4615 pixels = oi->engine_data;
4616 imagew = oi->cur->image.w; 4616 imagew = oi->cur->image.w;
4617 imageh = oi->cur->image.h; 4617 imageh = oi->cur->image.h;
@@ -4931,7 +4931,7 @@ evas_object_image_is_inside(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj
4931static int 4931static int
4932evas_object_image_has_opaque_rect(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj) 4932evas_object_image_has_opaque_rect(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
4933{ 4933{
4934 Evas_Object_Image *o = eo_data_scope_get(eo_obj, MY_CLASS); 4934 Evas_Object_Image *o = eo_data_get(eo_obj, MY_CLASS);
4935 4935
4936 if ((obj->map->cur.map) && (obj->map->cur.usemap)) return 0; 4936 if ((obj->map->cur.map) && (obj->map->cur.usemap)) return 0;
4937 if (((o->cur->border.l | o->cur->border.r | o->cur->border.t | o->cur->border.b) != 0) && 4937 if (((o->cur->border.l | o->cur->border.r | o->cur->border.t | o->cur->border.b) != 0) &&
@@ -4949,7 +4949,7 @@ evas_object_image_has_opaque_rect(Evas_Object *eo_obj, Evas_Object_Protected_Dat
4949static int 4949static int
4950evas_object_image_get_opaque_rect(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) 4950evas_object_image_get_opaque_rect(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h)
4951{ 4951{
4952 Evas_Object_Image *o = eo_data_scope_get(eo_obj, MY_CLASS); 4952 Evas_Object_Image *o = eo_data_get(eo_obj, MY_CLASS);
4953 4953
4954 if (o->cur->border.scale == 1.0) 4954 if (o->cur->border.scale == 1.0)
4955 { 4955 {
@@ -5048,29 +5048,29 @@ evas_object_image_filled_resize_listener(void *data EINA_UNUSED, Evas *e EINA_UN
5048Evas_Object * 5048Evas_Object *
5049_evas_object_image_source_get(Evas_Object *eo_obj) 5049_evas_object_image_source_get(Evas_Object *eo_obj)
5050{ 5050{
5051 Evas_Object_Image *o = eo_data_scope_get(eo_obj, MY_CLASS); 5051 Evas_Object_Image *o = eo_data_get(eo_obj, MY_CLASS);
5052 return o->cur->source; 5052 return o->cur->source;
5053} 5053}
5054 5054
5055Eina_Bool 5055Eina_Bool
5056_evas_object_image_preloading_get(const Evas_Object *eo_obj) 5056_evas_object_image_preloading_get(const Evas_Object *eo_obj)
5057{ 5057{
5058 Evas_Object_Image *o = eo_data_scope_get(eo_obj, MY_CLASS); 5058 Evas_Object_Image *o = eo_data_get(eo_obj, MY_CLASS);
5059 return o->preloading; 5059 return o->preloading;
5060} 5060}
5061 5061
5062void 5062void
5063_evas_object_image_preloading_set(Evas_Object *eo_obj, Eina_Bool preloading) 5063_evas_object_image_preloading_set(Evas_Object *eo_obj, Eina_Bool preloading)
5064{ 5064{
5065 Evas_Object_Image *o = eo_data_scope_get(eo_obj, MY_CLASS); 5065 Evas_Object_Image *o = eo_data_get(eo_obj, MY_CLASS);
5066 o->preloading = preloading; 5066 o->preloading = preloading;
5067} 5067}
5068 5068
5069void 5069void
5070_evas_object_image_preloading_check(Evas_Object *eo_obj) 5070_evas_object_image_preloading_check(Evas_Object *eo_obj)
5071{ 5071{
5072 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 5072 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
5073 Evas_Object_Image *o = eo_data_scope_get(eo_obj, MY_CLASS); 5073 Evas_Object_Image *o = eo_data_get(eo_obj, MY_CLASS);
5074 if (obj->layer->evas->engine.func->image_load_error_get) 5074 if (obj->layer->evas->engine.func->image_load_error_get)
5075 o->load_error = obj->layer->evas->engine.func->image_load_error_get 5075 o->load_error = obj->layer->evas->engine.func->image_load_error_get
5076 (obj->layer->evas->engine.data.output, o->engine_data); 5076 (obj->layer->evas->engine.data.output, o->engine_data);
@@ -5079,15 +5079,15 @@ _evas_object_image_preloading_check(Evas_Object *eo_obj)
5079Evas_Object * 5079Evas_Object *
5080_evas_object_image_video_parent_get(Evas_Object *eo_obj) 5080_evas_object_image_video_parent_get(Evas_Object *eo_obj)
5081{ 5081{
5082 Evas_Object_Image *o = eo_data_scope_get(eo_obj, MY_CLASS); 5082 Evas_Object_Image *o = eo_data_get(eo_obj, MY_CLASS);
5083 return o->video_surface ? o->pixels->video.parent : NULL; 5083 return o->video_surface ? o->pixels->video.parent : NULL;
5084} 5084}
5085 5085
5086void 5086void
5087_evas_object_image_video_overlay_show(Evas_Object *eo_obj) 5087_evas_object_image_video_overlay_show(Evas_Object *eo_obj)
5088{ 5088{
5089 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 5089 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
5090 Evas_Object_Image *o = eo_data_scope_get(eo_obj, MY_CLASS); 5090 Evas_Object_Image *o = eo_data_get(eo_obj, MY_CLASS);
5091 5091
5092 if (obj->cur->cache.clip.x != obj->prev->cache.clip.x || 5092 if (obj->cur->cache.clip.x != obj->prev->cache.clip.x ||
5093 obj->cur->cache.clip.y != obj->prev->cache.clip.y || 5093 obj->cur->cache.clip.y != obj->prev->cache.clip.y ||
@@ -5122,8 +5122,8 @@ _evas_object_image_video_overlay_show(Evas_Object *eo_obj)
5122void 5122void
5123_evas_object_image_video_overlay_hide(Evas_Object *eo_obj) 5123_evas_object_image_video_overlay_hide(Evas_Object *eo_obj)
5124{ 5124{
5125 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 5125 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
5126 Evas_Object_Image *o = eo_data_scope_get(eo_obj, MY_CLASS); 5126 Evas_Object_Image *o = eo_data_get(eo_obj, MY_CLASS);
5127 5127
5128 if (o->video_visible || o->created) 5128 if (o->video_visible || o->created)
5129 o->pixels->video.hide(o->pixels->video.data, eo_obj, &o->pixels->video); 5129 o->pixels->video.hide(o->pixels->video.data, eo_obj, &o->pixels->video);
diff --git a/src/lib/evas/canvas/evas_object_inform.c b/src/lib/evas/canvas/evas_object_inform.c
index c48b07f..848012d 100644
--- a/src/lib/evas/canvas/evas_object_inform.c
+++ b/src/lib/evas/canvas/evas_object_inform.c
@@ -6,7 +6,7 @@
6void 6void
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 = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 9 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
10 _evas_object_event_new(); 10 _evas_object_event_new();
11 11
12 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_SHOW, NULL, _evas_event_counter); 12 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_SHOW, NULL, _evas_event_counter);
@@ -16,7 +16,7 @@ evas_object_inform_call_show(Evas_Object *eo_obj)
16void 16void
17evas_object_inform_call_hide(Evas_Object *eo_obj) 17evas_object_inform_call_hide(Evas_Object *eo_obj)
18{ 18{
19 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 19 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
20 _evas_object_event_new(); 20 _evas_object_event_new();
21 21
22 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_HIDE, NULL, _evas_event_counter); 22 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_HIDE, NULL, _evas_event_counter);
@@ -35,7 +35,7 @@ evas_object_inform_call_move(Evas_Object *eo_obj, Evas_Object_Protected_Data *ob
35void 35void
36evas_object_inform_call_resize(Evas_Object *eo_obj) 36evas_object_inform_call_resize(Evas_Object *eo_obj)
37{ 37{
38 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 38 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
39 _evas_object_event_new(); 39 _evas_object_event_new();
40 40
41 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_RESIZE, NULL, _evas_event_counter); 41 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_RESIZE, NULL, _evas_event_counter);
@@ -45,7 +45,7 @@ evas_object_inform_call_resize(Evas_Object *eo_obj)
45void 45void
46evas_object_inform_call_restack(Evas_Object *eo_obj) 46evas_object_inform_call_restack(Evas_Object *eo_obj)
47{ 47{
48 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 48 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
49 _evas_object_event_new(); 49 _evas_object_event_new();
50 50
51 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_RESTACK, NULL, _evas_event_counter); 51 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_RESTACK, NULL, _evas_event_counter);
@@ -55,7 +55,7 @@ evas_object_inform_call_restack(Evas_Object *eo_obj)
55void 55void
56evas_object_inform_call_changed_size_hints(Evas_Object *eo_obj) 56evas_object_inform_call_changed_size_hints(Evas_Object *eo_obj)
57{ 57{
58 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 58 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
59 _evas_object_event_new(); 59 _evas_object_event_new();
60 60
61 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, NULL, _evas_event_counter); 61 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, NULL, _evas_event_counter);
@@ -65,7 +65,7 @@ evas_object_inform_call_changed_size_hints(Evas_Object *eo_obj)
65void 65void
66evas_object_inform_call_image_preloaded(Evas_Object *eo_obj) 66evas_object_inform_call_image_preloaded(Evas_Object *eo_obj)
67{ 67{
68 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 68 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
69 if (!_evas_object_image_preloading_get(eo_obj)) return; 69 if (!_evas_object_image_preloading_get(eo_obj)) return;
70 _evas_object_image_preloading_check(eo_obj); 70 _evas_object_image_preloading_check(eo_obj);
71 _evas_object_image_preloading_set(eo_obj, 0); 71 _evas_object_image_preloading_set(eo_obj, 0);
@@ -78,7 +78,7 @@ evas_object_inform_call_image_preloaded(Evas_Object *eo_obj)
78void 78void
79evas_object_inform_call_image_unloaded(Evas_Object *eo_obj) 79evas_object_inform_call_image_unloaded(Evas_Object *eo_obj)
80{ 80{
81 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 81 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
82 _evas_object_event_new(); 82 _evas_object_event_new();
83 83
84 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_IMAGE_UNLOADED, NULL, _evas_event_counter); 84 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_IMAGE_UNLOADED, NULL, _evas_event_counter);
@@ -88,7 +88,7 @@ evas_object_inform_call_image_unloaded(Evas_Object *eo_obj)
88void 88void
89evas_object_inform_call_image_resize(Evas_Object *eo_obj) 89evas_object_inform_call_image_resize(Evas_Object *eo_obj)
90{ 90{
91 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 91 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
92 _evas_object_event_new(); 92 _evas_object_event_new();
93 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_IMAGE_RESIZE, NULL, _evas_event_counter); 93 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_IMAGE_RESIZE, NULL, _evas_event_counter);
94 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas); 94 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas);
diff --git a/src/lib/evas/canvas/evas_object_intercept.c b/src/lib/evas/canvas/evas_object_intercept.c
index 41418f1..4c31cd8 100644
--- a/src/lib/evas/canvas/evas_object_intercept.c
+++ b/src/lib/evas/canvas/evas_object_intercept.c
@@ -9,7 +9,7 @@ static void evas_object_intercept_deinit(Evas_Object *eo_obj);
9static void 9static void
10evas_object_intercept_init(Evas_Object *eo_obj) 10evas_object_intercept_init(Evas_Object *eo_obj)
11{ 11{
12 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 12 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
13 if (!obj->interceptors) 13 if (!obj->interceptors)
14 obj->interceptors = evas_mem_calloc(sizeof(Evas_Intercept_Func)); 14 obj->interceptors = evas_mem_calloc(sizeof(Evas_Intercept_Func));
15} 15}
@@ -17,7 +17,7 @@ evas_object_intercept_init(Evas_Object *eo_obj)
17static void 17static void
18evas_object_intercept_deinit(Evas_Object *eo_obj) 18evas_object_intercept_deinit(Evas_Object *eo_obj)
19{ 19{
20 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 20 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
21 if (!obj->interceptors) return; 21 if (!obj->interceptors) return;
22 if ((obj->interceptors->show.func) || 22 if ((obj->interceptors->show.func) ||
23 (obj->interceptors->hide.func) || 23 (obj->interceptors->hide.func) ||
@@ -41,14 +41,14 @@ evas_object_intercept_deinit(Evas_Object *eo_obj)
41void 41void
42evas_object_intercept_cleanup(Evas_Object *eo_obj) 42evas_object_intercept_cleanup(Evas_Object *eo_obj)
43{ 43{
44 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 44 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
45 if (obj->interceptors) free(obj->interceptors); 45 if (obj->interceptors) free(obj->interceptors);
46} 46}
47 47
48int 48int
49evas_object_intercept_call_show(Evas_Object *eo_obj) 49evas_object_intercept_call_show(Evas_Object *eo_obj)
50{ 50{
51 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 51 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
52 int ret; 52 int ret;
53 53
54 if (!obj->interceptors) return 0; 54 if (!obj->interceptors) return 0;
@@ -64,7 +64,7 @@ evas_object_intercept_call_show(Evas_Object *eo_obj)
64int 64int
65evas_object_intercept_call_hide(Evas_Object *eo_obj) 65evas_object_intercept_call_hide(Evas_Object *eo_obj)
66{ 66{
67 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 67 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
68 int ret; 68 int ret;
69 69
70 if (!obj->interceptors) return 0; 70 if (!obj->interceptors) return 0;
@@ -95,7 +95,7 @@ evas_object_intercept_call_move(Evas_Object *eo_obj, Evas_Object_Protected_Data
95int 95int
96evas_object_intercept_call_resize(Evas_Object *eo_obj, Evas_Coord w, Evas_Coord h) 96evas_object_intercept_call_resize(Evas_Object *eo_obj, Evas_Coord w, Evas_Coord h)
97{ 97{
98 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 98 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
99 int ret; 99 int ret;
100 100
101 if (!obj->interceptors) return 0; 101 if (!obj->interceptors) return 0;
@@ -111,7 +111,7 @@ evas_object_intercept_call_resize(Evas_Object *eo_obj, Evas_Coord w, Evas_Coord
111int 111int
112evas_object_intercept_call_raise(Evas_Object *eo_obj) 112evas_object_intercept_call_raise(Evas_Object *eo_obj)
113{ 113{
114 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 114 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
115 int ret; 115 int ret;
116 116
117 if (!obj->interceptors) return 0; 117 if (!obj->interceptors) return 0;
@@ -127,7 +127,7 @@ evas_object_intercept_call_raise(Evas_Object *eo_obj)
127int 127int
128evas_object_intercept_call_lower(Evas_Object *eo_obj) 128evas_object_intercept_call_lower(Evas_Object *eo_obj)
129{ 129{
130 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 130 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
131 int ret; 131 int ret;
132 132
133 if (!obj->interceptors) return 0; 133 if (!obj->interceptors) return 0;
@@ -143,7 +143,7 @@ evas_object_intercept_call_lower(Evas_Object *eo_obj)
143int 143int
144evas_object_intercept_call_stack_above(Evas_Object *eo_obj, Evas_Object *above) 144evas_object_intercept_call_stack_above(Evas_Object *eo_obj, Evas_Object *above)
145{ 145{
146 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 146 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
147 int ret; 147 int ret;
148 148
149 if (!obj->interceptors) return 0; 149 if (!obj->interceptors) return 0;
@@ -159,7 +159,7 @@ evas_object_intercept_call_stack_above(Evas_Object *eo_obj, Evas_Object *above)
159int 159int
160evas_object_intercept_call_stack_below(Evas_Object *eo_obj, Evas_Object *below) 160evas_object_intercept_call_stack_below(Evas_Object *eo_obj, Evas_Object *below)
161{ 161{
162 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 162 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
163 int ret; 163 int ret;
164 164
165 if (!obj->interceptors) return 0; 165 if (!obj->interceptors) return 0;
@@ -175,7 +175,7 @@ evas_object_intercept_call_stack_below(Evas_Object *eo_obj, Evas_Object *below)
175int 175int
176evas_object_intercept_call_layer_set(Evas_Object *eo_obj, int l) 176evas_object_intercept_call_layer_set(Evas_Object *eo_obj, int l)
177{ 177{
178 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 178 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
179 int ret; 179 int ret;
180 180
181 if (!obj->interceptors) return 0; 181 if (!obj->interceptors) return 0;
@@ -191,7 +191,7 @@ evas_object_intercept_call_layer_set(Evas_Object *eo_obj, int l)
191int 191int
192evas_object_intercept_call_color_set(Evas_Object *eo_obj, int r, int g, int b, int a) 192evas_object_intercept_call_color_set(Evas_Object *eo_obj, int r, int g, int b, int a)
193{ 193{
194 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 194 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
195 int ret; 195 int ret;
196 196
197 if (!obj->interceptors) return 0; 197 if (!obj->interceptors) return 0;
@@ -222,7 +222,7 @@ evas_object_intercept_call_clip_set(Evas_Object *eo_obj, Evas_Object_Protected_D
222int 222int
223evas_object_intercept_call_clip_unset(Evas_Object *eo_obj) 223evas_object_intercept_call_clip_unset(Evas_Object *eo_obj)
224{ 224{
225 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 225 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
226 int ret; 226 int ret;
227 227
228 if (!obj->interceptors) return 0; 228 if (!obj->interceptors) return 0;
@@ -243,7 +243,7 @@ evas_object_intercept_show_callback_add(Evas_Object *eo_obj, Evas_Object_Interce
243 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 243 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
244 return; 244 return;
245 MAGIC_CHECK_END(); 245 MAGIC_CHECK_END();
246 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 246 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
247 if (!func) return; 247 if (!func) return;
248 evas_object_intercept_init(eo_obj); 248 evas_object_intercept_init(eo_obj);
249 if (!obj->interceptors) return; 249 if (!obj->interceptors) return;
@@ -259,7 +259,7 @@ evas_object_intercept_show_callback_del(Evas_Object *eo_obj, Evas_Object_Interce
259 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 259 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
260 return NULL; 260 return NULL;
261 MAGIC_CHECK_END(); 261 MAGIC_CHECK_END();
262 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 262 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
263 if (!func) return NULL; 263 if (!func) return NULL;
264 if (!obj->interceptors) return NULL; 264 if (!obj->interceptors) return NULL;
265 obj->interceptors->show.func = NULL; 265 obj->interceptors->show.func = NULL;
@@ -275,7 +275,7 @@ evas_object_intercept_hide_callback_add(Evas_Object *eo_obj, Evas_Object_Interce
275 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 275 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
276 return; 276 return;
277 MAGIC_CHECK_END(); 277 MAGIC_CHECK_END();
278 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 278 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
279 if (!func) return; 279 if (!func) return;
280 evas_object_intercept_init(eo_obj); 280 evas_object_intercept_init(eo_obj);
281 if (!obj->interceptors) return; 281 if (!obj->interceptors) return;
@@ -286,7 +286,7 @@ evas_object_intercept_hide_callback_add(Evas_Object *eo_obj, Evas_Object_Interce
286EAPI void * 286EAPI void *
287evas_object_intercept_hide_callback_del(Evas_Object *eo_obj, Evas_Object_Intercept_Hide_Cb func) 287evas_object_intercept_hide_callback_del(Evas_Object *eo_obj, Evas_Object_Intercept_Hide_Cb func)
288{ 288{
289 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 289 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
290 void *data; 290 void *data;
291 291
292 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 292 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
@@ -307,7 +307,7 @@ evas_object_intercept_move_callback_add(Evas_Object *eo_obj, Evas_Object_Interce
307 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 307 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
308 return; 308 return;
309 MAGIC_CHECK_END(); 309 MAGIC_CHECK_END();
310 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 310 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
311 if (!func) return; 311 if (!func) return;
312 evas_object_intercept_init(eo_obj); 312 evas_object_intercept_init(eo_obj);
313 if (!obj->interceptors) return; 313 if (!obj->interceptors) return;
@@ -318,7 +318,7 @@ evas_object_intercept_move_callback_add(Evas_Object *eo_obj, Evas_Object_Interce
318EAPI void * 318EAPI void *
319evas_object_intercept_move_callback_del(Evas_Object *eo_obj, Evas_Object_Intercept_Move_Cb func) 319evas_object_intercept_move_callback_del(Evas_Object *eo_obj, Evas_Object_Intercept_Move_Cb func)
320{ 320{
321 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 321 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
322 void *data; 322 void *data;
323 323
324 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 324 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
@@ -339,7 +339,7 @@ evas_object_intercept_resize_callback_add(Evas_Object *eo_obj, Evas_Object_Inter
339 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 339 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
340 return; 340 return;
341 MAGIC_CHECK_END(); 341 MAGIC_CHECK_END();
342 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 342 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
343 if (!func) return; 343 if (!func) return;
344 evas_object_intercept_init(eo_obj); 344 evas_object_intercept_init(eo_obj);
345 if (!obj->interceptors) return; 345 if (!obj->interceptors) return;
@@ -350,7 +350,7 @@ evas_object_intercept_resize_callback_add(Evas_Object *eo_obj, Evas_Object_Inter
350EAPI void * 350EAPI void *
351evas_object_intercept_resize_callback_del(Evas_Object *eo_obj, Evas_Object_Intercept_Resize_Cb func) 351evas_object_intercept_resize_callback_del(Evas_Object *eo_obj, Evas_Object_Intercept_Resize_Cb func)
352{ 352{
353 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 353 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
354 void *data; 354 void *data;
355 355
356 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 356 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
@@ -371,7 +371,7 @@ evas_object_intercept_raise_callback_add(Evas_Object *eo_obj, Evas_Object_Interc
371 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 371 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
372 return; 372 return;
373 MAGIC_CHECK_END(); 373 MAGIC_CHECK_END();
374 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 374 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
375 if (!func) return; 375 if (!func) return;
376 evas_object_intercept_init(eo_obj); 376 evas_object_intercept_init(eo_obj);
377 if (!obj->interceptors) return; 377 if (!obj->interceptors) return;
@@ -382,7 +382,7 @@ evas_object_intercept_raise_callback_add(Evas_Object *eo_obj, Evas_Object_Interc
382EAPI void * 382EAPI void *
383evas_object_intercept_raise_callback_del(Evas_Object *eo_obj, Evas_Object_Intercept_Raise_Cb func) 383evas_object_intercept_raise_callback_del(Evas_Object *eo_obj, Evas_Object_Intercept_Raise_Cb func)
384{ 384{
385 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 385 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
386 void *data; 386 void *data;
387 387
388 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 388 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
@@ -403,7 +403,7 @@ evas_object_intercept_lower_callback_add(Evas_Object *eo_obj, Evas_Object_Interc
403 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 403 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
404 return; 404 return;
405 MAGIC_CHECK_END(); 405 MAGIC_CHECK_END();
406 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 406 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
407 if (!func) return; 407 if (!func) return;
408 evas_object_intercept_init(eo_obj); 408 evas_object_intercept_init(eo_obj);
409 if (!obj->interceptors) return; 409 if (!obj->interceptors) return;
@@ -414,7 +414,7 @@ evas_object_intercept_lower_callback_add(Evas_Object *eo_obj, Evas_Object_Interc
414EAPI void * 414EAPI void *
415evas_object_intercept_lower_callback_del(Evas_Object *eo_obj, Evas_Object_Intercept_Lower_Cb func) 415evas_object_intercept_lower_callback_del(Evas_Object *eo_obj, Evas_Object_Intercept_Lower_Cb func)
416{ 416{
417 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 417 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
418 void *data; 418 void *data;
419 419
420 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 420 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
@@ -435,7 +435,7 @@ evas_object_intercept_stack_above_callback_add(Evas_Object *eo_obj, Evas_Object_
435 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 435 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
436 return; 436 return;
437 MAGIC_CHECK_END(); 437 MAGIC_CHECK_END();
438 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 438 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
439 if (!func) return; 439 if (!func) return;
440 evas_object_intercept_init(eo_obj); 440 evas_object_intercept_init(eo_obj);
441 if (!obj->interceptors) return; 441 if (!obj->interceptors) return;
@@ -446,7 +446,7 @@ evas_object_intercept_stack_above_callback_add(Evas_Object *eo_obj, Evas_Object_
446EAPI void * 446EAPI void *
447evas_object_intercept_stack_above_callback_del(Evas_Object *eo_obj, Evas_Object_Intercept_Stack_Above_Cb func) 447evas_object_intercept_stack_above_callback_del(Evas_Object *eo_obj, Evas_Object_Intercept_Stack_Above_Cb func)
448{ 448{
449 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 449 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
450 void *data; 450 void *data;
451 451
452 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 452 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
@@ -467,7 +467,7 @@ evas_object_intercept_stack_below_callback_add(Evas_Object *eo_obj, Evas_Object_
467 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 467 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
468 return; 468 return;
469 MAGIC_CHECK_END(); 469 MAGIC_CHECK_END();
470 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 470 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
471 if (!func) return; 471 if (!func) return;
472 evas_object_intercept_init(eo_obj); 472 evas_object_intercept_init(eo_obj);
473 if (!obj->interceptors) return; 473 if (!obj->interceptors) return;
@@ -478,7 +478,7 @@ evas_object_intercept_stack_below_callback_add(Evas_Object *eo_obj, Evas_Object_
478EAPI void * 478EAPI void *
479evas_object_intercept_stack_below_callback_del(Evas_Object *eo_obj, Evas_Object_Intercept_Stack_Below_Cb func) 479evas_object_intercept_stack_below_callback_del(Evas_Object *eo_obj, Evas_Object_Intercept_Stack_Below_Cb func)
480{ 480{
481 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 481 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
482 void *data; 482 void *data;
483 483
484 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 484 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
@@ -499,7 +499,7 @@ evas_object_intercept_layer_set_callback_add(Evas_Object *eo_obj, Evas_Object_In
499 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 499 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
500 return; 500 return;
501 MAGIC_CHECK_END(); 501 MAGIC_CHECK_END();
502 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 502 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
503 if (!func) return; 503 if (!func) return;
504 evas_object_intercept_init(eo_obj); 504 evas_object_intercept_init(eo_obj);
505 if (!obj->interceptors) return; 505 if (!obj->interceptors) return;
@@ -510,7 +510,7 @@ evas_object_intercept_layer_set_callback_add(Evas_Object *eo_obj, Evas_Object_In
510EAPI void * 510EAPI void *
511evas_object_intercept_layer_set_callback_del(Evas_Object *eo_obj, Evas_Object_Intercept_Layer_Set_Cb func) 511evas_object_intercept_layer_set_callback_del(Evas_Object *eo_obj, Evas_Object_Intercept_Layer_Set_Cb func)
512{ 512{
513 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 513 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
514 void *data; 514 void *data;
515 515
516 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 516 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
@@ -531,7 +531,7 @@ evas_object_intercept_color_set_callback_add(Evas_Object *eo_obj, Evas_Object_In
531 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 531 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
532 return; 532 return;
533 MAGIC_CHECK_END(); 533 MAGIC_CHECK_END();
534 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 534 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
535 if (!func) return; 535 if (!func) return;
536 evas_object_intercept_init(eo_obj); 536 evas_object_intercept_init(eo_obj);
537 if (!obj->interceptors) return; 537 if (!obj->interceptors) return;
@@ -542,7 +542,7 @@ evas_object_intercept_color_set_callback_add(Evas_Object *eo_obj, Evas_Object_In
542EAPI void * 542EAPI void *
543evas_object_intercept_color_set_callback_del(Evas_Object *eo_obj, Evas_Object_Intercept_Color_Set_Cb func) 543evas_object_intercept_color_set_callback_del(Evas_Object *eo_obj, Evas_Object_Intercept_Color_Set_Cb func)
544{ 544{
545 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 545 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
546 void *data; 546 void *data;
547 547
548 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 548 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
@@ -563,7 +563,7 @@ evas_object_intercept_clip_set_callback_add(Evas_Object *eo_obj, Evas_Object_Int
563 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 563 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
564 return; 564 return;
565 MAGIC_CHECK_END(); 565 MAGIC_CHECK_END();
566 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 566 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
567 if (!func) return; 567 if (!func) return;
568 evas_object_intercept_init(eo_obj); 568 evas_object_intercept_init(eo_obj);
569 if (!obj->interceptors) return; 569 if (!obj->interceptors) return;
@@ -574,7 +574,7 @@ evas_object_intercept_clip_set_callback_add(Evas_Object *eo_obj, Evas_Object_Int
574EAPI void * 574EAPI void *
575evas_object_intercept_clip_set_callback_del(Evas_Object *eo_obj, Evas_Object_Intercept_Clip_Set_Cb func) 575evas_object_intercept_clip_set_callback_del(Evas_Object *eo_obj, Evas_Object_Intercept_Clip_Set_Cb func)
576{ 576{
577 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 577 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
578 void *data; 578 void *data;
579 579
580 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 580 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
@@ -595,7 +595,7 @@ evas_object_intercept_clip_unset_callback_add(Evas_Object *eo_obj, Evas_Object_I
595 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 595 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
596 return; 596 return;
597 MAGIC_CHECK_END(); 597 MAGIC_CHECK_END();
598 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 598 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
599 if (!func) return; 599 if (!func) return;
600 evas_object_intercept_init(eo_obj); 600 evas_object_intercept_init(eo_obj);
601 if (!obj->interceptors) return; 601 if (!obj->interceptors) return;
@@ -606,7 +606,7 @@ evas_object_intercept_clip_unset_callback_add(Evas_Object *eo_obj, Evas_Object_I
606EAPI void * 606EAPI void *
607evas_object_intercept_clip_unset_callback_del(Evas_Object *eo_obj, Evas_Object_Intercept_Clip_Unset_Cb func) 607evas_object_intercept_clip_unset_callback_del(Evas_Object *eo_obj, Evas_Object_Intercept_Clip_Unset_Cb func)
608{ 608{
609 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 609 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
610 void *data; 610 void *data;
611 611
612 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 612 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
diff --git a/src/lib/evas/canvas/evas_object_line.c b/src/lib/evas/canvas/evas_object_line.c
index 10cf366..95c3e09 100644
--- a/src/lib/evas/canvas/evas_object_line.c
+++ b/src/lib/evas/canvas/evas_object_line.c
@@ -109,7 +109,7 @@ _line_xy_set(Eo *eo_obj, void *_pd, va_list *list)
109 if ((x1 == o->cur.x1) && (y1 == o->cur.y1) && 109 if ((x1 == o->cur.x1) && (y1 == o->cur.y1) &&
110 (x2 == o->cur.x2) && (y2 == o->cur.y2)) return; 110 (x2 == o->cur.x2) && (y2 == o->cur.y2)) return;
111 111
112 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 112 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
113 if (!(obj->layer->evas->is_frozen)) 113 if (!(obj->layer->evas->is_frozen))
114 { 114 {
115 if (!evas_event_passes_through(eo_obj, obj) && 115 if (!evas_event_passes_through(eo_obj, obj) &&
@@ -203,7 +203,7 @@ _line_xy_get(Eo *eo_obj, void *_pd, va_list *list)
203 Evas_Coord *x2 = va_arg(*list, Evas_Coord *); 203 Evas_Coord *x2 = va_arg(*list, Evas_Coord *);
204 Evas_Coord *y2 = va_arg(*list, Evas_Coord *); 204 Evas_Coord *y2 = va_arg(*list, Evas_Coord *);
205 205
206 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 206 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
207 if (x1) *x1 = obj->cur->geometry.x + o->cur.x1; 207 if (x1) *x1 = obj->cur->geometry.x + o->cur.x1;
208 if (y1) *y1 = obj->cur->geometry.y + o->cur.y1; 208 if (y1) *y1 = obj->cur->geometry.y + o->cur.y1;
209 if (x2) *x2 = obj->cur->geometry.x + o->cur.x2; 209 if (x2) *x2 = obj->cur->geometry.x + o->cur.x2;
@@ -214,7 +214,7 @@ _line_xy_get(Eo *eo_obj, void *_pd, va_list *list)
214static void 214static void
215evas_object_line_init(Evas_Object *eo_obj) 215evas_object_line_init(Evas_Object *eo_obj)
216{ 216{
217 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 217 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
218 /* set up methods (compulsory) */ 218 /* set up methods (compulsory) */
219 obj->func = &object_func; 219 obj->func = &object_func;
220 obj->type = o_type; 220 obj->type = o_type;
@@ -225,7 +225,7 @@ _constructor(Eo *eo_obj, void *class_data, va_list *list EINA_UNUSED)
225{ 225{
226 eo_do_super(eo_obj, MY_CLASS, eo_constructor()); 226 eo_do_super(eo_obj, MY_CLASS, eo_constructor());
227 227
228 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 228 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
229 evas_object_line_init(eo_obj); 229 evas_object_line_init(eo_obj);
230 evas_object_inject(eo_obj, obj, evas_object_evas_get(eo_parent_get(eo_obj))); 230 evas_object_inject(eo_obj, obj, evas_object_evas_get(eo_parent_get(eo_obj)));
231 231
@@ -247,7 +247,7 @@ _destructor(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
247static void 247static void
248evas_object_line_render(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, void *output, void *context, void *surface, int x, int y, Eina_Bool do_async) 248evas_object_line_render(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, void *output, void *context, void *surface, int x, int y, Eina_Bool do_async)
249{ 249{
250 Evas_Object_Line *o = eo_data_scope_get(eo_obj, MY_CLASS); 250 Evas_Object_Line *o = eo_data_get(eo_obj, MY_CLASS);
251 251
252 /* render object to surface with context, and offxet by x,y */ 252 /* render object to surface with context, and offxet by x,y */
253 253
@@ -276,7 +276,7 @@ evas_object_line_render(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, vo
276static void 276static void
277evas_object_line_render_pre(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj) 277evas_object_line_render_pre(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
278{ 278{
279 Evas_Object_Line *o = eo_data_scope_get(eo_obj, MY_CLASS); 279 Evas_Object_Line *o = eo_data_get(eo_obj, MY_CLASS);
280 int is_v, was_v; 280 int is_v, was_v;
281 Eina_Bool changed_color = EINA_FALSE; 281 Eina_Bool changed_color = EINA_FALSE;
282 282
@@ -360,7 +360,7 @@ evas_object_line_render_pre(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj
360static void 360static void
361evas_object_line_render_post(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj EINA_UNUSED) 361evas_object_line_render_post(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj EINA_UNUSED)
362{ 362{
363 Evas_Object_Line *o = eo_data_scope_get(eo_obj, MY_CLASS); 363 Evas_Object_Line *o = eo_data_get(eo_obj, MY_CLASS);
364 364
365 /* this moves the current data to the previous state parts of the object */ 365 /* this moves the current data to the previous state parts of the object */
366 /* in whatever way is safest for the object. also if we don't need object */ 366 /* in whatever way is safest for the object. also if we don't need object */
@@ -374,21 +374,21 @@ evas_object_line_render_post(Evas_Object *eo_obj, Evas_Object_Protected_Data *ob
374 374
375static unsigned int evas_object_line_id_get(Evas_Object *eo_obj) 375static unsigned int evas_object_line_id_get(Evas_Object *eo_obj)
376{ 376{
377 Evas_Object_Line *o = eo_data_scope_get(eo_obj, MY_CLASS); 377 Evas_Object_Line *o = eo_data_get(eo_obj, MY_CLASS);
378 if (!o) return 0; 378 if (!o) return 0;
379 return MAGIC_OBJ_LINE; 379 return MAGIC_OBJ_LINE;
380} 380}
381 381
382static unsigned int evas_object_line_visual_id_get(Evas_Object *eo_obj) 382static unsigned int evas_object_line_visual_id_get(Evas_Object *eo_obj)
383{ 383{
384 Evas_Object_Line *o = eo_data_scope_get(eo_obj, MY_CLASS); 384 Evas_Object_Line *o = eo_data_get(eo_obj, MY_CLASS);
385 if (!o) return 0; 385 if (!o) return 0;
386 return MAGIC_OBJ_SHAPE; 386 return MAGIC_OBJ_SHAPE;
387} 387}
388 388
389static void *evas_object_line_engine_data_get(Evas_Object *eo_obj) 389static void *evas_object_line_engine_data_get(Evas_Object *eo_obj)
390{ 390{
391 Evas_Object_Line *o = eo_data_scope_get(eo_obj, MY_CLASS); 391 Evas_Object_Line *o = eo_data_get(eo_obj, MY_CLASS);
392 return o->engine_data; 392 return o->engine_data;
393} 393}
394 394
@@ -429,7 +429,7 @@ evas_object_line_was_inside(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Protect
429static void 429static void
430evas_object_line_coords_recalc(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj) 430evas_object_line_coords_recalc(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
431{ 431{
432 Evas_Object_Line *o = eo_data_scope_get(eo_obj, MY_CLASS); 432 Evas_Object_Line *o = eo_data_get(eo_obj, MY_CLASS);
433 433
434 o->cur.cache.x1 = obj->cur->geometry.x + o->cur.x1; 434 o->cur.cache.x1 = obj->cur->geometry.x + o->cur.x1;
435 o->cur.cache.y1 = obj->cur->geometry.y + o->cur.y1; 435 o->cur.cache.y1 = obj->cur->geometry.y + o->cur.y1;
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index 1ee41bb..e51e934 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -91,7 +91,7 @@ _constructor(Eo *eo_obj, void *_pd, va_list *list EINA_UNUSED)
91void 91void
92evas_object_change_reset(Evas_Object *eo_obj) 92evas_object_change_reset(Evas_Object *eo_obj)
93{ 93{
94 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, MY_CLASS); 94 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, MY_CLASS);
95 if (!obj) return; 95 if (!obj) return;
96 obj->changed = EINA_FALSE; 96 obj->changed = EINA_FALSE;
97 obj->changed_move = EINA_FALSE; 97 obj->changed_move = EINA_FALSE;
@@ -104,7 +104,7 @@ evas_object_change_reset(Evas_Object *eo_obj)
104void 104void
105evas_object_cur_prev(Evas_Object *eo_obj) 105evas_object_cur_prev(Evas_Object *eo_obj)
106{ 106{
107 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, MY_CLASS); 107 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, MY_CLASS);
108 if (!obj) return; 108 if (!obj) return;
109 if (!obj->map->prev.valid_map && obj->map->prev.map) 109 if (!obj->map->prev.valid_map && obj->map->prev.map)
110 { 110 {
@@ -140,7 +140,7 @@ evas_object_cur_prev(Evas_Object *eo_obj)
140void 140void
141evas_object_free(Evas_Object *eo_obj, int clean_layer) 141evas_object_free(Evas_Object *eo_obj, int clean_layer)
142{ 142{
143 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, MY_CLASS); 143 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, MY_CLASS);
144 if (!obj) return; 144 if (!obj) return;
145 obj->clean_layer = clean_layer; 145 obj->clean_layer = clean_layer;
146 146
@@ -228,14 +228,14 @@ evas_object_change(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
228 } 228 }
229 EINA_LIST_FOREACH(obj->proxy->proxies, l, eo_obj2) 229 EINA_LIST_FOREACH(obj->proxy->proxies, l, eo_obj2)
230 { 230 {
231 obj2 = eo_data_scope_get(eo_obj2, MY_CLASS); 231 obj2 = eo_data_get(eo_obj2, MY_CLASS);
232 232
233 if (!obj2) continue; 233 if (!obj2) continue;
234 evas_object_change(eo_obj2, obj2); 234 evas_object_change(eo_obj2, obj2);
235 } 235 }
236 if (obj->smart.parent) 236 if (obj->smart.parent)
237 { 237 {
238 Evas_Object_Protected_Data *smart_parent = eo_data_scope_get(obj->smart.parent, MY_CLASS); 238 Evas_Object_Protected_Data *smart_parent = eo_data_get(obj->smart.parent, MY_CLASS);
239 if (!smart_parent) return; 239 if (!smart_parent) return;
240 evas_object_change(obj->smart.parent, smart_parent); 240 evas_object_change(obj->smart.parent, smart_parent);
241 } 241 }
@@ -264,7 +264,7 @@ evas_object_content_change(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
264void 264void
265evas_object_render_pre_visible_change(Eina_Array *rects, Evas_Object *eo_obj, int is_v, int was_v) 265evas_object_render_pre_visible_change(Eina_Array *rects, Evas_Object *eo_obj, int is_v, int was_v)
266{ 266{
267 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, MY_CLASS); 267 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, MY_CLASS);
268 268
269 if (!obj) return; 269 if (!obj) return;
270 if (obj->is_smart) return; 270 if (obj->is_smart) return;
@@ -290,7 +290,7 @@ evas_object_render_pre_visible_change(Eina_Array *rects, Evas_Object *eo_obj, in
290void 290void
291evas_object_render_pre_clipper_change(Eina_Array *rects, Evas_Object *eo_obj) 291evas_object_render_pre_clipper_change(Eina_Array *rects, Evas_Object *eo_obj)
292{ 292{
293 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, MY_CLASS); 293 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, MY_CLASS);
294 294
295 if (!obj) return; 295 if (!obj) return;
296 if (obj->is_smart) return; 296 if (obj->is_smart) return;
@@ -382,7 +382,7 @@ evas_object_render_pre_prev_cur_add(Eina_Array *rects, Evas_Object *eo_obj EINA_
382void 382void
383evas_object_clip_changes_clean(Evas_Object *eo_obj) 383evas_object_clip_changes_clean(Evas_Object *eo_obj)
384{ 384{
385 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, MY_CLASS); 385 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, MY_CLASS);
386 if (!obj) return; 386 if (!obj) return;
387 387
388 Eina_Rectangle *r; 388 Eina_Rectangle *r;
@@ -394,7 +394,7 @@ evas_object_clip_changes_clean(Evas_Object *eo_obj)
394void 394void
395evas_object_render_pre_effect_updates(Eina_Array *rects, Evas_Object *eo_obj, int is_v, int was_v EINA_UNUSED) 395evas_object_render_pre_effect_updates(Eina_Array *rects, Evas_Object *eo_obj, int is_v, int was_v EINA_UNUSED)
396{ 396{
397 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, MY_CLASS); 397 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, MY_CLASS);
398 Eina_Rectangle *r; 398 Eina_Rectangle *r;
399 Eina_List *l; 399 Eina_List *l;
400 unsigned int i; 400 unsigned int i;
@@ -551,7 +551,7 @@ evas_object_ref(Evas_Object *eo_obj)
551 551
552 eo_ref(eo_obj); 552 eo_ref(eo_obj);
553 553
554 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, MY_CLASS); 554 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, MY_CLASS);
555 if (!obj) return; 555 if (!obj) return;
556 obj->ref++; 556 obj->ref++;
557} 557}
@@ -563,7 +563,7 @@ evas_object_unref(Evas_Object *eo_obj)
563 return; 563 return;
564 MAGIC_CHECK_END(); 564 MAGIC_CHECK_END();
565 565
566 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, MY_CLASS); 566 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, MY_CLASS);
567 if (!obj) return; 567 if (!obj) return;
568 568
569 if (obj->ref == 0) return; 569 if (obj->ref == 0) return;
@@ -580,7 +580,7 @@ evas_object_ref_get(const Evas_Object *eo_obj)
580 return 0; 580 return 0;
581 MAGIC_CHECK_END(); 581 MAGIC_CHECK_END();
582 582
583 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, MY_CLASS); 583 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, MY_CLASS);
584 if (!obj) return 0; 584 if (!obj) return 0;
585 return obj->ref; 585 return obj->ref;
586} 586}
@@ -593,7 +593,7 @@ evas_object_del(Evas_Object *eo_obj)
593 return; 593 return;
594 MAGIC_CHECK_END(); 594 MAGIC_CHECK_END();
595 595
596 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, MY_CLASS); 596 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, MY_CLASS);
597 597
598 if (!obj) return; 598 if (!obj) return;
599 if (obj->delete_me || obj->eo_del_called) return; 599 if (obj->delete_me || obj->eo_del_called) return;
@@ -910,7 +910,7 @@ evas_object_size_hint_display_mode_get(const Evas_Object *eo_obj)
910 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 910 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
911 return EVAS_DISPLAY_MODE_NONE; 911 return EVAS_DISPLAY_MODE_NONE;
912 MAGIC_CHECK_END(); 912 MAGIC_CHECK_END();
913 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, MY_CLASS); 913 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, MY_CLASS);
914 if (!obj) return EVAS_DISPLAY_MODE_NONE; 914 if (!obj) return EVAS_DISPLAY_MODE_NONE;
915 if ((!obj->size_hints) || obj->delete_me) 915 if ((!obj->size_hints) || obj->delete_me)
916 return EVAS_DISPLAY_MODE_NONE; 916 return EVAS_DISPLAY_MODE_NONE;
@@ -923,7 +923,7 @@ evas_object_size_hint_display_mode_set(Evas_Object *eo_obj, Evas_Display_Mode di
923 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 923 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
924 return; 924 return;
925 MAGIC_CHECK_END(); 925 MAGIC_CHECK_END();
926 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, MY_CLASS); 926 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, MY_CLASS);
927 if (!obj) return; 927 if (!obj) return;
928 if (obj->delete_me) return; 928 if (obj->delete_me) return;
929 _evas_object_size_hint_alloc(eo_obj, obj); 929 _evas_object_size_hint_alloc(eo_obj, obj);
@@ -2005,7 +2005,7 @@ _canvas_object_top_at_xy_get(Eo *eo_e EINA_UNUSED, void *_pd, va_list *list)
2005EAPI Evas_Object * 2005EAPI Evas_Object *
2006evas_object_top_at_pointer_get(const Evas *eo_e) 2006evas_object_top_at_pointer_get(const Evas *eo_e)
2007{ 2007{
2008 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 2008 Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS);
2009 Evas_Object *ret = NULL; 2009 Evas_Object *ret = NULL;
2010 if (!e) return NULL; 2010 if (!e) return NULL;
2011 eo_do((Eo *)eo_e, evas_canvas_object_top_at_xy_get(e->pointer.x, e->pointer.y, EINA_TRUE, 2011 eo_do((Eo *)eo_e, evas_canvas_object_top_at_xy_get(e->pointer.x, e->pointer.y, EINA_TRUE,
@@ -2361,7 +2361,7 @@ _is_frame_object_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
2361static void 2361static void
2362_smart_parent_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list) 2362_smart_parent_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list)
2363{ 2363{
2364 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 2364 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
2365 if (!obj) return; 2365 if (!obj) return;
2366 Evas_Object **smart_parent = va_arg(*list, Evas_Object **); 2366 Evas_Object **smart_parent = va_arg(*list, Evas_Object **);
2367 if (smart_parent) *smart_parent = obj->smart.parent; 2367 if (smart_parent) *smart_parent = obj->smart.parent;
diff --git a/src/lib/evas/canvas/evas_object_polygon.c b/src/lib/evas/canvas/evas_object_polygon.c
index ad4f9b2..4b21c08 100644
--- a/src/lib/evas/canvas/evas_object_polygon.c
+++ b/src/lib/evas/canvas/evas_object_polygon.c
@@ -91,7 +91,7 @@ _constructor(Eo *eo_obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED
91{ 91{
92 eo_do_super(eo_obj, MY_CLASS, eo_constructor()); 92 eo_do_super(eo_obj, MY_CLASS, eo_constructor());
93 93
94 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 94 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
95 evas_object_polygon_init(eo_obj); 95 evas_object_polygon_init(eo_obj);
96 evas_object_inject(eo_obj, obj, evas_object_evas_get(eo_parent_get(eo_obj))); 96 evas_object_inject(eo_obj, obj, evas_object_evas_get(eo_parent_get(eo_obj)));
97} 97}
@@ -108,7 +108,7 @@ evas_object_polygon_point_add(Evas_Object *eo_obj, Evas_Coord x, Evas_Coord y)
108static void 108static void
109_polygon_point_add(Eo *eo_obj, void *_pd, va_list *list) 109_polygon_point_add(Eo *eo_obj, void *_pd, va_list *list)
110{ 110{
111 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 111 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
112 Evas_Object_Polygon *o = _pd; 112 Evas_Object_Polygon *o = _pd;
113 Evas_Polygon_Point *p; 113 Evas_Polygon_Point *p;
114 Evas_Coord min_x, max_x, min_y, max_y; 114 Evas_Coord min_x, max_x, min_y, max_y;
@@ -226,7 +226,7 @@ evas_object_polygon_points_clear(Evas_Object *eo_obj)
226static void 226static void
227_polygon_points_clear(Eo *eo_obj, void *_pd, va_list *list EINA_UNUSED) 227_polygon_points_clear(Eo *eo_obj, void *_pd, va_list *list EINA_UNUSED)
228{ 228{
229 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 229 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
230 Evas_Object_Polygon *o = _pd; 230 Evas_Object_Polygon *o = _pd;
231 void *list_data; 231 void *list_data;
232 int is, was; 232 int is, was;
@@ -270,7 +270,7 @@ _polygon_points_clear(Eo *eo_obj, void *_pd, va_list *list EINA_UNUSED)
270static void 270static void
271evas_object_polygon_init(Evas_Object *eo_obj) 271evas_object_polygon_init(Evas_Object *eo_obj)
272{ 272{
273 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 273 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
274 /* set up methods (compulsory) */ 274 /* set up methods (compulsory) */
275 obj->func = &object_func; 275 obj->func = &object_func;
276 obj->type = o_type; 276 obj->type = o_type;
@@ -279,7 +279,7 @@ evas_object_polygon_init(Evas_Object *eo_obj)
279static void 279static void
280_destructor(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) 280_destructor(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
281{ 281{
282 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 282 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
283 evas_object_polygon_free(eo_obj, obj); 283 evas_object_polygon_free(eo_obj, obj);
284 eo_do_super(eo_obj, MY_CLASS, eo_destructor()); 284 eo_do_super(eo_obj, MY_CLASS, eo_destructor());
285} 285}
@@ -287,7 +287,7 @@ _destructor(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
287static void 287static void
288evas_object_polygon_free(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj) 288evas_object_polygon_free(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
289{ 289{
290 Evas_Object_Polygon *o = eo_data_scope_get(eo_obj, MY_CLASS); 290 Evas_Object_Polygon *o = eo_data_get(eo_obj, MY_CLASS);
291 void *list_data; 291 void *list_data;
292 /* free obj */ 292 /* free obj */
293 EINA_LIST_FREE(o->points, list_data) 293 EINA_LIST_FREE(o->points, list_data)
@@ -302,7 +302,7 @@ evas_object_polygon_free(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
302static void 302static void
303evas_object_polygon_render(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, void *output, void *context, void *surface, int x, int y, Eina_Bool do_async) 303evas_object_polygon_render(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, void *output, void *context, void *surface, int x, int y, Eina_Bool do_async)
304{ 304{
305 Evas_Object_Polygon *o = eo_data_scope_get(eo_obj, MY_CLASS); 305 Evas_Object_Polygon *o = eo_data_get(eo_obj, MY_CLASS);
306 Eina_List *l; 306 Eina_List *l;
307 Evas_Polygon_Point *p; 307 Evas_Polygon_Point *p;
308 308
@@ -345,7 +345,7 @@ evas_object_polygon_render(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj,
345static void 345static void
346evas_object_polygon_render_pre(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj) 346evas_object_polygon_render_pre(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
347{ 347{
348 Evas_Object_Polygon *o = eo_data_scope_get(eo_obj, MY_CLASS); 348 Evas_Object_Polygon *o = eo_data_get(eo_obj, MY_CLASS);
349 int is_v, was_v; 349 int is_v, was_v;
350 350
351 /* dont pre-render the obj twice! */ 351 /* dont pre-render the obj twice! */
@@ -446,21 +446,21 @@ evas_object_polygon_render_post(Evas_Object *eo_obj, Evas_Object_Protected_Data
446 446
447static unsigned int evas_object_polygon_id_get(Evas_Object *eo_obj) 447static unsigned int evas_object_polygon_id_get(Evas_Object *eo_obj)
448{ 448{
449 Evas_Object_Polygon *o = eo_data_scope_get(eo_obj, MY_CLASS); 449 Evas_Object_Polygon *o = eo_data_get(eo_obj, MY_CLASS);
450 if (!o) return 0; 450 if (!o) return 0;
451 return MAGIC_OBJ_POLYGON; 451 return MAGIC_OBJ_POLYGON;
452} 452}
453 453
454static unsigned int evas_object_polygon_visual_id_get(Evas_Object *eo_obj) 454static unsigned int evas_object_polygon_visual_id_get(Evas_Object *eo_obj)
455{ 455{
456 Evas_Object_Polygon *o = eo_data_scope_get(eo_obj, MY_CLASS); 456 Evas_Object_Polygon *o = eo_data_get(eo_obj, MY_CLASS);
457 if (!o) return 0; 457 if (!o) return 0;
458 return MAGIC_OBJ_SHAPE; 458 return MAGIC_OBJ_SHAPE;
459} 459}
460 460
461static void *evas_object_polygon_engine_data_get(Evas_Object *eo_obj) 461static void *evas_object_polygon_engine_data_get(Evas_Object *eo_obj)
462{ 462{
463 Evas_Object_Polygon *o = eo_data_scope_get(eo_obj, MY_CLASS); 463 Evas_Object_Polygon *o = eo_data_get(eo_obj, MY_CLASS);
464 return o->engine_data; 464 return o->engine_data;
465} 465}
466 466
@@ -486,7 +486,7 @@ evas_object_polygon_was_opaque(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Prot
486static int 486static int
487evas_object_polygon_is_inside(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj EINA_UNUSED, Evas_Coord x, Evas_Coord y) 487evas_object_polygon_is_inside(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj EINA_UNUSED, Evas_Coord x, Evas_Coord y)
488{ 488{
489 Evas_Object_Polygon *o = eo_data_scope_get(eo_obj, MY_CLASS); 489 Evas_Object_Polygon *o = eo_data_get(eo_obj, MY_CLASS);
490 int num_edges = 0; /* Number of edges we crossed */ 490 int num_edges = 0; /* Number of edges we crossed */
491 Eina_List *itr; 491 Eina_List *itr;
492 Evas_Polygon_Point *p; 492 Evas_Polygon_Point *p;
diff --git a/src/lib/evas/canvas/evas_object_rectangle.c b/src/lib/evas/canvas/evas_object_rectangle.c
index 6c35155..1b97ef9 100644
--- a/src/lib/evas/canvas/evas_object_rectangle.c
+++ b/src/lib/evas/canvas/evas_object_rectangle.c
@@ -87,7 +87,7 @@ _constructor(Eo *eo_obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED
87{ 87{
88 eo_do_super(eo_obj, MY_CLASS, eo_constructor()); 88 eo_do_super(eo_obj, MY_CLASS, eo_constructor());
89 89
90 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 90 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
91 evas_object_rectangle_init(eo_obj); 91 evas_object_rectangle_init(eo_obj);
92 evas_object_inject(eo_obj, obj, evas_object_evas_get(eo_parent_get(eo_obj))); 92 evas_object_inject(eo_obj, obj, evas_object_evas_get(eo_parent_get(eo_obj)));
93} 93}
@@ -96,7 +96,7 @@ _constructor(Eo *eo_obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED
96static void 96static void
97evas_object_rectangle_init(Evas_Object *eo_obj) 97evas_object_rectangle_init(Evas_Object *eo_obj)
98{ 98{
99 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 99 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
100 /* set up methods (compulsory) */ 100 /* set up methods (compulsory) */
101 obj->func = &object_func; 101 obj->func = &object_func;
102 obj->type = o_type; 102 obj->type = o_type;
@@ -280,21 +280,21 @@ evas_object_rectangle_was_opaque(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Pr
280 280
281static unsigned int evas_object_rectangle_id_get(Evas_Object *eo_obj) 281static unsigned int evas_object_rectangle_id_get(Evas_Object *eo_obj)
282{ 282{
283 Evas_Object_Rectangle *o = eo_data_scope_get(eo_obj, MY_CLASS); 283 Evas_Object_Rectangle *o = eo_data_get(eo_obj, MY_CLASS);
284 if (!o) return 0; 284 if (!o) return 0;
285 return MAGIC_OBJ_RECTANGLE; 285 return MAGIC_OBJ_RECTANGLE;
286} 286}
287 287
288static unsigned int evas_object_rectangle_visual_id_get(Evas_Object *eo_obj) 288static unsigned int evas_object_rectangle_visual_id_get(Evas_Object *eo_obj)
289{ 289{
290 Evas_Object_Rectangle *o = eo_data_scope_get(eo_obj, MY_CLASS); 290 Evas_Object_Rectangle *o = eo_data_get(eo_obj, MY_CLASS);
291 if (!o) return 0; 291 if (!o) return 0;
292 return MAGIC_OBJ_SHAPE; 292 return MAGIC_OBJ_SHAPE;
293} 293}
294 294
295static void *evas_object_rectangle_engine_data_get(Evas_Object *eo_obj) 295static void *evas_object_rectangle_engine_data_get(Evas_Object *eo_obj)
296{ 296{
297 Evas_Object_Rectangle *o = eo_data_scope_get(eo_obj, MY_CLASS); 297 Evas_Object_Rectangle *o = eo_data_get(eo_obj, MY_CLASS);
298 return o->engine_data; 298 return o->engine_data;
299} 299}
300 300
diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c
index c6800ba..737e8a1 100644
--- a/src/lib/evas/canvas/evas_object_smart.c
+++ b/src/lib/evas/canvas/evas_object_smart.c
@@ -108,9 +108,7 @@ _smart_data_set(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
108{ 108{
109 void *data = va_arg(*list, void *); 109 void *data = va_arg(*list, void *);
110 Evas_Object_Smart *o = _pd; 110 Evas_Object_Smart *o = _pd;
111 if (o->data) eo_data_unref(eo_obj, o->data);
112 o->data = data; 111 o->data = data;
113 eo_data_ref(eo_obj, NULL);
114} 112}
115 113
116EAPI void * 114EAPI void *
@@ -176,7 +174,7 @@ evas_object_smart_interface_data_get(const Evas_Object *eo_obj,
176 return NULL; 174 return NULL;
177 MAGIC_CHECK_END(); 175 MAGIC_CHECK_END();
178 176
179 obj = eo_data_scope_get(eo_obj, MY_CLASS); 177 obj = eo_data_get(eo_obj, MY_CLASS);
180 s = evas_object_smart_smart_get(eo_obj); 178 s = evas_object_smart_smart_get(eo_obj);
181 if (!s) return NULL; 179 if (!s) return NULL;
182 180
@@ -206,7 +204,7 @@ evas_object_smart_smart_get(const Evas_Object *eo_obj)
206static void 204static void
207_smart_smart_get(Eo *eo_obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list) 205_smart_smart_get(Eo *eo_obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list)
208{ 206{
209 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 207 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
210 Evas_Smart **smart = va_arg(*list, Evas_Smart **); 208 Evas_Smart **smart = va_arg(*list, Evas_Smart **);
211 if (smart) *smart = obj->smart.smart; 209 if (smart) *smart = obj->smart.smart;
212} 210}
@@ -225,8 +223,8 @@ _smart_member_add(Eo *smart_obj, void *_pd, va_list *list)
225{ 223{
226 Evas_Object *eo_obj = va_arg(*list, Evas_Object *); 224 Evas_Object *eo_obj = va_arg(*list, Evas_Object *);
227 225
228 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 226 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
229 Evas_Object_Protected_Data *smart = eo_data_scope_get(smart_obj, EVAS_OBJ_CLASS); 227 Evas_Object_Protected_Data *smart = eo_data_get(smart_obj, EVAS_OBJ_CLASS);
230 Evas_Object_Smart *o = _pd; 228 Evas_Object_Smart *o = _pd;
231 229
232 if (obj->delete_me) 230 if (obj->delete_me)
@@ -271,7 +269,6 @@ _smart_member_add(Eo *smart_obj, void *_pd, va_list *list)
271 obj->layer->usage++; 269 obj->layer->usage++;
272 obj->smart.parent = smart_obj; 270 obj->smart.parent = smart_obj;
273 o->contained = eina_inlist_append(o->contained, EINA_INLIST_GET(obj)); 271 o->contained = eina_inlist_append(o->contained, EINA_INLIST_GET(obj));
274 eo_data_ref(eo_obj, NULL);
275 evas_object_smart_member_cache_invalidate(eo_obj, EINA_TRUE, EINA_TRUE, 272 evas_object_smart_member_cache_invalidate(eo_obj, EINA_TRUE, EINA_TRUE,
276 EINA_TRUE); 273 EINA_TRUE);
277 obj->restack = 1;