summaryrefslogtreecommitdiff
path: root/src/lib/evas/canvas
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2014-06-02 14:47:59 +0100
committerTom Hacohen <tom@stosb.com>2014-06-03 11:28:01 +0100
commit0fc3279db966a5329b80c84794f9bff97e7a7ef0 (patch)
treea9a5e8a5c4d3291ceef4889955ed60b91432641f /src/lib/evas/canvas
parent62a3522fcc4bbb6389d1c81b439cf9cc2f4a4e28 (diff)
Efl: Update code to use the new class names generated by eolian.
Diffstat (limited to 'src/lib/evas/canvas')
-rw-r--r--src/lib/evas/canvas/evas_3d_scene.c2
-rw-r--r--src/lib/evas/canvas/evas_3d_texture.c14
-rw-r--r--src/lib/evas/canvas/evas_box.eo8
-rw-r--r--src/lib/evas/canvas/evas_callbacks.c10
-rw-r--r--src/lib/evas/canvas/evas_clip.c4
-rw-r--r--src/lib/evas/canvas/evas_events.c132
-rw-r--r--src/lib/evas/canvas/evas_font_dir.c2
-rw-r--r--src/lib/evas/canvas/evas_key_grab.c4
-rw-r--r--src/lib/evas/canvas/evas_layer.c6
-rw-r--r--src/lib/evas/canvas/evas_map.c16
-rw-r--r--src/lib/evas/canvas/evas_name.c2
-rw-r--r--src/lib/evas/canvas/evas_object_box.c10
-rw-r--r--src/lib/evas/canvas/evas_object_grid.c2
-rw-r--r--src/lib/evas/canvas/evas_object_image.c148
-rw-r--r--src/lib/evas/canvas/evas_object_inform.c16
-rw-r--r--src/lib/evas/canvas/evas_object_intercept.c10
-rw-r--r--src/lib/evas/canvas/evas_object_line.c12
-rw-r--r--src/lib/evas/canvas/evas_object_main.c6
-rw-r--r--src/lib/evas/canvas/evas_object_polygon.c14
-rw-r--r--src/lib/evas/canvas/evas_object_rectangle.c8
-rw-r--r--src/lib/evas/canvas/evas_object_smart.c142
-rw-r--r--src/lib/evas/canvas/evas_object_smart.eo (renamed from src/lib/evas/canvas/evas_smart.eo)4
-rw-r--r--src/lib/evas/canvas/evas_object_smart_clipped.c22
-rw-r--r--src/lib/evas/canvas/evas_object_table.c10
-rw-r--r--src/lib/evas/canvas/evas_object_text.c60
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c56
-rw-r--r--src/lib/evas/canvas/evas_object_textgrid.c24
-rw-r--r--src/lib/evas/canvas/evas_render.c20
-rw-r--r--src/lib/evas/canvas/evas_smart_clipped.eo23
-rw-r--r--src/lib/evas/canvas/evas_stack.c4
-rw-r--r--src/lib/evas/canvas/evas_table.eo8
31 files changed, 400 insertions, 399 deletions
diff --git a/src/lib/evas/canvas/evas_3d_scene.c b/src/lib/evas/canvas/evas_3d_scene.c
index ec96baa..13b797f 100644
--- a/src/lib/evas/canvas/evas_3d_scene.c
+++ b/src/lib/evas/canvas/evas_3d_scene.c
@@ -29,7 +29,7 @@ _evas_3d_scene_evas_3d_object_change_notify(Eo *eo_obj EINA_UNUSED, Evas_3D_Scen
29 29
30 EINA_LIST_FOREACH(pd->images, l, eo) 30 EINA_LIST_FOREACH(pd->images, l, eo)
31 { 31 {
32 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo, EVAS_OBJ_CLASS); 32 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo, EVAS_OBJECT_CLASS);
33 evas_object_change(eo, obj); 33 evas_object_change(eo, obj);
34 } 34 }
35} 35}
diff --git a/src/lib/evas/canvas/evas_3d_texture.c b/src/lib/evas/canvas/evas_3d_texture.c
index ad90c5d..b2531c4 100644
--- a/src/lib/evas/canvas/evas_3d_texture.c
+++ b/src/lib/evas/canvas/evas_3d_texture.c
@@ -20,7 +20,7 @@ _texture_proxy_set(Evas_3D_Texture *texture, Evas_Object *eo_src, Evas_Object_Pr
20static inline void 20static inline void
21_texture_proxy_unset(Evas_3D_Texture_Data *texture) 21_texture_proxy_unset(Evas_3D_Texture_Data *texture)
22{ 22{
23 Evas_Object_Protected_Data *src = eo_data_scope_get(texture->source, EVAS_OBJ_CLASS); 23 Evas_Object_Protected_Data *src = eo_data_scope_get(texture->source, EVAS_OBJECT_CLASS);
24 24
25 EINA_COW_WRITE_BEGIN(evas_object_proxy_cow, src->proxy, Evas_Object_Proxy_Data, proxy_src); 25 EINA_COW_WRITE_BEGIN(evas_object_proxy_cow, src->proxy, Evas_Object_Proxy_Data, proxy_src);
26 { 26 {
@@ -66,9 +66,9 @@ _texture_proxy_subrender(Evas_3D_Texture *obj)
66 if (!pd->source) 66 if (!pd->source)
67 return; 67 return;
68 68
69 source = eo_data_scope_get(pd->source, EVAS_OBJ_CLASS); 69 source = eo_data_scope_get(pd->source, EVAS_OBJECT_CLASS);
70 70
71 is_image = eo_isa(pd->source, EVAS_OBJ_IMAGE_CLASS); 71 is_image = eo_isa(pd->source, EVAS_IMAGE_CLASS);
72 72
73 EINA_COW_WRITE_BEGIN(evas_object_proxy_cow, source->proxy, Evas_Object_Proxy_Data, proxy_write) 73 EINA_COW_WRITE_BEGIN(evas_object_proxy_cow, source->proxy, Evas_Object_Proxy_Data, proxy_write)
74 { 74 {
@@ -210,7 +210,7 @@ _evas_3d_texture_evas_3d_object_update_notify(Eo *obj, Evas_3D_Texture_Data *pd)
210 Eo *evas = NULL; 210 Eo *evas = NULL;
211 eo_do(obj, evas = evas_common_evas_get()); 211 eo_do(obj, evas = evas_common_evas_get());
212 Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CLASS); 212 Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CLASS);
213 Evas_Object_Protected_Data *src = eo_data_scope_get(pd->source, EVAS_OBJ_CLASS); 213 Evas_Object_Protected_Data *src = eo_data_scope_get(pd->source, EVAS_OBJECT_CLASS);
214 214
215 if (pd->engine_data == NULL) 215 if (pd->engine_data == NULL)
216 { 216 {
@@ -374,7 +374,7 @@ _evas_3d_texture_source_set(Eo *obj , Evas_3D_Texture_Data *pd, Evas_Object *sou
374 return; 374 return;
375 } 375 }
376 376
377 src = eo_data_scope_get(source, EVAS_OBJ_CLASS); 377 src = eo_data_scope_get(source, EVAS_OBJECT_CLASS);
378 378
379 if (src->delete_me) 379 if (src->delete_me)
380 { 380 {
@@ -400,7 +400,7 @@ _evas_3d_texture_source_visible_set(Eo *obj EINA_UNUSED, Evas_3D_Texture_Data *p
400 if (pd->source == NULL) 400 if (pd->source == NULL)
401 return; 401 return;
402 402
403 src_obj = eo_data_scope_get(pd->source, EVAS_OBJ_CLASS); 403 src_obj = eo_data_scope_get(pd->source, EVAS_OBJECT_CLASS);
404 404
405 if (src_obj->proxy->src_invisible == !visible) 405 if (src_obj->proxy->src_invisible == !visible)
406 return; 406 return;
@@ -422,7 +422,7 @@ _evas_3d_texture_source_visible_get(Eo *obj EINA_UNUSED, Evas_3D_Texture_Data *p
422 if (pd->source == NULL) 422 if (pd->source == NULL)
423 return EINA_FALSE; 423 return EINA_FALSE;
424 424
425 src_obj = eo_data_scope_get(pd->source, EVAS_OBJ_CLASS); 425 src_obj = eo_data_scope_get(pd->source, EVAS_OBJECT_CLASS);
426 return !src_obj->proxy->src_invisible; 426 return !src_obj->proxy->src_invisible;
427} 427}
428 428
diff --git a/src/lib/evas/canvas/evas_box.eo b/src/lib/evas/canvas/evas_box.eo
index cd4e8cc..45f3a8f 100644
--- a/src/lib/evas/canvas/evas_box.eo
+++ b/src/lib/evas/canvas/evas_box.eo
@@ -728,10 +728,10 @@ class Evas_Box (Evas_Smart_Clipped)
728 class::constructor; 728 class::constructor;
729 Eo_Base::constructor; 729 Eo_Base::constructor;
730 Evas_Object::smart_data::get; 730 Evas_Object::smart_data::get;
731 Evas_Smart::calculate; 731 Evas_Object_Smart::calculate;
732 Evas_Smart::add; 732 Evas_Object_Smart::add;
733 Evas_Smart::del; 733 Evas_Object_Smart::del;
734 Evas_Smart::resize; 734 Evas_Object_Smart::resize;
735 } 735 }
736 events { 736 events {
737 child,added; 737 child,added;
diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c
index 5aa362f..3a98453 100644
--- a/src/lib/evas/canvas/evas_callbacks.c
+++ b/src/lib/evas/canvas/evas_callbacks.c
@@ -187,7 +187,7 @@ evas_object_event_callback_all_del(Evas_Object *eo_obj)
187{ 187{
188 _eo_evas_object_cb_info *info; 188 _eo_evas_object_cb_info *info;
189 Eina_Inlist *itr; 189 Eina_Inlist *itr;
190 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 190 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
191 191
192 if (!obj) return; 192 if (!obj) return;
193 if (!obj->callbacks) return; 193 if (!obj->callbacks) return;
@@ -318,7 +318,7 @@ evas_object_event_callback_call(Evas_Object *eo_obj, Evas_Object_Protected_Data
318 if ((obj->smart.parent) && (type != EVAS_CALLBACK_FREE) && 318 if ((obj->smart.parent) && (type != EVAS_CALLBACK_FREE) &&
319 (type <= EVAS_CALLBACK_KEY_UP)) 319 (type <= EVAS_CALLBACK_KEY_UP))
320 { 320 {
321 Evas_Object_Protected_Data *smart_parent = eo_data_scope_get(obj->smart.parent, EVAS_OBJ_CLASS); 321 Evas_Object_Protected_Data *smart_parent = eo_data_scope_get(obj->smart.parent, EVAS_OBJECT_CLASS);
322 evas_object_event_callback_call(obj->smart.parent, smart_parent, type, event_info, event_id); 322 evas_object_event_callback_call(obj->smart.parent, smart_parent, type, event_info, event_id);
323 } 323 }
324 } 324 }
@@ -335,7 +335,7 @@ evas_object_event_callback_add(Evas_Object *eo_obj, Evas_Callback_Type type, Eva
335EAPI void 335EAPI void
336evas_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) 336evas_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)
337{ 337{
338 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 338 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
339 339
340 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 340 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
341 return; 341 return;
@@ -363,7 +363,7 @@ evas_object_event_callback_del(Evas_Object *eo_obj, Evas_Callback_Type type, Eva
363 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 363 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
364 return NULL; 364 return NULL;
365 MAGIC_CHECK_END(); 365 MAGIC_CHECK_END();
366 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 366 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
367 367
368 if (!obj) return NULL; 368 if (!obj) return NULL;
369 if (!func) return NULL; 369 if (!func) return NULL;
@@ -395,7 +395,7 @@ evas_object_event_callback_del_full(Evas_Object *eo_obj, Evas_Callback_Type type
395 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 395 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
396 return NULL; 396 return NULL;
397 MAGIC_CHECK_END(); 397 MAGIC_CHECK_END();
398 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 398 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
399 399
400 if (!obj) return NULL; 400 if (!obj) return NULL;
401 if (!func) return NULL; 401 if (!func) return NULL;
diff --git a/src/lib/evas/canvas/evas_clip.c b/src/lib/evas/canvas/evas_clip.c
index 20c302c..1947f0f 100644
--- a/src/lib/evas/canvas/evas_clip.c
+++ b/src/lib/evas/canvas/evas_clip.c
@@ -178,7 +178,7 @@ evas_object_mapped_clip_across_mark(Evas_Object *eo_obj, Evas_Object_Protected_D
178 if (obj->smart.parent) 178 if (obj->smart.parent)
179 { 179 {
180 Evas_Object_Protected_Data *smart_parent_obj = 180 Evas_Object_Protected_Data *smart_parent_obj =
181 eo_data_scope_get(obj->smart.parent, EVAS_OBJ_CLASS); 181 eo_data_scope_get(obj->smart.parent, EVAS_OBJECT_CLASS);
182 evas_object_child_map_across_mark 182 evas_object_child_map_across_mark
183 (eo_obj, obj, smart_parent_obj->map->cur.map_parent, 0, NULL); 183 (eo_obj, obj, smart_parent_obj->map->cur.map_parent, 0, NULL);
184 } 184 }
@@ -207,7 +207,7 @@ _evas_object_clip_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Object *
207 return; 207 return;
208 MAGIC_CHECK_END(); 208 MAGIC_CHECK_END();
209 209
210 clip = eo_data_scope_get(eo_clip, EVAS_OBJ_CLASS); 210 clip = eo_data_scope_get(eo_clip, EVAS_OBJECT_CLASS);
211 if (obj->cur->clipper && obj->cur->clipper->object == eo_clip) return; 211 if (obj->cur->clipper && obj->cur->clipper->object == eo_clip) return;
212 if (eo_obj == eo_clip) 212 if (eo_obj == eo_clip)
213 { 213 {
diff --git a/src/lib/evas/canvas/evas_events.c b/src/lib/evas/canvas/evas_events.c
index 4ed196b..14115c4 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_scope_get(obj->smart.parent, EVAS_OBJECT_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
@@ -180,9 +180,9 @@ _transform_to_src_space(Evas_Object_Protected_Data *obj, Evas_Object_Protected_D
180static void 180static void
181_evas_event_source_mouse_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mouse_Down *ev, int event_id) 181_evas_event_source_mouse_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mouse_Down *ev, int event_id)
182{ 182{
183 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 183 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
184 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); 184 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
185 Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJ_CLASS); 185 Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJECT_CLASS);
186 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 186 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS);
187 Evas_Coord_Point canvas = ev->canvas; 187 Evas_Coord_Point canvas = ev->canvas;
188 Evas_Object_Protected_Data *child; 188 Evas_Object_Protected_Data *child;
@@ -220,7 +220,7 @@ _evas_event_source_mouse_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event
220 220
221 EINA_LIST_FOREACH(src->proxy->src_event_in, l, eo_child) 221 EINA_LIST_FOREACH(src->proxy->src_event_in, l, eo_child)
222 { 222 {
223 child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); 223 child = eo_data_scope_get(eo_child, EVAS_OBJECT_CLASS);
224 if ((child->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) || 224 if ((child->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) ||
225 (child->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN)) 225 (child->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN))
226 { 226 {
@@ -239,7 +239,7 @@ _evas_event_source_mouse_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event
239 copy = evas_event_list_copy(src->proxy->src_event_in); 239 copy = evas_event_list_copy(src->proxy->src_event_in);
240 EINA_LIST_FOREACH(copy, l, eo_child) 240 EINA_LIST_FOREACH(copy, l, eo_child)
241 { 241 {
242 child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); 242 child = eo_data_scope_get(eo_child, EVAS_OBJECT_CLASS);
243 ev->canvas = point; 243 ev->canvas = point;
244 _evas_event_havemap_adjust(eo_child, child, &ev->canvas.x, 244 _evas_event_havemap_adjust(eo_child, child, &ev->canvas.x,
245 &ev->canvas.y, 245 &ev->canvas.y,
@@ -258,9 +258,9 @@ _evas_event_source_mouse_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event
258static void 258static void
259_evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mouse_Move *ev, int event_id) 259_evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mouse_Move *ev, int event_id)
260{ 260{
261 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 261 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
262 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); 262 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
263 Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJ_CLASS); 263 Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJECT_CLASS);
264 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 264 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS);
265 Evas_Coord_Point canvas = ev->cur.canvas; 265 Evas_Coord_Point canvas = ev->cur.canvas;
266 266
@@ -282,7 +282,7 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event
282 Eina_List *copy = evas_event_list_copy(src->proxy->src_event_in); 282 Eina_List *copy = evas_event_list_copy(src->proxy->src_event_in);
283 EINA_LIST_FOREACH(copy, l, eo_child) 283 EINA_LIST_FOREACH(copy, l, eo_child)
284 { 284 {
285 child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); 285 child = eo_data_scope_get(eo_child, EVAS_OBJECT_CLASS);
286 286
287 if ((evas_object_clippers_is_visible(eo_child, child) || 287 if ((evas_object_clippers_is_visible(eo_child, child) ||
288 child->mouse_grabbed) && 288 child->mouse_grabbed) &&
@@ -311,7 +311,7 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event
311 { 311 {
312 eo_child = outs->data; 312 eo_child = outs->data;
313 outs = eina_list_remove(outs, eo_child); 313 outs = eina_list_remove(outs, eo_child);
314 child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); 314 child = eo_data_scope_get(eo_child, EVAS_OBJECT_CLASS);
315 if ((child->mouse_grabbed == 0) && (!e->delete_me)) 315 if ((child->mouse_grabbed == 0) && (!e->delete_me))
316 { 316 {
317 if (child->mouse_in) continue; 317 if (child->mouse_in) continue;
@@ -346,7 +346,7 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event
346 346
347 EINA_LIST_FOREACH(copy, l, eo_child) 347 EINA_LIST_FOREACH(copy, l, eo_child)
348 { 348 {
349 child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); 349 child = eo_data_scope_get(eo_child, EVAS_OBJECT_CLASS);
350 350
351 ev->cur.canvas = point; 351 ev->cur.canvas = point;
352 352
@@ -394,7 +394,7 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event
394 int event_id2 = _evas_event_counter; 394 int event_id2 = _evas_event_counter;
395 EINA_LIST_FOREACH(ins, l, eo_child) 395 EINA_LIST_FOREACH(ins, l, eo_child)
396 { 396 {
397 child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); 397 child = eo_data_scope_get(eo_child, EVAS_OBJECT_CLASS);
398 if (!eina_list_data_find(src->proxy->src_event_in, eo_child)) 398 if (!eina_list_data_find(src->proxy->src_event_in, eo_child))
399 { 399 {
400 if (!child->mouse_in) 400 if (!child->mouse_in)
@@ -433,9 +433,9 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event
433static void 433static void
434_evas_event_source_mouse_up_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mouse_Up *ev, int event_id) 434_evas_event_source_mouse_up_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mouse_Up *ev, int event_id)
435{ 435{
436 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 436 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
437 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); 437 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
438 Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJ_CLASS); 438 Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJECT_CLASS);
439 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 439 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS);
440 Evas_Coord_Point canvas = ev->canvas; 440 Evas_Coord_Point canvas = ev->canvas;
441 441
@@ -454,7 +454,7 @@ _evas_event_source_mouse_up_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_M
454 EINA_LIST_FOREACH(copy, l, eo_child) 454 EINA_LIST_FOREACH(copy, l, eo_child)
455 { 455 {
456 if (src->delete_me) return; 456 if (src->delete_me) return;
457 child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); 457 child = eo_data_scope_get(eo_child, EVAS_OBJECT_CLASS);
458 if ((child->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) && 458 if ((child->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) &&
459 (child->mouse_grabbed > 0)) 459 (child->mouse_grabbed > 0))
460 { 460 {
@@ -485,9 +485,9 @@ _evas_event_source_mouse_up_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_M
485static void 485static void
486_evas_event_source_hold_events(Evas_Object *eo_obj, Evas *eo_e EINA_UNUSED, void *ev, int event_id) 486_evas_event_source_hold_events(Evas_Object *eo_obj, Evas *eo_e EINA_UNUSED, void *ev, int event_id)
487{ 487{
488 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 488 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
489 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); 489 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
490 Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJ_CLASS); 490 Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJECT_CLASS);
491 491
492 if (obj->layer->evas->is_frozen) return; 492 if (obj->layer->evas->is_frozen) return;
493 493
@@ -497,7 +497,7 @@ _evas_event_source_hold_events(Evas_Object *eo_obj, Evas *eo_e EINA_UNUSED, void
497 EINA_LIST_FOREACH(src->proxy->src_event_in, l, child_eo) 497 EINA_LIST_FOREACH(src->proxy->src_event_in, l, child_eo)
498 { 498 {
499 if (src->delete_me) return; 499 if (src->delete_me) return;
500 child = eo_data_scope_get(child_eo, EVAS_OBJ_CLASS); 500 child = eo_data_scope_get(child_eo, EVAS_OBJECT_CLASS);
501 evas_object_event_callback_call(child_eo, child, EVAS_CALLBACK_HOLD, ev, 501 evas_object_event_callback_call(child_eo, child, EVAS_CALLBACK_HOLD, ev,
502 event_id); 502 event_id);
503 if (src->layer->evas->delete_me) break; 503 if (src->layer->evas->delete_me) break;
@@ -507,9 +507,9 @@ _evas_event_source_hold_events(Evas_Object *eo_obj, Evas *eo_e EINA_UNUSED, void
507static void 507static void
508_evas_event_source_wheel_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mouse_Wheel *ev, int event_id) 508_evas_event_source_wheel_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mouse_Wheel *ev, int event_id)
509{ 509{
510 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 510 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
511 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); 511 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
512 Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJ_CLASS); 512 Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJECT_CLASS);
513 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 513 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS);
514 Evas_Coord_Point canvas = ev->canvas; 514 Evas_Coord_Point canvas = ev->canvas;
515 515
@@ -526,7 +526,7 @@ _evas_event_source_wheel_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mous
526 EINA_LIST_FOREACH(copy, l, eo_child) 526 EINA_LIST_FOREACH(copy, l, eo_child)
527 { 527 {
528 if (src->delete_me) return; 528 if (src->delete_me) return;
529 child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); 529 child = eo_data_scope_get(eo_child, EVAS_OBJECT_CLASS);
530 ev->canvas = point; 530 ev->canvas = point;
531 _evas_event_havemap_adjust(eo_child, child, 531 _evas_event_havemap_adjust(eo_child, child,
532 &ev->canvas.x, 532 &ev->canvas.x,
@@ -543,9 +543,9 @@ _evas_event_source_wheel_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mous
543static void 543static void
544_evas_event_source_multi_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Multi_Down *ev, int event_id) 544_evas_event_source_multi_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Multi_Down *ev, int event_id)
545{ 545{
546 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 546 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
547 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); 547 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
548 Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJ_CLASS); 548 Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJECT_CLASS);
549 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 549 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS);
550 Evas_Coord_Precision_Point canvas = ev->canvas; 550 Evas_Coord_Precision_Point canvas = ev->canvas;
551 551
@@ -563,7 +563,7 @@ _evas_event_source_multi_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event
563 563
564 EINA_LIST_FOREACH(src->proxy->src_event_in, l, eo_child) 564 EINA_LIST_FOREACH(src->proxy->src_event_in, l, eo_child)
565 { 565 {
566 child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); 566 child = eo_data_scope_get(eo_child, EVAS_OBJECT_CLASS);
567 if (child->pointer_mode != EVAS_OBJECT_POINTER_MODE_NOGRAB) 567 if (child->pointer_mode != EVAS_OBJECT_POINTER_MODE_NOGRAB)
568 { 568 {
569 child->mouse_grabbed += (addgrab + 1); 569 child->mouse_grabbed += (addgrab + 1);
@@ -581,7 +581,7 @@ _evas_event_source_multi_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event
581 &ev->canvas.x, 581 &ev->canvas.x,
582 &ev->canvas.y, 582 &ev->canvas.y,
583 child->mouse_grabbed); 583 child->mouse_grabbed);
584 child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); 584 child = eo_data_scope_get(eo_child, EVAS_OBJECT_CLASS);
585 evas_object_event_callback_call(eo_child, child, 585 evas_object_event_callback_call(eo_child, child,
586 EVAS_CALLBACK_MULTI_DOWN, ev, event_id); 586 EVAS_CALLBACK_MULTI_DOWN, ev, event_id);
587 if (e->delete_me) break; 587 if (e->delete_me) break;
@@ -594,9 +594,9 @@ _evas_event_source_multi_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event
594static void 594static void
595_evas_event_source_multi_up_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Multi_Up *ev, int event_id) 595_evas_event_source_multi_up_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Multi_Up *ev, int event_id)
596{ 596{
597 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 597 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
598 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); 598 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
599 Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJ_CLASS); 599 Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJECT_CLASS);
600 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 600 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS);
601 Evas_Coord_Precision_Point canvas = ev->canvas; 601 Evas_Coord_Precision_Point canvas = ev->canvas;
602 602
@@ -615,7 +615,7 @@ _evas_event_source_multi_up_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_M
615 EINA_LIST_FOREACH(copy, l, eo_child) 615 EINA_LIST_FOREACH(copy, l, eo_child)
616 { 616 {
617 ev->canvas = point; 617 ev->canvas = point;
618 child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); 618 child = eo_data_scope_get(eo_child, EVAS_OBJECT_CLASS);
619 if ((child->pointer_mode != EVAS_OBJECT_POINTER_MODE_NOGRAB) && 619 if ((child->pointer_mode != EVAS_OBJECT_POINTER_MODE_NOGRAB) &&
620 (child->mouse_grabbed > 0)) 620 (child->mouse_grabbed > 0))
621 { 621 {
@@ -638,9 +638,9 @@ _evas_event_source_multi_up_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_M
638static void 638static void
639_evas_event_source_multi_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Multi_Move *ev, int event_id) 639_evas_event_source_multi_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Multi_Move *ev, int event_id)
640{ 640{
641 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 641 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
642 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); 642 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
643 Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJ_CLASS); 643 Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJECT_CLASS);
644 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 644 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS);
645 Evas_Coord_Precision_Point canvas = ev->cur.canvas; 645 Evas_Coord_Precision_Point canvas = ev->cur.canvas;
646 646
@@ -663,7 +663,7 @@ _evas_event_source_multi_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event
663 Eina_List *copy = evas_event_list_copy(src->proxy->src_event_in); 663 Eina_List *copy = evas_event_list_copy(src->proxy->src_event_in);
664 EINA_LIST_FOREACH(copy, l, eo_child) 664 EINA_LIST_FOREACH(copy, l, eo_child)
665 { 665 {
666 child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); 666 child = eo_data_scope_get(eo_child, EVAS_OBJECT_CLASS);
667 if (((evas_object_clippers_is_visible(eo_child, child)) || 667 if (((evas_object_clippers_is_visible(eo_child, child)) ||
668 ((child->mouse_grabbed) && 668 ((child->mouse_grabbed) &&
669 (!evas_event_passes_through(eo_child, child)) && 669 (!evas_event_passes_through(eo_child, child)) &&
@@ -675,7 +675,7 @@ _evas_event_source_multi_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event
675 &ev->cur.canvas.x, 675 &ev->cur.canvas.x,
676 &ev->cur.canvas.y, 676 &ev->cur.canvas.y,
677 child->mouse_grabbed); 677 child->mouse_grabbed);
678 child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); 678 child = eo_data_scope_get(eo_child, EVAS_OBJECT_CLASS);
679 evas_object_event_callback_call(eo_child, child, 679 evas_object_event_callback_call(eo_child, child,
680 EVAS_CALLBACK_MULTI_MOVE, ev, 680 EVAS_CALLBACK_MULTI_MOVE, ev,
681 event_id); 681 event_id);
@@ -698,7 +698,7 @@ _evas_event_source_multi_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event
698 Eina_List *copy = evas_event_list_copy(src->proxy->src_event_in); 698 Eina_List *copy = evas_event_list_copy(src->proxy->src_event_in);
699 EINA_LIST_FOREACH(copy, l, eo_child) 699 EINA_LIST_FOREACH(copy, l, eo_child)
700 { 700 {
701 child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); 701 child = eo_data_scope_get(eo_child, EVAS_OBJECT_CLASS);
702 ev->cur.canvas = point; 702 ev->cur.canvas = point;
703 703
704 if (evas_object_is_in_output_rect(eo_child, child, 704 if (evas_object_is_in_output_rect(eo_child, child,
@@ -718,7 +718,7 @@ _evas_event_source_multi_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event
718 &ev->cur.canvas.x, 718 &ev->cur.canvas.x,
719 &ev->cur.canvas.y, 719 &ev->cur.canvas.y,
720 child->mouse_grabbed); 720 child->mouse_grabbed);
721 child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); 721 child = eo_data_scope_get(eo_child, EVAS_OBJECT_CLASS);
722 evas_object_event_callback_call(eo_child, child, 722 evas_object_event_callback_call(eo_child, child,
723 EVAS_CALLBACK_MULTI_MOVE, ev, 723 EVAS_CALLBACK_MULTI_MOVE, ev,
724 event_id); 724 event_id);
@@ -745,9 +745,9 @@ _evas_event_source_multi_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event
745static void 745static void
746_evas_event_source_mouse_in_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mouse_In *ev, int event_id) 746_evas_event_source_mouse_in_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mouse_In *ev, int event_id)
747{ 747{
748 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 748 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
749 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); 749 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
750 Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJ_CLASS); 750 Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJECT_CLASS);
751 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 751 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS);
752 Evas_Coord_Point canvas = ev->canvas; 752 Evas_Coord_Point canvas = ev->canvas;
753 Evas_Object *eo_child; 753 Evas_Object *eo_child;
@@ -774,7 +774,7 @@ _evas_event_source_mouse_in_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_
774 EINA_LIST_FOREACH(ins, l, eo_child) 774 EINA_LIST_FOREACH(ins, l, eo_child)
775 { 775 {
776 Evas_Object_Protected_Data *child = eo_data_scope_get(eo_child, 776 Evas_Object_Protected_Data *child = eo_data_scope_get(eo_child,
777 EVAS_OBJ_CLASS); 777 EVAS_OBJECT_CLASS);
778 if (!eina_list_data_find(src->proxy->src_event_in, eo_child)) 778 if (!eina_list_data_find(src->proxy->src_event_in, eo_child))
779 { 779 {
780 if(child->mouse_in) continue; 780 if(child->mouse_in) continue;
@@ -805,9 +805,9 @@ _evas_event_source_mouse_in_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_
805static void 805static void
806_evas_event_source_mouse_out_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mouse_Out *ev, int event_id) 806_evas_event_source_mouse_out_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mouse_Out *ev, int event_id)
807{ 807{
808 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 808 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
809 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); 809 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
810 Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJ_CLASS); 810 Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJECT_CLASS);
811 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 811 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS);
812 Evas_Coord_Point canvas = ev->canvas; 812 Evas_Coord_Point canvas = ev->canvas;
813 Evas_Object *eo_child; 813 Evas_Object *eo_child;
@@ -827,7 +827,7 @@ _evas_event_source_mouse_out_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_
827 EINA_LIST_FOREACH(copy, l, eo_child) 827 EINA_LIST_FOREACH(copy, l, eo_child)
828 { 828 {
829 Evas_Object_Protected_Data *child = eo_data_scope_get(eo_child, 829 Evas_Object_Protected_Data *child = eo_data_scope_get(eo_child,
830 EVAS_OBJ_CLASS); 830 EVAS_OBJECT_CLASS);
831 if (!child->mouse_in) continue; 831 if (!child->mouse_in) continue;
832 child->mouse_in = 0; 832 child->mouse_in = 0;
833 833
@@ -1063,7 +1063,7 @@ _evas_event_feed_mouse_down(Eo *eo_e, Evas_Public_Data *e, int b, Evas_Button_Fl
1063 copy = evas_event_list_copy(e->pointer.object.in); 1063 copy = evas_event_list_copy(e->pointer.object.in);
1064 EINA_LIST_FOREACH(copy, l, eo_obj) 1064 EINA_LIST_FOREACH(copy, l, eo_obj)
1065 { 1065 {
1066 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1066 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1067 if ((obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) || 1067 if ((obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) ||
1068 (obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN)) 1068 (obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN))
1069 { 1069 {
@@ -1078,7 +1078,7 @@ _evas_event_feed_mouse_down(Eo *eo_e, Evas_Public_Data *e, int b, Evas_Button_Fl
1078 } 1078 }
1079 EINA_LIST_FOREACH(copy, l, eo_obj) 1079 EINA_LIST_FOREACH(copy, l, eo_obj)
1080 { 1080 {
1081 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1081 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1082 if (obj->delete_me) continue; 1082 if (obj->delete_me) continue;
1083 ev.canvas.x = e->pointer.x; 1083 ev.canvas.x = e->pointer.x;
1084 ev.canvas.y = e->pointer.y; 1084 ev.canvas.y = e->pointer.y;
@@ -1135,7 +1135,7 @@ _post_up_handle(Evas *eo_e, unsigned int timestamp, const void *data)
1135 copy = evas_event_list_copy(e->pointer.object.in); 1135 copy = evas_event_list_copy(e->pointer.object.in);
1136 EINA_LIST_FOREACH(copy, ll, eo_obj) 1136 EINA_LIST_FOREACH(copy, ll, eo_obj)
1137 { 1137 {
1138 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1138 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1139 if ((!eina_list_data_find(ins, eo_obj)) || (!e->pointer.inside)) 1139 if ((!eina_list_data_find(ins, eo_obj)) || (!e->pointer.inside))
1140 { 1140 {
1141 if (!obj->mouse_in) continue; 1141 if (!obj->mouse_in) continue;
@@ -1181,7 +1181,7 @@ _post_up_handle(Evas *eo_e, unsigned int timestamp, const void *data)
1181 1181
1182 EINA_LIST_FOREACH(ins, l, eo_obj_itr) 1182 EINA_LIST_FOREACH(ins, l, eo_obj_itr)
1183 { 1183 {
1184 Evas_Object_Protected_Data *obj_itr = eo_data_scope_get(eo_obj_itr, EVAS_OBJ_CLASS); 1184 Evas_Object_Protected_Data *obj_itr = eo_data_scope_get(eo_obj_itr, EVAS_OBJECT_CLASS);
1185 if (!eina_list_data_find(e->pointer.object.in, eo_obj_itr)) 1185 if (!eina_list_data_find(e->pointer.object.in, eo_obj_itr))
1186 { 1186 {
1187 if (obj_itr->mouse_in) continue; 1187 if (obj_itr->mouse_in) continue;
@@ -1271,7 +1271,7 @@ _evas_event_feed_mouse_up(Eo *eo_e, Evas_Public_Data *e, int b, Evas_Button_Flag
1271 copy = evas_event_list_copy(e->pointer.object.in); 1271 copy = evas_event_list_copy(e->pointer.object.in);
1272 EINA_LIST_FOREACH(copy, l, eo_obj) 1272 EINA_LIST_FOREACH(copy, l, eo_obj)
1273 { 1273 {
1274 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1274 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1275 if ((obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) && 1275 if ((obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) &&
1276 (obj->mouse_grabbed > 0)) 1276 (obj->mouse_grabbed > 0))
1277 { 1277 {
@@ -1383,7 +1383,7 @@ _evas_event_feed_mouse_wheel(Eo *eo_e, Evas_Public_Data *e, int direction, int z
1383 1383
1384 EINA_LIST_FOREACH(copy, l, eo_obj) 1384 EINA_LIST_FOREACH(copy, l, eo_obj)
1385 { 1385 {
1386 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1386 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1387 if (!evas_event_freezes_through(eo_obj, obj)) 1387 if (!evas_event_freezes_through(eo_obj, obj))
1388 { 1388 {
1389 ev.canvas.x = e->pointer.x; 1389 ev.canvas.x = e->pointer.x;
@@ -1466,7 +1466,7 @@ _canvas_event_feed_mouse_move_internal(Eo *eo_e, void *_pd, int x, int y, unsign
1466 copy = evas_event_list_copy(e->pointer.object.in); 1466 copy = evas_event_list_copy(e->pointer.object.in);
1467 EINA_LIST_FOREACH(copy, l, eo_obj) 1467 EINA_LIST_FOREACH(copy, l, eo_obj)
1468 { 1468 {
1469 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1469 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1470 if ((!e->is_frozen) && 1470 if ((!e->is_frozen) &&
1471 (evas_object_clippers_is_visible(eo_obj, obj) || 1471 (evas_object_clippers_is_visible(eo_obj, obj) ||
1472 obj->mouse_grabbed) && 1472 obj->mouse_grabbed) &&
@@ -1534,7 +1534,7 @@ _canvas_event_feed_mouse_move_internal(Eo *eo_e, void *_pd, int x, int y, unsign
1534 Evas_Object *eo_obj; 1534 Evas_Object *eo_obj;
1535 eo_obj = outs->data; 1535 eo_obj = outs->data;
1536 outs = eina_list_remove(outs, eo_obj); 1536 outs = eina_list_remove(outs, eo_obj);
1537 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1537 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1538 if ((obj->mouse_grabbed == 0) && (!e->delete_me)) 1538 if ((obj->mouse_grabbed == 0) && (!e->delete_me))
1539 { 1539 {
1540 if (!obj->mouse_in) continue; 1540 if (!obj->mouse_in) continue;
@@ -1619,7 +1619,7 @@ _canvas_event_feed_mouse_move_internal(Eo *eo_e, void *_pd, int x, int y, unsign
1619 copy = evas_event_list_copy(e->pointer.object.in); 1619 copy = evas_event_list_copy(e->pointer.object.in);
1620 EINA_LIST_FOREACH(copy, l, eo_obj) 1620 EINA_LIST_FOREACH(copy, l, eo_obj)
1621 { 1621 {
1622 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1622 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1623 /* if its under the pointer and its visible and its in the new */ 1623 /* if its under the pointer and its visible and its in the new */
1624 /* in list */ 1624 /* in list */
1625 // FIXME: i don't think we need this 1625 // FIXME: i don't think we need this
@@ -1680,7 +1680,7 @@ _canvas_event_feed_mouse_move_internal(Eo *eo_e, void *_pd, int x, int y, unsign
1680 /* go thru our current list of ins */ 1680 /* go thru our current list of ins */
1681 EINA_LIST_FOREACH(ins, l, eo_obj) 1681 EINA_LIST_FOREACH(ins, l, eo_obj)
1682 { 1682 {
1683 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1683 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1684 /* if its not in the old list of ins send an enter event */ 1684 /* if its not in the old list of ins send an enter event */
1685 if (!eina_list_data_find(e->pointer.object.in, eo_obj)) 1685 if (!eina_list_data_find(e->pointer.object.in, eo_obj))
1686 { 1686 {
@@ -1793,7 +1793,7 @@ nogrep:
1793 eo_below_obj = evas_object_below_get(nogrep_obj); 1793 eo_below_obj = evas_object_below_get(nogrep_obj);
1794 if (eo_below_obj) 1794 if (eo_below_obj)
1795 { 1795 {
1796 Evas_Object_Protected_Data *below_obj = eo_data_scope_get(eo_below_obj, EVAS_OBJ_CLASS); 1796 Evas_Object_Protected_Data *below_obj = eo_data_scope_get(eo_below_obj, EVAS_OBJECT_CLASS);
1797 ins = _evas_event_object_list_raw_in_get(eo_e, NULL, 1797 ins = _evas_event_object_list_raw_in_get(eo_e, NULL,
1798 EINA_INLIST_GET(below_obj), NULL, 1798 EINA_INLIST_GET(below_obj), NULL,
1799 e->pointer.x, e->pointer.y, 1799 e->pointer.x, e->pointer.y,
@@ -1811,7 +1811,7 @@ nogrep:
1811 1811
1812 EINA_LIST_FOREACH(lst, l, eo_obj) 1812 EINA_LIST_FOREACH(lst, l, eo_obj)
1813 { 1813 {
1814 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1814 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1815 /* if its under the pointer and its visible and its in the new */ 1815 /* if its under the pointer and its visible and its in the new */
1816 /* in list */ 1816 /* in list */
1817 // FIXME: i don't think we need this 1817 // FIXME: i don't think we need this
@@ -1869,7 +1869,7 @@ nogrep:
1869 /* go thru our current list of ins */ 1869 /* go thru our current list of ins */
1870 EINA_LIST_FOREACH(newin, l, eo_obj) 1870 EINA_LIST_FOREACH(newin, l, eo_obj)
1871 { 1871 {
1872 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1872 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1873 /* if its not in the old list of ins send an enter event */ 1873 /* if its not in the old list of ins send an enter event */
1874 if (!eina_list_data_find(e->pointer.object.in, eo_obj)) 1874 if (!eina_list_data_find(e->pointer.object.in, eo_obj))
1875 { 1875 {
@@ -1950,7 +1950,7 @@ _evas_event_feed_mouse_in(Eo *eo_e, Evas_Public_Data *e, unsigned int timestamp,
1950 ins = evas_event_objects_event_list(eo_e, NULL, e->pointer.x, e->pointer.y); 1950 ins = evas_event_objects_event_list(eo_e, NULL, e->pointer.x, e->pointer.y);
1951 EINA_LIST_FOREACH(ins, l, eo_obj) 1951 EINA_LIST_FOREACH(ins, l, eo_obj)
1952 { 1952 {
1953 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1953 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1954 if (!eina_list_data_find(e->pointer.object.in, eo_obj)) 1954 if (!eina_list_data_find(e->pointer.object.in, eo_obj))
1955 { 1955 {
1956 if (obj->mouse_in) continue; 1956 if (obj->mouse_in) continue;
@@ -2014,7 +2014,7 @@ _evas_event_feed_mouse_out(Eo *eo_e, Evas_Public_Data *e, unsigned int timestamp
2014 copy = evas_event_list_copy(e->pointer.object.in); 2014 copy = evas_event_list_copy(e->pointer.object.in);
2015 EINA_LIST_FOREACH(copy, l, eo_obj) 2015 EINA_LIST_FOREACH(copy, l, eo_obj)
2016 { 2016 {
2017 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 2017 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
2018 if (!obj->mouse_in) continue; 2018 if (!obj->mouse_in) continue;
2019 obj->mouse_in = 0; 2019 obj->mouse_in = 0;
2020 if (!obj->delete_me) 2020 if (!obj->delete_me)
@@ -2097,7 +2097,7 @@ _canvas_event_feed_multi_down_internal(Evas *eo_e, void *_pd,
2097 copy = evas_event_list_copy(e->pointer.object.in); 2097 copy = evas_event_list_copy(e->pointer.object.in);
2098 EINA_LIST_FOREACH(copy, l, eo_obj) 2098 EINA_LIST_FOREACH(copy, l, eo_obj)
2099 { 2099 {
2100 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 2100 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
2101 if (obj->pointer_mode != EVAS_OBJECT_POINTER_MODE_NOGRAB) 2101 if (obj->pointer_mode != EVAS_OBJECT_POINTER_MODE_NOGRAB)
2102 { 2102 {
2103 obj->mouse_grabbed += addgrab + 1; 2103 obj->mouse_grabbed += addgrab + 1;
@@ -2106,7 +2106,7 @@ _canvas_event_feed_multi_down_internal(Evas *eo_e, void *_pd,
2106 } 2106 }
2107 EINA_LIST_FOREACH(copy, l, eo_obj) 2107 EINA_LIST_FOREACH(copy, l, eo_obj)
2108 { 2108 {
2109 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 2109 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
2110 ev.canvas.x = x; 2110 ev.canvas.x = x;
2111 ev.canvas.y = y; 2111 ev.canvas.y = y;
2112 ev.canvas.xsub = fx; 2112 ev.canvas.xsub = fx;
@@ -2204,7 +2204,7 @@ _canvas_event_feed_multi_up_internal(Evas *eo_e, void *_pd,
2204 copy = evas_event_list_copy(e->pointer.object.in); 2204 copy = evas_event_list_copy(e->pointer.object.in);
2205 EINA_LIST_FOREACH(copy, l, eo_obj) 2205 EINA_LIST_FOREACH(copy, l, eo_obj)
2206 { 2206 {
2207 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 2207 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
2208 ev.canvas.x = x; 2208 ev.canvas.x = x;
2209 ev.canvas.y = y; 2209 ev.canvas.y = y;
2210 ev.canvas.xsub = fx; 2210 ev.canvas.xsub = fx;
@@ -2308,7 +2308,7 @@ _canvas_event_feed_multi_move_internal(Eo *eo_e, void *_pd, int d, int x,
2308 copy = evas_event_list_copy(e->pointer.object.in); 2308 copy = evas_event_list_copy(e->pointer.object.in);
2309 EINA_LIST_FOREACH(copy, l, eo_obj) 2309 EINA_LIST_FOREACH(copy, l, eo_obj)
2310 { 2310 {
2311 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 2311 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
2312 if ((evas_object_clippers_is_visible(eo_obj, obj) || 2312 if ((evas_object_clippers_is_visible(eo_obj, obj) ||
2313 obj->mouse_grabbed) && 2313 obj->mouse_grabbed) &&
2314 (!evas_event_passes_through(eo_obj, obj)) && 2314 (!evas_event_passes_through(eo_obj, obj)) &&
@@ -2375,7 +2375,7 @@ _canvas_event_feed_multi_move_internal(Eo *eo_e, void *_pd, int d, int x,
2375 copy = evas_event_list_copy(e->pointer.object.in); 2375 copy = evas_event_list_copy(e->pointer.object.in);
2376 EINA_LIST_FOREACH(copy, l, eo_obj) 2376 EINA_LIST_FOREACH(copy, l, eo_obj)
2377 { 2377 {
2378 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 2378 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
2379 /* if its under the pointer and its visible and its in the new */ 2379 /* if its under the pointer and its visible and its in the new */
2380 /* in list */ 2380 /* in list */
2381 // FIXME: i don't think we need this 2381 // FIXME: i don't think we need this
@@ -2505,7 +2505,7 @@ _canvas_event_feed_key_down_internal(Eo *eo_e,
2505 { 2505 {
2506 if (!(e->modifiers.mask & g->not_modifiers)) 2506 if (!(e->modifiers.mask & g->not_modifiers))
2507 { 2507 {
2508 Evas_Object_Protected_Data *object_obj = eo_data_scope_get(g->object, EVAS_OBJ_CLASS); 2508 Evas_Object_Protected_Data *object_obj = eo_data_scope_get(g->object, EVAS_OBJECT_CLASS);
2509 if (!e->is_frozen && 2509 if (!e->is_frozen &&
2510 !evas_event_freezes_through(g->object, object_obj)) 2510 !evas_event_freezes_through(g->object, object_obj))
2511 { 2511 {
@@ -2530,7 +2530,7 @@ _canvas_event_feed_key_down_internal(Eo *eo_e,
2530 l = eina_list_next(l); 2530 l = eina_list_next(l);
2531 if (g->delete_me) 2531 if (g->delete_me)
2532 { 2532 {
2533 Evas_Object_Protected_Data *g_object_obj = eo_data_scope_get(g->object, EVAS_OBJ_CLASS); 2533 Evas_Object_Protected_Data *g_object_obj = eo_data_scope_get(g->object, EVAS_OBJECT_CLASS);
2534 evas_key_grab_free(g->object, g_object_obj, g->keyname, 2534 evas_key_grab_free(g->object, g_object_obj, g->keyname,
2535 g->modifiers, g->not_modifiers); 2535 g->modifiers, g->not_modifiers);
2536 } 2536 }
@@ -2540,7 +2540,7 @@ _canvas_event_feed_key_down_internal(Eo *eo_e,
2540 } 2540 }
2541 if ((e->focused) && (!exclusive)) 2541 if ((e->focused) && (!exclusive))
2542 { 2542 {
2543 Evas_Object_Protected_Data *focused_obj = eo_data_scope_get(e->focused, EVAS_OBJ_CLASS); 2543 Evas_Object_Protected_Data *focused_obj = eo_data_scope_get(e->focused, EVAS_OBJECT_CLASS);
2544 if (!e->is_frozen && !evas_event_freezes_through(e->focused, focused_obj)) 2544 if (!e->is_frozen && !evas_event_freezes_through(e->focused, focused_obj))
2545 evas_object_event_callback_call(e->focused, focused_obj, 2545 evas_object_event_callback_call(e->focused, focused_obj,
2546 EVAS_CALLBACK_KEY_DOWN, 2546 EVAS_CALLBACK_KEY_DOWN,
@@ -2610,7 +2610,7 @@ _canvas_event_feed_key_up_internal(Eo *eo_e,
2610 (g->not_modifiers == ~e->modifiers.mask))) && 2610 (g->not_modifiers == ~e->modifiers.mask))) &&
2611 (!strcmp(keyname, g->keyname))) 2611 (!strcmp(keyname, g->keyname)))
2612 { 2612 {
2613 Evas_Object_Protected_Data *object_obj = eo_data_scope_get(g->object, EVAS_OBJ_CLASS); 2613 Evas_Object_Protected_Data *object_obj = eo_data_scope_get(g->object, EVAS_OBJECT_CLASS);
2614 if (!e->is_frozen && 2614 if (!e->is_frozen &&
2615 !evas_event_freezes_through(g->object, object_obj)) 2615 !evas_event_freezes_through(g->object, object_obj))
2616 { 2616 {
@@ -2636,7 +2636,7 @@ _canvas_event_feed_key_up_internal(Eo *eo_e,
2636 if (gr->delete_me) 2636 if (gr->delete_me)
2637 { 2637 {
2638 Evas_Object_Protected_Data *gr_object_obj = 2638 Evas_Object_Protected_Data *gr_object_obj =
2639 eo_data_scope_get(gr->object, EVAS_OBJ_CLASS); 2639 eo_data_scope_get(gr->object, EVAS_OBJECT_CLASS);
2640 evas_key_grab_free(gr->object, gr_object_obj, gr->keyname, 2640 evas_key_grab_free(gr->object, gr_object_obj, gr->keyname,
2641 gr->modifiers, gr->not_modifiers); 2641 gr->modifiers, gr->not_modifiers);
2642 } 2642 }
@@ -2646,7 +2646,7 @@ _canvas_event_feed_key_up_internal(Eo *eo_e,
2646 } 2646 }
2647 if ((e->focused) && (!exclusive)) 2647 if ((e->focused) && (!exclusive))
2648 { 2648 {
2649 Evas_Object_Protected_Data *focused_obj = eo_data_scope_get(e->focused, EVAS_OBJ_CLASS); 2649 Evas_Object_Protected_Data *focused_obj = eo_data_scope_get(e->focused, EVAS_OBJECT_CLASS);
2650 if (!e->is_frozen && !evas_event_freezes_through(e->focused, focused_obj)) 2650 if (!e->is_frozen && !evas_event_freezes_through(e->focused, focused_obj))
2651 evas_object_event_callback_call(e->focused, focused_obj, 2651 evas_object_event_callback_call(e->focused, focused_obj,
2652 EVAS_CALLBACK_KEY_UP, 2652 EVAS_CALLBACK_KEY_UP,
@@ -2711,7 +2711,7 @@ _evas_event_feed_hold(Eo *eo_e, Evas_Public_Data *e, int hold, unsigned int time
2711 copy = evas_event_list_copy(e->pointer.object.in); 2711 copy = evas_event_list_copy(e->pointer.object.in);
2712 EINA_LIST_FOREACH(copy, l, eo_obj) 2712 EINA_LIST_FOREACH(copy, l, eo_obj)
2713 { 2713 {
2714 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 2714 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
2715 if ( !evas_event_freezes_through(eo_obj, obj)) 2715 if ( !evas_event_freezes_through(eo_obj, obj))
2716 { 2716 {
2717 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_HOLD, 2717 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 2628305..5bb13ad 100644
--- a/src/lib/evas/canvas/evas_font_dir.c
+++ b/src/lib/evas/canvas/evas_font_dir.c
@@ -1396,7 +1396,7 @@ evas_font_path_global_list(void)
1396void 1396void
1397evas_font_object_rehint(Evas_Object *eo_obj) 1397evas_font_object_rehint(Evas_Object *eo_obj)
1398{ 1398{
1399 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1399 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1400 if (obj->is_smart) 1400 if (obj->is_smart)
1401 { 1401 {
1402 EINA_INLIST_FOREACH(evas_object_smart_members_get_direct(eo_obj), obj) 1402 EINA_INLIST_FOREACH(evas_object_smart_members_get_direct(eo_obj), obj)
diff --git a/src/lib/evas/canvas/evas_key_grab.c b/src/lib/evas/canvas/evas_key_grab.c
index b7c0d96..d14a06f 100644
--- a/src/lib/evas/canvas/evas_key_grab.c
+++ b/src/lib/evas/canvas/evas_key_grab.c
@@ -98,7 +98,7 @@ evas_key_grab_free(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, const c
98 98
99 g = evas_key_grab_find(eo_obj, obj, keyname, modifiers, not_modifiers, 0); 99 g = evas_key_grab_find(eo_obj, obj, keyname, modifiers, not_modifiers, 0);
100 if (!g) return; 100 if (!g) return;
101 Evas_Object_Protected_Data *g_object = eo_data_scope_get(g->object, EVAS_OBJ_CLASS); 101 Evas_Object_Protected_Data *g_object = eo_data_scope_get(g->object, EVAS_OBJECT_CLASS);
102 g_object->grabs = eina_list_remove(g_object->grabs, g); 102 g_object->grabs = eina_list_remove(g_object->grabs, g);
103 obj->layer->evas->grabs = eina_list_remove(obj->layer->evas->grabs, g); 103 obj->layer->evas->grabs = eina_list_remove(obj->layer->evas->grabs, g);
104 if (g->keyname) free(g->keyname); 104 if (g->keyname) free(g->keyname);
@@ -133,7 +133,7 @@ _evas_object_key_ungrab(Eo *eo_obj, Evas_Object_Protected_Data *obj, const char
133 if (!keyname) return; 133 if (!keyname) return;
134 g = evas_key_grab_find(eo_obj, obj, keyname, modifiers, not_modifiers, 0); 134 g = evas_key_grab_find(eo_obj, obj, keyname, modifiers, not_modifiers, 0);
135 if (!g) return; 135 if (!g) return;
136 Evas_Object_Protected_Data *g_object = eo_data_scope_get(g->object, EVAS_OBJ_CLASS); 136 Evas_Object_Protected_Data *g_object = eo_data_scope_get(g->object, EVAS_OBJECT_CLASS);
137 if (g_object->layer->evas->walking_grabs) 137 if (g_object->layer->evas->walking_grabs)
138 { 138 {
139 if (!g->delete_me) 139 if (!g->delete_me)
diff --git a/src/lib/evas/canvas/evas_layer.c b/src/lib/evas/canvas/evas_layer.c
index 036f2e0..98f8755 100644
--- a/src/lib/evas/canvas/evas_layer.c
+++ b/src/lib/evas/canvas/evas_layer.c
@@ -145,8 +145,8 @@ evas_layer_del(Evas_Layer *lay)
145static void 145static void
146_evas_object_layer_set_child(Evas_Object *eo_obj, Evas_Object *par, short l) 146_evas_object_layer_set_child(Evas_Object *eo_obj, Evas_Object *par, short l)
147{ 147{
148 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 148 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
149 Evas_Object_Protected_Data *par_obj = eo_data_scope_get(par, EVAS_OBJ_CLASS); 149 Evas_Object_Protected_Data *par_obj = eo_data_scope_get(par, EVAS_OBJECT_CLASS);
150 150
151 if (obj->delete_me) return; 151 if (obj->delete_me) return;
152 if (obj->cur->layer == l) return; 152 if (obj->cur->layer == l) return;
@@ -236,7 +236,7 @@ _evas_object_layer_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
236{ 236{
237 if (obj->smart.parent) 237 if (obj->smart.parent)
238 { 238 {
239 Evas_Object_Protected_Data *smart_parent_obj = eo_data_scope_get(obj->smart.parent, EVAS_OBJ_CLASS); 239 Evas_Object_Protected_Data *smart_parent_obj = eo_data_scope_get(obj->smart.parent, EVAS_OBJECT_CLASS);
240 return smart_parent_obj->cur->layer; 240 return smart_parent_obj->cur->layer;
241 } 241 }
242 return obj->cur->layer; 242 return obj->cur->layer;
diff --git a/src/lib/evas/canvas/evas_map.c b/src/lib/evas/canvas/evas_map.c
index 142f6f0..9d41cf3 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_scope_get(eo_obj, EVAS_OBJECT_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_scope_get(eo_obj, EVAS_OBJECT_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_scope_get(eo_obj, EVAS_OBJECT_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_scope_get(eo_parent, EVAS_OBJECT_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)
@@ -483,7 +483,7 @@ _evas_object_map_enable_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bo
483 Evas_Object_Protected_Data *parents = NULL; 483 Evas_Object_Protected_Data *parents = NULL;
484 for (eo_parents = obj->smart.parent; eo_parents; eo_parents = parents->smart.parent) 484 for (eo_parents = obj->smart.parent; eo_parents; eo_parents = parents->smart.parent)
485 { 485 {
486 parents = eo_data_scope_get(eo_parents, EVAS_OBJ_CLASS); 486 parents = eo_data_scope_get(eo_parents, EVAS_OBJECT_CLASS);
487 if (!parents) break; 487 if (!parents) break;
488 parents->child_has_map = EINA_TRUE; 488 parents->child_has_map = EINA_TRUE;
489 } 489 }
@@ -795,7 +795,7 @@ evas_map_util_points_populate_from_object_full(Evas_Map *m, const Evas_Object *e
795 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 795 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
796 return; 796 return;
797 MAGIC_CHECK_END(); 797 MAGIC_CHECK_END();
798 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 798 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
799 799
800 if (!obj) return; 800 if (!obj) return;
801 if (m->count != 4) 801 if (m->count != 4)
@@ -817,7 +817,7 @@ evas_map_util_points_populate_from_object(Evas_Map *m, const Evas_Object *eo_obj
817 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 817 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
818 return; 818 return;
819 MAGIC_CHECK_END(); 819 MAGIC_CHECK_END();
820 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 820 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
821 821
822 if (!obj) return; 822 if (!obj) return;
823 if (m->count != 4) 823 if (m->count != 4)
@@ -1178,7 +1178,7 @@ evas_object_map_update(Evas_Object *eo_obj,
1178 int imagew, int imageh, 1178 int imagew, int imageh,
1179 int uvw, int uvh) 1179 int uvw, int uvh)
1180{ 1180{
1181 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1181 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1182 const Evas_Map_Point *p, *p_end; 1182 const Evas_Map_Point *p, *p_end;
1183 RGBA_Map_Point *pts, *pt; 1183 RGBA_Map_Point *pts, *pt;
1184 1184
diff --git a/src/lib/evas/canvas/evas_name.c b/src/lib/evas/canvas/evas_name.c
index 1d686eb..f7efdb0 100644
--- a/src/lib/evas/canvas/evas_name.c
+++ b/src/lib/evas/canvas/evas_name.c
@@ -38,7 +38,7 @@ _priv_evas_object_name_child_find(const Evas_Object *eo_obj, const char *name, i
38 const Eina_Inlist *lst; 38 const Eina_Inlist *lst;
39 Evas_Object_Protected_Data *child; 39 Evas_Object_Protected_Data *child;
40 40
41 if (!eo_isa(eo_obj, EVAS_OBJ_SMART_CLASS)) return NULL; 41 if (!eo_isa(eo_obj, EVAS_OBJECT_SMART_CLASS)) return NULL;
42 lst = evas_object_smart_members_get_direct(eo_obj); 42 lst = evas_object_smart_members_get_direct(eo_obj);
43 EINA_INLIST_FOREACH(lst, child) 43 EINA_INLIST_FOREACH(lst, child)
44 { 44 {
diff --git a/src/lib/evas/canvas/evas_object_box.c b/src/lib/evas/canvas/evas_object_box.c
index f4d99e1..00e7c4a 100644
--- a/src/lib/evas/canvas/evas_object_box.c
+++ b/src/lib/evas/canvas/evas_object_box.c
@@ -8,7 +8,7 @@
8#define MY_CLASS_NAME "Evas_Box" 8#define MY_CLASS_NAME "Evas_Box"
9#define MY_CLASS_NAME_LEGACY "Evas_Object_Box" 9#define MY_CLASS_NAME_LEGACY "Evas_Object_Box"
10 10
11#define MY_CLASS EVAS_OBJ_BOX_CLASS 11#define MY_CLASS EVAS_BOX_CLASS
12 12
13typedef struct _Evas_Object_Box_Iterator Evas_Object_Box_Iterator; 13typedef struct _Evas_Object_Box_Iterator Evas_Object_Box_Iterator;
14typedef struct _Evas_Object_Box_Accessor Evas_Object_Box_Accessor; 14typedef struct _Evas_Object_Box_Accessor Evas_Object_Box_Accessor;
@@ -389,7 +389,7 @@ _evas_box_internal_remove_at(Eo *o, Evas_Object_Box_Data *priv, unsigned int pos
389} 389}
390 390
391EOLIAN static void 391EOLIAN static void
392_evas_box_evas_smart_add(Eo *o, Evas_Object_Box_Data *priv) 392_evas_box_evas_object_smart_add(Eo *o, Evas_Object_Box_Data *priv)
393{ 393{
394 eo_do_super(o, MY_CLASS, evas_obj_smart_add()); 394 eo_do_super(o, MY_CLASS, evas_obj_smart_add());
395 395
@@ -406,7 +406,7 @@ _evas_box_evas_smart_add(Eo *o, Evas_Object_Box_Data *priv)
406} 406}
407 407
408EOLIAN static void 408EOLIAN static void
409_evas_box_evas_smart_del(Eo *o, Evas_Object_Box_Data *priv) 409_evas_box_evas_object_smart_del(Eo *o, Evas_Object_Box_Data *priv)
410{ 410{
411 Eina_List *l; 411 Eina_List *l;
412 412
@@ -427,7 +427,7 @@ _evas_box_evas_smart_del(Eo *o, Evas_Object_Box_Data *priv)
427} 427}
428 428
429EOLIAN static void 429EOLIAN static void
430_evas_box_evas_smart_resize(Eo *o, Evas_Object_Box_Data *_pd EINA_UNUSED, Evas_Coord w, Evas_Coord h) 430_evas_box_evas_object_smart_resize(Eo *o, Evas_Object_Box_Data *_pd EINA_UNUSED, Evas_Coord w, Evas_Coord h)
431{ 431{
432 Evas_Coord ow, oh; 432 Evas_Coord ow, oh;
433 evas_object_geometry_get(o, NULL, NULL, &ow, &oh); 433 evas_object_geometry_get(o, NULL, NULL, &ow, &oh);
@@ -436,7 +436,7 @@ _evas_box_evas_smart_resize(Eo *o, Evas_Object_Box_Data *_pd EINA_UNUSED, Evas_C
436} 436}
437 437
438EOLIAN static void 438EOLIAN static void
439_evas_box_evas_smart_calculate(Eo *o, Evas_Object_Box_Data *priv) 439_evas_box_evas_object_smart_calculate(Eo *o, Evas_Object_Box_Data *priv)
440{ 440{
441 if (priv->layout.cb) 441 if (priv->layout.cb)
442 { 442 {
diff --git a/src/lib/evas/canvas/evas_object_grid.c b/src/lib/evas/canvas/evas_object_grid.c
index 7af3ad9..a866c42 100644
--- a/src/lib/evas/canvas/evas_object_grid.c
+++ b/src/lib/evas/canvas/evas_object_grid.c
@@ -2,7 +2,7 @@
2#include "evas_private.h" 2#include "evas_private.h"
3#include <errno.h> 3#include <errno.h>
4 4
5#define MY_CLASS EVAS_OBJ_GRID_CLASS 5#define MY_CLASS EVAS_GRID_CLASS
6 6
7typedef struct _Evas_Grid_Data Evas_Grid_Data; 7typedef struct _Evas_Grid_Data Evas_Grid_Data;
8typedef struct _Evas_Object_Grid_Option Evas_Object_Grid_Option; 8typedef struct _Evas_Object_Grid_Option Evas_Object_Grid_Option;
diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c
index f4b7eb1..3dc74f0 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -15,7 +15,7 @@
15#include "../common/evas_convert_yuv.h" 15#include "../common/evas_convert_yuv.h"
16#include "evas_filter.h" 16#include "evas_filter.h"
17 17
18#define MY_CLASS EVAS_OBJ_IMAGE_CLASS 18#define MY_CLASS EVAS_IMAGE_CLASS
19 19
20#define MY_CLASS_NAME "Evas_Image" 20#define MY_CLASS_NAME "Evas_Image"
21 21
@@ -337,7 +337,7 @@ _init_cow(Eo *eo_obj)
337EOLIAN static void 337EOLIAN static void
338_evas_image_eo_base_constructor(Eo *eo_obj, Evas_Image_Data *o) 338_evas_image_eo_base_constructor(Eo *eo_obj, Evas_Image_Data *o)
339{ 339{
340 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 340 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
341 Evas *eo_e; 341 Evas *eo_e;
342 Eo *parent = NULL; 342 Eo *parent = NULL;
343 Evas_Colorspace cspace; 343 Evas_Colorspace cspace;
@@ -379,7 +379,7 @@ evas_object_image_add(Evas *eo_e)
379 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); 379 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS);
380 EINA_SAFETY_ON_NULL_RETURN_VAL(e, NULL); 380 EINA_SAFETY_ON_NULL_RETURN_VAL(e, NULL);
381 EINA_SAFETY_ON_NULL_RETURN_VAL(e->engine.func, NULL); 381 EINA_SAFETY_ON_NULL_RETURN_VAL(e->engine.func, NULL);
382 Evas_Object *eo_obj = eo_add(EVAS_OBJ_IMAGE_CLASS, eo_e); 382 Evas_Object *eo_obj = eo_add(EVAS_IMAGE_CLASS, eo_e);
383 eo_unref(eo_obj); 383 eo_unref(eo_obj);
384 return eo_obj; 384 return eo_obj;
385} 385}
@@ -539,7 +539,7 @@ _image_done_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Image_Data *o)
539EOLIAN static void 539EOLIAN static void
540_evas_image_mmap_set(Eo *eo_obj, Evas_Image_Data *o, const Eina_File *f, const char *key) 540_evas_image_mmap_set(Eo *eo_obj, Evas_Image_Data *o, const Eina_File *f, const char *key)
541{ 541{
542 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 542 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
543 Evas_Image_Load_Opts lo; 543 Evas_Image_Load_Opts lo;
544 544
545 if (o->cur->u.f == f) 545 if (o->cur->u.f == f)
@@ -571,7 +571,7 @@ _evas_image_mmap_get(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o, const Eina_File
571EOLIAN static void 571EOLIAN static void
572_evas_image_file_set(Eo *eo_obj, Evas_Image_Data *o, const char *file, const char *key) 572_evas_image_file_set(Eo *eo_obj, Evas_Image_Data *o, const char *file, const char *key)
573{ 573{
574 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 574 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
575 Evas_Image_Load_Opts lo; 575 Evas_Image_Load_Opts lo;
576 576
577 if ((o->cur->u.file) && (file) && (!strcmp(o->cur->u.file, file))) 577 if ((o->cur->u.file) && (file) && (!strcmp(o->cur->u.file, file)))
@@ -607,7 +607,7 @@ _evas_image_file_get(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o, const char **fi
607EOLIAN static Eina_Bool 607EOLIAN static Eina_Bool
608_evas_image_source_set(Eo *eo_obj, Evas_Image_Data *o, Evas_Object *eo_src) 608_evas_image_source_set(Eo *eo_obj, Evas_Image_Data *o, Evas_Object *eo_src)
609{ 609{
610 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 610 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
611 611
612 if (obj->delete_me && eo_src) 612 if (obj->delete_me && eo_src)
613 { 613 {
@@ -616,7 +616,7 @@ _evas_image_source_set(Eo *eo_obj, Evas_Image_Data *o, Evas_Object *eo_src)
616 } 616 }
617 if (eo_src) 617 if (eo_src)
618 { 618 {
619 Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJ_CLASS); 619 Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJECT_CLASS);
620 if (src->delete_me) 620 if (src->delete_me)
621 { 621 {
622 WRN("Setting object %p to deleted image source %p", eo_src, eo_obj); 622 WRN("Setting object %p to deleted image source %p", eo_src, eo_obj);
@@ -682,7 +682,7 @@ _evas_image_source_clip_set(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o, Eina_Boo
682 682
683 if (!o->cur->source) return; 683 if (!o->cur->source) return;
684 684
685 src_obj = eo_data_scope_get(o->cur->source, EVAS_OBJ_CLASS); 685 src_obj = eo_data_scope_get(o->cur->source, EVAS_OBJECT_CLASS);
686 evas_object_change(o->cur->source, src_obj); 686 evas_object_change(o->cur->source, src_obj);
687} 687}
688 688
@@ -695,7 +695,7 @@ _evas_image_source_clip_get(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o)
695EOLIAN static void 695EOLIAN static void
696_evas_image_source_events_set(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o, Eina_Bool source_events) 696_evas_image_source_events_set(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o, Eina_Bool source_events)
697{ 697{
698 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 698 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
699 699
700 source_events = !!source_events; 700 source_events = !!source_events;
701 if (obj->proxy->src_events == source_events) return; 701 if (obj->proxy->src_events == source_events) return;
@@ -712,7 +712,7 @@ _evas_image_source_events_set(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o, Eina_B
712EOLIAN static Eina_Bool 712EOLIAN static Eina_Bool
713_evas_image_source_events_get(Eo *eo_obj, Evas_Image_Data *_pd EINA_UNUSED) 713_evas_image_source_events_get(Eo *eo_obj, Evas_Image_Data *_pd EINA_UNUSED)
714{ 714{
715 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 715 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
716 return obj->proxy->src_events; 716 return obj->proxy->src_events;
717} 717}
718 718
@@ -751,7 +751,7 @@ _evas_image_source_visible_set(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o, Eina_
751 if (!o->cur->source) return; 751 if (!o->cur->source) return;
752 752
753 visible = !!visible; 753 visible = !!visible;
754 src_obj = eo_data_scope_get(o->cur->source, EVAS_OBJ_CLASS); 754 src_obj = eo_data_scope_get(o->cur->source, EVAS_OBJECT_CLASS);
755 if (src_obj->proxy->src_invisible == !visible) return; 755 if (src_obj->proxy->src_invisible == !visible) return;
756 756
757 EINA_COW_WRITE_BEGIN(evas_object_proxy_cow, src_obj->proxy, Evas_Object_Proxy_Data, proxy_write) 757 EINA_COW_WRITE_BEGIN(evas_object_proxy_cow, src_obj->proxy, Evas_Object_Proxy_Data, proxy_write)
@@ -773,7 +773,7 @@ _evas_image_source_visible_get(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o)
773 Eina_Bool visible; 773 Eina_Bool visible;
774 774
775 if (!o->cur->source) visible = EINA_FALSE; 775 if (!o->cur->source) visible = EINA_FALSE;
776 src_obj = eo_data_scope_get(o->cur->source, EVAS_OBJ_CLASS); 776 src_obj = eo_data_scope_get(o->cur->source, EVAS_OBJECT_CLASS);
777 if (src_obj) visible = !src_obj->proxy->src_invisible; 777 if (src_obj) visible = !src_obj->proxy->src_invisible;
778 else visible = EINA_FALSE; 778 else visible = EINA_FALSE;
779 779
@@ -784,7 +784,7 @@ _evas_image_source_visible_get(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o)
784EOLIAN static void 784EOLIAN static void
785_evas_image_scene_set(Eo *eo_obj, Evas_Image_Data *o, Evas_3D_Scene *scene) 785_evas_image_scene_set(Eo *eo_obj, Evas_Image_Data *o, Evas_3D_Scene *scene)
786{ 786{
787 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 787 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
788 Evas_Image_Load_Opts lo; 788 Evas_Image_Load_Opts lo;
789 789
790 if (o->cur->scene == scene) return; 790 if (o->cur->scene == scene) return;
@@ -810,7 +810,7 @@ _evas_image_scene_get(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o)
810EOLIAN static void 810EOLIAN static void
811_evas_image_border_set(Eo *eo_obj, Evas_Image_Data *o, int l, int r, int t, int b) 811_evas_image_border_set(Eo *eo_obj, Evas_Image_Data *o, int l, int r, int t, int b)
812{ 812{
813 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 813 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
814 814
815 if (l < 0) l = 0; 815 if (l < 0) l = 0;
816 if (r < 0) r = 0; 816 if (r < 0) r = 0;
@@ -851,7 +851,7 @@ _evas_image_border_center_fill_set(Eo *eo_obj, Evas_Image_Data *o, Evas_Border_F
851 EINA_COW_IMAGE_STATE_WRITE_END(o, state_write); 851 EINA_COW_IMAGE_STATE_WRITE_END(o, state_write);
852 852
853 o->changed = EINA_TRUE; 853 o->changed = EINA_TRUE;
854 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 854 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
855 evas_object_change(eo_obj, obj); 855 evas_object_change(eo_obj, obj);
856} 856}
857 857
@@ -901,7 +901,7 @@ _evas_image_border_scale_set(Eo *eo_obj, Evas_Image_Data *o, double scale)
901 EINA_COW_IMAGE_STATE_WRITE_END(o, state_write); 901 EINA_COW_IMAGE_STATE_WRITE_END(o, state_write);
902 902
903 o->changed = EINA_TRUE; 903 o->changed = EINA_TRUE;
904 obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 904 obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
905 evas_object_change(eo_obj, obj); 905 evas_object_change(eo_obj, obj);
906} 906}
907 907
@@ -937,7 +937,7 @@ _evas_image_fill_set(Eo *eo_obj, Evas_Image_Data *o, Evas_Coord x, Evas_Coord y,
937 EINA_COW_IMAGE_STATE_WRITE_END(o, state_write); 937 EINA_COW_IMAGE_STATE_WRITE_END(o, state_write);
938 938
939 o->changed = EINA_TRUE; 939 o->changed = EINA_TRUE;
940 obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 940 obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
941 evas_object_change(eo_obj, obj); 941 evas_object_change(eo_obj, obj);
942} 942}
943 943
@@ -962,7 +962,7 @@ _evas_image_fill_spread_set(Eo *eo_obj, Evas_Image_Data *o, Evas_Fill_Spread spr
962 EINA_COW_IMAGE_STATE_WRITE_END(o, state_write); 962 EINA_COW_IMAGE_STATE_WRITE_END(o, state_write);
963 963
964 o->changed = EINA_TRUE; 964 o->changed = EINA_TRUE;
965 obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 965 obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
966 evas_object_change(eo_obj, obj); 966 evas_object_change(eo_obj, obj);
967} 967}
968 968
@@ -975,7 +975,7 @@ _evas_image_fill_spread_get(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o)
975EOLIAN static void 975EOLIAN static void
976_evas_image_size_set(Eo *eo_obj, Evas_Image_Data *o, int w, int h) 976_evas_image_size_set(Eo *eo_obj, Evas_Image_Data *o, int w, int h)
977{ 977{
978 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 978 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
979 979
980 int stride = 0; 980 int stride = 0;
981 981
@@ -1066,7 +1066,7 @@ _evas_image_load_error_get(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o)
1066EOLIAN static void* 1066EOLIAN static void*
1067_evas_image_data_convert(Eo *eo_obj, Evas_Image_Data *o, Evas_Colorspace to_cspace) 1067_evas_image_data_convert(Eo *eo_obj, Evas_Image_Data *o, Evas_Colorspace to_cspace)
1068{ 1068{
1069 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1069 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1070 DATA32 *data; 1070 DATA32 *data;
1071 void* result = NULL; 1071 void* result = NULL;
1072 1072
@@ -1093,7 +1093,7 @@ _evas_image_data_convert(Eo *eo_obj, Evas_Image_Data *o, Evas_Colorspace to_cspa
1093EOLIAN static void 1093EOLIAN static void
1094_evas_image_data_set(Eo *eo_obj, Evas_Image_Data *o, void *data) 1094_evas_image_data_set(Eo *eo_obj, Evas_Image_Data *o, void *data)
1095{ 1095{
1096 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1096 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1097 void *p_data; 1097 void *p_data;
1098 Eina_Bool resize_call = EINA_FALSE; 1098 Eina_Bool resize_call = EINA_FALSE;
1099 1099
@@ -1190,7 +1190,7 @@ _evas_image_data_get(Eo *eo_obj, Evas_Image_Data *_pd EINA_UNUSED, Eina_Bool for
1190 1190
1191 if (!o->engine_data) return NULL; 1191 if (!o->engine_data) return NULL;
1192 1192
1193 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1193 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1194 1194
1195 if (for_writing) evas_render_rendering_wait(obj->layer->evas); 1195 if (for_writing) evas_render_rendering_wait(obj->layer->evas);
1196 1196
@@ -1261,7 +1261,7 @@ _image_preload_internal(Eo *eo_obj, void *_pd, Eina_Bool cancel)
1261 } 1261 }
1262 // FIXME: if already busy preloading, then dont request again until 1262 // FIXME: if already busy preloading, then dont request again until
1263 // preload done 1263 // preload done
1264 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1264 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1265 if (cancel) 1265 if (cancel)
1266 { 1266 {
1267 if (o->preloading) 1267 if (o->preloading)
@@ -1299,7 +1299,7 @@ _evas_image_preload_cancel(Eo *eo_obj, Evas_Image_Data *_pd EINA_UNUSED)
1299EOLIAN static void 1299EOLIAN static void
1300_evas_image_data_copy_set(Eo *eo_obj, Evas_Image_Data *o, void *data) 1300_evas_image_data_copy_set(Eo *eo_obj, Evas_Image_Data *o, void *data)
1301{ 1301{
1302 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1302 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1303 1303
1304 if (!data) return; 1304 if (!data) return;
1305 _evas_object_image_cleanup(eo_obj, obj, o); 1305 _evas_object_image_cleanup(eo_obj, obj, o);
@@ -1387,14 +1387,14 @@ _evas_image_data_update_add(Eo *eo_obj, Evas_Image_Data *o, int x, int y, int w,
1387 } 1387 }
1388 1388
1389 o->changed = EINA_TRUE; 1389 o->changed = EINA_TRUE;
1390 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1390 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1391 evas_object_change(eo_obj, obj); 1391 evas_object_change(eo_obj, obj);
1392} 1392}
1393 1393
1394EOLIAN static void 1394EOLIAN static void
1395_evas_image_alpha_set(Eo *eo_obj, Evas_Image_Data *o, Eina_Bool has_alpha) 1395_evas_image_alpha_set(Eo *eo_obj, Evas_Image_Data *o, Eina_Bool has_alpha)
1396{ 1396{
1397 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1397 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1398 1398
1399 if ((o->preloading) && (o->engine_data)) 1399 if ((o->preloading) && (o->engine_data))
1400 { 1400 {
@@ -1465,7 +1465,7 @@ _evas_image_smooth_scale_set(Eo *eo_obj, Evas_Image_Data *o, Eina_Bool smooth_sc
1465 EINA_COW_IMAGE_STATE_WRITE_END(o, state_write); 1465 EINA_COW_IMAGE_STATE_WRITE_END(o, state_write);
1466 1466
1467 o->changed = EINA_TRUE; 1467 o->changed = EINA_TRUE;
1468 obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1468 obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1469 evas_object_change(eo_obj, obj); 1469 evas_object_change(eo_obj, obj);
1470} 1470}
1471 1471
@@ -1478,7 +1478,7 @@ _evas_image_smooth_scale_get(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o)
1478EOLIAN static void 1478EOLIAN static void
1479_evas_image_reload(Eo *eo_obj, Evas_Image_Data *o) 1479_evas_image_reload(Eo *eo_obj, Evas_Image_Data *o)
1480{ 1480{
1481 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1481 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1482 1482
1483 if ((o->preloading) && (o->engine_data)) 1483 if ((o->preloading) && (o->engine_data))
1484 { 1484 {
@@ -1514,7 +1514,7 @@ _evas_image_save(Eo *eo_obj, Evas_Image_Data *o, const char *file, const char *k
1514 int quality = 80, compress = 9, ok = 0; 1514 int quality = 80, compress = 9, ok = 0;
1515 RGBA_Image *im; 1515 RGBA_Image *im;
1516 if (!o->engine_data) return 0; 1516 if (!o->engine_data) return 0;
1517 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1517 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1518 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); 1518 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);
1519 if (flags) 1519 if (flags)
1520 { 1520 {
@@ -1567,7 +1567,7 @@ _evas_image_save(Eo *eo_obj, Evas_Image_Data *o, const char *file, const char *k
1567EOLIAN static Eina_Bool 1567EOLIAN static Eina_Bool
1568_evas_image_pixels_import(Eo *eo_obj, Evas_Image_Data *o, Evas_Pixel_Import_Source *pixels) 1568_evas_image_pixels_import(Eo *eo_obj, Evas_Image_Data *o, Evas_Pixel_Import_Source *pixels)
1569{ 1569{
1570 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1570 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1571 1571
1572 _evas_object_image_cleanup(eo_obj, obj, o); 1572 _evas_object_image_cleanup(eo_obj, obj, o);
1573 if ((pixels->w != o->cur->image.w) || (pixels->h != o->cur->image.h)) return 0; 1573 if ((pixels->w != o->cur->image.w) || (pixels->h != o->cur->image.h)) return 0;
@@ -1647,7 +1647,7 @@ _evas_image_pixels_get_callback_set(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o,
1647EOLIAN static void 1647EOLIAN static void
1648_evas_image_pixels_dirty_set(Eo *eo_obj, Evas_Image_Data *o, Eina_Bool dirty) 1648_evas_image_pixels_dirty_set(Eo *eo_obj, Evas_Image_Data *o, Eina_Bool dirty)
1649{ 1649{
1650 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1650 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1651 1651
1652 if (dirty) o->dirty_pixels = EINA_TRUE; 1652 if (dirty) o->dirty_pixels = EINA_TRUE;
1653 else o->dirty_pixels = EINA_FALSE; 1653 else o->dirty_pixels = EINA_FALSE;
@@ -1672,7 +1672,7 @@ _evas_image_load_dpi_set(Eo *eo_obj, Evas_Image_Data *o, double dpi)
1672 1672
1673 if (o->cur->u.file) 1673 if (o->cur->u.file)
1674 { 1674 {
1675 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1675 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1676 evas_object_image_unload(eo_obj, 0); 1676 evas_object_image_unload(eo_obj, 0);
1677 evas_object_inform_call_image_unloaded(eo_obj); 1677 evas_object_inform_call_image_unloaded(eo_obj);
1678 evas_object_image_load(eo_obj, obj, o); 1678 evas_object_image_load(eo_obj, obj, o);
@@ -1701,7 +1701,7 @@ _evas_image_load_size_set(Eo *eo_obj, Evas_Image_Data *o, int w, int h)
1701 1701
1702 if (o->cur->u.file) 1702 if (o->cur->u.file)
1703 { 1703 {
1704 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1704 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1705 evas_object_image_unload(eo_obj, 0); 1705 evas_object_image_unload(eo_obj, 0);
1706 evas_object_inform_call_image_unloaded(eo_obj); 1706 evas_object_inform_call_image_unloaded(eo_obj);
1707 evas_object_image_load(eo_obj, obj, o); 1707 evas_object_image_load(eo_obj, obj, o);
@@ -1728,7 +1728,7 @@ _evas_image_load_scale_down_set(Eo *eo_obj, Evas_Image_Data *o, int scale_down)
1728 1728
1729 if (o->cur->u.file) 1729 if (o->cur->u.file)
1730 { 1730 {
1731 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1731 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1732 evas_object_image_unload(eo_obj, 0); 1732 evas_object_image_unload(eo_obj, 0);
1733 evas_object_inform_call_image_unloaded(eo_obj); 1733 evas_object_inform_call_image_unloaded(eo_obj);
1734 evas_object_image_load(eo_obj, obj, o); 1734 evas_object_image_load(eo_obj, obj, o);
@@ -1760,7 +1760,7 @@ _evas_image_load_region_set(Eo *eo_obj, Evas_Image_Data *o, int x, int y, int w,
1760 1760
1761 if (o->cur->u.file) 1761 if (o->cur->u.file)
1762 { 1762 {
1763 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1763 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1764 evas_object_image_unload(eo_obj, 0); 1764 evas_object_image_unload(eo_obj, 0);
1765 evas_object_inform_call_image_unloaded(eo_obj); 1765 evas_object_inform_call_image_unloaded(eo_obj);
1766 evas_object_image_load(eo_obj, obj, o); 1766 evas_object_image_load(eo_obj, obj, o);
@@ -1797,7 +1797,7 @@ _evas_image_load_orientation_get(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o)
1797EOLIAN static void 1797EOLIAN static void
1798_evas_image_colorspace_set(Eo *eo_obj, Evas_Image_Data *o, Evas_Colorspace cspace) 1798_evas_image_colorspace_set(Eo *eo_obj, Evas_Image_Data *o, Evas_Colorspace cspace)
1799{ 1799{
1800 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1800 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1801 1801
1802 _evas_object_image_cleanup(eo_obj, obj, o); 1802 _evas_object_image_cleanup(eo_obj, obj, o);
1803 1803
@@ -1818,7 +1818,7 @@ _evas_image_colorspace_get(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o)
1818EOLIAN static void 1818EOLIAN static void
1819_evas_image_video_surface_set(Eo *eo_obj, Evas_Image_Data *o, Evas_Video_Surface *surf) 1819_evas_image_video_surface_set(Eo *eo_obj, Evas_Image_Data *o, Evas_Video_Surface *surf)
1820{ 1820{
1821 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1821 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1822 1822
1823 _evas_object_image_cleanup(eo_obj, obj, o); 1823 _evas_object_image_cleanup(eo_obj, obj, o);
1824 if (o->video_surface) 1824 if (o->video_surface)
@@ -1881,7 +1881,7 @@ _evas_image_video_surface_get(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o)
1881EOLIAN static void 1881EOLIAN static void
1882_evas_image_video_surface_caps_set(Eo *eo_obj, Evas_Image_Data *o, unsigned int caps) 1882_evas_image_video_surface_caps_set(Eo *eo_obj, Evas_Image_Data *o, unsigned int caps)
1883{ 1883{
1884 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1884 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1885 1885
1886 _evas_object_image_cleanup(eo_obj, obj, o); 1886 _evas_object_image_cleanup(eo_obj, obj, o);
1887 1887
@@ -1922,7 +1922,7 @@ evas_object_image_native_surface_set(Evas_Object *eo_obj, Evas_Native_Surface *s
1922EOLIAN static void 1922EOLIAN static void
1923_evas_image_native_surface_set(Eo *eo_obj, Evas_Image_Data *o, Evas_Native_Surface *surf) 1923_evas_image_native_surface_set(Eo *eo_obj, Evas_Image_Data *o, Evas_Native_Surface *surf)
1924{ 1924{
1925 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1925 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1926 1926
1927 evas_render_rendering_wait(obj->layer->evas); 1927 evas_render_rendering_wait(obj->layer->evas);
1928 1928
@@ -1939,7 +1939,7 @@ _evas_image_native_surface_get(Eo *eo_obj, Evas_Image_Data *o)
1939{ 1939{
1940 Evas_Native_Surface *surf; 1940 Evas_Native_Surface *surf;
1941 1941
1942 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1942 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1943 1943
1944 surf = 1944 surf =
1945 (!obj->layer->evas->engine.func->image_native_get ? NULL : 1945 (!obj->layer->evas->engine.func->image_native_get ? NULL :
@@ -1951,7 +1951,7 @@ _evas_image_native_surface_get(Eo *eo_obj, Evas_Image_Data *o)
1951EOLIAN static void 1951EOLIAN static void
1952_evas_image_scale_hint_set(Eo *eo_obj, Evas_Image_Data *o, Evas_Image_Scale_Hint hint) 1952_evas_image_scale_hint_set(Eo *eo_obj, Evas_Image_Data *o, Evas_Image_Scale_Hint hint)
1953{ 1953{
1954 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1954 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1955 if (o->scale_hint == hint) return; 1955 if (o->scale_hint == hint) return;
1956 o->scale_hint = hint; 1956 o->scale_hint = hint;
1957 if (o->engine_data) 1957 if (o->engine_data)
@@ -1987,7 +1987,7 @@ _evas_image_scale_hint_get(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o)
1987EOLIAN static void 1987EOLIAN static void
1988_evas_image_content_hint_set(Eo *eo_obj, Evas_Image_Data *o, Evas_Image_Content_Hint hint) 1988_evas_image_content_hint_set(Eo *eo_obj, Evas_Image_Data *o, Evas_Image_Content_Hint hint)
1989{ 1989{
1990 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1990 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1991 if (o->content_hint == hint) return; 1991 if (o->content_hint == hint) return;
1992 o->content_hint = hint; 1992 o->content_hint = hint;
1993 if (o->engine_data) 1993 if (o->engine_data)
@@ -2037,7 +2037,7 @@ _evas_image_content_hint_get(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o)
2037EOLIAN static Eina_Bool 2037EOLIAN static Eina_Bool
2038_evas_image_region_support_get(Eo *eo_obj, Evas_Image_Data *o) 2038_evas_image_region_support_get(Eo *eo_obj, Evas_Image_Data *o)
2039{ 2039{
2040 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 2040 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
2041 2041
2042 Eina_Bool region; 2042 Eina_Bool region;
2043 region = obj->layer->evas->engine.func->image_can_region_get( 2043 region = obj->layer->evas->engine.func->image_can_region_get(
@@ -2052,7 +2052,7 @@ EOLIAN static Eina_Bool
2052_evas_image_animated_get(Eo *eo_obj, Evas_Image_Data *o) 2052_evas_image_animated_get(Eo *eo_obj, Evas_Image_Data *o)
2053{ 2053{
2054 Eina_Bool animated; 2054 Eina_Bool animated;
2055 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 2055 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
2056 2056
2057 animated = 2057 animated =
2058 obj->layer->evas->engine.func->image_animated_get ? 2058 obj->layer->evas->engine.func->image_animated_get ?
@@ -2069,7 +2069,7 @@ _evas_image_animated_frame_count_get(Eo *eo_obj, Evas_Image_Data *o)
2069 frame_count = -1; 2069 frame_count = -1;
2070 2070
2071 if (!evas_object_image_animated_get(eo_obj)) return frame_count; 2071 if (!evas_object_image_animated_get(eo_obj)) return frame_count;
2072 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 2072 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
2073 2073
2074 if (obj->layer->evas->engine.func->image_animated_frame_count_get) 2074 if (obj->layer->evas->engine.func->image_animated_frame_count_get)
2075 frame_count = obj->layer->evas->engine.func->image_animated_frame_count_get(obj->layer->evas->engine.data.output, o->engine_data); 2075 frame_count = obj->layer->evas->engine.func->image_animated_frame_count_get(obj->layer->evas->engine.data.output, o->engine_data);
@@ -2080,7 +2080,7 @@ _evas_image_animated_frame_count_get(Eo *eo_obj, Evas_Image_Data *o)
2080EOLIAN static Evas_Image_Animated_Loop_Hint 2080EOLIAN static Evas_Image_Animated_Loop_Hint
2081_evas_image_animated_loop_type_get(Eo *eo_obj, Evas_Image_Data *o) 2081_evas_image_animated_loop_type_get(Eo *eo_obj, Evas_Image_Data *o)
2082{ 2082{
2083 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 2083 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
2084 2084
2085 Evas_Image_Animated_Loop_Hint hint; 2085 Evas_Image_Animated_Loop_Hint hint;
2086 hint = EVAS_IMAGE_ANIMATED_HINT_NONE; 2086 hint = EVAS_IMAGE_ANIMATED_HINT_NONE;
@@ -2095,7 +2095,7 @@ _evas_image_animated_loop_type_get(Eo *eo_obj, Evas_Image_Data *o)
2095EOLIAN static int 2095EOLIAN static int
2096_evas_image_animated_loop_count_get(Eo *eo_obj, Evas_Image_Data *o) 2096_evas_image_animated_loop_count_get(Eo *eo_obj, Evas_Image_Data *o)
2097{ 2097{
2098 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 2098 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
2099 2099
2100 int loop_count; 2100 int loop_count;
2101 loop_count = -1; 2101 loop_count = -1;
@@ -2112,7 +2112,7 @@ _evas_image_animated_loop_count_get(Eo *eo_obj, Evas_Image_Data *o)
2112EOLIAN static double 2112EOLIAN static double
2113_evas_image_animated_frame_duration_get(Eo *eo_obj, Evas_Image_Data *o, int start_frame, int frame_num) 2113_evas_image_animated_frame_duration_get(Eo *eo_obj, Evas_Image_Data *o, int start_frame, int frame_num)
2114{ 2114{
2115 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 2115 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
2116 int frame_count = 0; 2116 int frame_count = 0;
2117 2117
2118 double frame_duration; 2118 double frame_duration;
@@ -2132,7 +2132,7 @@ _evas_image_animated_frame_duration_get(Eo *eo_obj, Evas_Image_Data *o, int star
2132EOLIAN static void 2132EOLIAN static void
2133_evas_image_animated_frame_set(Eo *eo_obj, Evas_Image_Data *o, int frame_index) 2133_evas_image_animated_frame_set(Eo *eo_obj, Evas_Image_Data *o, int frame_index)
2134{ 2134{
2135 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 2135 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
2136 int frame_count = 0; 2136 int frame_count = 0;
2137 2137
2138 if (!o->cur->u.file) return; 2138 if (!o->cur->u.file) return;
@@ -2244,7 +2244,7 @@ _proxy_unset(Evas_Object *proxy, Evas_Object_Protected_Data *cur_proxy, Evas_Ima
2244 2244
2245 if (!o->cur->source) return; 2245 if (!o->cur->source) return;
2246 2246
2247 cur_source = eo_data_scope_get(o->cur->source, EVAS_OBJ_CLASS); 2247 cur_source = eo_data_scope_get(o->cur->source, EVAS_OBJECT_CLASS);
2248 2248
2249 EINA_COW_WRITE_BEGIN(evas_object_proxy_cow, cur_source->proxy, Evas_Object_Proxy_Data, proxy_source_write) 2249 EINA_COW_WRITE_BEGIN(evas_object_proxy_cow, cur_source->proxy, Evas_Object_Proxy_Data, proxy_source_write)
2250 { 2250 {
@@ -2295,8 +2295,8 @@ _proxy_unset(Evas_Object *proxy, Evas_Object_Protected_Data *cur_proxy, Evas_Ima
2295static void 2295static void
2296_proxy_set(Evas_Object *eo_proxy, Evas_Object *eo_src) 2296_proxy_set(Evas_Object *eo_proxy, Evas_Object *eo_src)
2297{ 2297{
2298 Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJ_CLASS); 2298 Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJECT_CLASS);
2299 Evas_Object_Protected_Data *proxy = eo_data_scope_get(eo_proxy, EVAS_OBJ_CLASS); 2299 Evas_Object_Protected_Data *proxy = eo_data_scope_get(eo_proxy, EVAS_OBJECT_CLASS);
2300 Evas_Image_Data *o = eo_data_scope_get(eo_proxy, MY_CLASS); 2300 Evas_Image_Data *o = eo_data_scope_get(eo_proxy, MY_CLASS);
2301 2301
2302 evas_object_image_file_set(eo_proxy, NULL, NULL); 2302 evas_object_image_file_set(eo_proxy, NULL, NULL);
@@ -2334,7 +2334,7 @@ _proxy_error(Evas_Object *eo_proxy, void *context, void *output, void *surface,
2334 if (!o->proxyerror) printf("Err: Argh! Recursive proxies.\n"); 2334 if (!o->proxyerror) printf("Err: Argh! Recursive proxies.\n");
2335 o->proxyerror = 1; 2335 o->proxyerror = 1;
2336 2336
2337 Evas_Object_Protected_Data *proxy = eo_data_scope_get(eo_proxy, EVAS_OBJ_CLASS); 2337 Evas_Object_Protected_Data *proxy = eo_data_scope_get(eo_proxy, EVAS_OBJECT_CLASS);
2338 func = proxy->layer->evas->engine.func; 2338 func = proxy->layer->evas->engine.func;
2339 func->context_color_set(output, context, 0, 0, 0, 255); 2339 func->context_color_set(output, context, 0, 0, 0, 255);
2340 func->context_multiplier_unset(output, context); 2340 func->context_multiplier_unset(output, context);
@@ -2362,7 +2362,7 @@ _proxy_subrender(Evas *eo_e, Evas_Object *eo_source, Evas_Object *eo_proxy, Evas
2362 int w, h; 2362 int w, h;
2363 2363
2364 if (!eo_source) return; 2364 if (!eo_source) return;
2365 source = eo_data_scope_get(eo_source, EVAS_OBJ_CLASS); 2365 source = eo_data_scope_get(eo_source, EVAS_OBJECT_CLASS);
2366 2366
2367 w = source->cur->geometry.w; 2367 w = source->cur->geometry.w;
2368 h = source->cur->geometry.h; 2368 h = source->cur->geometry.h;
@@ -2433,7 +2433,7 @@ _proxy_subrender(Evas *eo_e, Evas_Object *eo_source, Evas_Object *eo_proxy, Evas
2433static void 2433static void
2434_3d_set(Evas_Object *eo_obj, Evas_3D_Scene *scene) 2434_3d_set(Evas_Object *eo_obj, Evas_3D_Scene *scene)
2435{ 2435{
2436 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 2436 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
2437 Evas_Image_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); 2437 Evas_Image_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
2438 Evas_3D_Scene_Data *pd_scene = eo_data_scope_get(scene, 2438 Evas_3D_Scene_Data *pd_scene = eo_data_scope_get(scene,
2439 EVAS_3D_SCENE_CLASS); 2439 EVAS_3D_SCENE_CLASS);
@@ -2610,7 +2610,7 @@ evas_object_image_unload(Evas_Object *eo_obj, Eina_Bool dirty)
2610 if ((!o->cur->u.file) || 2610 if ((!o->cur->u.file) ||
2611 (o->pixels_checked_out > 0)) return; 2611 (o->pixels_checked_out > 0)) return;
2612 2612
2613 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 2613 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
2614 if (dirty) 2614 if (dirty)
2615 { 2615 {
2616 if (o->engine_data) 2616 if (o->engine_data)
@@ -2774,7 +2774,7 @@ evas_object_image_figure_y_fill(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Pro
2774static void 2774static void
2775evas_object_image_init(Evas_Object *eo_obj) 2775evas_object_image_init(Evas_Object *eo_obj)
2776{ 2776{
2777 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 2777 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
2778 /* set up methods (compulsory) */ 2778 /* set up methods (compulsory) */
2779 obj->func = &object_func; 2779 obj->func = &object_func;
2780 obj->private_data = eo_data_ref(eo_obj, MY_CLASS); 2780 obj->private_data = eo_data_ref(eo_obj, MY_CLASS);
@@ -2784,7 +2784,7 @@ evas_object_image_init(Evas_Object *eo_obj)
2784EOLIAN static void 2784EOLIAN static void
2785_evas_image_eo_base_destructor(Eo *eo_obj, Evas_Image_Data *_pd EINA_UNUSED) 2785_evas_image_eo_base_destructor(Eo *eo_obj, Evas_Image_Data *_pd EINA_UNUSED)
2786{ 2786{
2787 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 2787 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
2788 2788
2789 evas_object_image_video_surface_set(eo_obj, NULL); 2789 evas_object_image_video_surface_set(eo_obj, NULL);
2790 evas_object_image_free(eo_obj, obj); 2790 evas_object_image_free(eo_obj, obj);
@@ -3011,7 +3011,7 @@ _filter_cb(Evas_Filter_Context *ctx, void *data, Eina_Bool success)
3011 // Redraw image normally 3011 // Redraw image normally
3012 if (!success) 3012 if (!success)
3013 { 3013 {
3014 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 3014 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
3015 Evas_Image_Data *o = (Evas_Image_Data *) obj->private_data; 3015 Evas_Image_Data *o = (Evas_Image_Data *) obj->private_data;
3016 3016
3017 ERR("Filter failed at runtime!"); 3017 ERR("Filter failed at runtime!");
@@ -3020,7 +3020,7 @@ _filter_cb(Evas_Filter_Context *ctx, void *data, Eina_Bool success)
3020 EINA_COW_IMAGE_STATE_WRITE_END(o, state_write) 3020 EINA_COW_IMAGE_STATE_WRITE_END(o, state_write)
3021 3021
3022 // Update object 3022 // Update object
3023 obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 3023 obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
3024 o->changed = EINA_TRUE; 3024 o->changed = EINA_TRUE;
3025 evas_object_change(eo_obj, obj); 3025 evas_object_change(eo_obj, obj);
3026 evas_object_clip_dirty(eo_obj, obj); 3026 evas_object_clip_dirty(eo_obj, obj);
@@ -3101,7 +3101,7 @@ evas_object_image_render(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, v
3101 3101
3102 Evas_Object_Protected_Data *source = 3102 Evas_Object_Protected_Data *source =
3103 (o->cur->source ? 3103 (o->cur->source ?
3104 eo_data_scope_get(o->cur->source, EVAS_OBJ_CLASS): 3104 eo_data_scope_get(o->cur->source, EVAS_OBJECT_CLASS):
3105 NULL); 3105 NULL);
3106 3106
3107 if (o->cur->scene) 3107 if (o->cur->scene)
@@ -3235,7 +3235,7 @@ start_draw:
3235 iter = eina_hash_iterator_data_new(o->cur->filter.sources); 3235 iter = eina_hash_iterator_data_new(o->cur->filter.sources);
3236 EINA_ITERATOR_FOREACH(iter, pb) 3236 EINA_ITERATOR_FOREACH(iter, pb)
3237 { 3237 {
3238 prxsource = eo_data_scope_get(pb->eo_source, EVAS_OBJ_CLASS); 3238 prxsource = eo_data_scope_get(pb->eo_source, EVAS_OBJECT_CLASS);
3239 if (prxsource->changed) 3239 if (prxsource->changed)
3240 { 3240 {
3241 redraw = EINA_TRUE; 3241 redraw = EINA_TRUE;
@@ -3650,7 +3650,7 @@ evas_object_image_render_pre(Evas_Object *eo_obj,
3650 /* Proxy: Do it early */ 3650 /* Proxy: Do it early */
3651 if (o->cur->source) 3651 if (o->cur->source)
3652 { 3652 {
3653 Evas_Object_Protected_Data *source = eo_data_scope_get(o->cur->source, EVAS_OBJ_CLASS); 3653 Evas_Object_Protected_Data *source = eo_data_scope_get(o->cur->source, EVAS_OBJECT_CLASS);
3654 if (source->proxy->redraw || source->changed) 3654 if (source->proxy->redraw || source->changed)
3655 { 3655 {
3656 /* XXX: Do I need to sort out the map here? */ 3656 /* XXX: Do I need to sort out the map here? */
@@ -3980,7 +3980,7 @@ evas_object_image_is_opaque(Evas_Object *eo_obj EINA_UNUSED,
3980 // FIXME: use proxy 3980 // FIXME: use proxy
3981 if (o->cur->source) 3981 if (o->cur->source)
3982 { 3982 {
3983 Evas_Object_Protected_Data *cur_source = eo_data_scope_get(o->cur->source, EVAS_OBJ_CLASS); 3983 Evas_Object_Protected_Data *cur_source = eo_data_scope_get(o->cur->source, EVAS_OBJECT_CLASS);
3984 EINA_COW_IMAGE_STATE_WRITE_BEGIN(o, state_write) 3984 EINA_COW_IMAGE_STATE_WRITE_BEGIN(o, state_write)
3985 { 3985 {
3986 state_write->opaque = evas_object_is_opaque(o->cur->source, cur_source); 3986 state_write->opaque = evas_object_is_opaque(o->cur->source, cur_source);
@@ -4170,7 +4170,7 @@ evas_object_image_is_inside(Evas_Object *eo_obj,
4170 */ 4170 */
4171 Evas_Object_Protected_Data *source = 4171 Evas_Object_Protected_Data *source =
4172 (o->cur->source ? 4172 (o->cur->source ?
4173 eo_data_scope_get(o->cur->source, EVAS_OBJ_CLASS): 4173 eo_data_scope_get(o->cur->source, EVAS_OBJECT_CLASS):
4174 NULL); 4174 NULL);
4175 4175
4176 if (o->cur->scene) 4176 if (o->cur->scene)
@@ -4665,7 +4665,7 @@ _evas_object_image_preloading_set(Evas_Object *eo_obj, Eina_Bool preloading)
4665void 4665void
4666_evas_object_image_preloading_check(Evas_Object *eo_obj) 4666_evas_object_image_preloading_check(Evas_Object *eo_obj)
4667{ 4667{
4668 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 4668 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
4669 Evas_Image_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); 4669 Evas_Image_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
4670 if (obj->layer->evas->engine.func->image_load_error_get) 4670 if (obj->layer->evas->engine.func->image_load_error_get)
4671 o->load_error = obj->layer->evas->engine.func->image_load_error_get 4671 o->load_error = obj->layer->evas->engine.func->image_load_error_get
@@ -4682,7 +4682,7 @@ _evas_object_image_video_parent_get(Evas_Object *eo_obj)
4682void 4682void
4683_evas_object_image_video_overlay_show(Evas_Object *eo_obj) 4683_evas_object_image_video_overlay_show(Evas_Object *eo_obj)
4684{ 4684{
4685 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 4685 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
4686 Evas_Image_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); 4686 Evas_Image_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
4687 4687
4688 if (obj->cur->cache.clip.x != obj->prev->cache.clip.x || 4688 if (obj->cur->cache.clip.x != obj->prev->cache.clip.x ||
@@ -4721,7 +4721,7 @@ _evas_object_image_video_overlay_show(Evas_Object *eo_obj)
4721void 4721void
4722_evas_object_image_video_overlay_hide(Evas_Object *eo_obj) 4722_evas_object_image_video_overlay_hide(Evas_Object *eo_obj)
4723{ 4723{
4724 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 4724 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
4725 Evas_Image_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); 4725 Evas_Image_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
4726 4726
4727 if (o->video_visible || o->created) 4727 if (o->video_visible || o->created)
@@ -4738,7 +4738,7 @@ _evas_object_image_video_overlay_hide(Evas_Object *eo_obj)
4738void 4738void
4739_evas_object_image_video_overlay_do(Evas_Object *eo_obj) 4739_evas_object_image_video_overlay_do(Evas_Object *eo_obj)
4740{ 4740{
4741 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 4741 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
4742 Evas_Image_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); 4742 Evas_Image_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
4743 Evas_Public_Data *e = obj->layer->evas; 4743 Evas_Public_Data *e = obj->layer->evas;
4744 4744
@@ -4800,7 +4800,7 @@ _evas_image_filter_program_set(Eo *eo_obj, Evas_Image_Data *o, const char *arg)
4800 EINA_COW_IMAGE_STATE_WRITE_END(o, state_write); 4800 EINA_COW_IMAGE_STATE_WRITE_END(o, state_write);
4801 4801
4802 // Update object 4802 // Update object
4803 obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 4803 obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
4804 o->changed = EINA_TRUE; 4804 o->changed = EINA_TRUE;
4805 evas_object_change(eo_obj, obj); 4805 evas_object_change(eo_obj, obj);
4806} 4806}
@@ -4812,8 +4812,8 @@ _filter_source_hash_free_cb(void *data)
4812 Evas_Object_Protected_Data *proxy, *source; 4812 Evas_Object_Protected_Data *proxy, *source;
4813 Evas_Image_Data *o; 4813 Evas_Image_Data *o;
4814 4814
4815 proxy = eo_data_scope_get(pb->eo_proxy, EVAS_OBJ_CLASS); 4815 proxy = eo_data_scope_get(pb->eo_proxy, EVAS_OBJECT_CLASS);
4816 source = eo_data_scope_get(pb->eo_source, EVAS_OBJ_CLASS); 4816 source = eo_data_scope_get(pb->eo_source, EVAS_OBJECT_CLASS);
4817 4817
4818 if (source) 4818 if (source)
4819 { 4819 {
@@ -4856,8 +4856,8 @@ _evas_image_filter_source_set(Eo *eo_obj, Evas_Image_Data *o, const char *name,
4856 Eina_Hash *sources = o->cur->filter.sources; 4856 Eina_Hash *sources = o->cur->filter.sources;
4857 int sources_count = o->cur->filter.sources_count; 4857 int sources_count = o->cur->filter.sources_count;
4858 4858
4859 obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 4859 obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
4860 if (eo_source) source = eo_data_scope_get(eo_source, EVAS_OBJ_CLASS); 4860 if (eo_source) source = eo_data_scope_get(eo_source, EVAS_OBJECT_CLASS);
4861 4861
4862 if (!name) 4862 if (!name)
4863 { 4863 {
diff --git a/src/lib/evas/canvas/evas_object_inform.c b/src/lib/evas/canvas/evas_object_inform.c
index 28ff355..d6689a3 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_scope_get(eo_obj, EVAS_OBJECT_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_scope_get(eo_obj, EVAS_OBJECT_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_scope_get(eo_obj, EVAS_OBJECT_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_scope_get(eo_obj, EVAS_OBJECT_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_scope_get(eo_obj, EVAS_OBJECT_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_scope_get(eo_obj, EVAS_OBJECT_CLASS);
69 EINA_SAFETY_ON_NULL_RETURN(obj); 69 EINA_SAFETY_ON_NULL_RETURN(obj);
70 70
71 if (!_evas_object_image_preloading_get(eo_obj)) return; 71 if (!_evas_object_image_preloading_get(eo_obj)) return;
@@ -80,7 +80,7 @@ evas_object_inform_call_image_preloaded(Evas_Object *eo_obj)
80void 80void
81evas_object_inform_call_image_unloaded(Evas_Object *eo_obj) 81evas_object_inform_call_image_unloaded(Evas_Object *eo_obj)
82{ 82{
83 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 83 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
84 _evas_object_event_new(); 84 _evas_object_event_new();
85 85
86 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_IMAGE_UNLOADED, NULL, _evas_event_counter); 86 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_IMAGE_UNLOADED, NULL, _evas_event_counter);
@@ -90,7 +90,7 @@ evas_object_inform_call_image_unloaded(Evas_Object *eo_obj)
90void 90void
91evas_object_inform_call_image_resize(Evas_Object *eo_obj) 91evas_object_inform_call_image_resize(Evas_Object *eo_obj)
92{ 92{
93 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 93 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
94 _evas_object_event_new(); 94 _evas_object_event_new();
95 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_IMAGE_RESIZE, NULL, _evas_event_counter); 95 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_IMAGE_RESIZE, NULL, _evas_event_counter);
96 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas); 96 _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 1f84983..a1c331d 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_scope_get(eo_obj, EVAS_OBJECT_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_scope_get(eo_obj, EVAS_OBJECT_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,7 +41,7 @@ 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_scope_get(eo_obj, EVAS_OBJECT_CLASS);
45 if (obj->interceptors) free(obj->interceptors); 45 if (obj->interceptors) free(obj->interceptors);
46} 46}
47 47
@@ -203,7 +203,7 @@ evas_object_intercept_call_clip_unset(Evas_Object *eo_obj, Evas_Object_Protected
203 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); \ 203 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); \
204 return; \ 204 return; \
205 MAGIC_CHECK_END(); \ 205 MAGIC_CHECK_END(); \
206 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); \ 206 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); \
207 if (!func) return; \ 207 if (!func) return; \
208 evas_object_intercept_init(eo_obj); \ 208 evas_object_intercept_init(eo_obj); \
209 if (!obj->interceptors) return; \ 209 if (!obj->interceptors) return; \
@@ -220,7 +220,7 @@ evas_object_intercept_call_clip_unset(Evas_Object *eo_obj, Evas_Object_Protected
220 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); \ 220 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); \
221 return NULL; \ 221 return NULL; \
222 MAGIC_CHECK_END(); \ 222 MAGIC_CHECK_END(); \
223 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); \ 223 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); \
224 if (!func) return NULL; \ 224 if (!func) return NULL; \
225 if (!obj->interceptors) return NULL; \ 225 if (!obj->interceptors) return NULL; \
226 obj->interceptors->Lower_Type.func = NULL; \ 226 obj->interceptors->Lower_Type.func = NULL; \
diff --git a/src/lib/evas/canvas/evas_object_line.c b/src/lib/evas/canvas/evas_object_line.c
index 247777a..48db646 100644
--- a/src/lib/evas/canvas/evas_object_line.c
+++ b/src/lib/evas/canvas/evas_object_line.c
@@ -1,7 +1,7 @@
1#include "evas_common_private.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3 3
4#define MY_CLASS EVAS_OBJ_LINE_CLASS 4#define MY_CLASS EVAS_LINE_CLASS
5 5
6/* private magic number for line objects */ 6/* private magic number for line objects */
7static const char o_type[] = "line"; 7static const char o_type[] = "line";
@@ -96,7 +96,7 @@ evas_object_line_add(Evas *e)
96 MAGIC_CHECK(e, Evas, MAGIC_EVAS); 96 MAGIC_CHECK(e, Evas, MAGIC_EVAS);
97 return NULL; 97 return NULL;
98 MAGIC_CHECK_END(); 98 MAGIC_CHECK_END();
99 Evas_Object *eo_obj = eo_add(EVAS_OBJ_LINE_CLASS, e); 99 Evas_Object *eo_obj = eo_add(EVAS_LINE_CLASS, e);
100 eo_unref(eo_obj); 100 eo_unref(eo_obj);
101 return eo_obj; 101 return eo_obj;
102} 102}
@@ -113,7 +113,7 @@ _evas_line_xy_set(Eo *eo_obj, Evas_Line_Data *_pd, Evas_Coord x1, Evas_Coord y1,
113 return; 113 return;
114 MAGIC_CHECK_END(); 114 MAGIC_CHECK_END();
115 115
116 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 116 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
117 117
118 if ((x1 == (obj->cur->geometry.x + o->cur.x1)) && 118 if ((x1 == (obj->cur->geometry.x + o->cur.x1)) &&
119 (y1 == (obj->cur->geometry.y + o->cur.y1)) && 119 (y1 == (obj->cur->geometry.y + o->cur.y1)) &&
@@ -196,7 +196,7 @@ _evas_line_xy_get(Eo *eo_obj, Evas_Line_Data *_pd, Evas_Coord *x1, Evas_Coord *y
196 const Evas_Line_Data *o = _pd; 196 const Evas_Line_Data *o = _pd;
197 197
198 198
199 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 199 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
200 if (x1) *x1 = obj->cur->geometry.x + o->cur.x1; 200 if (x1) *x1 = obj->cur->geometry.x + o->cur.x1;
201 if (y1) *y1 = obj->cur->geometry.y + o->cur.y1; 201 if (y1) *y1 = obj->cur->geometry.y + o->cur.y1;
202 if (x2) *x2 = obj->cur->geometry.x + o->cur.x2; 202 if (x2) *x2 = obj->cur->geometry.x + o->cur.x2;
@@ -207,7 +207,7 @@ _evas_line_xy_get(Eo *eo_obj, Evas_Line_Data *_pd, Evas_Coord *x1, Evas_Coord *y
207static void 207static void
208evas_object_line_init(Evas_Object *eo_obj) 208evas_object_line_init(Evas_Object *eo_obj)
209{ 209{
210 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 210 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
211 /* set up methods (compulsory) */ 211 /* set up methods (compulsory) */
212 obj->func = &object_func; 212 obj->func = &object_func;
213 obj->private_data = eo_data_ref(eo_obj, MY_CLASS); 213 obj->private_data = eo_data_ref(eo_obj, MY_CLASS);
@@ -223,7 +223,7 @@ _evas_line_eo_base_constructor(Eo *eo_obj, Evas_Line_Data *class_data EINA_UNUSE
223 223
224 eo_do_super(eo_obj, MY_CLASS, eo_constructor()); 224 eo_do_super(eo_obj, MY_CLASS, eo_constructor());
225 225
226 obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 226 obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
227 evas_object_line_init(eo_obj); 227 evas_object_line_init(eo_obj);
228 eo_do(eo_obj, parent = eo_parent_get()); 228 eo_do(eo_obj, parent = eo_parent_get());
229 evas_object_inject(eo_obj, obj, evas_object_evas_get(parent)); 229 evas_object_inject(eo_obj, obj, evas_object_evas_get(parent));
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index c4a47f3..fab722f 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -3,7 +3,7 @@
3 3
4EVAS_MEMPOOL(_mp_sh); 4EVAS_MEMPOOL(_mp_sh);
5 5
6#define MY_CLASS EVAS_OBJ_CLASS 6#define MY_CLASS EVAS_OBJECT_CLASS
7 7
8#define MY_CLASS_NAME "Evas_Object" 8#define MY_CLASS_NAME "Evas_Object"
9 9
@@ -671,9 +671,9 @@ _evas_object_eo_base_destructor(Eo *eo_obj, Evas_Object_Protected_Data *obj)
671 } 671 }
672 EINA_LIST_FOREACH_SAFE(obj->proxy->proxies, l, l2, proxy) 672 EINA_LIST_FOREACH_SAFE(obj->proxy->proxies, l, l2, proxy)
673 { 673 {
674 if (eo_isa(proxy, EVAS_OBJ_IMAGE_CLASS)) 674 if (eo_isa(proxy, EVAS_IMAGE_CLASS))
675 evas_object_image_source_unset(proxy); 675 evas_object_image_source_unset(proxy);
676 else if (eo_isa(proxy, EVAS_OBJ_TEXT_CLASS)) 676 else if (eo_isa(proxy, EVAS_TEXT_CLASS))
677 eo_do(proxy, evas_obj_text_filter_source_set(NULL, eo_obj)); 677 eo_do(proxy, evas_obj_text_filter_source_set(NULL, eo_obj));
678 } 678 }
679 679
diff --git a/src/lib/evas/canvas/evas_object_polygon.c b/src/lib/evas/canvas/evas_object_polygon.c
index 576de20..53d8316 100644
--- a/src/lib/evas/canvas/evas_object_polygon.c
+++ b/src/lib/evas/canvas/evas_object_polygon.c
@@ -1,7 +1,7 @@
1#include "evas_common_private.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3 3
4#define MY_CLASS EVAS_OBJ_POLYGON_CLASS 4#define MY_CLASS EVAS_POLYGON_CLASS
5 5
6/* private magic number for polygon objects */ 6/* private magic number for polygon objects */
7static const char o_type[] = "polygon"; 7static const char o_type[] = "polygon";
@@ -97,7 +97,7 @@ evas_object_polygon_add(Evas *e)
97 MAGIC_CHECK(e, Evas, MAGIC_EVAS); 97 MAGIC_CHECK(e, Evas, MAGIC_EVAS);
98 return NULL; 98 return NULL;
99 MAGIC_CHECK_END(); 99 MAGIC_CHECK_END();
100 Evas_Object *eo_obj = eo_add(EVAS_OBJ_POLYGON_CLASS, e); 100 Evas_Object *eo_obj = eo_add(EVAS_POLYGON_CLASS, e);
101 eo_unref(eo_obj); 101 eo_unref(eo_obj);
102 return eo_obj; 102 return eo_obj;
103} 103}
@@ -110,7 +110,7 @@ _evas_polygon_eo_base_constructor(Eo *eo_obj, Evas_Polygon_Data *class_data EINA
110 110
111 eo_do_super(eo_obj, MY_CLASS, eo_constructor()); 111 eo_do_super(eo_obj, MY_CLASS, eo_constructor());
112 112
113 obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 113 obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
114 evas_object_polygon_init(eo_obj); 114 evas_object_polygon_init(eo_obj);
115 eo_do(eo_obj, parent = eo_parent_get()); 115 eo_do(eo_obj, parent = eo_parent_get());
116 evas_object_inject(eo_obj, obj, evas_object_evas_get(parent)); 116 evas_object_inject(eo_obj, obj, evas_object_evas_get(parent));
@@ -119,7 +119,7 @@ _evas_polygon_eo_base_constructor(Eo *eo_obj, Evas_Polygon_Data *class_data EINA
119EOLIAN static void 119EOLIAN static void
120_evas_polygon_point_add(Eo *eo_obj, Evas_Polygon_Data *_pd, Evas_Coord x, Evas_Coord y) 120_evas_polygon_point_add(Eo *eo_obj, Evas_Polygon_Data *_pd, Evas_Coord x, Evas_Coord y)
121{ 121{
122 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 122 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
123 Evas_Polygon_Data *o = _pd; 123 Evas_Polygon_Data *o = _pd;
124 Evas_Polygon_Point *p; 124 Evas_Polygon_Point *p;
125 Evas_Coord min_x, max_x, min_y, max_y; 125 Evas_Coord min_x, max_x, min_y, max_y;
@@ -226,7 +226,7 @@ _evas_polygon_point_add(Eo *eo_obj, Evas_Polygon_Data *_pd, Evas_Coord x, Evas_C
226EOLIAN static void 226EOLIAN static void
227_evas_polygon_points_clear(Eo *eo_obj, Evas_Polygon_Data *_pd) 227_evas_polygon_points_clear(Eo *eo_obj, Evas_Polygon_Data *_pd)
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_scope_get(eo_obj, EVAS_OBJECT_CLASS);
230 Evas_Polygon_Data *o = _pd; 230 Evas_Polygon_Data *o = _pd;
231 void *list_data; 231 void *list_data;
232 int is, was; 232 int is, was;
@@ -270,7 +270,7 @@ _evas_polygon_points_clear(Eo *eo_obj, Evas_Polygon_Data *_pd)
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_scope_get(eo_obj, EVAS_OBJECT_CLASS);
274 /* set up methods (compulsory) */ 274 /* set up methods (compulsory) */
275 obj->func = &object_func; 275 obj->func = &object_func;
276 obj->private_data = eo_data_ref(eo_obj, MY_CLASS); 276 obj->private_data = eo_data_ref(eo_obj, MY_CLASS);
@@ -280,7 +280,7 @@ evas_object_polygon_init(Evas_Object *eo_obj)
280EOLIAN static void 280EOLIAN static void
281_evas_polygon_eo_base_destructor(Eo *eo_obj, Evas_Polygon_Data *_pd EINA_UNUSED) 281_evas_polygon_eo_base_destructor(Eo *eo_obj, Evas_Polygon_Data *_pd EINA_UNUSED)
282{ 282{
283 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 283 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
284 284
285 evas_object_polygon_free(eo_obj, obj, obj->private_data); 285 evas_object_polygon_free(eo_obj, obj, obj->private_data);
286 eo_do_super(eo_obj, MY_CLASS, eo_destructor()); 286 eo_do_super(eo_obj, MY_CLASS, eo_destructor());
diff --git a/src/lib/evas/canvas/evas_object_rectangle.c b/src/lib/evas/canvas/evas_object_rectangle.c
index 4859f82..aa11425 100644
--- a/src/lib/evas/canvas/evas_object_rectangle.c
+++ b/src/lib/evas/canvas/evas_object_rectangle.c
@@ -1,7 +1,7 @@
1#include "evas_common_private.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3 3
4#define MY_CLASS EVAS_OBJ_RECTANGLE_CLASS 4#define MY_CLASS EVAS_RECTANGLE_CLASS
5 5
6/* private magic number for rectangle objects */ 6/* private magic number for rectangle objects */
7static const char o_type[] = "rectangle"; 7static const char o_type[] = "rectangle";
@@ -85,7 +85,7 @@ evas_object_rectangle_add(Evas *e)
85 MAGIC_CHECK(e, Evas, MAGIC_EVAS); 85 MAGIC_CHECK(e, Evas, MAGIC_EVAS);
86 return NULL; 86 return NULL;
87 MAGIC_CHECK_END(); 87 MAGIC_CHECK_END();
88 Evas_Object *eo_obj = eo_add(EVAS_OBJ_RECTANGLE_CLASS, e); 88 Evas_Object *eo_obj = eo_add(EVAS_RECTANGLE_CLASS, e);
89 eo_unref(eo_obj); 89 eo_unref(eo_obj);
90 return eo_obj; 90 return eo_obj;
91} 91}
@@ -97,7 +97,7 @@ _evas_rectangle_eo_base_constructor(Eo *eo_obj, Evas_Rectangle_Data *class_data
97 97
98 eo_do_super(eo_obj, MY_CLASS, eo_constructor()); 98 eo_do_super(eo_obj, MY_CLASS, eo_constructor());
99 99
100 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 100 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
101 evas_object_rectangle_init(eo_obj); 101 evas_object_rectangle_init(eo_obj);
102 102
103 eo_do(eo_obj, parent = eo_parent_get()); 103 eo_do(eo_obj, parent = eo_parent_get());
@@ -108,7 +108,7 @@ _evas_rectangle_eo_base_constructor(Eo *eo_obj, Evas_Rectangle_Data *class_data
108static void 108static void
109evas_object_rectangle_init(Evas_Object *eo_obj) 109evas_object_rectangle_init(Evas_Object *eo_obj)
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_scope_get(eo_obj, EVAS_OBJECT_CLASS);
112 /* set up methods (compulsory) */ 112 /* set up methods (compulsory) */
113 obj->func = &object_func; 113 obj->func = &object_func;
114 obj->private_data = eo_data_ref(eo_obj, MY_CLASS); 114 obj->private_data = eo_data_ref(eo_obj, MY_CLASS);
diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c
index 0c0005d..d6adf65 100644
--- a/src/lib/evas/canvas/evas_object_smart.c
+++ b/src/lib/evas/canvas/evas_object_smart.c
@@ -1,7 +1,7 @@
1#include "evas_common_private.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3 3
4#define MY_CLASS EVAS_OBJ_SMART_CLASS 4#define MY_CLASS EVAS_OBJECT_SMART_CLASS
5 5
6#define MY_CLASS_NAME "Evas_Smart" 6#define MY_CLASS_NAME "Evas_Smart"
7#define MY_CLASS_NAME_LEGACY "Evas_Object_Smart" 7#define MY_CLASS_NAME_LEGACY "Evas_Object_Smart"
@@ -113,7 +113,7 @@ static const Evas_Object_Func object_func =
113 113
114/* public funcs */ 114/* public funcs */
115EOLIAN static void 115EOLIAN static void
116_evas_smart_data_set(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o, void *data) 116_evas_object_smart_data_set(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o, void *data)
117{ 117{
118 if (o->data) eo_data_unref(eo_obj, o->data); 118 if (o->data) eo_data_unref(eo_obj, o->data);
119 o->data = data; 119 o->data = data;
@@ -121,7 +121,7 @@ _evas_smart_data_set(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o, void *data)
121} 121}
122 122
123EOLIAN static void * 123EOLIAN static void *
124_evas_smart_evas_object_smart_data_get(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o) 124_evas_object_smart_evas_object_smart_data_get(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o)
125{ 125{
126 return o->data; 126 return o->data;
127} 127}
@@ -137,7 +137,7 @@ evas_object_smart_interface_get(const Evas_Object *eo_obj,
137 return NULL; 137 return NULL;
138 MAGIC_CHECK_END(); 138 MAGIC_CHECK_END();
139 139
140 if (!eo_isa(eo_obj, EVAS_OBJ_SMART_CLASS)) return NULL; 140 if (!eo_isa(eo_obj, EVAS_OBJECT_SMART_CLASS)) return NULL;
141 141
142 s = evas_object_smart_smart_get(eo_obj); 142 s = evas_object_smart_smart_get(eo_obj);
143 if (!s) return NULL; 143 if (!s) return NULL;
@@ -187,9 +187,9 @@ evas_object_smart_interface_data_get(const Evas_Object *eo_obj,
187} 187}
188 188
189EOLIAN static Evas_Smart* 189EOLIAN static Evas_Smart*
190_evas_smart_smart_get(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o EINA_UNUSED) 190_evas_object_smart_smart_get(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o EINA_UNUSED)
191{ 191{
192 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 192 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
193 return obj->smart.smart; 193 return obj->smart.smart;
194} 194}
195 195
@@ -203,11 +203,11 @@ evas_object_smart_member_add(Evas_Object *eo_obj, Evas_Object *smart_obj)
203} 203}
204 204
205EOLIAN static void 205EOLIAN static void
206_evas_smart_member_add(Eo *smart_obj, Evas_Smart_Data *o, Evas_Object *eo_obj) 206_evas_object_smart_member_add(Eo *smart_obj, Evas_Smart_Data *o, Evas_Object *eo_obj)
207{ 207{
208 208
209 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 209 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
210 Evas_Object_Protected_Data *smart = eo_data_scope_get(smart_obj, EVAS_OBJ_CLASS); 210 Evas_Object_Protected_Data *smart = eo_data_scope_get(smart_obj, EVAS_OBJECT_CLASS);
211 211
212 if (obj->delete_me) 212 if (obj->delete_me)
213 { 213 {
@@ -268,7 +268,7 @@ evas_object_smart_member_del(Evas_Object *eo_obj)
268 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 268 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
269 return; 269 return;
270 MAGIC_CHECK_END(); 270 MAGIC_CHECK_END();
271 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 271 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
272 if (!obj) return; 272 if (!obj) return;
273 if (!obj->smart.parent) return; 273 if (!obj->smart.parent) return;
274 Evas_Object *smart_obj = obj->smart.parent; 274 Evas_Object *smart_obj = obj->smart.parent;
@@ -277,13 +277,13 @@ evas_object_smart_member_del(Evas_Object *eo_obj)
277} 277}
278 278
279EOLIAN static void 279EOLIAN static void
280_evas_smart_member_del(Eo *smart_obj, Evas_Smart_Data *_pd EINA_UNUSED, Evas_Object *eo_obj) 280_evas_object_smart_member_del(Eo *smart_obj, Evas_Smart_Data *_pd EINA_UNUSED, Evas_Object *eo_obj)
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_scope_get(eo_obj, EVAS_OBJECT_CLASS);
283 283
284 if (!obj->smart.parent) return; 284 if (!obj->smart.parent) return;
285 285
286 Evas_Object_Protected_Data *smart = eo_data_scope_get(smart_obj, EVAS_OBJ_CLASS); 286 Evas_Object_Protected_Data *smart = eo_data_scope_get(smart_obj, EVAS_OBJECT_CLASS);
287 if (smart->smart.smart && smart->smart.smart->smart_class->member_del) 287 if (smart->smart.smart && smart->smart.smart->smart_class->member_del)
288 smart->smart.smart->smart_class->member_del(smart_obj, eo_obj); 288 smart->smart.smart->smart_class->member_del(smart_obj, eo_obj);
289 289
@@ -308,13 +308,13 @@ _evas_smart_member_del(Eo *smart_obj, Evas_Smart_Data *_pd EINA_UNUSED, Evas_Obj
308} 308}
309 309
310EOLIAN static Eina_Bool 310EOLIAN static Eina_Bool
311_evas_smart_evas_object_smart_type_check(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, const char *type) 311_evas_object_smart_evas_object_smart_type_check(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, const char *type)
312{ 312{
313 const Evas_Smart_Class *sc; 313 const Evas_Smart_Class *sc;
314 Eo_Class *klass; 314 Eo_Class *klass;
315 Eina_Bool type_check = EINA_FALSE; 315 Eina_Bool type_check = EINA_FALSE;
316 316
317 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 317 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
318 if (!obj) return EINA_FALSE; 318 if (!obj) return EINA_FALSE;
319 319
320 klass = eina_hash_find(_evas_smart_class_names_hash_table, type); 320 klass = eina_hash_find(_evas_smart_class_names_hash_table, type);
@@ -338,13 +338,13 @@ _evas_smart_evas_object_smart_type_check(Eo *eo_obj, Evas_Smart_Data *o EINA_UNU
338} 338}
339 339
340EOLIAN static Eina_Bool 340EOLIAN static Eina_Bool
341_evas_smart_evas_object_smart_type_check_ptr(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, const char* type) 341_evas_object_smart_evas_object_smart_type_check_ptr(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, const char* type)
342{ 342{
343 Eo_Class *klass; 343 Eo_Class *klass;
344 const Evas_Smart_Class *sc; 344 const Evas_Smart_Class *sc;
345 Eina_Bool type_check = EINA_FALSE; 345 Eina_Bool type_check = EINA_FALSE;
346 346
347 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 347 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
348 if (!obj) return EINA_FALSE; 348 if (!obj) return EINA_FALSE;
349 349
350 klass = eina_hash_find(_evas_smart_class_names_hash_table, type); 350 klass = eina_hash_find(_evas_smart_class_names_hash_table, type);
@@ -403,7 +403,7 @@ _evas_object_smart_iterator_free(Evas_Object_Smart_Iterator *it)
403 403
404// Should we have an eo_children_iterator_new API and just inherit from it ? 404// Should we have an eo_children_iterator_new API and just inherit from it ?
405EOLIAN static Eina_Iterator* 405EOLIAN static Eina_Iterator*
406_evas_smart_iterator_new(Eo *o, Evas_Smart_Data *priv) 406_evas_object_smart_iterator_new(Eo *o, Evas_Smart_Data *priv)
407{ 407{
408 Evas_Object_Smart_Iterator *it; 408 Evas_Object_Smart_Iterator *it;
409 409
@@ -424,7 +424,7 @@ _evas_smart_iterator_new(Eo *o, Evas_Smart_Data *priv)
424} 424}
425 425
426EOLIAN static Eina_List* 426EOLIAN static Eina_List*
427_evas_smart_members_get(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o) 427_evas_object_smart_members_get(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o)
428{ 428{
429 Eina_List *members; 429 Eina_List *members;
430 430
@@ -534,14 +534,14 @@ evas_object_smart_add(Evas *eo_e, Evas_Smart *s)
534 MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS); 534 MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS);
535 return NULL; 535 return NULL;
536 MAGIC_CHECK_END(); 536 MAGIC_CHECK_END();
537 eo_obj = eo_add(EVAS_OBJ_SMART_CLASS, eo_e); 537 eo_obj = eo_add(EVAS_OBJECT_SMART_CLASS, eo_e);
538 eo_do(eo_obj, evas_obj_smart_attach(s)); 538 eo_do(eo_obj, evas_obj_smart_attach(s));
539 eo_unref(eo_obj); 539 eo_unref(eo_obj);
540 return eo_obj; 540 return eo_obj;
541} 541}
542 542
543EOLIAN static void 543EOLIAN static void
544_evas_smart_eo_base_constructor(Eo *eo_obj, Evas_Smart_Data *class_data EINA_UNUSED) 544_evas_object_smart_eo_base_constructor(Eo *eo_obj, Evas_Smart_Data *class_data EINA_UNUSED)
545{ 545{
546 Evas_Object_Protected_Data *obj; 546 Evas_Object_Protected_Data *obj;
547 Evas_Smart_Data *smart; 547 Evas_Smart_Data *smart;
@@ -553,7 +553,7 @@ _evas_smart_eo_base_constructor(Eo *eo_obj, Evas_Smart_Data *class_data EINA_UNU
553 eo_do_super(eo_obj, MY_CLASS, eo_constructor()); 553 eo_do_super(eo_obj, MY_CLASS, eo_constructor());
554 evas_object_smart_init(eo_obj); 554 evas_object_smart_init(eo_obj);
555 555
556 obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 556 obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
557 eo_do(eo_obj, parent = eo_parent_get()); 557 eo_do(eo_obj, parent = eo_parent_get());
558 evas_object_inject(eo_obj, obj, evas_object_evas_get(parent)); 558 evas_object_inject(eo_obj, obj, evas_object_evas_get(parent));
559 eo_do(eo_obj, 559 eo_do(eo_obj,
@@ -562,98 +562,98 @@ _evas_smart_eo_base_constructor(Eo *eo_obj, Evas_Smart_Data *class_data EINA_UNU
562} 562}
563 563
564EOLIAN static void 564EOLIAN static void
565_evas_smart_add(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED) 565_evas_object_smart_add(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED)
566{ 566{
567 // If this function is reached, so we do nothing except trying to call 567 // If this function is reached, so we do nothing except trying to call
568 // the function of the legacy smart class. 568 // the function of the legacy smart class.
569 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 569 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
570 Evas_Smart *s = obj->smart.smart; 570 Evas_Smart *s = obj->smart.smart;
571 if (s && s->smart_class->add) s->smart_class->add(eo_obj); 571 if (s && s->smart_class->add) s->smart_class->add(eo_obj);
572} 572}
573 573
574EOLIAN static void 574EOLIAN static void
575_evas_smart_del(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o EINA_UNUSED) 575_evas_object_smart_del(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o EINA_UNUSED)
576{ 576{
577} 577}
578 578
579EOLIAN static void 579EOLIAN static void
580_evas_smart_resize(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, Evas_Coord w, Evas_Coord h) 580_evas_object_smart_resize(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, Evas_Coord w, Evas_Coord h)
581{ 581{
582 // If this function is reached, so we do nothing except trying to call 582 // If this function is reached, so we do nothing except trying to call
583 // the function of the legacy smart class. 583 // the function of the legacy smart class.
584 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 584 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
585 Evas_Smart *s = obj->smart.smart; 585 Evas_Smart *s = obj->smart.smart;
586 if (s && s->smart_class->resize) s->smart_class->resize(eo_obj, w, h); 586 if (s && s->smart_class->resize) s->smart_class->resize(eo_obj, w, h);
587} 587}
588 588
589EOLIAN static void 589EOLIAN static void
590_evas_smart_move(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, Evas_Coord x, Evas_Coord y) 590_evas_object_smart_move(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, Evas_Coord x, Evas_Coord y)
591{ 591{
592 // If this function is reached, so we do nothing except trying to call 592 // If this function is reached, so we do nothing except trying to call
593 // the function of the legacy smart class. 593 // the function of the legacy smart class.
594 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 594 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
595 Evas_Smart *s = obj->smart.smart; 595 Evas_Smart *s = obj->smart.smart;
596 if (s && s->smart_class->move) s->smart_class->move(eo_obj, x, y); 596 if (s && s->smart_class->move) s->smart_class->move(eo_obj, x, y);
597} 597}
598 598
599EOLIAN static void 599EOLIAN static void
600_evas_smart_show(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED) 600_evas_object_smart_show(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED)
601{ 601{
602 // If this function is reached, so we do nothing except trying to call 602 // If this function is reached, so we do nothing except trying to call
603 // the function of the legacy smart class. 603 // the function of the legacy smart class.
604 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 604 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
605 Evas_Smart *s = obj->smart.smart; 605 Evas_Smart *s = obj->smart.smart;
606 if (s && s->smart_class->show) s->smart_class->show(eo_obj); 606 if (s && s->smart_class->show) s->smart_class->show(eo_obj);
607} 607}
608 608
609EOLIAN static void 609EOLIAN static void
610_evas_smart_hide(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED) 610_evas_object_smart_hide(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED)
611{ 611{
612 // If this function is reached, so we do nothing except trying to call 612 // If this function is reached, so we do nothing except trying to call
613 // the function of the legacy smart class. 613 // the function of the legacy smart class.
614 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 614 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
615 Evas_Smart *s = obj->smart.smart; 615 Evas_Smart *s = obj->smart.smart;
616 if (s && s->smart_class->hide) s->smart_class->hide(eo_obj); 616 if (s && s->smart_class->hide) s->smart_class->hide(eo_obj);
617} 617}
618 618
619EOLIAN static void 619EOLIAN static void
620_evas_smart_color_set(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, int r, int g, int b, int a) 620_evas_object_smart_color_set(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, int r, int g, int b, int a)
621{ 621{
622 // If this function is reached, so we do nothing except trying to call 622 // If this function is reached, so we do nothing except trying to call
623 // the function of the legacy smart class. 623 // the function of the legacy smart class.
624 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 624 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
625 Evas_Smart *s = obj->smart.smart; 625 Evas_Smart *s = obj->smart.smart;
626 if (s && s->smart_class->color_set) s->smart_class->color_set(eo_obj, r, g, b, a); 626 if (s && s->smart_class->color_set) s->smart_class->color_set(eo_obj, r, g, b, a);
627} 627}
628 628
629EOLIAN static void 629EOLIAN static void
630_evas_smart_clip_set(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, Evas_Object *clip) 630_evas_object_smart_clip_set(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, Evas_Object *clip)
631{ 631{
632 // If this function is reached, so we do nothing except trying to call 632 // If this function is reached, so we do nothing except trying to call
633 // the function of the legacy smart class. 633 // the function of the legacy smart class.
634 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 634 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
635 Evas_Smart *s = obj->smart.smart; 635 Evas_Smart *s = obj->smart.smart;
636 if (s && s->smart_class->clip_set) s->smart_class->clip_set(eo_obj, clip); 636 if (s && s->smart_class->clip_set) s->smart_class->clip_set(eo_obj, clip);
637} 637}
638 638
639EOLIAN static void 639EOLIAN static void
640_evas_smart_clip_unset(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED) 640_evas_object_smart_clip_unset(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED)
641{ 641{
642 // If this function is reached, so we do nothing except trying to call 642 // If this function is reached, so we do nothing except trying to call
643 // the function of the legacy smart class. 643 // the function of the legacy smart class.
644 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 644 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
645 Evas_Smart *s = obj->smart.smart; 645 Evas_Smart *s = obj->smart.smart;
646 if (s && s->smart_class->clip_unset) s->smart_class->clip_unset(eo_obj); 646 if (s && s->smart_class->clip_unset) s->smart_class->clip_unset(eo_obj);
647} 647}
648 648
649static void 649EOLIAN static void
650_evas_smart_attach(Eo *eo_obj, Evas_Smart_Data *_pd EINA_UNUSED, Evas_Smart *s) 650_evas_object_smart_attach(Eo *eo_obj, Evas_Smart_Data *_pd EINA_UNUSED, Evas_Smart *s)
651{ 651{
652 MAGIC_CHECK(s, Evas_Smart, MAGIC_SMART); 652 MAGIC_CHECK(s, Evas_Smart, MAGIC_SMART);
653 return; 653 return;
654 MAGIC_CHECK_END(); 654 MAGIC_CHECK_END();
655 unsigned int i; 655 unsigned int i;
656 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 656 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
657 obj->smart.smart = s; 657 obj->smart.smart = s;
658 obj->type = s->smart_class->name; 658 obj->type = s->smart_class->name;
659 evas_object_smart_use(s); 659 evas_object_smart_use(s);
@@ -787,7 +787,7 @@ evas_object_smart_callback_call(Evas_Object *eo_obj, const char *event, void *ev
787} 787}
788 788
789EOLIAN static Eina_Bool 789EOLIAN static Eina_Bool
790_evas_smart_callbacks_descriptions_set(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o, const Evas_Smart_Cb_Description *descriptions) 790_evas_object_smart_callbacks_descriptions_set(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o, const Evas_Smart_Cb_Description *descriptions)
791{ 791{
792 const Evas_Smart_Cb_Description *d; 792 const Evas_Smart_Cb_Description *d;
793 unsigned int i, count = 0; 793 unsigned int i, count = 0;
@@ -813,12 +813,12 @@ _evas_smart_callbacks_descriptions_set(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *
813} 813}
814 814
815EOLIAN static void 815EOLIAN static void
816_evas_smart_callbacks_descriptions_get(Eo *eo_obj, Evas_Smart_Data *o, const Evas_Smart_Cb_Description ***class_descriptions, unsigned int *class_count, const Evas_Smart_Cb_Description ***instance_descriptions, unsigned int *instance_count) 816_evas_object_smart_callbacks_descriptions_get(Eo *eo_obj, Evas_Smart_Data *o, const Evas_Smart_Cb_Description ***class_descriptions, unsigned int *class_count, const Evas_Smart_Cb_Description ***instance_descriptions, unsigned int *instance_count)
817{ 817{
818 if (class_descriptions) *class_descriptions = NULL; 818 if (class_descriptions) *class_descriptions = NULL;
819 if (class_count) *class_count = 0; 819 if (class_count) *class_count = 0;
820 820
821 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 821 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
822 if (obj->smart.smart && class_descriptions) 822 if (obj->smart.smart && class_descriptions)
823 *class_descriptions = obj->smart.smart->callbacks.array; 823 *class_descriptions = obj->smart.smart->callbacks.array;
824 if (obj->smart.smart && class_count) 824 if (obj->smart.smart && class_count)
@@ -831,7 +831,7 @@ _evas_smart_callbacks_descriptions_get(Eo *eo_obj, Evas_Smart_Data *o, const Eva
831} 831}
832 832
833EOLIAN static void 833EOLIAN static void
834_evas_smart_callback_description_find(Eo *eo_obj, Evas_Smart_Data *o, const char *name, const Evas_Smart_Cb_Description **class_description, const Evas_Smart_Cb_Description **instance_description) 834_evas_object_smart_callback_description_find(Eo *eo_obj, Evas_Smart_Data *o, const char *name, const Evas_Smart_Cb_Description **class_description, const Evas_Smart_Cb_Description **instance_description)
835{ 835{
836 836
837 if (!name) 837 if (!name)
@@ -841,7 +841,7 @@ _evas_smart_callback_description_find(Eo *eo_obj, Evas_Smart_Data *o, const char
841 return; 841 return;
842 } 842 }
843 843
844 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 844 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
845 if (class_description) 845 if (class_description)
846 *class_description = evas_smart_cb_description_find 846 *class_description = evas_smart_cb_description_find
847 (&obj->smart.smart->callbacks, name); 847 (&obj->smart.smart->callbacks, name);
@@ -852,9 +852,9 @@ _evas_smart_callback_description_find(Eo *eo_obj, Evas_Smart_Data *o, const char
852} 852}
853 853
854EOLIAN static void 854EOLIAN static void
855_evas_smart_need_recalculate_set(Eo *eo_obj, Evas_Smart_Data *o, Eina_Bool value) 855_evas_object_smart_need_recalculate_set(Eo *eo_obj, Evas_Smart_Data *o, Eina_Bool value)
856{ 856{
857 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 857 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
858 858
859 // XXX: do i need this? 859 // XXX: do i need this?
860 if (obj->delete_me) return; 860 if (obj->delete_me) return;
@@ -881,15 +881,15 @@ _evas_smart_need_recalculate_set(Eo *eo_obj, Evas_Smart_Data *o, Eina_Bool value
881} 881}
882 882
883EOLIAN static Eina_Bool 883EOLIAN static Eina_Bool
884_evas_smart_need_recalculate_get(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o) 884_evas_object_smart_need_recalculate_get(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o)
885{ 885{
886 return o->need_recalculate; 886 return o->need_recalculate;
887} 887}
888 888
889EOLIAN static void 889EOLIAN static void
890_evas_smart_calculate(Eo *eo_obj, Evas_Smart_Data *o) 890_evas_object_smart_calculate(Eo *eo_obj, Evas_Smart_Data *o)
891{ 891{
892 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 892 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
893 893
894 if (!obj->smart.smart || !obj->smart.smart->smart_class->calculate) 894 if (!obj->smart.smart || !obj->smart.smart->smart_class->calculate)
895 return; 895 return;
@@ -932,7 +932,7 @@ evas_call_smarts_calculate(Evas *eo_e)
932 /* move the item to the processed list */ 932 /* move the item to the processed list */
933 o = EINA_CLIST_ENTRY(elem, Evas_Smart_Data, calc_entry); 933 o = EINA_CLIST_ENTRY(elem, Evas_Smart_Data, calc_entry);
934 eina_clist_remove(&o->calc_entry); 934 eina_clist_remove(&o->calc_entry);
935 obj = eo_data_scope_get(o->object, EVAS_OBJ_CLASS); 935 obj = eo_data_scope_get(o->object, EVAS_OBJECT_CLASS);
936 936
937 if (obj->delete_me) continue; 937 if (obj->delete_me) continue;
938 eina_clist_add_tail(&e->calc_done, &o->calc_entry); 938 eina_clist_add_tail(&e->calc_done, &o->calc_entry);
@@ -961,9 +961,9 @@ evas_call_smarts_calculate(Evas *eo_e)
961} 961}
962 962
963EOLIAN static void 963EOLIAN static void
964_evas_smart_changed(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED) 964_evas_object_smart_changed(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED)
965{ 965{
966 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 966 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
967 evas_object_change(eo_obj, obj); 967 evas_object_change(eo_obj, obj);
968 eo_do(eo_obj, evas_obj_smart_need_recalculate_set(1)); 968 eo_do(eo_obj, evas_obj_smart_need_recalculate_set(1));
969} 969}
@@ -971,7 +971,7 @@ _evas_smart_changed(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED)
971Eina_Bool 971Eina_Bool
972evas_object_smart_changed_get(Evas_Object *eo_obj) 972evas_object_smart_changed_get(Evas_Object *eo_obj)
973{ 973{
974 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 974 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
975 Evas_Object_Protected_Data *o2; 975 Evas_Object_Protected_Data *o2;
976 976
977 if (!evas_object_is_visible(eo_obj, obj) && 977 if (!evas_object_is_visible(eo_obj, obj) &&
@@ -997,7 +997,7 @@ evas_object_smart_changed_get(Evas_Object *eo_obj)
997void 997void
998evas_object_smart_del(Evas_Object *eo_obj) 998evas_object_smart_del(Evas_Object *eo_obj)
999{ 999{
1000 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1000 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1001 Evas_Smart_Data *sobj; 1001 Evas_Smart_Data *sobj;
1002 Evas_Smart *s; 1002 Evas_Smart *s;
1003 unsigned int i; 1003 unsigned int i;
@@ -1073,7 +1073,7 @@ evas_object_update_bounding_box(Evas_Object *eo_obj, Evas_Object_Protected_Data
1073 /* We are not yet trying to find the smallest bounding box, but we want to find a good approximation quickly. 1073 /* We are not yet trying to find the smallest bounding box, but we want to find a good approximation quickly.
1074 * That's why we initialiaze min and max search to geometry of the parent object. 1074 * That's why we initialiaze min and max search to geometry of the parent object.
1075 */ 1075 */
1076 Evas_Object_Protected_Data *smart_obj = eo_data_scope_get(obj->smart.parent, EVAS_OBJ_CLASS); 1076 Evas_Object_Protected_Data *smart_obj = eo_data_scope_get(obj->smart.parent, EVAS_OBJECT_CLASS);
1077 Evas_Smart_Data *smart_parent = eo_data_scope_get(obj->smart.parent, MY_CLASS); 1077 Evas_Smart_Data *smart_parent = eo_data_scope_get(obj->smart.parent, MY_CLASS);
1078 if (!smart_parent || !smart_obj) return; 1078 if (!smart_parent || !smart_obj) return;
1079 1079
@@ -1181,7 +1181,7 @@ evas_object_smart_bounding_box_get(Evas_Object *eo_obj,
1181void 1181void
1182evas_object_smart_cleanup(Evas_Object *eo_obj) 1182evas_object_smart_cleanup(Evas_Object *eo_obj)
1183{ 1183{
1184 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1184 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1185 1185
1186 if (obj->smart.parent) 1186 if (obj->smart.parent)
1187 evas_object_smart_member_del(eo_obj); 1187 evas_object_smart_member_del(eo_obj);
@@ -1225,7 +1225,7 @@ evas_object_smart_member_cache_invalidate(Evas_Object *eo_obj,
1225 return; 1225 return;
1226 MAGIC_CHECK_END(); 1226 MAGIC_CHECK_END();
1227 1227
1228 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1228 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1229 Evas_Object_Protected_Data *member; 1229 Evas_Object_Protected_Data *member;
1230 1230
1231 if (pass_events) 1231 if (pass_events)
@@ -1250,7 +1250,7 @@ void
1250evas_object_smart_member_raise(Evas_Object *eo_member) 1250evas_object_smart_member_raise(Evas_Object *eo_member)
1251{ 1251{
1252 Evas_Smart_Data *o; 1252 Evas_Smart_Data *o;
1253 Evas_Object_Protected_Data *member = eo_data_scope_get(eo_member, EVAS_OBJ_CLASS); 1253 Evas_Object_Protected_Data *member = eo_data_scope_get(eo_member, EVAS_OBJECT_CLASS);
1254 o = eo_data_scope_get(member->smart.parent, MY_CLASS); 1254 o = eo_data_scope_get(member->smart.parent, MY_CLASS);
1255 o->contained = eina_inlist_demote(o->contained, EINA_INLIST_GET(member)); 1255 o->contained = eina_inlist_demote(o->contained, EINA_INLIST_GET(member));
1256} 1256}
@@ -1259,7 +1259,7 @@ void
1259evas_object_smart_member_lower(Evas_Object *eo_member) 1259evas_object_smart_member_lower(Evas_Object *eo_member)
1260{ 1260{
1261 Evas_Smart_Data *o; 1261 Evas_Smart_Data *o;
1262 Evas_Object_Protected_Data *member = eo_data_scope_get(eo_member, EVAS_OBJ_CLASS); 1262 Evas_Object_Protected_Data *member = eo_data_scope_get(eo_member, EVAS_OBJECT_CLASS);
1263 o = eo_data_scope_get(member->smart.parent, MY_CLASS); 1263 o = eo_data_scope_get(member->smart.parent, MY_CLASS);
1264 o->contained = eina_inlist_promote(o->contained, EINA_INLIST_GET(member)); 1264 o->contained = eina_inlist_promote(o->contained, EINA_INLIST_GET(member));
1265} 1265}
@@ -1268,8 +1268,8 @@ void
1268evas_object_smart_member_stack_above(Evas_Object *eo_member, Evas_Object *eo_other) 1268evas_object_smart_member_stack_above(Evas_Object *eo_member, Evas_Object *eo_other)
1269{ 1269{
1270 Evas_Smart_Data *o; 1270 Evas_Smart_Data *o;
1271 Evas_Object_Protected_Data *member = eo_data_scope_get(eo_member, EVAS_OBJ_CLASS); 1271 Evas_Object_Protected_Data *member = eo_data_scope_get(eo_member, EVAS_OBJECT_CLASS);
1272 Evas_Object_Protected_Data *other = eo_data_scope_get(eo_other, EVAS_OBJ_CLASS); 1272 Evas_Object_Protected_Data *other = eo_data_scope_get(eo_other, EVAS_OBJECT_CLASS);
1273 o = eo_data_scope_get(member->smart.parent, MY_CLASS); 1273 o = eo_data_scope_get(member->smart.parent, MY_CLASS);
1274 o->contained = eina_inlist_remove(o->contained, EINA_INLIST_GET(member)); 1274 o->contained = eina_inlist_remove(o->contained, EINA_INLIST_GET(member));
1275 o->contained = eina_inlist_append_relative(o->contained, EINA_INLIST_GET(member), EINA_INLIST_GET(other)); 1275 o->contained = eina_inlist_append_relative(o->contained, EINA_INLIST_GET(member), EINA_INLIST_GET(other));
@@ -1279,8 +1279,8 @@ void
1279evas_object_smart_member_stack_below(Evas_Object *eo_member, Evas_Object *eo_other) 1279evas_object_smart_member_stack_below(Evas_Object *eo_member, Evas_Object *eo_other)
1280{ 1280{
1281 Evas_Smart_Data *o; 1281 Evas_Smart_Data *o;
1282 Evas_Object_Protected_Data *member = eo_data_scope_get(eo_member, EVAS_OBJ_CLASS); 1282 Evas_Object_Protected_Data *member = eo_data_scope_get(eo_member, EVAS_OBJECT_CLASS);
1283 Evas_Object_Protected_Data *other = eo_data_scope_get(eo_other, EVAS_OBJ_CLASS); 1283 Evas_Object_Protected_Data *other = eo_data_scope_get(eo_other, EVAS_OBJECT_CLASS);
1284 o = eo_data_scope_get(member->smart.parent, MY_CLASS); 1284 o = eo_data_scope_get(member->smart.parent, MY_CLASS);
1285 o->contained = eina_inlist_remove(o->contained, EINA_INLIST_GET(member)); 1285 o->contained = eina_inlist_remove(o->contained, EINA_INLIST_GET(member));
1286 o->contained = eina_inlist_prepend_relative(o->contained, EINA_INLIST_GET(member), EINA_INLIST_GET(other)); 1286 o->contained = eina_inlist_prepend_relative(o->contained, EINA_INLIST_GET(member), EINA_INLIST_GET(other));
@@ -1292,7 +1292,7 @@ evas_object_smart_need_bounding_box_update(Evas_Object *eo_obj)
1292 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 1292 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
1293 return; 1293 return;
1294 MAGIC_CHECK_END(); 1294 MAGIC_CHECK_END();
1295 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1295 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1296 Evas_Smart_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); 1296 Evas_Smart_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
1297 1297
1298 if (o->update_boundingbox_needed) return; 1298 if (o->update_boundingbox_needed) return;
@@ -1387,7 +1387,7 @@ evas_object_smart_bounding_box_update(Evas_Object *eo_obj, Evas_Object_Protected
1387static void 1387static void
1388evas_object_smart_init(Evas_Object *eo_obj) 1388evas_object_smart_init(Evas_Object *eo_obj)
1389{ 1389{
1390 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1390 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1391 obj->is_smart = EINA_TRUE; 1391 obj->is_smart = EINA_TRUE;
1392 /* set up methods (compulsory) */ 1392 /* set up methods (compulsory) */
1393 obj->func = &object_func; 1393 obj->func = &object_func;
@@ -1516,16 +1516,16 @@ static void *evas_object_smart_engine_data_get(Evas_Object *eo_obj)
1516} 1516}
1517 1517
1518static void 1518static void
1519_evas_smart_class_constructor(Eo_Class *klass EINA_UNUSED) 1519_evas_object_smart_class_constructor(Eo_Class *klass EINA_UNUSED)
1520{ 1520{
1521 _evas_smart_class_names_hash_table = eina_hash_string_small_new(NULL); 1521 _evas_smart_class_names_hash_table = eina_hash_string_small_new(NULL);
1522 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); 1522 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
1523} 1523}
1524 1524
1525static void 1525static void
1526_evas_smart_class_destructor(Eo_Class *klass EINA_UNUSED) 1526_evas_object_smart_class_destructor(Eo_Class *klass EINA_UNUSED)
1527{ 1527{
1528 eina_hash_free(_evas_smart_class_names_hash_table); 1528 eina_hash_free(_evas_smart_class_names_hash_table);
1529} 1529}
1530 1530
1531#include "canvas/evas_smart.eo.c" 1531#include "canvas/evas_object_smart.eo.c"
diff --git a/src/lib/evas/canvas/evas_smart.eo b/src/lib/evas/canvas/evas_object_smart.eo
index b0e8e51..d594f0b 100644
--- a/src/lib/evas/canvas/evas_smart.eo
+++ b/src/lib/evas/canvas/evas_object_smart.eo
@@ -1,7 +1,7 @@
1class Evas_Smart (Evas_Object, Evas_Signal_Interface) 1class Evas_Object_Smart (Evas_Object, Evas_Signal_Interface)
2{ 2{
3 legacy_prefix: evas_object_smart;
4 eo_prefix: evas_obj_smart; 3 eo_prefix: evas_obj_smart;
4 data: Evas_Smart_Data;
5 properties { 5 properties {
6 need_recalculate { 6 need_recalculate {
7 set { 7 set {
diff --git a/src/lib/evas/canvas/evas_object_smart_clipped.c b/src/lib/evas/canvas/evas_object_smart_clipped.c
index 7b828e9..38382f2 100644
--- a/src/lib/evas/canvas/evas_object_smart_clipped.c
+++ b/src/lib/evas/canvas/evas_object_smart_clipped.c
@@ -1,7 +1,7 @@
1#include "evas_common_private.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3 3
4#define MY_CLASS EVAS_OBJ_SMART_CLIPPED_CLASS 4#define MY_CLASS EVAS_SMART_CLIPPED_CLASS
5 5
6#define CSO_DATA_GET(eo_obj, ptr) \ 6#define CSO_DATA_GET(eo_obj, ptr) \
7 Evas_Object_Smart_Clipped_Data *ptr = (eo_isa(eo_obj, MY_CLASS) ? \ 7 Evas_Object_Smart_Clipped_Data *ptr = (eo_isa(eo_obj, MY_CLASS) ? \
@@ -68,7 +68,7 @@ evas_object_smart_clipped_smart_add(Evas_Object *eo_obj)
68} 68}
69 69
70EOLIAN static void 70EOLIAN static void
71_evas_smart_clipped_evas_smart_add(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED) 71_evas_smart_clipped_evas_object_smart_add(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED)
72{ 72{
73 evas_object_smart_clipped_smart_add(eo_obj); 73 evas_object_smart_clipped_smart_add(eo_obj);
74} 74}
@@ -95,7 +95,7 @@ evas_object_smart_clipped_smart_del(Evas_Object *eo_obj)
95} 95}
96 96
97EOLIAN static void 97EOLIAN static void
98_evas_smart_clipped_evas_smart_del(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED) 98_evas_smart_clipped_evas_object_smart_del(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED)
99{ 99{
100 evas_object_smart_clipped_smart_del(eo_obj); 100 evas_object_smart_clipped_smart_del(eo_obj);
101} 101}
@@ -110,7 +110,7 @@ evas_object_smart_clipped_smart_move(Evas_Object *eo_obj, Evas_Coord x, Evas_Coo
110} 110}
111 111
112EOLIAN static void 112EOLIAN static void
113_evas_smart_clipped_evas_smart_move(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED, Evas_Coord x, Evas_Coord y) 113_evas_smart_clipped_evas_object_smart_move(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED, Evas_Coord x, Evas_Coord y)
114{ 114{
115 evas_object_smart_clipped_smart_move(eo_obj, x, y); 115 evas_object_smart_clipped_smart_move(eo_obj, x, y);
116} 116}
@@ -124,7 +124,7 @@ evas_object_smart_clipped_smart_show(Evas_Object *eo_obj)
124} 124}
125 125
126EOLIAN static void 126EOLIAN static void
127_evas_smart_clipped_evas_smart_show(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED) 127_evas_smart_clipped_evas_object_smart_show(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED)
128{ 128{
129 evas_object_smart_clipped_smart_show(eo_obj); 129 evas_object_smart_clipped_smart_show(eo_obj);
130} 130}
@@ -137,7 +137,7 @@ evas_object_smart_clipped_smart_hide(Evas_Object *eo_obj)
137} 137}
138 138
139EOLIAN static void 139EOLIAN static void
140_evas_smart_clipped_evas_smart_hide(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED) 140_evas_smart_clipped_evas_object_smart_hide(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED)
141{ 141{
142 evas_object_smart_clipped_smart_hide(eo_obj); 142 evas_object_smart_clipped_smart_hide(eo_obj);
143} 143}
@@ -150,7 +150,7 @@ evas_object_smart_clipped_smart_color_set(Evas_Object *eo_obj, int r, int g, int
150} 150}
151 151
152EOLIAN static void 152EOLIAN static void
153_evas_smart_clipped_evas_smart_color_set(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED, int r, int g, int b, int a) 153_evas_smart_clipped_evas_object_smart_color_set(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED, int r, int g, int b, int a)
154{ 154{
155 evas_object_smart_clipped_smart_color_set(eo_obj, r, g, b, a); 155 evas_object_smart_clipped_smart_color_set(eo_obj, r, g, b, a);
156} 156}
@@ -163,7 +163,7 @@ evas_object_smart_clipped_smart_clip_set(Evas_Object *eo_obj, Evas_Object *clip)
163} 163}
164 164
165EOLIAN static void 165EOLIAN static void
166_evas_smart_clipped_evas_smart_clip_set(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED, Evas_Object *clip) 166_evas_smart_clipped_evas_object_smart_clip_set(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED, Evas_Object *clip)
167{ 167{
168 evas_object_smart_clipped_smart_clip_set(eo_obj, clip); 168 evas_object_smart_clipped_smart_clip_set(eo_obj, clip);
169} 169}
@@ -176,7 +176,7 @@ evas_object_smart_clipped_smart_clip_unset(Evas_Object *eo_obj)
176} 176}
177 177
178EOLIAN static void 178EOLIAN static void
179_evas_smart_clipped_evas_smart_clip_unset(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED) 179_evas_smart_clipped_evas_object_smart_clip_unset(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED)
180{ 180{
181 evas_object_smart_clipped_smart_clip_unset(eo_obj); 181 evas_object_smart_clipped_smart_clip_unset(eo_obj);
182} 182}
@@ -193,7 +193,7 @@ evas_object_smart_clipped_smart_member_add(Evas_Object *eo_obj, Evas_Object *mem
193} 193}
194 194
195EOLIAN static void 195EOLIAN static void
196_evas_smart_clipped_evas_smart_member_add(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED, Evas_Object *member) 196_evas_smart_clipped_evas_object_smart_member_add(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED, Evas_Object *member)
197{ 197{
198 eo_do_super(eo_obj, MY_CLASS, evas_obj_smart_member_add(member)); 198 eo_do_super(eo_obj, MY_CLASS, evas_obj_smart_member_add(member));
199 evas_object_smart_clipped_smart_member_add(eo_obj, member); 199 evas_object_smart_clipped_smart_member_add(eo_obj, member);
@@ -211,7 +211,7 @@ evas_object_smart_clipped_smart_member_del(Evas_Object *eo_obj, Evas_Object *mem
211} 211}
212 212
213EOLIAN static void 213EOLIAN static void
214_evas_smart_clipped_evas_smart_member_del(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED, Evas_Object *member) 214_evas_smart_clipped_evas_object_smart_member_del(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED, Evas_Object *member)
215{ 215{
216 evas_object_smart_clipped_smart_member_del(eo_obj, member); 216 evas_object_smart_clipped_smart_member_del(eo_obj, member);
217 eo_do_super(eo_obj, MY_CLASS, evas_obj_smart_member_del(member)); 217 eo_do_super(eo_obj, MY_CLASS, evas_obj_smart_member_del(member));
diff --git a/src/lib/evas/canvas/evas_object_table.c b/src/lib/evas/canvas/evas_object_table.c
index 969a5eb..826cc5b 100644
--- a/src/lib/evas/canvas/evas_object_table.c
+++ b/src/lib/evas/canvas/evas_object_table.c
@@ -2,7 +2,7 @@
2#include "evas_private.h" 2#include "evas_private.h"
3#include <errno.h> 3#include <errno.h>
4 4
5#define MY_CLASS EVAS_OBJ_TABLE_CLASS 5#define MY_CLASS EVAS_TABLE_CLASS
6 6
7#define MY_CLASS_NAME "Evas_Table" 7#define MY_CLASS_NAME "Evas_Table"
8#define MY_CLASS_NAME_LEGACY "Evas_Object_Table" 8#define MY_CLASS_NAME_LEGACY "Evas_Object_Table"
@@ -881,7 +881,7 @@ _evas_object_table_smart_calculate_regular(Evas_Object *o, Evas_Table_Data *priv
881} 881}
882 882
883EOLIAN static void 883EOLIAN static void
884_evas_table_evas_smart_add(Eo *obj, Evas_Table_Data *priv) 884_evas_table_evas_object_smart_add(Eo *obj, Evas_Table_Data *priv)
885{ 885{
886 priv->pad.h = 0; 886 priv->pad.h = 0;
887 priv->pad.v = 0; 887 priv->pad.v = 0;
@@ -899,7 +899,7 @@ _evas_table_evas_smart_add(Eo *obj, Evas_Table_Data *priv)
899} 899}
900 900
901EOLIAN static void 901EOLIAN static void
902_evas_table_evas_smart_del(Eo *obj, Evas_Table_Data *priv) 902_evas_table_evas_object_smart_del(Eo *obj, Evas_Table_Data *priv)
903{ 903{
904 Eina_List *l; 904 Eina_List *l;
905 905
@@ -923,7 +923,7 @@ _evas_table_evas_smart_del(Eo *obj, Evas_Table_Data *priv)
923} 923}
924 924
925EOLIAN static void 925EOLIAN static void
926_evas_table_evas_smart_resize(Eo *obj, Evas_Table_Data *_pd EINA_UNUSED, Evas_Coord w, Evas_Coord h) 926_evas_table_evas_object_smart_resize(Eo *obj, Evas_Table_Data *_pd EINA_UNUSED, Evas_Coord w, Evas_Coord h)
927{ 927{
928 Evas_Coord ow, oh; 928 Evas_Coord ow, oh;
929 evas_object_geometry_get(obj, NULL, NULL, &ow, &oh); 929 evas_object_geometry_get(obj, NULL, NULL, &ow, &oh);
@@ -932,7 +932,7 @@ _evas_table_evas_smart_resize(Eo *obj, Evas_Table_Data *_pd EINA_UNUSED, Evas_Co
932} 932}
933 933
934EOLIAN static void 934EOLIAN static void
935_evas_table_evas_smart_calculate(Eo *o, Evas_Table_Data *priv) 935_evas_table_evas_object_smart_calculate(Eo *o, Evas_Table_Data *priv)
936{ 936{
937 if ((priv->size.cols < 1) || (priv->size.rows < 1)) 937 if ((priv->size.cols < 1) || (priv->size.rows < 1))
938 { 938 {
diff --git a/src/lib/evas/canvas/evas_object_text.c b/src/lib/evas/canvas/evas_object_text.c
index 8ddfdd9..4c1fea1 100644
--- a/src/lib/evas/canvas/evas_object_text.c
+++ b/src/lib/evas/canvas/evas_object_text.c
@@ -2,7 +2,7 @@
2#include "evas_private.h" 2#include "evas_private.h"
3#include "evas_filter.h" 3#include "evas_filter.h"
4 4
5#define MY_CLASS EVAS_OBJ_TEXT_CLASS 5#define MY_CLASS EVAS_TEXT_CLASS
6 6
7#define MY_CLASS_NAME "Evas_Text" 7#define MY_CLASS_NAME "Evas_Text"
8 8
@@ -150,7 +150,7 @@ _evas_object_text_char_coords_get(const Evas_Object *eo_obj,
150 const Evas_Text_Data *o, 150 const Evas_Text_Data *o,
151 size_t pos, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) 151 size_t pos, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h)
152{ 152{
153 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 153 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
154 Evas_Object_Text_Item *it; 154 Evas_Object_Text_Item *it;
155 155
156 EINA_INLIST_FOREACH(EINA_INLIST_GET(o->items), it) 156 EINA_INLIST_FOREACH(EINA_INLIST_GET(o->items), it)
@@ -271,7 +271,7 @@ static int
271_evas_object_text_last_up_to_pos(const Evas_Object *eo_obj, 271_evas_object_text_last_up_to_pos(const Evas_Object *eo_obj,
272 const Evas_Text_Data *o, Evas_Coord cx, Evas_Coord cy) 272 const Evas_Text_Data *o, Evas_Coord cx, Evas_Coord cy)
273{ 273{
274 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 274 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
275 Evas_Object_Text_Item *it; 275 Evas_Object_Text_Item *it;
276 276
277#ifdef BIDI_SUPPORT 277#ifdef BIDI_SUPPORT
@@ -326,7 +326,7 @@ _evas_object_text_char_at_coords(const Evas_Object *eo_obj,
326 const Evas_Text_Data *o, Evas_Coord cx, Evas_Coord cy, 326 const Evas_Text_Data *o, Evas_Coord cx, Evas_Coord cy,
327 Evas_Coord *rx, Evas_Coord *ry, Evas_Coord *rw, Evas_Coord *rh) 327 Evas_Coord *rx, Evas_Coord *ry, Evas_Coord *rw, Evas_Coord *rh)
328{ 328{
329 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 329 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
330 Evas_Object_Text_Item *it; 330 Evas_Object_Text_Item *it;
331 331
332 EINA_INLIST_FOREACH(EINA_INLIST_GET(o->items), it) 332 EINA_INLIST_FOREACH(EINA_INLIST_GET(o->items), it)
@@ -370,7 +370,7 @@ evas_object_text_add(Evas *e)
370 MAGIC_CHECK(e, Evas, MAGIC_EVAS); 370 MAGIC_CHECK(e, Evas, MAGIC_EVAS);
371 return NULL; 371 return NULL;
372 MAGIC_CHECK_END(); 372 MAGIC_CHECK_END();
373 Evas_Object *eo_obj = eo_add(EVAS_OBJ_TEXT_CLASS, e); 373 Evas_Object *eo_obj = eo_add(EVAS_TEXT_CLASS, e);
374 eo_unref(eo_obj); 374 eo_unref(eo_obj);
375 return eo_obj; 375 return eo_obj;
376} 376}
@@ -380,7 +380,7 @@ _evas_text_eo_base_constructor(Eo *eo_obj, Evas_Text_Data *class_data EINA_UNUSE
380{ 380{
381 eo_do_super(eo_obj, MY_CLASS, eo_constructor()); 381 eo_do_super(eo_obj, MY_CLASS, eo_constructor());
382 evas_object_text_init(eo_obj); 382 evas_object_text_init(eo_obj);
383 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 383 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
384 Eo *parent = NULL; 384 Eo *parent = NULL;
385 385
386 eo_do(eo_obj, parent = eo_parent_get()); 386 eo_do(eo_obj, parent = eo_parent_get());
@@ -443,7 +443,7 @@ _evas_text_font_set(Eo *eo_obj, Evas_Text_Data *o, const char *font, Evas_Font_S
443 eina_stringshare_replace(&o->cur.font, font); 443 eina_stringshare_replace(&o->cur.font, font);
444 o->prev.font = NULL; 444 o->prev.font = NULL;
445 445
446 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 446 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
447 if (!(obj->layer->evas->is_frozen)) 447 if (!(obj->layer->evas->is_frozen))
448 { 448 {
449 pass = evas_event_passes_through(eo_obj, obj); 449 pass = evas_event_passes_through(eo_obj, obj);
@@ -670,7 +670,7 @@ _layout_text_item_trim(Evas_Object_Protected_Data *obj, Evas_Text_Data *o, Evas_
670static void 670static void
671_evas_object_text_layout(Evas_Object *eo_obj, Evas_Text_Data *o, Eina_Unicode *text) 671_evas_object_text_layout(Evas_Object *eo_obj, Evas_Text_Data *o, Eina_Unicode *text)
672{ 672{
673 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 673 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
674 EvasBiDiStrIndex *v_to_l = NULL; 674 EvasBiDiStrIndex *v_to_l = NULL;
675 Evas_Coord advance = 0; 675 Evas_Coord advance = 0;
676 size_t pos, visual_pos; 676 size_t pos, visual_pos;
@@ -915,7 +915,7 @@ _evas_object_text_layout(Evas_Object *eo_obj, Evas_Text_Data *o, Eina_Unicode *t
915EOLIAN static void 915EOLIAN static void
916_evas_text_evas_object_size_set(Eo *eo_obj, Evas_Text_Data *o, Evas_Coord w, Evas_Coord h) 916_evas_text_evas_object_size_set(Eo *eo_obj, Evas_Text_Data *o, Evas_Coord w, Evas_Coord h)
917{ 917{
918 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 918 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
919 919
920 EINA_COW_STATE_WRITE_BEGIN(obj, state_write, cur) 920 EINA_COW_STATE_WRITE_BEGIN(obj, state_write, cur)
921 { 921 {
@@ -930,7 +930,7 @@ _evas_text_evas_object_size_set(Eo *eo_obj, Evas_Text_Data *o, Evas_Coord w, Eva
930EOLIAN static void 930EOLIAN static void
931_evas_text_ellipsis_set(Eo *eo_obj, Evas_Text_Data *o, double ellipsis) 931_evas_text_ellipsis_set(Eo *eo_obj, Evas_Text_Data *o, double ellipsis)
932{ 932{
933 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 933 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
934 934
935 if (o->cur.ellipsis == ellipsis) return; 935 if (o->cur.ellipsis == ellipsis) return;
936 936
@@ -977,7 +977,7 @@ _evas_text_text_set(Eo *eo_obj, Evas_Text_Data *o, const char *_text)
977 text = eina_unicode_utf8_to_unicode(_text, &len); 977 text = eina_unicode_utf8_to_unicode(_text, &len);
978 978
979 if (!text) text = eina_unicode_strdup(EINA_UNICODE_EMPTY_STRING); 979 if (!text) text = eina_unicode_strdup(EINA_UNICODE_EMPTY_STRING);
980 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 980 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
981 was = evas_object_is_in_output_rect(eo_obj, obj, 981 was = evas_object_is_in_output_rect(eo_obj, obj,
982 obj->layer->evas->pointer.x, 982 obj->layer->evas->pointer.x,
983 obj->layer->evas->pointer.y, 1, 1); 983 obj->layer->evas->pointer.y, 1, 1);
@@ -1060,7 +1060,7 @@ _evas_text_max_descent_get(Eo *eo_obj EINA_UNUSED, Evas_Text_Data *o)
1060EOLIAN static Evas_Coord 1060EOLIAN static Evas_Coord
1061_evas_text_inset_get(Eo *eo_obj, Evas_Text_Data *o) 1061_evas_text_inset_get(Eo *eo_obj, Evas_Text_Data *o)
1062{ 1062{
1063 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1063 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1064 Evas_Coord inset = 0; 1064 Evas_Coord inset = 0;
1065 if (!o->font) return inset; 1065 if (!o->font) return inset;
1066 if (!o->items) return inset; 1066 if (!o->items) return inset;
@@ -1108,7 +1108,7 @@ _evas_text_char_pos_get(Eo *eo_obj, Evas_Text_Data *o, int pos, Evas_Coord *cx,
1108 if (!o->font) return ret; 1108 if (!o->font) return ret;
1109 if (!o->items || (pos < 0)) return ret; 1109 if (!o->items || (pos < 0)) return ret;
1110 1110
1111 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1111 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1112 1112
1113 Eina_Bool int_ret = _evas_object_text_char_coords_get(eo_obj, o, (size_t) pos, 1113 Eina_Bool int_ret = _evas_object_text_char_coords_get(eo_obj, o, (size_t) pos,
1114 &x, &y, &w, &h); 1114 &x, &y, &w, &h);
@@ -1180,7 +1180,7 @@ _evas_text_char_coords_get(Eo *eo_obj, Evas_Text_Data *o, Evas_Coord x, Evas_Coo
1180 rw += rx; 1180 rw += rx;
1181 rx = 0; 1181 rx = 0;
1182 } 1182 }
1183 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1183 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1184 if ((rx + rw) > obj->cur->geometry.w) rw = obj->cur->geometry.w - rx; 1184 if ((rx + rw) > obj->cur->geometry.w) rw = obj->cur->geometry.w - rx;
1185 if (rw < 0) rw = 0; 1185 if (rw < 0) rw = 0;
1186 if (ry < 0) 1186 if (ry < 0)
@@ -1206,7 +1206,7 @@ _evas_text_style_set(Eo *eo_obj, Evas_Text_Data *o, Evas_Text_Style_Type style)
1206 int w = 0, h = 0; 1206 int w = 0, h = 0;
1207 1207
1208 if (o->cur.style == style) return; 1208 if (o->cur.style == style) return;
1209 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1209 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1210 1210
1211 evas_text_style_pad_get(o->cur.style, &pl, &pr, &pt, &pb); 1211 evas_text_style_pad_get(o->cur.style, &pl, &pr, &pt, &pb);
1212 o->cur.style = style; 1212 o->cur.style = style;
@@ -1236,7 +1236,7 @@ _evas_text_shadow_color_set(Eo *eo_obj, Evas_Text_Data *o, int r, int g, int b,
1236 o->cur.shadow.b = b; 1236 o->cur.shadow.b = b;
1237 o->cur.shadow.a = a; 1237 o->cur.shadow.a = a;
1238 o->changed = 1; 1238 o->changed = 1;
1239 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1239 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1240 evas_object_change(eo_obj, obj); 1240 evas_object_change(eo_obj, obj);
1241} 1241}
1242 1242
@@ -1260,7 +1260,7 @@ _evas_text_glow_color_set(Eo *eo_obj, Evas_Text_Data *o, int r, int g, int b, in
1260 o->cur.glow.b = b; 1260 o->cur.glow.b = b;
1261 o->cur.glow.a = a; 1261 o->cur.glow.a = a;
1262 o->changed = 1; 1262 o->changed = 1;
1263 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1263 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1264 evas_object_change(eo_obj, obj); 1264 evas_object_change(eo_obj, obj);
1265} 1265}
1266 1266
@@ -1284,7 +1284,7 @@ _evas_text_glow2_color_set(Eo *eo_obj, Evas_Text_Data *o, int r, int g, int b, i
1284 o->cur.glow2.b = b; 1284 o->cur.glow2.b = b;
1285 o->cur.glow2.a = a; 1285 o->cur.glow2.a = a;
1286 o->changed = 1; 1286 o->changed = 1;
1287 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1287 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1288 evas_object_change(eo_obj, obj); 1288 evas_object_change(eo_obj, obj);
1289} 1289}
1290 1290
@@ -1308,7 +1308,7 @@ _evas_text_outline_color_set(Eo *eo_obj, Evas_Text_Data *o, int r, int g, int b,
1308 o->cur.outline.b = b; 1308 o->cur.outline.b = b;
1309 o->cur.outline.a = a; 1309 o->cur.outline.a = a;
1310 o->changed = 1; 1310 o->changed = 1;
1311 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1311 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1312 evas_object_change(eo_obj, obj); 1312 evas_object_change(eo_obj, obj);
1313} 1313}
1314 1314
@@ -1503,7 +1503,7 @@ evas_text_style_pad_get(Evas_Text_Style_Type style, int *l, int *r, int *t, int
1503static void 1503static void
1504evas_object_text_init(Evas_Object *eo_obj) 1504evas_object_text_init(Evas_Object *eo_obj)
1505{ 1505{
1506 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1506 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1507 /* set up methods (compulsory) */ 1507 /* set up methods (compulsory) */
1508 obj->func = &object_func; 1508 obj->func = &object_func;
1509 obj->private_data = eo_data_ref(eo_obj, MY_CLASS); 1509 obj->private_data = eo_data_ref(eo_obj, MY_CLASS);
@@ -1521,7 +1521,7 @@ evas_object_text_init(Evas_Object *eo_obj)
1521EOLIAN static void 1521EOLIAN static void
1522_evas_text_eo_base_destructor(Eo *eo_obj, Evas_Text_Data *o EINA_UNUSED) 1522_evas_text_eo_base_destructor(Eo *eo_obj, Evas_Text_Data *o EINA_UNUSED)
1523{ 1523{
1524 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1524 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1525 evas_object_text_free(eo_obj, obj); 1525 evas_object_text_free(eo_obj, obj);
1526 eo_do_super(eo_obj, MY_CLASS, eo_destructor()); 1526 eo_do_super(eo_obj, MY_CLASS, eo_destructor());
1527} 1527}
@@ -1588,7 +1588,7 @@ _filter_cb(Evas_Filter_Context *ctx, void *data, Eina_Bool success)
1588 // Redraw text with normal styles in case of failure 1588 // Redraw text with normal styles in case of failure
1589 if (!success) 1589 if (!success)
1590 { 1590 {
1591 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1591 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1592 Evas_Text_Data *o = (Evas_Text_Data *) obj->private_data; 1592 Evas_Text_Data *o = (Evas_Text_Data *) obj->private_data;
1593 1593
1594 ERR("Filter failed at runtime!"); 1594 ERR("Filter failed at runtime!");
@@ -1764,7 +1764,7 @@ evas_object_text_render(Evas_Object *eo_obj,
1764 iter = eina_hash_iterator_data_new(o->cur.filter.sources); 1764 iter = eina_hash_iterator_data_new(o->cur.filter.sources);
1765 EINA_ITERATOR_FOREACH(iter, pb) 1765 EINA_ITERATOR_FOREACH(iter, pb)
1766 { 1766 {
1767 source = eo_data_scope_get(pb->eo_source, EVAS_OBJ_CLASS); 1767 source = eo_data_scope_get(pb->eo_source, EVAS_OBJECT_CLASS);
1768 if (source->changed) 1768 if (source->changed)
1769 { 1769 {
1770 redraw = EINA_TRUE; 1770 redraw = EINA_TRUE;
@@ -2181,7 +2181,7 @@ evas_object_text_scale_update(Evas_Object *eo_obj,
2181void 2181void
2182_evas_object_text_rehint(Evas_Object *eo_obj) 2182_evas_object_text_rehint(Evas_Object *eo_obj)
2183{ 2183{
2184 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 2184 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
2185 Evas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); 2185 Evas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
2186 int is, was; 2186 int is, was;
2187 2187
@@ -2213,7 +2213,7 @@ _evas_object_text_rehint(Evas_Object *eo_obj)
2213static void 2213static void
2214_evas_object_text_recalc(Evas_Object *eo_obj, Eina_Unicode *text) 2214_evas_object_text_recalc(Evas_Object *eo_obj, Eina_Unicode *text)
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_scope_get(eo_obj, EVAS_OBJECT_CLASS);
2217 Evas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); 2217 Evas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
2218 2218
2219 if (!text) text = eina_unicode_strdup(EINA_UNICODE_EMPTY_STRING); 2219 if (!text) text = eina_unicode_strdup(EINA_UNICODE_EMPTY_STRING);
@@ -2328,7 +2328,7 @@ _evas_text_filter_program_set(Eo *eo_obj, Evas_Text_Data *o, const char *arg)
2328 eina_stringshare_replace(&o->cur.filter.code, arg); 2328 eina_stringshare_replace(&o->cur.filter.code, arg);
2329 2329
2330 // Update object 2330 // Update object
2331 obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 2331 obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
2332 _evas_object_text_items_clear(o); 2332 _evas_object_text_items_clear(o);
2333 o->changed = 1; 2333 o->changed = 1;
2334 _evas_object_text_recalc(eo_obj, o->cur.text); 2334 _evas_object_text_recalc(eo_obj, o->cur.text);
@@ -2345,8 +2345,8 @@ _filter_source_hash_free_cb(void *data)
2345 Evas_Object_Protected_Data *proxy, *source; 2345 Evas_Object_Protected_Data *proxy, *source;
2346 Evas_Text_Data *o; 2346 Evas_Text_Data *o;
2347 2347
2348 proxy = eo_data_scope_get(pb->eo_proxy, EVAS_OBJ_CLASS); 2348 proxy = eo_data_scope_get(pb->eo_proxy, EVAS_OBJECT_CLASS);
2349 source = eo_data_scope_get(pb->eo_source, EVAS_OBJ_CLASS); 2349 source = eo_data_scope_get(pb->eo_source, EVAS_OBJECT_CLASS);
2350 2350
2351 if (source) 2351 if (source)
2352 { 2352 {
@@ -2382,8 +2382,8 @@ _evas_text_filter_source_set(Eo *eo_obj, Evas_Text_Data *o, const char *name, Ev
2382 Evas_Filter_Proxy_Binding *pb, *pb_old = NULL; 2382 Evas_Filter_Proxy_Binding *pb, *pb_old = NULL;
2383 Evas_Object_Protected_Data *source = NULL; 2383 Evas_Object_Protected_Data *source = NULL;
2384 2384
2385 obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 2385 obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
2386 if (eo_source) source = eo_data_scope_get(eo_source, EVAS_OBJ_CLASS); 2386 if (eo_source) source = eo_data_scope_get(eo_source, EVAS_OBJECT_CLASS);
2387 2387
2388 if (!name) 2388 if (!name)
2389 { 2389 {
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index c6d9770..b01a554 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -67,7 +67,7 @@
67//#define LYDBG(f, args...) printf(f, ##args) 67//#define LYDBG(f, args...) printf(f, ##args)
68#define LYDBG(f, args...) 68#define LYDBG(f, args...)
69 69
70#define MY_CLASS EVAS_OBJ_TEXTBLOCK_CLASS 70#define MY_CLASS EVAS_TEXTBLOCK_CLASS
71 71
72#define MY_CLASS_NAME "Evas_Textblock" 72#define MY_CLASS_NAME "Evas_Textblock"
73 73
@@ -715,7 +715,7 @@ _nodes_clear(const Evas_Object *eo_obj)
715static void 715