summaryrefslogtreecommitdiff
path: root/src/lib/evas
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-08-15 14:44:41 +0100
committerTom Hacohen <tom@stosb.com>2016-08-15 15:07:42 +0100
commite65aae994e72c1d3f8ac6b5360d3772f177b77ef (patch)
tree7ecaf136e45470635889191aded2b47057720a98 /src/lib/evas
parent35abb3c34d10a4826c98055fb85ecf93915e5ea8 (diff)
Eo: Finish the renaming of Eo to the EFL.
This renames all the rest of the API to the EFL namespace except for Eo_Event that will follow soon. Obviously breaks both API and ABI.
Diffstat (limited to 'src/lib/evas')
-rw-r--r--src/lib/evas/Evas_Common.h4
-rw-r--r--src/lib/evas/Evas_Legacy.h4
-rw-r--r--src/lib/evas/canvas/efl_canvas_image.c108
-rw-r--r--src/lib/evas/canvas/efl_canvas_proxy.c50
-rw-r--r--src/lib/evas/canvas/efl_canvas_scene3d.c30
-rw-r--r--src/lib/evas/canvas/efl_canvas_snapshot.c4
-rw-r--r--src/lib/evas/canvas/efl_canvas_surface.c2
-rw-r--r--src/lib/evas/canvas/efl_canvas_surface_tbm.c10
-rw-r--r--src/lib/evas/canvas/efl_canvas_surface_wayland.c10
-rw-r--r--src/lib/evas/canvas/efl_canvas_surface_x11.c10
-rw-r--r--src/lib/evas/canvas/efl_event_hold.c10
-rw-r--r--src/lib/evas/canvas/efl_event_key.c8
-rw-r--r--src/lib/evas/canvas/efl_event_pointer.c8
-rw-r--r--src/lib/evas/canvas/evas_callbacks.c26
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_camera.c16
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_light.c12
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_material.c16
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_mesh.c18
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_node.c88
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_object.c8
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_primitive.c6
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_scene.c30
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_texture.c56
-rw-r--r--src/lib/evas/canvas/evas_clip.c6
-rw-r--r--src/lib/evas/canvas/evas_device.c44
-rw-r--r--src/lib/evas/canvas/evas_events.c286
-rw-r--r--src/lib/evas/canvas/evas_events_legacy.c6
-rw-r--r--src/lib/evas/canvas/evas_filter_mixin.c32
-rw-r--r--src/lib/evas/canvas/evas_font_dir.c16
-rw-r--r--src/lib/evas/canvas/evas_gl.c8
-rw-r--r--src/lib/evas/canvas/evas_image_legacy.c92
-rw-r--r--src/lib/evas/canvas/evas_key_grab.c4
-rw-r--r--src/lib/evas/canvas/evas_layer.c20
-rw-r--r--src/lib/evas/canvas/evas_main.c54
-rw-r--r--src/lib/evas/canvas/evas_map.c22
-rw-r--r--src/lib/evas/canvas/evas_name.c10
-rw-r--r--src/lib/evas/canvas/evas_object_box.c14
-rw-r--r--src/lib/evas/canvas/evas_object_grid.c8
-rw-r--r--src/lib/evas/canvas/evas_object_image.c136
-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.c18
-rw-r--r--src/lib/evas/canvas/evas_object_main.c156
-rw-r--r--src/lib/evas/canvas/evas_object_polygon.c22
-rw-r--r--src/lib/evas/canvas/evas_object_rectangle.c14
-rw-r--r--src/lib/evas/canvas/evas_object_smart.c152
-rw-r--r--src/lib/evas/canvas/evas_object_smart_clipped.c14
-rw-r--r--src/lib/evas/canvas/evas_object_table.c12
-rw-r--r--src/lib/evas/canvas/evas_object_text.c92
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c486
-rw-r--r--src/lib/evas/canvas/evas_object_textgrid.c54
-rw-r--r--src/lib/evas/canvas/evas_object_vg.c36
-rw-r--r--src/lib/evas/canvas/evas_out.c16
-rw-r--r--src/lib/evas/canvas/evas_render.c50
-rw-r--r--src/lib/evas/canvas/evas_stack.c4
-rw-r--r--src/lib/evas/canvas/evas_textblock_hyphenation.x4
-rw-r--r--src/lib/evas/canvas/evas_touch_point.c6
-rw-r--r--src/lib/evas/canvas/evas_vg_container.c28
-rw-r--r--src/lib/evas/canvas/evas_vg_gradient.c10
-rw-r--r--src/lib/evas/canvas/evas_vg_gradient_linear.c20
-rw-r--r--src/lib/evas/canvas/evas_vg_gradient_radial.c20
-rw-r--r--src/lib/evas/canvas/evas_vg_node.c52
-rw-r--r--src/lib/evas/canvas/evas_vg_private.h4
-rw-r--r--src/lib/evas/canvas/evas_vg_root_node.c16
-rw-r--r--src/lib/evas/canvas/evas_vg_shape.c46
-rw-r--r--src/lib/evas/canvas/render2/evas_render2.c2
-rw-r--r--src/lib/evas/canvas/render2/evas_render2_old.c14
-rw-r--r--src/lib/evas/canvas/render2/evas_render2_th_main.c6
-rw-r--r--src/lib/evas/common3d/save_load/evas_model_load_save_common.c2
-rw-r--r--src/lib/evas/filters/evas_filter.c8
-rw-r--r--src/lib/evas/filters/evas_filter_parser.c6
-rw-r--r--src/lib/evas/include/evas_inline.x8
-rw-r--r--src/lib/evas/include/evas_private.h12
73 files changed, 1354 insertions, 1354 deletions
diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h
index b55d7b2..40a92a4 100644
--- a/src/lib/evas/Evas_Common.h
+++ b/src/lib/evas/Evas_Common.h
@@ -2825,12 +2825,12 @@ EAPI int evas_smart_usage_get(const Evas_Smart *s)
2825 * This function has been implemented to support legacy mechanism that checks 2825 * This function has been implemented to support legacy mechanism that checks
2826 * objects types by name. 2826 * objects types by name.
2827 * USE IT ONLY FOR LEGACY SUPPORT. 2827 * USE IT ONLY FOR LEGACY SUPPORT.
2828 * Otherwise, it is HIGHLY recommended to use eo_isa. 2828 * Otherwise, it is HIGHLY recommended to use efl_isa.
2829 * 2829 *
2830 * @param type The type (name string) to add. 2830 * @param type The type (name string) to add.
2831 * @param klass The class to associate to the type. 2831 * @param klass The class to associate to the type.
2832 * 2832 *
2833 * @see eo_isa 2833 * @see efl_isa
2834 * 2834 *
2835 * @ingroup Evas_Smart_Object_Group 2835 * @ingroup Evas_Smart_Object_Group
2836 */ 2836 */
diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h
index 1962953..9608891 100644
--- a/src/lib/evas/Evas_Legacy.h
+++ b/src/lib/evas/Evas_Legacy.h
@@ -2382,7 +2382,7 @@ EAPI Evas_Object *evas_object_rectangle_add(Evas *e) EINA_WARN_UNUSED_RESULT EIN
2382 * @code 2382 * @code
2383 * vector = evas_object_vg_add(canvas); 2383 * vector = evas_object_vg_add(canvas);
2384 * root = evas_obj_vg_root_node_get(vector); 2384 * root = evas_obj_vg_root_node_get(vector);
2385 * shape = eo_add(EVAS_VG_SHAPE_CLASS, root); 2385 * shape = efl_add(EVAS_VG_SHAPE_CLASS, root);
2386 * Efl_Gfx_Path_Command *path_cmd = NULL; 2386 * Efl_Gfx_Path_Command *path_cmd = NULL;
2387 * double *points = NULL; 2387 * double *points = NULL;
2388 * efl_gfx_path_append_circle(&path_cmd, &points); 2388 * efl_gfx_path_append_circle(&path_cmd, &points);
@@ -5089,7 +5089,7 @@ EAPI void *evas_object_smart_interface_data_get(const Evas_Object *o
5089 * If @c obj is not a smart object, this call will fail immediately. 5089 * If @c obj is not a smart object, this call will fail immediately.
5090 * 5090 *
5091 * This function supports Eo and legacy inheritance mechanisms. However, it is 5091 * This function supports Eo and legacy inheritance mechanisms. However, it is
5092 * recommended to use @ref eo_isa instead if your object is using Eo from top 5092 * recommended to use @ref efl_isa instead if your object is using Eo from top
5093 * to bottom. 5093 * to bottom.
5094 * 5094 *
5095 * The checks use smart classes names and string comparison. There is a version 5095 * The checks use smart classes names and string comparison. There is a version
diff --git a/src/lib/evas/canvas/efl_canvas_image.c b/src/lib/evas/canvas/efl_canvas_image.c
index adfbb99..ee32e61 100644
--- a/src/lib/evas/canvas/efl_canvas_image.c
+++ b/src/lib/evas/canvas/efl_canvas_image.c
@@ -6,8 +6,8 @@
6Eina_Bool 6Eina_Bool
7_evas_image_mmap_set(Eo *eo_obj, const Eina_File *f, const char *key) 7_evas_image_mmap_set(Eo *eo_obj, const Eina_File *f, const char *key)
8{ 8{
9 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 9 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
10 Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); 10 Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
11 Evas_Image_Load_Opts lo; 11 Evas_Image_Load_Opts lo;
12 12
13 if (o->cur->u.f == f) 13 if (o->cur->u.f == f)
@@ -36,7 +36,7 @@ _efl_canvas_image_efl_file_mmap_set(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSE
36void 36void
37_evas_image_mmap_get(const Eo *eo_obj, const Eina_File **f, const char **key) 37_evas_image_mmap_get(const Eo *eo_obj, const Eina_File **f, const char **key)
38{ 38{
39 Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); 39 Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
40 40
41 if (f) 41 if (f)
42 *f = o->cur->mmaped_source ? o->cur->u.f : NULL; 42 *f = o->cur->mmaped_source ? o->cur->u.f : NULL;
@@ -54,8 +54,8 @@ _efl_canvas_image_efl_file_mmap_get(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSE
54Eina_Bool 54Eina_Bool
55_evas_image_file_set(Eo *eo_obj, const char *file, const char *key) 55_evas_image_file_set(Eo *eo_obj, const char *file, const char *key)
56{ 56{
57 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 57 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
58 Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); 58 Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
59 Evas_Image_Load_Opts lo; 59 Evas_Image_Load_Opts lo;
60 const char *file2; 60 const char *file2;
61 61
@@ -95,7 +95,7 @@ _efl_canvas_image_efl_file_file_set(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSE
95void 95void
96_evas_image_file_get(const Eo *eo_obj, const char **file, const char **key) 96_evas_image_file_get(const Eo *eo_obj, const char **file, const char **key)
97{ 97{
98 Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); 98 Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
99 99
100 if (file) 100 if (file)
101 { 101 {
@@ -117,7 +117,7 @@ _efl_canvas_image_efl_file_file_get(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSE
117Efl_Image_Load_Error 117Efl_Image_Load_Error
118_evas_image_load_error_get(const Eo *eo_obj) 118_evas_image_load_error_get(const Eo *eo_obj)
119{ 119{
120 Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); 120 Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
121 121
122 return o->load_error; 122 return o->load_error;
123} 123}
@@ -139,7 +139,7 @@ _image_preload_internal(Eo *eo_obj, Evas_Image_Data *o, Eina_Bool cancel)
139 } 139 }
140 // FIXME: if already busy preloading, then dont request again until 140 // FIXME: if already busy preloading, then dont request again until
141 // preload done 141 // preload done
142 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 142 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
143 if (cancel) 143 if (cancel)
144 { 144 {
145 if (o->preloading) 145 if (o->preloading)
@@ -161,8 +161,8 @@ _image_preload_internal(Eo *eo_obj, Evas_Image_Data *o, Eina_Bool cancel)
161void 161void
162_evas_image_load_async_start(Eo *eo_obj) 162_evas_image_load_async_start(Eo *eo_obj)
163{ 163{
164 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 164 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
165 Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); 165 Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
166 166
167 evas_object_async_block(obj); 167 evas_object_async_block(obj);
168 _image_preload_internal(eo_obj, o, EINA_FALSE); 168 _image_preload_internal(eo_obj, o, EINA_FALSE);
@@ -177,8 +177,8 @@ _efl_canvas_image_efl_image_load_load_async_start(Eo *eo_obj, void *_pd EINA_UNU
177void 177void
178_evas_image_load_async_cancel(Eo *eo_obj) 178_evas_image_load_async_cancel(Eo *eo_obj)
179{ 179{
180 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 180 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
181 Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); 181 Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
182 182
183 evas_object_async_block(obj); 183 evas_object_async_block(obj);
184 _image_preload_internal(eo_obj, o, EINA_TRUE); 184 _image_preload_internal(eo_obj, o, EINA_TRUE);
@@ -193,8 +193,8 @@ _efl_canvas_image_efl_image_load_load_async_cancel(Eo *eo_obj, void *_pd EINA_UN
193void 193void
194_evas_image_load_dpi_set(Eo *eo_obj, double dpi) 194_evas_image_load_dpi_set(Eo *eo_obj, double dpi)
195{ 195{
196 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 196 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
197 Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); 197 Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
198 198
199 if (dpi == o->load_opts->dpi) return; 199 if (dpi == o->load_opts->dpi) return;
200 evas_object_async_block(obj); 200 evas_object_async_block(obj);
@@ -221,7 +221,7 @@ _efl_canvas_image_efl_image_load_load_dpi_set(Eo *eo_obj, void *_pd EINA_UNUSED
221double 221double
222_evas_image_load_dpi_get(const Eo *eo_obj) 222_evas_image_load_dpi_get(const Eo *eo_obj)
223{ 223{
224 Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); 224 Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
225 225
226 return o->load_opts->dpi; 226 return o->load_opts->dpi;
227} 227}
@@ -235,8 +235,8 @@ _efl_canvas_image_efl_image_load_load_dpi_get(Eo *eo_obj, void *_pd EINA_UNUSED
235void 235void
236_evas_image_load_size_set(Eo *eo_obj, int w, int h) 236_evas_image_load_size_set(Eo *eo_obj, int w, int h)
237{ 237{
238 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 238 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
239 Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); 239 Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
240 240
241 if ((o->load_opts->w == w) && (o->load_opts->h == h)) return; 241 if ((o->load_opts->w == w) && (o->load_opts->h == h)) return;
242 evas_object_async_block(obj); 242 evas_object_async_block(obj);
@@ -267,7 +267,7 @@ _efl_canvas_image_efl_image_load_load_size_set(Eo *eo_obj, void *_pd EINA_UNUSED
267void 267void
268_evas_image_load_size_get(const Eo *eo_obj, int *w, int *h) 268_evas_image_load_size_get(const Eo *eo_obj, int *w, int *h)
269{ 269{
270 Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); 270 Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
271 271
272 if (w) *w = o->load_opts->w; 272 if (w) *w = o->load_opts->w;
273 if (h) *h = o->load_opts->h; 273 if (h) *h = o->load_opts->h;
@@ -282,8 +282,8 @@ _efl_canvas_image_efl_image_load_load_size_get(Eo *eo_obj, void *_pd EINA_UNUSED
282void 282void
283_evas_image_load_scale_down_set(Eo *eo_obj, int scale_down) 283_evas_image_load_scale_down_set(Eo *eo_obj, int scale_down)
284{ 284{
285 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 285 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
286 Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); 286 Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
287 287
288 if (o->load_opts->scale_down_by == scale_down) return; 288 if (o->load_opts->scale_down_by == scale_down) return;
289 evas_object_async_block(obj); 289 evas_object_async_block(obj);
@@ -310,7 +310,7 @@ _efl_canvas_image_efl_image_load_load_scale_down_set(Eo *eo_obj, void *_pd EINA_
310int 310int
311_evas_image_load_scale_down_get(const Eo *eo_obj) 311_evas_image_load_scale_down_get(const Eo *eo_obj)
312{ 312{
313 Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); 313 Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
314 314
315 return o->load_opts->scale_down_by; 315 return o->load_opts->scale_down_by;
316} 316}
@@ -324,8 +324,8 @@ _efl_canvas_image_efl_image_load_load_scale_down_get(Eo *eo_obj, void *_pd EINA_
324void 324void
325_evas_image_load_region_set(Eo *eo_obj, int x, int y, int w, int h) 325_evas_image_load_region_set(Eo *eo_obj, int x, int y, int w, int h)
326{ 326{
327 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 327 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
328 Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); 328 Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
329 329
330 if ((o->load_opts->region.x == x) && (o->load_opts->region.y == y) && 330 if ((o->load_opts->region.x == x) && (o->load_opts->region.y == y) &&
331 (o->load_opts->region.w == w) && (o->load_opts->region.h == h)) return; 331 (o->load_opts->region.w == w) && (o->load_opts->region.h == h)) return;
@@ -358,7 +358,7 @@ _efl_canvas_image_efl_image_load_load_region_set(Eo *eo_obj, void *_pd EINA_UNUS
358void 358void
359_evas_image_load_region_get(const Eo *eo_obj, int *x, int *y, int *w, int *h) 359_evas_image_load_region_get(const Eo *eo_obj, int *x, int *y, int *w, int *h)
360{ 360{
361 Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); 361 Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
362 362
363 if (x) *x = o->load_opts->region.x; 363 if (x) *x = o->load_opts->region.x;
364 if (y) *y = o->load_opts->region.y; 364 if (y) *y = o->load_opts->region.y;
@@ -375,8 +375,8 @@ _efl_canvas_image_efl_image_load_load_region_get(Eo *eo_obj, void *_pd EINA_UNUS
375void 375void
376_evas_image_load_orientation_set(Eo *eo_obj, Eina_Bool enable) 376_evas_image_load_orientation_set(Eo *eo_obj, Eina_Bool enable)
377{ 377{
378 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 378 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
379 Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); 379 Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
380 380
381 if (o->load_opts->orientation == !!enable) return; 381 if (o->load_opts->orientation == !!enable) return;
382 evas_object_async_block(obj); 382 evas_object_async_block(obj);
@@ -395,7 +395,7 @@ _efl_canvas_image_efl_image_load_load_orientation_set(Eo *eo_obj, void *_pd EINA
395Eina_Bool 395Eina_Bool
396_evas_image_load_orientation_get(const Eo *eo_obj) 396_evas_image_load_orientation_get(const Eo *eo_obj)
397{ 397{
398 Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); 398 Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
399 399
400 return o->load_opts->orientation; 400 return o->load_opts->orientation;
401} 401}
@@ -409,8 +409,8 @@ _efl_canvas_image_efl_image_load_load_orientation_get(Eo *eo_obj, void *_pd EINA
409Eina_Bool 409Eina_Bool
410_evas_image_load_region_support_get(const Eo *eo_obj) 410_evas_image_load_region_support_get(const Eo *eo_obj)
411{ 411{
412 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 412 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
413 Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); 413 Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
414 414
415 return ENFN->image_can_region_get(ENDT, o->engine_data); 415 return ENFN->image_can_region_get(ENDT, o->engine_data);
416} 416}
@@ -425,8 +425,8 @@ _efl_canvas_image_efl_image_load_load_region_support_get(Eo *eo_obj, void *_pd E
425Eina_Bool 425Eina_Bool
426_evas_image_animated_get(const Eo *eo_obj) 426_evas_image_animated_get(const Eo *eo_obj)
427{ 427{
428 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 428 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
429 Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); 429 Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
430 430
431 if (!ENFN->image_animated_get) 431 if (!ENFN->image_animated_get)
432 return EINA_FALSE; 432 return EINA_FALSE;
@@ -443,14 +443,14 @@ _efl_canvas_image_efl_image_animated_animated_get(Eo *eo_obj, void *_pd EINA_UNU
443int 443int
444_evas_image_animated_frame_count_get(const Eo *eo_obj) 444_evas_image_animated_frame_count_get(const Eo *eo_obj)
445{ 445{
446 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 446 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
447 Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); 447 Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
448 448
449 if (!ENFN->image_animated_frame_count_get || 449 if (!ENFN->image_animated_frame_count_get ||
450 !evas_object_image_animated_get(eo_obj)) 450 !evas_object_image_animated_get(eo_obj))
451 return -1; 451 return -1;
452 452
453 obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 453 obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
454 return ENFN->image_animated_frame_count_get(ENDT, o->engine_data); 454 return ENFN->image_animated_frame_count_get(ENDT, o->engine_data);
455} 455}
456 456
@@ -463,8 +463,8 @@ _efl_canvas_image_efl_image_animated_animated_frame_count_get(Eo *eo_obj, void *
463Efl_Image_Animated_Loop_Hint 463Efl_Image_Animated_Loop_Hint
464_evas_image_animated_loop_type_get(const Eo *eo_obj) 464_evas_image_animated_loop_type_get(const Eo *eo_obj)
465{ 465{
466 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 466 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
467 Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); 467 Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
468 468
469 if (!ENFN->image_animated_loop_type_get || 469 if (!ENFN->image_animated_loop_type_get ||
470 !evas_object_image_animated_get(eo_obj)) 470 !evas_object_image_animated_get(eo_obj))
@@ -482,8 +482,8 @@ _efl_canvas_image_efl_image_animated_animated_loop_type_get(Eo *eo_obj, void *_p
482int 482int
483_evas_image_animated_loop_count_get(const Eo *eo_obj) 483_evas_image_animated_loop_count_get(const Eo *eo_obj)
484{ 484{
485 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 485 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
486 Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); 486 Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
487 487
488 if (!ENFN->image_animated_loop_count_get || 488 if (!ENFN->image_animated_loop_count_get ||
489 !evas_object_image_animated_get(eo_obj)) 489 !evas_object_image_animated_get(eo_obj))
@@ -501,8 +501,8 @@ _efl_canvas_image_efl_image_animated_animated_loop_count_get(Eo *eo_obj, void *_
501double 501double
502_evas_image_animated_frame_duration_get(const Eo *eo_obj, int start_frame, int frame_num) 502_evas_image_animated_frame_duration_get(const Eo *eo_obj, int start_frame, int frame_num)
503{ 503{
504 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 504 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
505 Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); 505 Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
506 int frame_count = 0; 506 int frame_count = 0;
507 507
508 if (!ENFN->image_animated_frame_count_get || 508 if (!ENFN->image_animated_frame_count_get ||
@@ -525,8 +525,8 @@ _efl_canvas_image_efl_image_animated_animated_frame_duration_get(Eo *eo_obj, voi
525Eina_Bool 525Eina_Bool
526_evas_image_animated_frame_set(Eo *eo_obj, int frame_index) 526_evas_image_animated_frame_set(Eo *eo_obj, int frame_index)
527{ 527{
528 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 528 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
529 Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); 529 Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
530 int frame_count = 0; 530 int frame_count = 0;
531 531
532 if (!o->cur->u.file) return EINA_FALSE; 532 if (!o->cur->u.file) return EINA_FALSE;
@@ -567,7 +567,7 @@ _efl_canvas_image_efl_image_animated_animated_frame_set(Eo *eo_obj, void *_pd EI
567int 567int
568_evas_image_animated_frame_get(const Eo *eo_obj) 568_evas_image_animated_frame_get(const Eo *eo_obj)
569{ 569{
570 Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); 570 Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
571 571
572 if (!o->cur->u.file) return EINA_FALSE; 572 if (!o->cur->u.file) return EINA_FALSE;
573 if (!evas_object_image_animated_get(eo_obj)) return EINA_FALSE; 573 if (!evas_object_image_animated_get(eo_obj)) return EINA_FALSE;
@@ -583,7 +583,7 @@ _efl_canvas_image_efl_image_animated_animated_frame_get(Eo *eo_obj, void *_pd EI
583EOLIAN static void 583EOLIAN static void
584_efl_canvas_image_efl_gfx_buffer_buffer_size_get(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED, int *w, int *h) 584_efl_canvas_image_efl_gfx_buffer_buffer_size_get(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED, int *w, int *h)
585{ 585{
586 Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); 586 Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
587 587
588 if (w) *w = o->cur->image.w; 588 if (w) *w = o->cur->image.w;
589 if (h) *h = o->cur->image.h; 589 if (h) *h = o->cur->image.h;
@@ -742,8 +742,8 @@ _efl_canvas_image_efl_gfx_buffer_buffer_data_set(Eo *eo_obj, void *_pd EINA_UNUS
742 void *pixels, int w, int h, int stride, 742 void *pixels, int w, int h, int stride,
743 Efl_Gfx_Colorspace cspace) 743 Efl_Gfx_Colorspace cspace)
744{ 744{
745 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 745 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
746 Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); 746 Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
747 747
748 return _image_pixels_set(obj, o, pixels, w, h, stride, cspace, EINA_FALSE); 748 return _image_pixels_set(obj, o, pixels, w, h, stride, cspace, EINA_FALSE);
749} 749}
@@ -753,8 +753,8 @@ _efl_canvas_image_efl_gfx_buffer_buffer_copy_set(Eo *eo_obj, void *_pd EINA_UNUS
753 const void *pixels, int w, int h, int stride, 753 const void *pixels, int w, int h, int stride,
754 Efl_Gfx_Colorspace cspace) 754 Efl_Gfx_Colorspace cspace)
755{ 755{
756 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 756 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
757 Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); 757 Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
758 758
759 return _image_pixels_set(obj, o, (void *) pixels, w, h, stride, cspace, EINA_TRUE); 759 return _image_pixels_set(obj, o, (void *) pixels, w, h, stride, cspace, EINA_TRUE);
760} 760}
@@ -762,8 +762,8 @@ _efl_canvas_image_efl_gfx_buffer_buffer_copy_set(Eo *eo_obj, void *_pd EINA_UNUS
762EOLIAN static void * 762EOLIAN static void *
763_efl_canvas_image_efl_gfx_buffer_buffer_data_get(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED) 763_efl_canvas_image_efl_gfx_buffer_buffer_data_get(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED)
764{ 764{
765 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 765 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
766 Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); 766 Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
767 767
768 if (!o->buffer_data_set || !o->engine_data || !ENFN->image_data_direct) 768 if (!o->buffer_data_set || !o->engine_data || !ENFN->image_data_direct)
769 return NULL; 769 return NULL;
@@ -778,8 +778,8 @@ _efl_canvas_image_efl_gfx_buffer_buffer_map(Eo *eo_obj, void *_pd EINA_UNUSED,
778 int x, int y, int w, int h, 778 int x, int y, int w, int h,
779 Efl_Gfx_Colorspace cspace, int *stride) 779 Efl_Gfx_Colorspace cspace, int *stride)
780{ 780{
781 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 781 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
782 Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); 782 Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
783 int len = 0, s = 0, width = 0, height = 0; 783 int len = 0, s = 0, width = 0, height = 0;
784 void *data = NULL; 784 void *data = NULL;
785 785
@@ -820,8 +820,8 @@ EOLIAN static Eina_Bool
820_efl_canvas_image_efl_gfx_buffer_buffer_unmap(Eo *eo_obj, void *_pd EINA_UNUSED, 820_efl_canvas_image_efl_gfx_buffer_buffer_unmap(Eo *eo_obj, void *_pd EINA_UNUSED,
821 void *data, int length) 821 void *data, int length)
822{ 822{
823 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 823 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
824 Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); 824 Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
825 825
826 if (!ENFN->image_data_unmap || !o->engine_data) 826 if (!ENFN->image_data_unmap || !o->engine_data)
827 return EINA_FALSE; 827 return EINA_FALSE;
diff --git a/src/lib/evas/canvas/efl_canvas_proxy.c b/src/lib/evas/canvas/efl_canvas_proxy.c
index d0b6a2e..47f5a01 100644
--- a/src/lib/evas/canvas/efl_canvas_proxy.c
+++ b/src/lib/evas/canvas/efl_canvas_proxy.c
@@ -6,8 +6,8 @@
6Eina_Bool 6Eina_Bool
7_evas_image_proxy_source_set(Eo *eo_obj, Evas_Object *eo_src) 7_evas_image_proxy_source_set(Eo *eo_obj, Evas_Object *eo_src)
8{ 8{
9 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 9 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
10 Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); 10 Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
11 if (obj->delete_me && eo_src) 11 if (obj->delete_me && eo_src)
12 { 12 {
13 WRN("Setting deleted object %p as image source %p", eo_src, eo_obj); 13 WRN("Setting deleted object %p as image source %p", eo_src, eo_obj);
@@ -15,7 +15,7 @@ _evas_image_proxy_source_set(Eo *eo_obj, Evas_Object *eo_src)
15 } 15 }
16 if (eo_src) 16 if (eo_src)
17 { 17 {
18 Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS); 18 Evas_Object_Protected_Data *src = efl_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
19 if (src->delete_me) 19 if (src->delete_me)
20 { 20 {
21 WRN("Setting object %p to deleted image source %p", eo_src, eo_obj); 21 WRN("Setting object %p to deleted image source %p", eo_src, eo_obj);
@@ -65,7 +65,7 @@ _efl_canvas_proxy_source_set(Eo *eo_obj, void *_pd EINA_UNUSED, Evas_Object *eo_
65Evas_Object * 65Evas_Object *
66_evas_image_proxy_source_get(const Eo *eo_obj) 66_evas_image_proxy_source_get(const Eo *eo_obj)
67{ 67{
68 Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); 68 Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
69 return o->cur->source; 69 return o->cur->source;
70} 70}
71 71
@@ -79,8 +79,8 @@ void
79_evas_image_proxy_source_clip_set(Eo *eo_obj, Eina_Bool source_clip) 79_evas_image_proxy_source_clip_set(Eo *eo_obj, Eina_Bool source_clip)
80{ 80{
81 Evas_Object_Protected_Data *src_obj; 81 Evas_Object_Protected_Data *src_obj;
82 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 82 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
83 Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); 83 Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
84 84
85 source_clip = !!source_clip; 85 source_clip = !!source_clip;
86 if (o->proxy_src_clip == source_clip) return; 86 if (o->proxy_src_clip == source_clip) return;
@@ -89,7 +89,7 @@ _evas_image_proxy_source_clip_set(Eo *eo_obj, Eina_Bool source_clip)
89 89
90 if (!o->cur->source) return; 90 if (!o->cur->source) return;
91 91
92 src_obj = eo_data_scope_get(o->cur->source, EFL_CANVAS_OBJECT_CLASS); 92 src_obj = efl_data_scope_get(o->cur->source, EFL_CANVAS_OBJECT_CLASS);
93 evas_object_change(o->cur->source, src_obj); 93 evas_object_change(o->cur->source, src_obj);
94} 94}
95 95
@@ -102,7 +102,7 @@ _efl_canvas_proxy_source_clip_set(Eo *eo_obj, void *_pd EINA_UNUSED, Eina_Bool s
102Eina_Bool 102Eina_Bool
103_evas_image_proxy_source_clip_get(const Eo *eo_obj) 103_evas_image_proxy_source_clip_get(const Eo *eo_obj)
104{ 104{
105 Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); 105 Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
106 return o->proxy_src_clip; 106 return o->proxy_src_clip;
107} 107}
108 108
@@ -115,8 +115,8 @@ _efl_canvas_proxy_source_clip_get(Eo *eo_obj, void *_pd EINA_UNUSED)
115void 115void
116_evas_image_proxy_source_events_set(Eo *eo_obj, Eina_Bool source_events) 116_evas_image_proxy_source_events_set(Eo *eo_obj, Eina_Bool source_events)
117{ 117{
118 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 118 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
119 Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); 119 Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
120 120
121 source_events = !!source_events; 121 source_events = !!source_events;
122 if (obj->proxy->src_events == source_events) return; 122 if (obj->proxy->src_events == source_events) return;
@@ -139,7 +139,7 @@ _efl_canvas_proxy_source_events_set(Eo *eo_obj, void *_pd EINA_UNUSED, Eina_Bool
139Eina_Bool 139Eina_Bool
140_evas_image_proxy_source_events_get(const Eo *eo_obj) 140_evas_image_proxy_source_events_get(const Eo *eo_obj)
141{ 141{
142 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 142 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
143 return obj->proxy->src_events; 143 return obj->proxy->src_events;
144} 144}
145 145
@@ -152,7 +152,7 @@ _efl_canvas_proxy_source_events_get(Eo *eo_obj, void *_pd EINA_UNUSED)
152Evas_Object * 152Evas_Object *
153_evas_object_image_source_get(Evas_Object *eo_obj) 153_evas_object_image_source_get(Evas_Object *eo_obj)
154{ 154{
155 Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); 155 Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
156 return o->cur->source; 156 return o->cur->source;
157} 157}
158 158
@@ -163,7 +163,7 @@ _evas_image_proxy_unset(Evas_Object *proxy, Evas_Object_Protected_Data *cur_prox
163 163
164 if (!o->cur->source) return; 164 if (!o->cur->source) return;
165 165
166 cur_source = eo_data_scope_get(o->cur->source, EFL_CANVAS_OBJECT_CLASS); 166 cur_source = efl_data_scope_get(o->cur->source, EFL_CANVAS_OBJECT_CLASS);
167 167
168 EINA_COW_WRITE_BEGIN(evas_object_proxy_cow, cur_source->proxy, Evas_Object_Proxy_Data, proxy_source_write) 168 EINA_COW_WRITE_BEGIN(evas_object_proxy_cow, cur_source->proxy, Evas_Object_Proxy_Data, proxy_source_write)
169 { 169 {
@@ -215,9 +215,9 @@ _evas_image_proxy_unset(Evas_Object *proxy, Evas_Object_Protected_Data *cur_prox
215void 215void
216_evas_image_proxy_set(Evas_Object *eo_proxy, Evas_Object *eo_src) 216_evas_image_proxy_set(Evas_Object *eo_proxy, Evas_Object *eo_src)
217{ 217{
218 Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS); 218 Evas_Object_Protected_Data *src = efl_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
219 Evas_Object_Protected_Data *proxy = eo_data_scope_get(eo_proxy, EFL_CANVAS_OBJECT_CLASS); 219 Evas_Object_Protected_Data *proxy = efl_data_scope_get(eo_proxy, EFL_CANVAS_OBJECT_CLASS);
220 Evas_Image_Data *o = eo_data_scope_get(eo_proxy, EFL_CANVAS_IMAGE_INTERNAL_CLASS); 220 Evas_Image_Data *o = efl_data_scope_get(eo_proxy, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
221 221
222 _evas_image_file_set(eo_proxy, NULL, NULL); 222 _evas_image_file_set(eo_proxy, NULL, NULL);
223 223
@@ -244,14 +244,14 @@ _evas_image_proxy_set(Evas_Object *eo_proxy, Evas_Object *eo_src)
244static inline void * 244static inline void *
245_proxy_image_get(Evas_Image_Data *o) 245_proxy_image_get(Evas_Image_Data *o)
246{ 246{
247 Evas_Object_Protected_Data *source = eo_data_scope_get(o->cur->source, EFL_CANVAS_OBJECT_CLASS); 247 Evas_Object_Protected_Data *source = efl_data_scope_get(o->cur->source, EFL_CANVAS_OBJECT_CLASS);
248 Evas_Image_Data *source_img = NULL; 248 Evas_Image_Data *source_img = NULL;
249 249
250 if (!source) 250 if (!source)
251 return NULL; 251 return NULL;
252 252
253 if (eo_isa(o->cur->source, EFL_CANVAS_IMAGE_INTERNAL_CLASS)) 253 if (efl_isa(o->cur->source, EFL_CANVAS_IMAGE_INTERNAL_CLASS))
254 source_img = eo_data_scope_get(o->cur->source, EFL_CANVAS_IMAGE_INTERNAL_CLASS); 254 source_img = efl_data_scope_get(o->cur->source, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
255 255
256 if (source_img) 256 if (source_img)
257 return source_img->engine_data; 257 return source_img->engine_data;
@@ -266,8 +266,8 @@ _efl_canvas_proxy_efl_gfx_buffer_buffer_map(Eo *eo_obj, void *_pd EINA_UNUSED,
266 int x, int y, int w, int h, 266 int x, int y, int w, int h,
267 Efl_Gfx_Colorspace cspace, int *stride) 267 Efl_Gfx_Colorspace cspace, int *stride)
268{ 268{
269 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 269 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
270 Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); 270 Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
271 int len = 0, s = 0, width = 0, height = 0; 271 int len = 0, s = 0, width = 0, height = 0;
272 void *image, *data = NULL; 272 void *image, *data = NULL;
273 273
@@ -315,8 +315,8 @@ EOLIAN static Eina_Bool
315_efl_canvas_proxy_efl_gfx_buffer_buffer_unmap(Eo *eo_obj, void *_pd EINA_UNUSED, 315_efl_canvas_proxy_efl_gfx_buffer_buffer_unmap(Eo *eo_obj, void *_pd EINA_UNUSED,
316 void *data, int length) 316 void *data, int length)
317{ 317{
318 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 318 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
319 Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); 319 Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
320 320
321 if (!ENFN->image_data_unmap || !o->engine_data) 321 if (!ENFN->image_data_unmap || !o->engine_data)
322 return EINA_FALSE; 322 return EINA_FALSE;
@@ -334,7 +334,7 @@ void
334_evas_image_proxy_error(Evas_Object *eo_proxy, void *context, void *output, void *surface, 334_evas_image_proxy_error(Evas_Object *eo_proxy, void *context, void *output, void *surface,
335 int x, int y, Eina_Bool do_async) 335 int x, int y, Eina_Bool do_async)
336{ 336{
337 Evas_Image_Data *o = eo_data_scope_get(eo_proxy, EFL_CANVAS_IMAGE_INTERNAL_CLASS); 337 Evas_Image_Data *o = efl_data_scope_get(eo_proxy, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
338 Evas_Object_Protected_Data *proxy; 338 Evas_Object_Protected_Data *proxy;
339 Evas_Func *func; 339 Evas_Func *func;
340 340
@@ -344,7 +344,7 @@ _evas_image_proxy_error(Evas_Object *eo_proxy, void *context, void *output, void
344 o->proxyerror = 1; 344 o->proxyerror = 1;
345 } 345 }
346 346
347 proxy = eo_data_scope_get(eo_proxy, EFL_CANVAS_OBJECT_CLASS); 347 proxy = efl_data_scope_get(eo_proxy, EFL_CANVAS_OBJECT_CLASS);
348 func = proxy->layer->evas->engine.func; 348 func = proxy->layer->evas->engine.func;
349 func->context_color_set(output, context, 0, 0, 0, 255); 349 func->context_color_set(output, context, 0, 0, 0, 255);
350 func->context_multiplier_unset(output, context); 350 func->context_multiplier_unset(output, context);
diff --git a/src/lib/evas/canvas/efl_canvas_scene3d.c b/src/lib/evas/canvas/efl_canvas_scene3d.c
index 367e502..ef4e491 100644
--- a/src/lib/evas/canvas/efl_canvas_scene3d.c
+++ b/src/lib/evas/canvas/efl_canvas_scene3d.c
@@ -6,8 +6,8 @@
6EOLIAN static void 6EOLIAN static void
7_efl_canvas_scene3d_scene3d_set(Eo *eo_obj, void *pd EINA_UNUSED, Evas_Canvas3D_Scene *scene) 7_efl_canvas_scene3d_scene3d_set(Eo *eo_obj, void *pd EINA_UNUSED, Evas_Canvas3D_Scene *scene)
8{ 8{
9 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 9 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
10 Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); 10 Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
11 Evas_Image_Load_Opts lo; 11 Evas_Image_Load_Opts lo;
12 12
13 if (o->cur->scene == scene) return; 13 if (o->cur->scene == scene) return;
@@ -24,7 +24,7 @@ _efl_canvas_scene3d_scene3d_set(Eo *eo_obj, void *pd EINA_UNUSED, Evas_Canvas3D_
24EOLIAN static Evas_Canvas3D_Scene * 24EOLIAN static Evas_Canvas3D_Scene *
25_efl_canvas_scene3d_scene3d_get(Eo *eo_obj, void *pd EINA_UNUSED) 25_efl_canvas_scene3d_scene3d_get(Eo *eo_obj, void *pd EINA_UNUSED)
26{ 26{
27 Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); 27 Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
28 return o->cur->scene; 28 return o->cur->scene;
29} 29}
30 30
@@ -38,7 +38,7 @@ _evas_image_3d_render(Evas *eo_e, Evas_Object *eo_obj,
38 Evas_Canvas3D_Scene_Public_Data scene_data; 38 Evas_Canvas3D_Scene_Public_Data scene_data;
39 Evas_Canvas3D_Scene_Data *pd_scene = NULL; 39 Evas_Canvas3D_Scene_Data *pd_scene = NULL;
40 40
41 pd_scene = eo_data_scope_get(scene, EVAS_CANVAS3D_SCENE_CLASS); 41 pd_scene = efl_data_scope_get(scene, EVAS_CANVAS3D_SCENE_CLASS);
42 42
43 if ((pd_scene->w == 0) || (pd_scene->h == 0)) return; 43 if ((pd_scene->w == 0) || (pd_scene->h == 0)) return;
44 if (!pd_scene->camera_node) 44 if (!pd_scene->camera_node)
@@ -47,7 +47,7 @@ _evas_image_3d_render(Evas *eo_e, Evas_Object *eo_obj,
47 return; 47 return;
48 } 48 }
49 49
50 e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); 50 e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
51 51
52 if (pd_scene->surface) 52 if (pd_scene->surface)
53 { 53 {
@@ -141,9 +141,9 @@ _evas_image_3d_render(Evas *eo_e, Evas_Object *eo_obj,
141void 141void
142_evas_image_3d_set(Evas_Object *eo_obj, Evas_Canvas3D_Scene *scene) 142_evas_image_3d_set(Evas_Object *eo_obj, Evas_Canvas3D_Scene *scene)
143{ 143{
144 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 144 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
145 Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); 145 Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
146 Evas_Canvas3D_Scene_Data *pd_scene = eo_data_scope_get(scene, 146 Evas_Canvas3D_Scene_Data *pd_scene = efl_data_scope_get(scene,
147 EVAS_CANVAS3D_SCENE_CLASS); 147 EVAS_CANVAS3D_SCENE_CLASS);
148 EINA_COW_WRITE_BEGIN(evas_object_3d_cow, obj->data_3d, Evas_Object_3D_Data, 148 EINA_COW_WRITE_BEGIN(evas_object_3d_cow, obj->data_3d, Evas_Object_3D_Data,
149 data) 149 data)
@@ -151,7 +151,7 @@ _evas_image_3d_set(Evas_Object *eo_obj, Evas_Canvas3D_Scene *scene)
151 data->surface = NULL; 151 data->surface = NULL;
152 data->w = 0; 152 data->w = 0;
153 data->h = 0; 153 data->h = 0;
154 eo_ref(scene); 154 efl_ref(scene);
155 } 155 }
156 EINA_COW_WRITE_END(evas_object_3d_cow, obj->data_3d, data); 156 EINA_COW_WRITE_END(evas_object_3d_cow, obj->data_3d, data);
157 157
@@ -173,12 +173,12 @@ _evas_image_3d_unset(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Protected_Data
173 if (!o->cur->scene) return; 173 if (!o->cur->scene) return;
174 174
175 Evas_Canvas3D_Scene_Data *pd_scene = 175 Evas_Canvas3D_Scene_Data *pd_scene =
176 eo_data_scope_get(o->cur->scene, EVAS_CANVAS3D_SCENE_CLASS); 176 efl_data_scope_get(o->cur->scene, EVAS_CANVAS3D_SCENE_CLASS);
177 177
178 EINA_COW_IMAGE_STATE_WRITE_BEGIN(o, state_write) 178 EINA_COW_IMAGE_STATE_WRITE_BEGIN(o, state_write)
179 { 179 {
180 pd_scene->images = eina_list_remove(pd_scene->images, eo_obj); 180 pd_scene->images = eina_list_remove(pd_scene->images, eo_obj);
181 eo_unref(state_write->scene); 181 efl_unref(state_write->scene);
182 state_write->scene = NULL; 182 state_write->scene = NULL;
183 } 183 }
184 EINA_COW_IMAGE_STATE_WRITE_END(o, state_write); 184 EINA_COW_IMAGE_STATE_WRITE_END(o, state_write);
@@ -215,7 +215,7 @@ _efl_canvas_scene3d_efl_gfx_buffer_buffer_map(Eo *eo_obj, void *_pd EINA_UNUSED,
215 int x, int y, int w, int h, 215 int x, int y, int w, int h,
216 Efl_Gfx_Colorspace cspace, int *stride EINA_UNUSED) 216 Efl_Gfx_Colorspace cspace, int *stride EINA_UNUSED)
217{ 217{
218 Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); 218 Evas_Image_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
219 Evas_Public_Data *e; 219 Evas_Public_Data *e;
220 Evas_Canvas3D_Object_Data *pd_parent; 220 Evas_Canvas3D_Object_Data *pd_parent;
221 Evas_Canvas3D_Scene_Data *pd_scene; 221 Evas_Canvas3D_Scene_Data *pd_scene;
@@ -238,9 +238,9 @@ _efl_canvas_scene3d_efl_gfx_buffer_buffer_map(Eo *eo_obj, void *_pd EINA_UNUSED,
238 return NULL; 238 return NULL;
239 } 239 }
240 240
241 pd_parent = eo_data_scope_get(o->cur->scene, EVAS_CANVAS3D_OBJECT_CLASS); 241 pd_parent = efl_data_scope_get(o->cur->scene, EVAS_CANVAS3D_OBJECT_CLASS);
242 e = eo_data_scope_get(pd_parent->evas, EVAS_CANVAS_CLASS); 242 e = efl_data_scope_get(pd_parent->evas, EVAS_CANVAS_CLASS);
243 pd_scene = eo_data_scope_get(o->cur->scene, EVAS_CANVAS3D_SCENE_CLASS); 243 pd_scene = efl_data_scope_get(o->cur->scene, EVAS_CANVAS3D_SCENE_CLASS);
244 244
245 if (e->engine.func->drawable_size_get) 245 if (e->engine.func->drawable_size_get)
246 { 246 {
diff --git a/src/lib/evas/canvas/efl_canvas_snapshot.c b/src/lib/evas/canvas/efl_canvas_snapshot.c
index 9aae799..9f77ce6 100644
--- a/src/lib/evas/canvas/efl_canvas_snapshot.c
+++ b/src/lib/evas/canvas/efl_canvas_snapshot.c
@@ -8,12 +8,12 @@ _efl_canvas_snapshot_efl_object_constructor(Eo *eo_obj, void *pd EINA_UNUSED)
8{ 8{
9 Evas_Object_Protected_Data *obj; 9 Evas_Object_Protected_Data *obj;
10 10
11 eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS)); 11 eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
12 if (!eo_obj) return NULL; 12 if (!eo_obj) return NULL;
13 13
14 efl_canvas_object_pass_events_set(eo_obj, EINA_TRUE); 14 efl_canvas_object_pass_events_set(eo_obj, EINA_TRUE);
15 15
16 obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 16 obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
17 EINA_COW_STATE_WRITE_BEGIN(obj, sw, cur) 17 EINA_COW_STATE_WRITE_BEGIN(obj, sw, cur)
18 sw->snapshot = EINA_TRUE; 18 sw->snapshot = EINA_TRUE;
19 EINA_COW_STATE_WRITE_END(obj, sw, cur); 19 EINA_COW_STATE_WRITE_END(obj, sw, cur);
diff --git a/src/lib/evas/canvas/efl_canvas_surface.c b/src/lib/evas/canvas/efl_canvas_surface.c
index 13c86f0..9d3437b 100644
--- a/src/lib/evas/canvas/efl_canvas_surface.c
+++ b/src/lib/evas/canvas/efl_canvas_surface.c
@@ -5,7 +5,7 @@
5EOLIAN static Eo * 5EOLIAN static Eo *
6_efl_canvas_surface_efl_object_constructor(Eo *eo, Efl_Canvas_Surface_Data *pd) 6_efl_canvas_surface_efl_object_constructor(Eo *eo, Efl_Canvas_Surface_Data *pd)
7{ 7{
8 eo = efl_constructor(eo_super(eo, MY_CLASS)); 8 eo = efl_constructor(efl_super(eo, MY_CLASS));
9 pd->surf.version = EVAS_NATIVE_SURFACE_VERSION; 9 pd->surf.version = EVAS_NATIVE_SURFACE_VERSION;
10 return eo; 10 return eo;
11} 11}
diff --git a/src/lib/evas/canvas/efl_canvas_surface_tbm.c b/src/lib/evas/canvas/efl_canvas_surface_tbm.c
index 116aad0..6ef23d6 100644
--- a/src/lib/evas/canvas/efl_canvas_surface_tbm.c
+++ b/src/lib/evas/canvas/efl_canvas_surface_tbm.c
@@ -12,8 +12,8 @@ _efl_canvas_surface_tbm_efl_object_constructor(Eo *eo, Efl_Canvas_Surface_Tbm_Da
12{ 12{
13 Evas_Object_Protected_Data *obj; 13 Evas_Object_Protected_Data *obj;
14 14
15 eo = efl_constructor(eo_super(eo, MY_CLASS)); 15 eo = efl_constructor(efl_super(eo, MY_CLASS));
16 obj = eo_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS); 16 obj = efl_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS);
17 if (!obj) return NULL; 17 if (!obj) return NULL;
18 18
19 if (!ENFN->image_native_init(ENDT, EVAS_NATIVE_SURFACE_TBM)) 19 if (!ENFN->image_native_init(ENDT, EVAS_NATIVE_SURFACE_TBM))
@@ -22,7 +22,7 @@ _efl_canvas_surface_tbm_efl_object_constructor(Eo *eo, Efl_Canvas_Surface_Tbm_Da
22 return NULL; 22 return NULL;
23 } 23 }
24 24
25 pd->base = eo_data_ref(eo, EFL_CANVAS_SURFACE_MIXIN); 25 pd->base = efl_data_ref(eo, EFL_CANVAS_SURFACE_MIXIN);
26 pd->base->surf.type = EVAS_NATIVE_SURFACE_TBM; 26 pd->base->surf.type = EVAS_NATIVE_SURFACE_TBM;
27 return eo; 27 return eo;
28} 28}
@@ -32,10 +32,10 @@ _efl_canvas_surface_tbm_efl_object_destructor(Eo *eo, Efl_Canvas_Surface_Tbm_Dat
32{ 32{
33 Evas_Object_Protected_Data *obj; 33 Evas_Object_Protected_Data *obj;
34 34
35 obj = eo_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS); 35 obj = efl_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS);
36 36
37 ENFN->image_native_shutdown(ENDT, EVAS_NATIVE_SURFACE_TBM); 37 ENFN->image_native_shutdown(ENDT, EVAS_NATIVE_SURFACE_TBM);
38 eo_data_unref(eo, pd->base); 38 efl_data_unref(eo, pd->base);
39 efl_destructor(eo); 39 efl_destructor(eo);
40} 40}
41 41
diff --git a/src/lib/evas/canvas/efl_canvas_surface_wayland.c b/src/lib/evas/canvas/efl_canvas_surface_wayland.c
index f15e969..040a874 100644
--- a/src/lib/evas/canvas/efl_canvas_surface_wayland.c
+++ b/src/lib/evas/canvas/efl_canvas_surface_wayland.c
@@ -12,8 +12,8 @@ _efl_canvas_surface_wayland_efl_object_constructor(Eo *eo, Efl_Canvas_Surface_Wa
12{ 12{
13 Evas_Object_Protected_Data *obj; 13 Evas_Object_Protected_Data *obj;
14 14
15 eo = efl_constructor(eo_super(eo, MY_CLASS)); 15 eo = efl_constructor(efl_super(eo, MY_CLASS));
16 obj = eo_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS); 16 obj = efl_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS);
17 if (!obj) return NULL; 17 if (!obj) return NULL;
18 18
19 if (!ENFN->image_native_init(ENDT, EVAS_NATIVE_SURFACE_WL)) 19 if (!ENFN->image_native_init(ENDT, EVAS_NATIVE_SURFACE_WL))
@@ -22,7 +22,7 @@ _efl_canvas_surface_wayland_efl_object_constructor(Eo *eo, Efl_Canvas_Surface_Wa
22 return NULL; 22 return NULL;
23 } 23 }
24 24
25 pd->base = eo_data_ref(eo, EFL_CANVAS_SURFACE_MIXIN); 25 pd->base = efl_data_ref(eo, EFL_CANVAS_SURFACE_MIXIN);
26 pd->base->surf.type = EVAS_NATIVE_SURFACE_WL; 26 pd->base->surf.type = EVAS_NATIVE_SURFACE_WL;
27 return eo; 27 return eo;
28} 28}
@@ -32,10 +32,10 @@ _efl_canvas_surface_wayland_efl_object_destructor(Eo *eo, Efl_Canvas_Surface_Way
32{ 32{
33 Evas_Object_Protected_Data *obj; 33 Evas_Object_Protected_Data *obj;
34 34
35 obj = eo_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS); 35 obj = efl_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS);
36 36
37 ENFN->image_native_shutdown(ENDT, EVAS_NATIVE_SURFACE_WL); 37 ENFN->image_native_shutdown(ENDT, EVAS_NATIVE_SURFACE_WL);
38 eo_data_unref(eo, pd->base); 38 efl_data_unref(eo, pd->base);
39 efl_destructor(eo); 39 efl_destructor(eo);
40} 40}
41 41
diff --git a/src/lib/evas/canvas/efl_canvas_surface_x11.c b/src/lib/evas/canvas/efl_canvas_surface_x11.c
index c463a15..36a5f5f 100644
--- a/src/lib/evas/canvas/efl_canvas_surface_x11.c
+++ b/src/lib/evas/canvas/efl_canvas_surface_x11.c
@@ -13,8 +13,8 @@ _efl_canvas_surface_x11_efl_object_constructor(Eo *eo, Efl_Canvas_Surface_X11_Da
13{ 13{
14 Evas_Object_Protected_Data *obj; 14 Evas_Object_Protected_Data *obj;
15 15
16 eo = efl_constructor(eo_super(eo, MY_CLASS)); 16 eo = efl_constructor(efl_super(eo, MY_CLASS));
17 obj = eo_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS); 17 obj = efl_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS);
18 if (!obj) return NULL; 18 if (!obj) return NULL;
19 19
20 if (!ENFN->image_native_init(ENDT, EVAS_NATIVE_SURFACE_X11)) 20 if (!ENFN->image_native_init(ENDT, EVAS_NATIVE_SURFACE_X11))
@@ -23,7 +23,7 @@ _efl_canvas_surface_x11_efl_object_constructor(Eo *eo, Efl_Canvas_Surface_X11_Da
23 return NULL; 23 return NULL;
24 } 24 }
25 25
26 pd->base = eo_data_ref(eo, EFL_CANVAS_SURFACE_MIXIN); 26 pd->base = efl_data_ref(eo, EFL_CANVAS_SURFACE_MIXIN);
27 pd->base->surf.version = EVAS_NATIVE_SURFACE_VERSION; 27 pd->base->surf.version = EVAS_NATIVE_SURFACE_VERSION;
28 pd->base->surf.type = EVAS_NATIVE_SURFACE_X11; 28 pd->base->surf.type = EVAS_NATIVE_SURFACE_X11;
29 return eo; 29 return eo;
@@ -34,10 +34,10 @@ _efl_canvas_surface_x11_efl_object_destructor(Eo *eo, Efl_Canvas_Surface_X11_Dat
34{ 34{
35 Evas_Object_Protected_Data *obj; 35 Evas_Object_Protected_Data *obj;
36 36
37 obj = eo_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS); 37 obj = efl_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS);
38 38
39 ENFN->image_native_shutdown(ENDT, EVAS_NATIVE_SURFACE_X11); 39 ENFN->image_native_shutdown(ENDT, EVAS_NATIVE_SURFACE_X11);
40 eo_data_unref(eo, pd->base); 40 efl_data_unref(eo, pd->base);
41 efl_destructor(eo); 41 efl_destructor(eo);
42} 42}
43 43
diff --git a/src/lib/evas/canvas/efl_event_hold.c b/src/lib/evas/canvas/efl_event_hold.c
index 95a4ae7..524f75c 100644
--- a/src/lib/evas/canvas/efl_event_hold.c
+++ b/src/lib/evas/canvas/efl_event_hold.c
@@ -63,7 +63,7 @@ _efl_event_hold_efl_event_input_event_flags_get(Eo *obj EINA_UNUSED, Efl_Event_H
63EOLIAN static Eo * 63EOLIAN static Eo *
64_efl_event_hold_efl_object_constructor(Eo *obj, Efl_Event_Hold_Data *pd) 64_efl_event_hold_efl_object_constructor(Eo *obj, Efl_Event_Hold_Data *pd)
65{ 65{
66 obj = efl_constructor(eo_super(obj, MY_CLASS)); 66 obj = efl_constructor(efl_super(obj, MY_CLASS));
67 pd->eo = obj; 67 pd->eo = obj;
68 return obj; 68 return obj;
69} 69}
@@ -73,8 +73,8 @@ _efl_event_hold_efl_event_instance_get(Eo *klass EINA_UNUSED, void *_pd EINA_UNU
73 Efl_Object *owner, void **priv) 73 Efl_Object *owner, void **priv)
74{ 74{
75 // TODO: Implement a cache. Depends only on how many hold events we trigger. 75 // TODO: Implement a cache. Depends only on how many hold events we trigger.
76 Efl_Event *evt = eo_add(MY_CLASS, owner); 76 Efl_Event *evt = efl_add(MY_CLASS, owner);
77 if (priv) *priv = eo_data_scope_get(evt, MY_CLASS); 77 if (priv) *priv = efl_data_scope_get(evt, MY_CLASS);
78 return evt; 78 return evt;
79} 79}
80 80
@@ -89,8 +89,8 @@ EOLIAN static Efl_Event *
89_efl_event_hold_efl_event_dup(Eo *obj, Efl_Event_Hold_Data *pd) 89_efl_event_hold_efl_event_dup(Eo *obj, Efl_Event_Hold_Data *pd)
90{ 90{
91 Efl_Event_Hold_Data *ev; 91 Efl_Event_Hold_Data *ev;
92 Efl_Event *evt = eo_add(EFL_EVENT_HOLD_CLASS, efl_parent_get(obj)); 92 Efl_Event *evt = efl_add(EFL_EVENT_HOLD_CLASS, efl_parent_get(obj));
93 ev = eo_data_scope_get(evt, MY_CLASS); 93 ev = efl_data_scope_get(evt, MY_CLASS);
94 if (ev) 94 if (ev)
95 { 95 {
96 memcpy(ev, pd, sizeof(*ev)); 96 memcpy(ev, pd, sizeof(*ev));
diff --git a/src/lib/evas/canvas/efl_event_key.c b/src/lib/evas/canvas/efl_event_key.c
index 7729432..81dcd3f 100644
--- a/src/lib/evas/canvas/efl_event_key.c
+++ b/src/lib/evas/canvas/efl_event_key.c
@@ -20,7 +20,7 @@ _del_hook(Eo *evt)
20 { 20 {
21 if (efl_parent_get(evt)) 21 if (efl_parent_get(evt))
22 { 22 {
23 eo_ref(evt); 23 efl_ref(evt);
24 efl_parent_set(evt, NULL); 24 efl_parent_set(evt, NULL);
25 } 25 }
26 s_cached_event = evt; 26 s_cached_event = evt;
@@ -48,11 +48,11 @@ _efl_event_key_efl_event_instance_get(Eo *klass EINA_UNUSED, void *_pd EINA_UNUS
48 } 48 }
49 else 49 else
50 { 50 {
51 evt = eo_add(EFL_EVENT_KEY_CLASS, owner); 51 evt = efl_add(EFL_EVENT_KEY_CLASS, owner);
52 efl_del_intercept_set(evt, _del_hook); 52 efl_del_intercept_set(evt, _del_hook);
53 } 53 }
54 54
55 ev = eo_data_scope_get(evt, EFL_EVENT_KEY_CLASS); 55 ev = efl_data_scope_get(evt, EFL_EVENT_KEY_CLASS);
56 ev->fake = EINA_FALSE; 56 ev->fake = EINA_FALSE;
57 if (priv) *priv = ev; 57 if (priv) *priv = ev;
58 58
@@ -71,7 +71,7 @@ _efl_event_key_class_destructor(Efl_Class *klass EINA_UNUSED)
71EOLIAN static Efl_Object * 71EOLIAN static Efl_Object *
72_efl_event_key_efl_object_constructor(Eo *obj, Efl_Event_Key_Data *pd EINA_UNUSED) 72_efl_event_key_efl_object_constructor(Eo *obj, Efl_Event_Key_Data *pd EINA_UNUSED)
73{ 73{
74 obj = efl_constructor(eo_super(obj, MY_CLASS)); 74 obj = efl_constructor(efl_super(obj, MY_CLASS));
75 efl_event_reset(obj); 75 efl_event_reset(obj);
76 return obj; 76 return obj;
77} 77}
diff --git a/src/lib/evas/canvas/efl_event_pointer.c b/src/lib/evas/canvas/efl_event_pointer.c
index 8bd45c4..8db2735 100644
--- a/src/lib/evas/canvas/efl_event_pointer.c
+++ b/src/lib/evas/canvas/efl_event_pointer.c
@@ -31,7 +31,7 @@ _del_hook(Eo *evt)
31 { 31 {
32 if (efl_parent_get(evt)) 32 if (efl_parent_get(evt))
33 { 33 {
34 eo_ref(evt); 34 efl_ref(evt);
35 efl_parent_set(evt, NULL); 35 efl_parent_set(evt, NULL);
36 } 36 }
37 s_cached_event = evt; 37 s_cached_event = evt;
@@ -59,11 +59,11 @@ _efl_event_pointer_efl_event_instance_get(Eo *klass EINA_UNUSED, void *_pd EINA_
59 } 59 }
60 else 60 else
61 { 61 {
62 evt = eo_add(EFL_EVENT_POINTER_CLASS, owner); 62 evt = efl_add(EFL_EVENT_POINTER_CLASS, owner);
63 efl_del_intercept_set(evt, _del_hook); 63 efl_del_intercept_set(evt, _del_hook);
64 } 64 }
65 65
66 ev = eo_data_scope_get(evt, EFL_EVENT_POINTER_CLASS); 66 ev = efl_data_scope_get(evt, EFL_EVENT_POINTER_CLASS);
67 ev->fake = EINA_FALSE; 67 ev->fake = EINA_FALSE;
68 if (priv) *priv = ev; 68 if (priv) *priv = ev;
69 69
@@ -82,7 +82,7 @@ _efl_event_pointer_class_destructor(Efl_Class *klass EINA_UNUSED)
82EOLIAN static Efl_Object * 82EOLIAN static Efl_Object *
83_efl_event_pointer_efl_object_constructor(Eo *obj, Efl_Event_Pointer_Data *pd EINA_UNUSED) 83_efl_event_pointer_efl_object_constructor(Eo *obj, Efl_Event_Pointer_Data *pd EINA_UNUSED)
84{ 84{
85 efl_constructor(eo_super(obj, MY_CLASS)); 85 efl_constructor(efl_super(obj, MY_CLASS));
86 efl_event_reset(obj); 86 efl_event_reset(obj);
87 return obj; 87 return obj;
88} 88}
diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c
index 82b8105..36f4f38 100644
--- a/src/lib/evas/canvas/evas_callbacks.c
+++ b/src/lib/evas/canvas/evas_callbacks.c
@@ -125,7 +125,7 @@ _evas_post_event_callback_call(Evas *eo_e, Evas_Public_Data *e)
125void 125void
126_evas_post_event_callback_free(Evas *eo_e) 126_evas_post_event_callback_free(Evas *eo_e)
127{ 127{
128 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); 128 Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
129 Evas_Post_Callback *pc; 129 Evas_Post_Callback *pc;
130 130
131 EINA_LIST_FREE(e->post_events, pc) 131 EINA_LIST_FREE(e->post_events, pc)
@@ -139,7 +139,7 @@ evas_object_event_callback_all_del(Evas_Object *eo_obj)
139{ 139{
140 _eo_evas_object_cb_info *info; 140 _eo_evas_object_cb_info *info;
141 Eina_Inlist *itr; 141 Eina_Inlist *itr;
142 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 142 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
143 143
144 if (!obj) return; 144 if (!obj) return;
145 if (!obj->callbacks) return; 145 if (!obj->callbacks) return;
@@ -164,7 +164,7 @@ evas_event_callback_all_del(Evas *eo_e)
164{ 164{
165 _eo_evas_object_cb_info *info; 165 _eo_evas_object_cb_info *info;
166 Eina_Inlist *itr; 166 Eina_Inlist *itr;
167 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); 167 Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
168 168
169 if (!e) return; 169 if (!e) return;
170 if (!e->callbacks) return; 170 if (!e->callbacks) return;
@@ -316,7 +316,7 @@ evas_object_event_callback_call(Evas_Object *eo_obj, Evas_Object_Protected_Data
316 if ((obj->smart.parent) && (type != EVAS_CALLBACK_FREE) && 316 if ((obj->smart.parent) && (type != EVAS_CALLBACK_FREE) &&
317 (type <= EVAS_CALLBACK_KEY_UP)) 317 (type <= EVAS_CALLBACK_KEY_UP))
318 { 318 {
319 Evas_Object_Protected_Data *smart_parent = eo_data_scope_get(obj->smart.parent, EFL_CANVAS_OBJECT_CLASS); 319 Evas_Object_Protected_Data *smart_parent = efl_data_scope_get(obj->smart.parent, EFL_CANVAS_OBJECT_CLASS);
320 evas_object_event_callback_call(obj->smart.parent, smart_parent, type, event_info, event_id, efl_event_desc, efl_event_info); 320 evas_object_event_callback_call(obj->smart.parent, smart_parent, type, event_info, event_id, efl_event_desc, efl_event_info);
321 } 321 }
322 } 322 }
@@ -333,7 +333,7 @@ evas_object_event_callback_add(Evas_Object *eo_obj, Evas_Callback_Type type, Eva
333EAPI void 333EAPI void
334evas_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) 334evas_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)
335{ 335{
336 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 336 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
337 337
338 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 338 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
339 return; 339 return;
@@ -362,7 +362,7 @@ evas_object_event_callback_del(Evas_Object *eo_obj, Evas_Callback_Type type, Eva
362 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 362 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
363 return NULL; 363 return NULL;
364 MAGIC_CHECK_END(); 364 MAGIC_CHECK_END();
365 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 365 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
366 366
367 if (!obj) return NULL; 367 if (!obj) return NULL;
368 if (!func) return NULL; 368 if (!func) return NULL;
@@ -393,7 +393,7 @@ evas_object_event_callback_del_full(Evas_Object *eo_obj, Evas_Callback_Type type
393 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 393 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
394 return NULL; 394 return NULL;
395 MAGIC_CHECK_END(); 395 MAGIC_CHECK_END();
396 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 396 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
397 397
398 if (!obj) return NULL; 398 if (!obj) return NULL;
399 if (!func) return NULL; 399 if (!func) return NULL;
@@ -426,7 +426,7 @@ evas_event_callback_add(Evas *eo_e, Evas_Callback_Type type, Evas_Event_Cb func,
426EAPI void 426EAPI void
427evas_event_callback_priority_add(Evas *eo_e, Evas_Callback_Type type, Evas_Callback_Priority priority, Evas_Event_Cb func, const void *data) 427evas_event_callback_priority_add(Evas *eo_e, Evas_Callback_Type type, Evas_Callback_Priority priority, Evas_Event_Cb func, const void *data)
428{ 428{
429 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); 429 Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
430 430
431 MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS); 431 MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS);
432 return; 432 return;
@@ -448,7 +448,7 @@ evas_event_callback_priority_add(Evas *eo_e, Evas_Callback_Type type, Evas_Callb
448EAPI void * 448EAPI void *
449evas_event_callback_del(Evas *eo_e, Evas_Callback_Type type, Evas_Event_Cb func) 449evas_event_callback_del(Evas *eo_e, Evas_Callback_Type type, Evas_Event_Cb func)
450{ 450{
451 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); 451 Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
452 _eo_evas_cb_info *info; 452 _eo_evas_cb_info *info;
453 453
454 MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS); 454 MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS);
@@ -484,7 +484,7 @@ evas_event_callback_del_full(Evas *eo_e, Evas_Callback_Type type, Evas_Event_Cb
484 MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS); 484 MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS);
485 return NULL; 485 return NULL;
486 MAGIC_CHECK_END(); 486 MAGIC_CHECK_END();
487 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); 487 Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
488 488
489 if (!e) return NULL; 489 if (!e) return NULL;
490 if (!func) return NULL; 490 if (!func) return NULL;
@@ -516,7 +516,7 @@ evas_post_event_callback_push(Evas *eo_e, Evas_Object_Event_Post_Cb func, const
516 return; 516 return;
517 MAGIC_CHECK_END(); 517 MAGIC_CHECK_END();
518 518
519 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); 519 Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
520 if (!e) return; 520 if (!e) return;
521 EVAS_MEMPOOL_INIT(_mp_pc, "evas_post_callback", Evas_Post_Callback, 64, ); 521 EVAS_MEMPOOL_INIT(_mp_pc, "evas_post_callback", Evas_Post_Callback, 64, );
522 pc = EVAS_MEMPOOL_ALLOC(_mp_pc, Evas_Post_Callback); 522 pc = EVAS_MEMPOOL_ALLOC(_mp_pc, Evas_Post_Callback);
@@ -539,7 +539,7 @@ evas_post_event_callback_remove(Evas *eo_e, Evas_Object_Event_Post_Cb func)
539 return; 539 return;
540 MAGIC_CHECK_END(); 540 MAGIC_CHECK_END();
541 541
542 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); 542 Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
543 if (!e) return; 543 if (!e) return;
544 EINA_LIST_FOREACH(e->post_events, l, pc) 544 EINA_LIST_FOREACH(e->post_events, l, pc)
545 { 545 {
@@ -561,7 +561,7 @@ evas_post_event_callback_remove_full(Evas *eo_e, Evas_Object_Event_Post_Cb func,
561 return; 561 return;
562 MAGIC_CHECK_END(); 562 MAGIC_CHECK_END();
563 563
564 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); 564 Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
565 if (!e) return; 565 if (!e) return;
566 EINA_LIST_FOREACH(e->post_events, l, pc) 566 EINA_LIST_FOREACH(e->post_events, l, pc)
567 { 567 {
diff --git a/src/lib/evas/canvas/evas_canvas3d_camera.c b/src/lib/evas/canvas/evas_canvas3d_camera.c
index ab222e6..109838e 100644
--- a/src/lib/evas/canvas/evas_canvas3d_camera.c
+++ b/src/lib/evas/canvas/evas_canvas3d_camera.c
@@ -28,7 +28,7 @@ _evas_canvas3d_camera_evas_canvas3d_object_update_notify(Eo *obj EINA_UNUSED,
28void 28void
29evas_canvas3d_camera_node_add(Evas_Canvas3D_Camera *camera, Evas_Canvas3D_Node *node) 29evas_canvas3d_camera_node_add(Evas_Canvas3D_Camera *camera, Evas_Canvas3D_Node *node)
30{ 30{
31 Evas_Canvas3D_Camera_Data *pd = eo_data_scope_get(camera, MY_CLASS); 31 Evas_Canvas3D_Camera_Data *pd = efl_data_scope_get(camera, MY_CLASS);
32 int count = 0; 32 int count = 0;
33 33
34 if (!pd->nodes) 34 if (!pd->nodes)
@@ -48,7 +48,7 @@ evas_canvas3d_camera_node_add(Evas_Canvas3D_Camera *camera, Evas_Canvas3D_Node *
48void 48void
49evas_canvas3d_camera_node_del(Evas_Canvas3D_Camera *camera, Evas_Canvas3D_Node *node) 49evas_canvas3d_camera_node_del(Evas_Canvas3D_Camera *camera, Evas_Canvas3D_Node *node)
50{ 50{
51 Evas_Canvas3D_Camera_Data *pd = eo_data_scope_get(camera, MY_CLASS); 51 Evas_Canvas3D_Camera_Data *pd = efl_data_scope_get(camera, MY_CLASS);
52 int count = 0; 52 int count = 0;
53 53
54 if (!pd->nodes) 54 if (!pd->nodes)
@@ -66,7 +66,7 @@ EOLIAN static Eo *
66_evas_canvas3d_camera_efl_object_constructor(Eo *obj, 66_evas_canvas3d_camera_efl_object_constructor(Eo *obj,
67 Evas_Canvas3D_Camera_Data *pd EINA_UNUSED) 67 Evas_Canvas3D_Camera_Data *pd EINA_UNUSED)
68{ 68{
69 obj = efl_constructor(eo_super(obj, MY_CLASS)); 69 obj = efl_constructor(efl_super(obj, MY_CLASS));
70 evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_CAMERA); 70 evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_CAMERA);
71 71
72 return obj; 72 return obj;
@@ -85,14 +85,14 @@ _evas_canvas3d_camera_efl_object_destructor(Eo *obj,
85 it = eina_hash_iterator_key_new(pd->nodes); 85 it = eina_hash_iterator_key_new(pd->nodes);
86 while (eina_iterator_next(it, &data)) 86 while (eina_iterator_next(it, &data))
87 { 87 {
88 node = eo_data_scope_get(data, EVAS_CANVAS3D_NODE_CLASS); 88 node = efl_data_scope_get(data, EVAS_CANVAS3D_NODE_CLASS);
89 node->data.camera.camera = NULL; 89 node->data.camera.camera = NULL;
90 } 90 }
91 91
92 eina_hash_free(pd->nodes); 92 eina_hash_free(pd->nodes);
93 } 93 }
94 94
95 efl_destructor(eo_super(obj, MY_CLASS)); 95 efl_destructor(efl_super(obj, MY_CLASS));
96} 96}
97 97
98EAPI Evas_Canvas3D_Camera * 98EAPI Evas_Canvas3D_Camera *
@@ -101,7 +101,7 @@ evas_canvas3d_camera_add(Evas *e)
101 MAGIC_CHECK(e, Evas, MAGIC_EVAS); 101 MAGIC_CHECK(e, Evas, MAGIC_EVAS);
102 return NULL; 102 return NULL;
103 MAGIC_CHECK_END(); 103 MAGIC_CHECK_END();
104 Evas_Object *eo_obj = eo_add(MY_CLASS, e); 104 Evas_Object *eo_obj = efl_add(MY_CLASS, e);
105 return eo_obj; 105 return eo_obj;
106} 106}
107 107
@@ -161,8 +161,8 @@ _evas_canvas3d_camera_node_visible_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Camera
161{ 161{
162 Eina_Matrix4 matrix_vp; 162 Eina_Matrix4 matrix_vp;
163 Eina_Quaternion planes[6]; 163 Eina_Quaternion planes[6];
164 Evas_Canvas3D_Node_Data *pd_node = eo_data_scope_get(node, EVAS_CANVAS3D_NODE_CLASS); 164 Evas_Canvas3D_Node_Data *pd_node = efl_data_scope_get(node, EVAS_CANVAS3D_NODE_CLASS);
165 Evas_Canvas3D_Node_Data *pd_camera = eo_data_scope_get(camera_node, EVAS_CANVAS3D_NODE_CLASS); 165 Evas_Canvas3D_Node_Data *pd_camera = efl_data_scope_get(camera_node, EVAS_CANVAS3D_NODE_CLASS);
166 Eina_Vector3 central_point; 166 Eina_Vector3 central_point;
167 167
168 if (!node || pd_node->type != EVAS_CANVAS3D_NODE_TYPE_MESH) 168 if (!node || pd_node->type != EVAS_CANVAS3D_NODE_TYPE_MESH)
diff --git a/src/lib/evas/canvas/evas_canvas3d_light.c b/src/lib/evas/canvas/evas_canvas3d_light.c
index 77a7d49..f71c54d 100644
--- a/src/lib/evas/canvas/evas_canvas3d_light.c
+++ b/src/lib/evas/canvas/evas_canvas3d_light.c
@@ -29,7 +29,7 @@ void
29evas_canvas3d_light_node_add(Evas_Canvas3D_Light *light, Evas_Canvas3D_Node *node) 29evas_canvas3d_light_node_add(Evas_Canvas3D_Light *light, Evas_Canvas3D_Node *node)
30{ 30{
31 int count = 0; 31 int count = 0;
32 Evas_Canvas3D_Light_Data *pd = eo_data_scope_get(light, MY_CLASS); 32 Evas_Canvas3D_Light_Data *pd = efl_data_scope_get(light, MY_CLASS);
33 if (pd->nodes == NULL) 33 if (pd->nodes == NULL)
34 { 34 {
35 pd->nodes = eina_hash_pointer_new(NULL); 35 pd->nodes = eina_hash_pointer_new(NULL);
@@ -50,7 +50,7 @@ void
50evas_canvas3d_light_node_del(Evas_Canvas3D_Light *light, Evas_Canvas3D_Node *node) 50evas_canvas3d_light_node_del(Evas_Canvas3D_Light *light, Evas_Canvas3D_Node *node)
51{ 51{
52 int count = 0; 52 int count = 0;
53 Evas_Canvas3D_Light_Data *pd = eo_data_scope_get(light, MY_CLASS); 53 Evas_Canvas3D_Light_Data *pd = efl_data_scope_get(light, MY_CLASS);
54 if (pd->nodes == NULL) 54 if (pd->nodes == NULL)
55 { 55 {
56 ERR("No node to delete."); 56 ERR("No node to delete.");
@@ -72,14 +72,14 @@ evas_canvas3d_light_add(Evas *e)
72 MAGIC_CHECK(e, Evas, MAGIC_EVAS); 72 MAGIC_CHECK(e, Evas, MAGIC_EVAS);
73 return NULL; 73 return NULL;
74 MAGIC_CHECK_END(); 74 MAGIC_CHECK_END();
75 Evas_Object *eo_obj = eo_add(MY_CLASS, e); 75 Evas_Object *eo_obj = efl_add(MY_CLASS, e);
76 return eo_obj; 76 return eo_obj;
77} 77}
78 78
79EOLIAN static Eo * 79EOLIAN static Eo *
80_evas_canvas3d_light_efl_object_constructor(Eo *obj, Evas_Canvas3D_Light_Data *pd) 80_evas_canvas3d_light_efl_object_constructor(Eo *obj, Evas_Canvas3D_Light_Data *pd)
81{ 81{
82 obj = efl_constructor(eo_super(obj, MY_CLASS)); 82 obj = efl_constructor(efl_super(obj, MY_CLASS));
83 evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_LIGHT); 83 evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_LIGHT);
84 evas_color_set(&pd->ambient, 0.0, 0.0, 0.0, 1.0); 84 evas_color_set(&pd->ambient, 0.0, 0.0, 0.0, 1.0);
85 evas_color_set(&pd->diffuse, 1.0, 1.0, 1.0, 1.0); 85 evas_color_set(&pd->diffuse, 1.0, 1.0, 1.0, 1.0);
@@ -108,14 +108,14 @@ _evas_canvas3d_light_efl_object_destructor(Eo *obj, Evas_Canvas3D_Light_Data *pd
108 it = eina_hash_iterator_key_new(pd->nodes); 108 it = eina_hash_iterator_key_new(pd->nodes);
109 while (eina_iterator_next(it, &data)) 109 while (eina_iterator_next(it, &data))
110 { 110 {
111 node = eo_data_scope_get(data, EVAS_CANVAS3D_NODE_CLASS); 111 node = efl_data_scope_get(data, EVAS_CANVAS3D_NODE_CLASS);
112 node->data.light.light = NULL; 112 node->data.light.light = NULL;
113 } 113 }
114 114
115 eina_hash_free(pd->nodes); 115 eina_hash_free(pd->nodes);
116 } 116 }
117 117
118 efl_destructor(eo_super(obj, MY_CLASS)); 118 efl_destructor(efl_super(obj, MY_CLASS));
119} 119}
120 120
121 121
diff --git a/src/lib/evas/canvas/evas_canvas3d_material.c b/src/lib/evas/canvas/evas_canvas3d_material.c
index 150f5eb..802fcde 100644
--- a/src/lib/evas/canvas/evas_canvas3d_material.c
+++ b/src/lib/evas/canvas/evas_canvas3d_material.c
@@ -39,7 +39,7 @@ void
39evas_canvas3d_material_mesh_add(Evas_Canvas3D_Material *material, Evas_Canvas3D_Mesh *mesh) 39evas_canvas3d_material_mesh_add(Evas_Canvas3D_Material *material, Evas_Canvas3D_Mesh *mesh)
40{ 40{
41 int count = 0; 41 int count = 0;
42 Evas_Canvas3D_Material_Data *pd = eo_data_scope_get(material, MY_CLASS); 42 Evas_Canvas3D_Material_Data *pd = efl_data_scope_get(material, MY_CLASS);
43 43
44 if (pd->meshes == NULL) 44 if (pd->meshes == NULL)
45 { 45 {
@@ -61,7 +61,7 @@ void
61evas_canvas3d_material_mesh_del(Evas_Canvas3D_Material *material, Evas_Canvas3D_Mesh *mesh) 61evas_canvas3d_material_mesh_del(Evas_Canvas3D_Material *material, Evas_Canvas3D_Mesh *mesh)
62{ 62{
63 int count = 0; 63 int count = 0;
64 Evas_Canvas3D_Material_Data *pd = eo_data_scope_get(material, MY_CLASS); 64 Evas_Canvas3D_Material_Data *pd = efl_data_scope_get(material, MY_CLASS);
65 65
66 if (pd->meshes == NULL) 66 if (pd->meshes == NULL)
67 { 67 {
@@ -84,14 +84,14 @@ evas_canvas3d_material_add(Evas *e)
84 MAGIC_CHECK(e, Evas, MAGIC_EVAS); 84 MAGIC_CHECK(e, Evas, MAGIC_EVAS);
85 return NULL; 85 return NULL;
86 MAGIC_CHECK_END(); 86 MAGIC_CHECK_END();
87 Evas_Object *eo_obj = eo_add(MY_CLASS, e); 87 Evas_Object *eo_obj = efl_add(MY_CLASS, e);
88 return eo_obj; 88 return eo_obj;
89} 89}
90 90
91EOLIAN static Eo * 91EOLIAN static Eo *
92_evas_canvas3d_material_efl_object_constructor(Eo *obj EINA_UNUSED, Evas_Canvas3D_Material_Data *pd) 92_evas_canvas3d_material_efl_object_constructor(Eo *obj EINA_UNUSED, Evas_Canvas3D_Material_Data *pd)
93{ 93{
94 obj = efl_constructor(eo_super(obj, MY_CLASS)); 94 obj = efl_constructor(efl_super(obj, MY_CLASS));
95 evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_MATERIAL); 95 evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_MATERIAL);
96 96
97 evas_color_set(&pd->attribs[EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT].color, 0.2, 0.2, 0.2, 1.0); 97 evas_color_set(&pd->attribs[EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT].color, 0.2, 0.2, 0.2, 1.0);
@@ -118,7 +118,7 @@ _evas_canvas3d_material_efl_object_destructor(Eo *obj, Evas_Canvas3D_Material_Da
118 it = eina_hash_iterator_key_new(pd->meshes); 118 it = eina_hash_iterator_key_new(pd->meshes);
119 while (eina_iterator_next(it, &data)) 119 while (eina_iterator_next(it, &data))
120 { 120 {
121 mesh = eo_data_scope_get(data, EVAS_CANVAS3D_MESH_CLASS); 121 mesh = efl_data_scope_get(data, EVAS_CANVAS3D_MESH_CLASS);
122 if (mesh->frames) 122 if (mesh->frames)
123 { 123 {
124 EINA_LIST_FOREACH(mesh->frames, l, f) 124 EINA_LIST_FOREACH(mesh->frames, l, f)
@@ -136,7 +136,7 @@ _evas_canvas3d_material_efl_object_destructor(Eo *obj, Evas_Canvas3D_Material_Da
136 evas_canvas3d_texture_material_del(pd->attribs[i].texture, obj); 136 evas_canvas3d_texture_material_del(pd->attribs[i].texture, obj);
137 } 137 }
138 } 138 }
139 efl_destructor(eo_super(obj, MY_CLASS)); 139 efl_destructor(efl_super(obj, MY_CLASS));
140} 140}
141 141
142EOLIAN static void 142EOLIAN static void
@@ -187,12 +187,12 @@ _evas_canvas3d_material_texture_set(Eo *obj, Evas_Canvas3D_Material_Data *pd, Ev
187 if (pd->attribs[attrib].texture) 187 if (pd->attribs[attrib].texture)
188 { 188 {
189 evas_canvas3d_texture_material_del(pd->attribs[attrib].texture, obj); 189 evas_canvas3d_texture_material_del(pd->attribs[attrib].texture, obj);
190 eo_unref(pd->attribs[attrib].texture); 190 efl_unref(pd->attribs[attrib].texture);
191 } 191 }
192 192
193 pd->attribs[attrib].texture = texture; 193 pd->attribs[attrib].texture = texture;
194 evas_canvas3d_texture_material_add(texture, obj); 194 evas_canvas3d_texture_material_add(texture, obj);
195 eo_ref(texture); 195 efl_ref(texture);
196 } 196 }
197 197
198 evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MATERIAL_TEXTURE, NULL); 198 evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MATERIAL_TEXTURE, NULL);
diff --git a/src/lib/evas/canvas/evas_canvas3d_mesh.c b/src/lib/evas/canvas/evas_canvas3d_mesh.c
index e59497f..d9e5b68 100644
--- a/src/lib/evas/canvas/evas_canvas3d_mesh.c
+++ b/src/lib/evas/canvas/evas_canvas3d_mesh.c
@@ -213,7 +213,7 @@ void
213evas_canvas3d_mesh_node_add(Evas_Canvas3D_Mesh *mesh, Evas_Canvas3D_Node *node) 213evas_canvas3d_mesh_node_add(Evas_Canvas3D_Mesh *mesh, Evas_Canvas3D_Node *node)
214{ 214{
215 int count = 0; 215 int count = 0;
216 Evas_Canvas3D_Mesh_Data *pd = eo_data_scope_get(mesh, MY_CLASS); 216 Evas_Canvas3D_Mesh_Data *pd = efl_data_scope_get(mesh, MY_CLASS);
217 if (pd->nodes == NULL) 217 if (pd->nodes == NULL)
218 { 218 {
219 pd->nodes = eina_hash_pointer_new(NULL); 219 pd->nodes = eina_hash_pointer_new(NULL);
@@ -234,7 +234,7 @@ void
234evas_canvas3d_mesh_node_del(Evas_Canvas3D_Mesh *mesh, Evas_Canvas3D_Node *node) 234evas_canvas3d_mesh_node_del(Evas_Canvas3D_Mesh *mesh, Evas_Canvas3D_Node *node)
235{ 235{
236 int count = 0; 236 int count = 0;
237 Evas_Canvas3D_Mesh_Data *pd = eo_data_scope_get(mesh, MY_CLASS); 237 Evas_Canvas3D_Mesh_Data *pd = efl_data_scope_get(mesh, MY_CLASS);
238 if (pd->nodes == NULL) 238 if (pd->nodes == NULL)
239 { 239 {
240 ERR("No node to delete."); 240 ERR("No node to delete.");
@@ -256,14 +256,14 @@ evas_canvas3d_mesh_add(Evas *e)
256 MAGIC_CHECK(e, Evas, MAGIC_EVAS); 256 MAGIC_CHECK(e, Evas, MAGIC_EVAS);
257 return NULL; 257 return NULL;
258 MAGIC_CHECK_END(); 258 MAGIC_CHECK_END();
259 Evas_Object *eo_obj = eo_add(MY_CLASS, e); 259 Evas_Object *eo_obj = efl_add(MY_CLASS, e);
260 return eo_obj; 260 return eo_obj;
261} 261}
262 262
263EOLIAN static Eo * 263EOLIAN static Eo *
264_evas_canvas3d_mesh_efl_object_constructor(Eo *obj, Evas_Canvas3D_Mesh_Data *pd) 264_evas_canvas3d_mesh_efl_object_constructor(Eo *obj, Evas_Canvas3D_Mesh_Data *pd)
265{ 265{
266 obj = efl_constructor(eo_super(obj, MY_CLASS)); 266 obj = efl_constructor(efl_super(obj, MY_CLASS));
267 evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_MESH); 267 evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_MESH);
268 _mesh_init(pd); 268 _mesh_init(pd);
269 269
@@ -274,7 +274,7 @@ EOLIAN static void
274_evas_canvas3d_mesh_efl_object_destructor(Eo *obj, Evas_Canvas3D_Mesh_Data *pd) 274_evas_canvas3d_mesh_efl_object_destructor(Eo *obj, Evas_Canvas3D_Mesh_Data *pd)
275{ 275{
276 _mesh_fini(pd); 276 _mesh_fini(pd);
277 efl_destructor(eo_super(obj, MY_CLASS)); 277 efl_destructor(efl_super(obj, MY_CLASS));
278} 278}
279 279
280EOLIAN static void 280EOLIAN static void
@@ -371,11 +371,11 @@ _evas_canvas3d_mesh_frame_material_set(Eo *obj, Evas_Canvas3D_Mesh_Data *pd, int
371 if (f->material) 371 if (f->material)
372 { 372 {
373 evas_canvas3d_material_mesh_del(f->material, obj); 373 evas_canvas3d_material_mesh_del(f->material, obj);
374 eo_unref(f->material); 374 efl_unref(f->material);
375 } 375 }
376 376
377 f->material = material; 377 f->material = material;
378 eo_ref(material); 378 efl_ref(material);
379 evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_MATERIAL, NULL); 379 evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_MATERIAL, NULL);
380 evas_canvas3d_material_mesh_add(material, obj); 380 evas_canvas3d_material_mesh_add(material, obj);
381} 381}
@@ -920,7 +920,7 @@ _evas_canvas3d_mesh_from_primitive_set(Eo *obj,
920{ 920{
921 if ((primitive == NULL) || (obj == NULL)) return; 921 if ((primitive == NULL) || (obj == NULL)) return;
922 922
923 Evas_Canvas3D_Primitive_Data *ppd = eo_data_scope_get(primitive, EVAS_CANVAS3D_PRIMITIVE_CLASS); 923 Evas_Canvas3D_Primitive_Data *ppd = efl_data_scope_get(primitive, EVAS_CANVAS3D_PRIMITIVE_CLASS);
924 924
925 evas_common_set_model_from_primitive(obj, frame, ppd); 925 evas_common_set_model_from_primitive(obj, frame, ppd);
926} 926}
@@ -968,7 +968,7 @@ _mesh_frame_find(Evas_Canvas3D_Mesh *mesh, int frame,
968{ 968{
969 Eina_List *left, *right; 969 Eina_List *left, *right;
970 Evas_Canvas3D_Mesh_Frame *f0 = NULL, *f1; 970 Evas_Canvas3D_Mesh_Frame *f0 = NULL, *f1;
971 Evas_Canvas3D_Mesh_Data *pdmesh = eo_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS); 971 Evas_Canvas3D_Mesh_Data *pdmesh = efl_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS);
972 972
973 left = pdmesh->frames; 973 left = pdmesh->frames;
974 right = eina_list_next(left); 974 right = eina_list_next(left);
diff --git a/src/lib/evas/canvas/evas_canvas3d_node.c b/src/lib/evas/canvas/evas_canvas3d_node.c
index c4f6eee..4454571 100644
--- a/src/lib/evas/canvas/evas_canvas3d_node.c
+++ b/src/lib/evas/canvas/evas_canvas3d_node.c
@@ -60,7 +60,7 @@ _evas_canvas3d_node_private_callback_collision(void *data, const Eo_Event *event
60 Eina_Bool ret = EINA_FALSE; 60 Eina_Bool ret = EINA_FALSE;
61 61
62 target_node = (Evas_Canvas3D_Node *)event->info; 62 target_node = (Evas_Canvas3D_Node *)event->info;
63 pd_target = eo_data_scope_get(target_node, EVAS_CANVAS3D_NODE_CLASS); 63 pd_target = efl_data_scope_get(target_node, EVAS_CANVAS3D_NODE_CLASS);
64 collision_list = (Eina_List *)data; 64 collision_list = (Eina_List *)data;
65 eo_desc = efl_object_legacy_only_event_description_get("collision"); 65 eo_desc = efl_object_legacy_only_event_description_get("collision");
66 66
@@ -68,7 +68,7 @@ _evas_canvas3d_node_private_callback_collision(void *data, const Eo_Event *event
68 { 68 {
69 EINA_LIST_FOREACH(collision_list, l, n) 69 EINA_LIST_FOREACH(collision_list, l, n)
70 { 70 {
71 pd = eo_data_scope_get(n, EVAS_CANVAS3D_NODE_CLASS); 71 pd = efl_data_scope_get(n, EVAS_CANVAS3D_NODE_CLASS);
72 if (box_intersection_box(&pd_target->aabb, &pd->aabb)) 72 if (box_intersection_box(&pd_target->aabb, &pd->aabb))
73 ret = efl_event_callback_call(target_node, eo_desc, n); 73 ret = efl_event_callback_call(target_node, eo_desc, n);
74 } 74 }
@@ -184,7 +184,7 @@ _evas_canvas3d_node_evas_canvas3d_object_change_notify(Eo *obj, Evas_Canvas3D_No
184 EINA_LIST_FOREACH(pd->members, l, n) 184 EINA_LIST_FOREACH(pd->members, l, n)
185 { 185 {
186 /*Skip change orientation if node is billboard*/ 186 /*Skip change orientation if node is billboard*/
187 Evas_Canvas3D_Node_Data *pdm = eo_data_scope_get(n, EVAS_CANVAS3D_NODE_CLASS); 187 Evas_Canvas3D_Node_Data *pdm = efl_data_scope_get(n, EVAS_CANVAS3D_NODE_CLASS);
188 if (pdm->billboard_target) 188 if (pdm->billboard_target)
189 continue; 189 continue;
190 evas_canvas3d_object_change(n, EVAS_CANVAS3D_STATE_NODE_PARENT_ORIENTATION, obj); 190 evas_canvas3d_object_change(n, EVAS_CANVAS3D_STATE_NODE_PARENT_ORIENTATION, obj);
@@ -224,7 +224,7 @@ _evas_canvas3d_node_evas_canvas3d_object_callback_unregister(Eo *obj, Evas_Canva
224static Eina_Bool 224static Eina_Bool
225_node_transform_update(Evas_Canvas3D_Node *node, void *data EINA_UNUSED) 225_node_transform_update(Evas_Canvas3D_Node *node, void *data EINA_UNUSED)
226{ 226{
227 Evas_Canvas3D_Node_Data *pd = eo_data_scope_get(node, MY_CLASS); 227 Evas_Canvas3D_Node_Data *pd = efl_data_scope_get(node, MY_CLASS);
228 Eina_Bool transform_dirty = EINA_FALSE, parent_dirty = EINA_FALSE; 228 Eina_Bool transform_dirty = EINA_FALSE, parent_dirty = EINA_FALSE;
229 229
230 transform_dirty = evas_canvas3d_object_dirty_get(node, EVAS_CANVAS3D_STATE_NODE_TRANSFORM_ORIENTATION); 230 transform_dirty = evas_canvas3d_object_dirty_get(node, EVAS_CANVAS3D_STATE_NODE_TRANSFORM_ORIENTATION);
@@ -238,7 +238,7 @@ _node_transform_update(Evas_Canvas3D_Node *node, void *data EINA_UNUSED)
238 { 238 {
239 if (pd->parent) 239 if (pd->parent)
240 { 240 {
241 Evas_Canvas3D_Node_Data *pdparent = eo_data_scope_get(pd->parent, MY_CLASS); 241 Evas_Canvas3D_Node_Data *pdparent = efl_data_scope_get(pd->parent, MY_CLASS);
242 const Eina_Vector3 *scale_parent = &pdparent->scale_world; 242 const Eina_Vector3 *scale_parent = &pdparent->scale_world;
243 const Eina_Quaternion *orientation_parent = &pdparent->orientation_world; 243 const Eina_Quaternion *orientation_parent = &pdparent->orientation_world;
244 244
@@ -315,10 +315,10 @@ _node_billboard_update(Evas_Canvas3D_Node *node, void *data EINA_UNUSED)
315{ 315{
316 Eina_Vector3 target; 316 Eina_Vector3 target;
317 Eina_Vector3 up; 317 Eina_Vector3 up;
318 Evas_Canvas3D_Node_Data *pd_node = eo_data_scope_get(node, MY_CLASS); 318 Evas_Canvas3D_Node_Data *pd_node = efl_data_scope_get(node, MY_CLASS);
319 if (pd_node->billboard_target) 319 if (pd_node->billboard_target)
320 { 320 {
321 Evas_Canvas3D_Node_Data *pd_target = eo_data_scope_get(pd_node->billboard_target, 321 Evas_Canvas3D_Node_Data *pd_target = efl_data_scope_get(pd_node->billboard_target,
322 MY_CLASS); 322 MY_CLASS);
323 eina_vector3_set(&target, pd_target->position.x, pd_target->position.y, 323 eina_vector3_set(&target, pd_target->position.x, pd_target->position.y,
324 pd_target->position.z); 324 pd_target->position.z);
@@ -353,7 +353,7 @@ _node_billboard_update(Evas_Canvas3D_Node *node, void *data EINA_UNUSED)
353static Eina_Bool 353static Eina_Bool
354_node_item_update(Evas_Canvas3D_Node *node, void *data EINA_UNUSED) 354_node_item_update(Evas_Canvas3D_Node *node, void *data EINA_UNUSED)
355{ 355{
356 Evas_Canvas3D_Node_Data *pd = eo_data_scope_get(node, EVAS_CANVAS3D_NODE_CLASS); 356 Evas_Canvas3D_Node_Data *pd = efl_data_scope_get(node, EVAS_CANVAS3D_NODE_CLASS);
357 if (pd->type == EVAS_CANVAS3D_NODE_TYPE_CAMERA) 357 if (pd->type == EVAS_CANVAS3D_NODE_TYPE_CAMERA)
358 { 358 {
359 if (pd->data.camera.camera) 359 if (pd->data.camera.camera)
@@ -446,7 +446,7 @@ _update_node_shapes(Evas_Canvas3D_Node *node)
446 int i; 446 int i;
447 int count; 447 int count;
448 Eina_Vector3 *vertices = NULL; 448 Eina_Vector3 *vertices = NULL;
449 Evas_Canvas3D_Node_Data *pd = eo_data_scope_get(node, EVAS_CANVAS3D_NODE_CLASS); 449 Evas_Canvas3D_Node_Data *pd = efl_data_scope_get(node, EVAS_CANVAS3D_NODE_CLASS);
450 Eina_Bool transform_orientation_dirty; 450 Eina_Bool transform_orientation_dirty;
451 Eina_Bool transform_position_dirty; 451 Eina_Bool transform_position_dirty;
452 Eina_Bool transform_scale_dirty; 452 Eina_Bool transform_scale_dirty;
@@ -497,7 +497,7 @@ _update_node_shapes(Evas_Canvas3D_Node *node)
497Eina_Bool 497Eina_Bool
498node_aabb_update(Evas_Canvas3D_Node *node, void *data EINA_UNUSED) 498node_aabb_update(Evas_Canvas3D_Node *node, void *data EINA_UNUSED)
499{ 499{
500 Evas_Canvas3D_Node_Data *pd = eo_data_scope_get(node, EVAS_CANVAS3D_NODE_CLASS); 500 Evas_Canvas3D_Node_Data *pd = efl_data_scope_get(node, EVAS_CANVAS3D_NODE_CLASS);
501 Eina_List *current; 501 Eina_List *current;
502 Evas_Canvas3D_Node *datanode; 502 Evas_Canvas3D_Node *datanode;
503 const Efl_Event_Description *eo_desc = NULL; 503 const Efl_Event_Description *eo_desc = NULL;
@@ -507,7 +507,7 @@ node_aabb_update(Evas_Canvas3D_Node *node, void *data EINA_UNUSED)
507 _update_node_shapes(node); 507 _update_node_shapes(node);
508 EINA_LIST_FOREACH(pd->members, current, datanode) 508 EINA_LIST_FOREACH(pd->members, current, datanode)
509 { 509 {
510 Evas_Canvas3D_Node_Data *datapd = eo_data_scope_get(datanode, EVAS_CANVAS3D_NODE_CLASS); 510 Evas_Canvas3D_Node_Data *datapd = efl_data_scope_get(datanode, EVAS_CANVAS3D_NODE_CLASS);
511 evas_box3_union(&pd->obb, &pd->obb, &datapd->obb); 511 evas_box3_union(&pd->obb, &pd->obb, &datapd->obb);
512 evas_box3_union(&pd->aabb, &pd->aabb, &datapd->aabb); 512 evas_box3_union(&pd->aabb, &pd->aabb, &datapd->aabb);
513 } 513 }
@@ -523,7 +523,7 @@ static Eina_Bool
523_node_update_done(Evas_Canvas3D_Node *obj, void *data EINA_UNUSED) 523_node_update_done(Evas_Canvas3D_Node *obj, void *data EINA_UNUSED)
524{ 524{
525 //@FIXME 525 //@FIXME
526 Evas_Canvas3D_Object_Data *pdobject = eo_data_scope_get(obj, EVAS_CANVAS3D_OBJECT_CLASS); 526 Evas_Canvas3D_Object_Data *pdobject = efl_data_scope_get(obj, EVAS_CANVAS3D_OBJECT_CLASS);
527 memset(&pdobject->dirty[0], 0x00, sizeof(Eina_Bool) * EVAS_CANVAS3D_STATE_MAX); 527 memset(&pdobject->dirty[0], 0x00, sizeof(Eina_Bool) * EVAS_CANVAS3D_STATE_MAX);
528 return EINA_TRUE; 528 return EINA_TRUE;
529} 529}
@@ -556,7 +556,7 @@ _evas_canvas3d_node_evas_canvas3d_object_update_notify(Eo *obj, Evas_Canvas3D_No
556static void 556static void
557_node_free(Evas_Canvas3D_Object *obj) 557_node_free(Evas_Canvas3D_Object *obj)
558{ 558{
559 Evas_Canvas3D_Node_Data *pd = eo_data_scope_get(obj, MY_CLASS); 559 Evas_Canvas3D_Node_Data *pd = efl_data_scope_get(obj, MY_CLASS);
560 560
561 if (pd->members) 561 if (pd->members)
562 { 562 {
@@ -565,7 +565,7 @@ _node_free(Evas_Canvas3D_Object *obj)
565 565
566 EINA_LIST_FOREACH(pd->members, l, n) 566 EINA_LIST_FOREACH(pd->members, l, n)
567 { 567 {
568 eo_unref(n); 568 efl_unref(n);
569 } 569 }
570 570
571 eina_list_free(pd->members); 571 eina_list_free(pd->members);
@@ -583,7 +583,7 @@ _node_free(Evas_Canvas3D_Object *obj)
583 583
584 EINA_LIST_FOREACH(pd->data.mesh.meshes, l, m) 584 EINA_LIST_FOREACH(pd->data.mesh.meshes, l, m)
585 { 585 {
586 eo_unref(m); 586 efl_unref(m);
587 } 587 }
588 588
589 eina_list_free(pd->data.mesh.meshes); 589 eina_list_free(pd->data.mesh.meshes);
@@ -603,7 +603,7 @@ void
603evas_canvas3d_node_scene_root_add(Evas_Canvas3D_Node *node, Evas_Canvas3D_Scene *scene) 603evas_canvas3d_node_scene_root_add(Evas_Canvas3D_Node *node, Evas_Canvas3D_Scene *scene)
604{ 604{
605 int count = 0; 605 int count = 0;
606 Evas_Canvas3D_Node_Data *pd = eo_data_scope_get(node, MY_CLASS); 606 Evas_Canvas3D_Node_Data *pd = efl_data_scope_get(node, MY_CLASS);
607 if (pd->scenes_root == NULL) 607 if (pd->scenes_root == NULL)
608 { 608 {
609 pd->scenes_root = eina_hash_pointer_new(NULL); 609 pd->scenes_root = eina_hash_pointer_new(NULL);
@@ -624,7 +624,7 @@ void
624evas_canvas3d_node_scene_root_del(Evas_Canvas3D_Node *node, Evas_Canvas3D_Scene *scene) 624evas_canvas3d_node_scene_root_del(Evas_Canvas3D_Node *node, Evas_Canvas3D_Scene *scene)
625{ 625{
626 int count = 0; 626 int count = 0;
627 Evas_Canvas3D_Node_Data *pd = eo_data_scope_get(node, MY_CLASS); 627 Evas_Canvas3D_Node_Data *pd = efl_data_scope_get(node, MY_CLASS);
628 if (pd->scenes_root == NULL) 628 if (pd->scenes_root == NULL)
629 { 629 {
630 ERR("No scene to delete."); 630 ERR("No scene to delete.");
@@ -649,7 +649,7 @@ void
649evas_canvas3d_node_scene_camera_add(Evas_Canvas3D_Node *node, Evas_Canvas3D_Scene *scene) 649evas_canvas3d_node_scene_camera_add(Evas_Canvas3D_Node *node, Evas_Canvas3D_Scene *scene)
650{ 650{
651 int count = 0; 651 int count = 0;
652 Evas_Canvas3D_Node_Data *pd = eo_data_scope_get(node, MY_CLASS); 652 Evas_Canvas3D_Node_Data *pd = efl_data_scope_get(node, MY_CLASS);
653 if (pd->scenes_camera == NULL) 653 if (pd->scenes_camera == NULL)
654 { 654 {
655 pd->scenes_camera = eina_hash_pointer_new(NULL); 655 pd->scenes_camera = eina_hash_pointer_new(NULL);
@@ -670,7 +670,7 @@ void
670evas_canvas3d_node_scene_camera_del(Evas_Canvas3D_Node *node, Evas_Canvas3D_Scene *scene) 670evas_canvas3d_node_scene_camera_del(Evas_Canvas3D_Node *node, Evas_Canvas3D_Scene *scene)
671{ 671{
672 int count = 0; 672 int count = 0;
673 Evas_Canvas3D_Node_Data *pd = eo_data_scope_get(node, MY_CLASS); 673 Evas_Canvas3D_Node_Data *pd = efl_data_scope_get(node, MY_CLASS);
674 if (pd->scenes_camera == NULL) 674 if (pd->scenes_camera == NULL)
675 { 675 {
676 ERR("No scene to delete."); 676 ERR("No scene to delete.");
@@ -707,7 +707,7 @@ evas_canvas3d_node_traverse(Evas_Canvas3D_Node *from, Evas_Canvas3D_Node *to, Ev
707 707
708 if (node == from) 708 if (node == from)
709 break; 709 break;
710 Evas_Canvas3D_Node_Data *pdnode = eo_data_scope_get(node, MY_CLASS); 710 Evas_Canvas3D_Node_Data *pdnode = efl_data_scope_get(node, MY_CLASS);
711 node = pdnode->parent; 711 node = pdnode->parent;
712 712
713 if (node == NULL) 713 if (node == NULL)
@@ -723,7 +723,7 @@ evas_canvas3d_node_traverse(Evas_Canvas3D_Node *from, Evas_Canvas3D_Node *to, Ev
723 723
724 if (node == to) 724 if (node == to)
725 break; 725 break;
726 Evas_Canvas3D_Node_Data *pdnode = eo_data_scope_get(node, MY_CLASS); 726 Evas_Canvas3D_Node_Data *pdnode = efl_data_scope_get(node, MY_CLASS);
727 node = pdnode->parent; 727 node = pdnode->parent;
728 728
729 if (node == NULL) 729 if (node == NULL)
@@ -771,7 +771,7 @@ evas_canvas3d_node_tree_traverse(Evas_Canvas3D_Node *root, Evas_Canvas3D_Tree_Tr
771 { 771 {
772 /* Dequeue a node. */ 772 /* Dequeue a node. */
773 node = eina_list_data_get(nodes); 773 node = eina_list_data_get(nodes);
774 Evas_Canvas3D_Node_Data *pdnode = eo_data_scope_get(node, MY_CLASS); 774 Evas_Canvas3D_Node_Data *pdnode = efl_data_scope_get(node, MY_CLASS);
775 775
776 nodes = eina_list_remove_list(nodes, nodes); 776 nodes = eina_list_remove_list(nodes, nodes);
777 777
@@ -795,7 +795,7 @@ evas_canvas3d_node_tree_traverse(Evas_Canvas3D_Node *root, Evas_Canvas3D_Tree_Tr
795 { 795 {
796 /* Pop a node from the stack. */ 796 /* Pop a node from the stack. */
797 node = eina_list_data_get(nodes); 797 node = eina_list_data_get(nodes);
798 Evas_Canvas3D_Node_Data *pdnode = eo_data_scope_get(node, MY_CLASS); 798 Evas_Canvas3D_Node_Data *pdnode = efl_data_scope_get(node, MY_CLASS);
799 nodes = eina_list_remove_list(nodes, nodes); 799 nodes = eina_list_remove_list(nodes, nodes);
800 800
801 /* Call node function on the node. */ 801 /* Call node function on the node. */
@@ -825,7 +825,7 @@ evas_canvas3d_node_tree_traverse(Evas_Canvas3D_Node *root, Evas_Canvas3D_Tree_Tr
825 { 825 {
826 /* Peek a node from the stack. */ 826 /* Peek a node from the stack. */
827 node = eina_list_data_get(nodes); 827 node = eina_list_data_get(nodes);
828 Evas_Canvas3D_Node_Data *pdnode = eo_data_scope_get(node, MY_CLASS); 828 Evas_Canvas3D_Node_Data *pdnode = efl_data_scope_get(node, MY_CLASS);
829 if (eina_list_count(pdnode->members) == 0) 829 if (eina_list_count(pdnode->members) == 0)
830 { 830 {
831 /* The peeked node is a leaf node, 831 /* The peeked node is a leaf node,
@@ -852,7 +852,7 @@ evas_canvas3d_node_tree_traverse(Evas_Canvas3D_Node *root, Evas_Canvas3D_Tree_Tr
852 * its childs into the stack. */ 852 * its childs into the stack. */
853 Evas_Canvas3D_Node_Data *pdlast; 853 Evas_Canvas3D_Node_Data *pdlast;
854 if (last ) 854 if (last )
855 pdlast= eo_data_scope_get(last, MY_CLASS); 855 pdlast= efl_data_scope_get(last, MY_CLASS);
856 if (last && pdlast->parent == node) 856 if (last && pdlast->parent == node)
857 { 857 {
858 /* Visit the node as it doesn't have any unvisited child node. */ 858 /* Visit the node as it doesn't have any unvisited child node. */
@@ -893,7 +893,7 @@ evas_canvas3d_node_mesh_collect(Evas_Canvas3D_Node *node, void *data)
893 Evas_Canvas3D_Mesh_Data *mesh_pd; 893 Evas_Canvas3D_Mesh_Data *mesh_pd;
894 Evas_Canvas3D_Mesh_Frame *f; 894 Evas_Canvas3D_Mesh_Frame *f;
895 Evas_Canvas3D_Scene_Public_Data *scene_data = (Evas_Canvas3D_Scene_Public_Data *)data; 895 Evas_Canvas3D_Scene_Public_Data *scene_data = (Evas_Canvas3D_Scene_Public_Data *)data;
896 Evas_Canvas3D_Node_Data *pd = eo_data_scope_get(node, MY_CLASS); 896 Evas_Canvas3D_Node_Data *pd = efl_data_scope_get(node, MY_CLASS);
897 unsigned short int *index; 897 unsigned short int *index;
898 int stride, tex_stride, normal_stride; 898 int stride, tex_stride, normal_stride;
899 899
@@ -903,14 +903,14 @@ evas_canvas3d_node_mesh_collect(Evas_Canvas3D_Node *node, void *data)
903 /*In case LOD calculate distance to the camera node*/ 903 /*In case LOD calculate distance to the camera node*/
904 if (pd->lod) 904 if (pd->lod)
905 { 905 {
906 Evas_Canvas3D_Node_Data *pd_camera = eo_data_scope_get(scene_data->camera_node, MY_CLASS); 906 Evas_Canvas3D_Node_Data *pd_camera = efl_data_scope_get(scene_data->camera_node, MY_CLASS);
907 scene_data->lod_distance = eina_vector3_distance_get(&pd_camera->position, &pd->position_world); 907 scene_data->lod_distance = eina_vector3_distance_get(&pd_camera->position, &pd->position_world);
908 } 908 }
909 /* calculation of tangent space for all meshes */ 909 /* calculation of tangent space for all meshes */
910 list_meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get(node); 910 list_meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get(node);
911 EINA_LIST_FOREACH(list_meshes, l, mesh) 911 EINA_LIST_FOREACH(list_meshes, l, mesh)
912 { 912 {
913 mesh_pd = eo_data_scope_get(mesh, MY_CLASS); 913 mesh_pd = efl_data_scope_get(mesh, MY_CLASS);
914 f = evas_canvas3d_mesh_frame_find(mesh_pd, 0); 914 f = evas_canvas3d_mesh_frame_find(mesh_pd, 0);
915 if (!f) 915 if (!f)
916 { 916 {
@@ -964,8 +964,8 @@ Eina_Bool
964evas_canvas3d_node_color_node_mesh_collect(Evas_Canvas3D_Node *node, void *data) 964evas_canvas3d_node_color_node_mesh_collect(Evas_Canvas3D_Node *node, void *data)
965{ 965{
966 Evas_Canvas3D_Scene_Public_Data *scene_data = (Evas_Canvas3D_Scene_Public_Data *)data; 966 Evas_Canvas3D_Scene_Public_Data *scene_data = (Evas_Canvas3D_Scene_Public_Data *)data;
967 Evas_Canvas3D_Node_Data *pd = eo_data_scope_get(node, MY_CLASS); 967 Evas_Canvas3D_Node_Data *pd = efl_data_scope_get(node, MY_CLASS);
968 Evas_Canvas3D_Node_Data *pd_camera = eo_data_scope_get(scene_data->camera_node, MY_CLASS); 968 Evas_Canvas3D_Node_Data *pd_camera = efl_data_scope_get(scene_data->camera_node, MY_CLASS);
969 Evas_Canvas3D_Camera *camera = (Evas_Canvas3D_Camera*)pd_camera->data.camera.camera; 969 Evas_Canvas3D_Camera *camera = (Evas_Canvas3D_Camera*)pd_camera->data.camera.camera;
970 970
971 Eina_List *list_meshes, *l; 971 Eina_List *list_meshes, *l;
@@ -1012,7 +1012,7 @@ Eina_Bool
1012evas_canvas3d_node_light_collect(Evas_Canvas3D_Node *node, void *data) 1012evas_canvas3d_node_light_collect(Evas_Canvas3D_Node *node, void *data)
1013{ 1013{
1014 Evas_Canvas3D_Scene_Public_Data *scene_data = (Evas_Canvas3D_Scene_Public_Data *)data; 1014 Evas_Canvas3D_Scene_Public_Data *scene_data = (Evas_Canvas3D_Scene_Public_Data *)data;
1015 Evas_Canvas3D_Node_Data *pd = eo_data_scope_get(node, MY_CLASS); 1015 Evas_Canvas3D_Node_Data *pd = efl_data_scope_get(node, MY_CLASS);
1016 if (pd->type == EVAS_CANVAS3D_NODE_TYPE_LIGHT) 1016 if (pd->type == EVAS_CANVAS3D_NODE_TYPE_LIGHT)
1017 scene_data->light_nodes = eina_list_append(scene_data->light_nodes, node); 1017 scene_data->light_nodes = eina_list_append(scene_data->light_nodes, node);
1018 1018
@@ -1025,7 +1025,7 @@ evas_canvas3d_node_add(Evas *e, Evas_Canvas3D_Node_Type type)
1025 MAGIC_CHECK(e, Evas, MAGIC_EVAS); 1025 MAGIC_CHECK(e, Evas, MAGIC_EVAS);
1026 return NULL; 1026 return NULL;
1027 MAGIC_CHECK_END(); 1027 MAGIC_CHECK_END();
1028 Evas_Object *eo_obj = eo_add(MY_CLASS, e, evas_canvas3d_node_constructor(eo_self, type)); 1028 Evas_Object *eo_obj = efl_add(MY_CLASS, e, evas_canvas3d_node_constructor(efl_self, type));
1029 return eo_obj; 1029 return eo_obj;
1030} 1030}
1031 1031
@@ -1069,7 +1069,7 @@ _evas_canvas3d_node_efl_object_destructor(Eo *obj, Evas_Canvas3D_Node_Data *pd E
1069{ 1069{
1070 _node_free(obj); 1070 _node_free(obj);
1071 1071
1072 efl_destructor(eo_super(obj, MY_CLASS)); 1072 efl_destructor(efl_super(obj, MY_CLASS));
1073} 1073}
1074 1074
1075EOLIAN static Evas_Canvas3D_Node_Type 1075EOLIAN static Evas_Canvas3D_Node_Type
@@ -1086,14 +1086,14 @@ _evas_canvas3d_node_member_add(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas
1086 ERR("Failed to add a member node (adding to itself)."); 1086 ERR("Failed to add a member node (adding to itself).");
1087 return; 1087 return;
1088 } 1088 }
1089 Evas_Canvas3D_Node_Data *pdmember = eo_data_scope_get(member, MY_CLASS); 1089 Evas_Canvas3D_Node_Data *pdmember = efl_data_scope_get(member, MY_CLASS);
1090 if (!pdmember || pdmember->parent == obj) 1090 if (!pdmember || pdmember->parent == obj)
1091 return; 1091 return;
1092 1092
1093 if (pdmember->parent) 1093 if (pdmember->parent)
1094 { 1094 {
1095 /* Detaching from previous parent. */ 1095 /* Detaching from previous parent. */
1096 Evas_Canvas3D_Node_Data *pdmemberparent = eo_data_scope_get(pdmember->parent, MY_CLASS); 1096 Evas_Canvas3D_Node_Data *pdmemberparent = efl_data_scope_get(pdmember->parent, MY_CLASS);
1097 pdmemberparent->members = eina_list_remove(pdmemberparent->members, member); 1097 pdmemberparent->members = eina_list_remove(pdmemberparent->members, member);
1098 1098
1099 /* Mark changed. */ 1099 /* Mark changed. */
@@ -1102,7 +1102,7 @@ _evas_canvas3d_node_member_add(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas
1102 else 1102 else
1103 { 1103 {
1104 /* Should get a new reference. */ 1104 /* Should get a new reference. */
1105 eo_ref(member); 1105 efl_ref(member);
1106 } 1106 }
1107 1107
1108 /* Add the member node. */ 1108 /* Add the member node. */
@@ -1119,7 +1119,7 @@ _evas_canvas3d_node_member_add(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas
1119EOLIAN static void 1119EOLIAN static void
1120_evas_canvas3d_node_member_del(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas3D_Node *member) 1120_evas_canvas3d_node_member_del(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas3D_Node *member)
1121{ 1121{
1122 Evas_Canvas3D_Node_Data *pdmember = eo_data_scope_get(member, MY_CLASS); 1122 Evas_Canvas3D_Node_Data *pdmember = efl_data_scope_get(member, MY_CLASS);
1123 if (!pdmember || pdmember->parent != obj) 1123 if (!pdmember || pdmember->parent != obj)
1124 { 1124 {
1125 ERR("Failed to delete a member node (not a member of the given node)"); 1125 ERR("Failed to delete a member node (not a member of the given node)");
@@ -1137,7 +1137,7 @@ _evas_canvas3d_node_member_del(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas
1137 evas_canvas3d_object_change(member, EVAS_CANVAS3D_STATE_NODE_PARENT_SCALE, NULL); 1137 evas_canvas3d_object_change(member, EVAS_CANVAS3D_STATE_NODE_PARENT_SCALE, NULL);
1138 1138
1139 /* Decrease reference count. */ 1139 /* Decrease reference count. */
1140 eo_unref(member); 1140 efl_unref(member);
1141} 1141}
1142 1142
1143EOLIAN static Evas_Canvas3D_Node * 1143EOLIAN static Evas_Canvas3D_Node *
@@ -1456,11 +1456,11 @@ _evas_canvas3d_node_camera_set(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas
1456 { 1456 {
1457 /* Detach previous camera object. */ 1457 /* Detach previous camera object. */
1458 evas_canvas3d_camera_node_del(pd->data.camera.camera, obj); 1458 evas_canvas3d_camera_node_del(pd->data.camera.camera, obj);
1459 eo_unref(pd->data.camera.camera); 1459 efl_unref(pd->data.camera.camera);
1460 } 1460 }
1461 1461
1462 pd->data.camera.camera = camera; 1462 pd->data.camera.camera = camera;
1463 eo_ref(camera); 1463 efl_ref(camera);
1464 1464
1465 /* Register change notification on the camera for this node. */ 1465 /* Register change notification on the camera for this node. */
1466 evas_canvas3d_camera_node_add(camera, obj); 1466 evas_canvas3d_camera_node_add(camera, obj);
@@ -1491,11 +1491,11 @@ _evas_canvas3d_node_light_set(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas3
1491 { 1491 {
1492 /* Detach previous light object. */ 1492 /* Detach previous light object. */
1493 evas_canvas3d_light_node_del(pd->data.light.light, obj); 1493 evas_canvas3d_light_node_del(pd->data.light.light, obj);
1494 eo_unref(pd->data.light.light); 1494 efl_unref(pd->data.light.light);
1495 } 1495 }
1496 1496
1497 pd->data.light.light = light; 1497 pd->data.light.light = light;
1498 eo_ref(light); 1498 efl_ref(light);
1499 1499
1500 /* Register change notification on the light for this node. */ 1500 /* Register change notification on the light for this node. */
1501 evas_canvas3d_light_node_add(light, obj); 1501 evas_canvas3d_light_node_add(light, obj);
@@ -1542,7 +1542,7 @@ _evas_canvas3d_node_mesh_add(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas3D
1542 } 1542 }
1543 1543
1544 pd->data.mesh.meshes = eina_list_append(pd->data.mesh.meshes, mesh); 1544 pd->data.mesh.meshes = eina_list_append(pd->data.mesh.meshes, mesh);
1545 eo_ref(mesh); 1545 efl_ref(mesh);
1546 1546
1547 /* Register change notification. */ 1547 /* Register change notification. */
1548 evas_canvas3d_mesh_node_add(mesh, obj); 1548 evas_canvas3d_mesh_node_add(mesh, obj);
@@ -1569,7 +1569,7 @@ _evas_canvas3d_node_mesh_del(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas3D
1569 1569
1570 pd->data.mesh.meshes = eina_list_remove(pd->data.mesh.meshes, mesh); 1570 pd->data.mesh.meshes = eina_list_remove(pd->data.mesh.meshes, mesh);
1571 evas_canvas3d_mesh_node_del(mesh, obj); 1571 evas_canvas3d_mesh_node_del(mesh, obj);
1572 eo_unref(mesh); 1572 efl_unref(mesh);
1573 1573
1574 evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_MESH_GEOMETRY, NULL); 1574 evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_MESH_GEOMETRY, NULL);
1575 evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_MESH_MATERIAL, NULL); 1575 evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_MESH_MATERIAL, NULL);
diff --git a/src/lib/evas/canvas/evas_canvas3d_object.c b/src/lib/evas/canvas/evas_canvas3d_object.c
index 8f99115..9dde9f8 100644
--- a/src/lib/evas/canvas/evas_canvas3d_object.c
+++ b/src/lib/evas/canvas/evas_canvas3d_object.c
@@ -7,7 +7,7 @@ EOLIAN static Eo *
7_evas_canvas3d_object_efl_object_constructor(Eo *obj, Evas_Canvas3D_Object_Data *pd) 7_evas_canvas3d_object_efl_object_constructor(Eo *obj, Evas_Canvas3D_Object_Data *pd)
8{ 8{
9 Eo *e = NULL; 9 Eo *e = NULL;
10 obj = efl_constructor(eo_super(obj, MY_CLASS)); 10 obj = efl_constructor(efl_super(obj, MY_CLASS));
11 e = efl_parent_get(obj); 11 e = efl_parent_get(obj);
12 pd->evas = e; 12 pd->evas = e;
13 pd->type = EVAS_CANVAS3D_OBJECT_TYPE_INVALID; 13 pd->type = EVAS_CANVAS3D_OBJECT_TYPE_INVALID;
@@ -21,7 +21,7 @@ EOLIAN static Evas *
21{ 21{
22 if (klass == EVAS_CANVAS_CLASS) 22 if (klass == EVAS_CANVAS_CLASS)
23 return pd->evas; 23 return pd->evas;
24 return efl_provider_find(eo_super(obj, MY_CLASS), klass); 24 return efl_provider_find(efl_super(obj, MY_CLASS), klass);
25} 25}
26 26
27EOLIAN static void 27EOLIAN static void
@@ -76,7 +76,7 @@ _evas_canvas3d_object_efl_object_event_callback_priority_add(Eo *obj,
76{ 76{
77 Eina_Bool r = EINA_FALSE; 77 Eina_Bool r = EINA_FALSE;
78 78
79 r = efl_event_callback_priority_add(eo_super(obj, MY_CLASS), desc, priority, func, user_data); 79 r = efl_event_callback_priority_add(efl_super(obj, MY_CLASS), desc, priority, func, user_data);
80 evas_canvas3d_object_callback_register(obj, desc->name, user_data); 80 evas_canvas3d_object_callback_register(obj, desc->name, user_data);
81 81
82 return r; 82 return r;
@@ -89,7 +89,7 @@ _evas_canvas3d_object_efl_object_event_callback_del(Eo *obj, Evas_Canvas3D_Objec
89 const void *user_data) 89 const void *user_data)
90{ 90{
91 Eina_Bool r = EINA_FALSE; 91 Eina_Bool r = EINA_FALSE;
92 r = efl_event_callback_del(eo_super(obj, MY_CLASS), desc, func, user_data); 92 r = efl_event_callback_del(efl_super(obj, MY_CLASS), desc, func, user_data);
93 if (r) evas_canvas3d_object_callback_unregister(obj, desc->name); 93 if (r) evas_canvas3d_object_callback_unregister(obj, desc->name);
94 return r; 94 return r;
95} 95}
diff --git a/src/lib/evas/canvas/evas_canvas3d_primitive.c b/src/lib/evas/canvas/evas_canvas3d_primitive.c
index 07e63a8..bcfa90e 100644
--- a/src/lib/evas/canvas/evas_canvas3d_primitive.c
+++ b/src/lib/evas/canvas/evas_canvas3d_primitive.c
@@ -20,14 +20,14 @@ evas_canvas3d_primitive_add(Evas *e)
20 MAGIC_CHECK(e, Evas, MAGIC_EVAS); 20 MAGIC_CHECK(e, Evas, MAGIC_EVAS);
21 return NULL; 21 return NULL;
22 MAGIC_CHECK_END(); 22 MAGIC_CHECK_END();
23 Evas_Object *eo_obj = eo_add(MY_CLASS, e); 23 Evas_Object *eo_obj = efl_add(MY_CLASS, e);
24 return eo_obj; 24 return eo_obj;
25} 25}
26 26
27EOLIAN static Eo * 27EOLIAN static Eo *
28_evas_canvas3d_primitive_efl_object_constructor(Eo *obj, Evas_Canvas3D_Primitive_Data *pd) 28_evas_canvas3d_primitive_efl_object_constructor(Eo *obj, Evas_Canvas3D_Primitive_Data *pd)
29{ 29{
30 obj = efl_constructor(eo_super(obj, MY_CLASS)); 30 obj = efl_constructor(efl_super(obj, MY_CLASS));
31 evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_PRIMITIVE); 31 evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_PRIMITIVE);
32 _primitive_init(pd); 32 _primitive_init(pd);
33 33
@@ -37,7 +37,7 @@ _evas_canvas3d_primitive_efl_object_constructor(Eo *obj, Evas_Canvas3D_Primitive
37EOLIAN static void 37EOLIAN static void
38_evas_canvas3d_primitive_efl_object_destructor(Eo *obj, Evas_Canvas3D_Primitive_Data *pd EINA_UNUSED) 38_evas_canvas3d_primitive_efl_object_destructor(Eo *obj, Evas_Canvas3D_Primitive_Data *pd EINA_UNUSED)
39{ 39{
40 efl_destructor(eo_super(obj, MY_CLASS)); 40 efl_destructor(efl_super(obj, MY_CLASS));
41} 41}
42 42
43EOLIAN static void 43EOLIAN static void
diff --git a/src/lib/evas/canvas/evas_canvas3d_scene.c b/src/lib/evas/canvas/evas_canvas3d_scene.c
index 4e5cc39..f172188 100644
--- a/src/lib/evas/canvas/evas_canvas3d_scene.c
+++ b/src/lib/evas/canvas/evas_canvas3d_scene.c
@@ -37,7 +37,7 @@ _evas_canvas3d_scene_evas_canvas3d_object_change_notify(Eo *eo_obj EINA_UNUSED,
37 37
38 EINA_LIST_FOREACH(pd->images, l, eo) 38 EINA_LIST_FOREACH(pd->images, l, eo)
39 { 39 {
40 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS); 40 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS);
41 evas_object_change(eo, obj); 41 evas_object_change(eo, obj);
42 } 42 }
43} 43}
@@ -64,14 +64,14 @@ evas_canvas3d_scene_add(Evas *e)
64 MAGIC_CHECK(e, Evas, MAGIC_EVAS); 64 MAGIC_CHECK(e, Evas, MAGIC_EVAS);
65 return NULL; 65 return NULL;
66 MAGIC_CHECK_END(); 66 MAGIC_CHECK_END();
67 Evas_Object *eo_obj = eo_add(MY_CLASS, e); 67 Evas_Object *eo_obj = efl_add(MY_CLASS, e);
68 return eo_obj; 68 return eo_obj;
69} 69}
70 70
71EOLIAN static Eo * 71EOLIAN static Eo *
72_evas_canvas3d_scene_efl_object_constructor(Eo *obj, Evas_Canvas3D_Scene_Data *pd) 72_evas_canvas3d_scene_efl_object_constructor(Eo *obj, Evas_Canvas3D_Scene_Data *pd)
73{ 73{
74 obj = efl_constructor(eo_super(obj, MY_CLASS)); 74 obj = efl_constructor(efl_super(obj, MY_CLASS));
75 evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_SCENE); 75 evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_SCENE);
76 evas_color_set(&pd->bg_color, 0.0, 0.0, 0.0, 0.0); 76 evas_color_set(&pd->bg_color, 0.0, 0.0, 0.0, 0.0);
77 pd->shadows_enabled = EINA_FALSE; 77 pd->shadows_enabled = EINA_FALSE;
@@ -92,14 +92,14 @@ _evas_canvas3d_scene_root_node_set(Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_C
92 if (pd->root_node) 92 if (pd->root_node)
93 { 93 {
94 evas_canvas3d_node_scene_root_del(pd->root_node, obj); 94 evas_canvas3d_node_scene_root_del(pd->root_node, obj);
95 eo_unref(pd->root_node); 95 efl_unref(pd->root_node);
96 } 96 }
97 97
98 pd->root_node = node; 98 pd->root_node = node;
99 99
100 if (node) 100 if (node)
101 { 101 {
102 eo_ref(node); 102 efl_ref(node);
103 evas_canvas3d_node_scene_root_add(node, obj); 103 evas_canvas3d_node_scene_root_add(node, obj);
104 } 104 }
105 105
@@ -301,7 +301,7 @@ _pick_data_mesh_add(Evas_Canvas3D_Pick_Data *data, const Evas_Ray3 *ray,
301 301
302 evas_canvas3d_mesh_interpolate_vertex_buffer_get(mesh, frame, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 302 evas_canvas3d_mesh_interpolate_vertex_buffer_get(mesh, frame, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD,
303 &tex0, &tex1, &tex_weight); 303 &tex0, &tex1, &tex_weight);
304 Evas_Canvas3D_Mesh_Data *pdmesh = eo_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS); 304 Evas_Canvas3D_Mesh_Data *pdmesh = efl_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS);
305 if (pdmesh->indices) 305 if (pdmesh->indices)
306 { 306 {
307 unsigned int i0, i1, i2; 307 unsigned int i0, i1, i2;
@@ -561,7 +561,7 @@ _node_pick(Evas_Canvas3D_Node *node, void *data)
561 Evas_Ray3 ray; 561 Evas_Ray3 ray;
562 Evas_Canvas3D_Pick_Data *pick = (Evas_Canvas3D_Pick_Data *)data; 562 Evas_Canvas3D_Pick_Data *pick = (Evas_Canvas3D_Pick_Data *)data;
563 Eina_Matrix4 mvp; 563 Eina_Matrix4 mvp;
564 Evas_Canvas3D_Node_Data *pd_node = eo_data_scope_get(node, EVAS_CANVAS3D_NODE_CLASS); 564 Evas_Canvas3D_Node_Data *pd_node = efl_data_scope_get(node, EVAS_CANVAS3D_NODE_CLASS);
565 565
566 evas_canvas3d_node_tree_traverse(node, EVAS_CANVAS3D_TREE_TRAVERSE_POST_ORDER, EINA_FALSE, 566 evas_canvas3d_node_tree_traverse(node, EVAS_CANVAS3D_TREE_TRAVERSE_POST_ORDER, EINA_FALSE,
567 node_aabb_update, NULL); 567 node_aabb_update, NULL);
@@ -630,8 +630,8 @@ _evas_canvas3d_scene_pick(const Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_Real
630 Evas_Canvas3D_Node *picked_node = NULL; 630 Evas_Canvas3D_Node *picked_node = NULL;
631 const Efl_Event_Description *eo_desc = NULL; 631 const Efl_Event_Description *eo_desc = NULL;
632 632
633 pd_parent = eo_data_scope_get(obj, EVAS_CANVAS3D_OBJECT_CLASS); 633 pd_parent = efl_data_scope_get(obj, EVAS_CANVAS3D_OBJECT_CLASS);
634 e = eo_data_scope_get(pd_parent->evas, EVAS_CANVAS_CLASS); 634 e = efl_data_scope_get(pd_parent->evas, EVAS_CANVAS_CLASS);
635 635
636 _pick_data_init(&data, e, x, y); 636 _pick_data_init(&data, e, x, y);
637 px = round(x * pd->w / e->viewport.w); 637 px = round(x * pd->w / e->viewport.w);
@@ -704,8 +704,8 @@ _evas_canvas3d_scene_pick(const Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_Real
704 } 704 }
705 /* Update the scene graph. */ 705 /* Update the scene graph. */
706 evas_canvas3d_object_update((Eo *) obj); 706 evas_canvas3d_object_update((Eo *) obj);
707 pd_camera_node = eo_data_scope_get(pd->camera_node, EVAS_CANVAS3D_NODE_CLASS); 707 pd_camera_node = efl_data_scope_get(pd->camera_node, EVAS_CANVAS3D_NODE_CLASS);
708 pd_camera = eo_data_scope_get(pd_camera_node->data.camera.camera, EVAS_CANVAS3D_CAMERA_CLASS); 708 pd_camera = efl_data_scope_get(pd_camera_node->data.camera.camera, EVAS_CANVAS3D_CAMERA_CLASS);
709 eina_matrix4_multiply(&data.matrix_vp, 709 eina_matrix4_multiply(&data.matrix_vp,
710 &pd_camera->projection, 710 &pd_camera->projection,
711 &pd_camera_node->data.camera.matrix_world_to_eye); 711 &pd_camera_node->data.camera.matrix_world_to_eye);
@@ -740,15 +740,15 @@ _evas_canvas3d_scene_exist(const Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_Rea
740 Evas_Canvas3D_Object_Data *pd_parent; 740 Evas_Canvas3D_Object_Data *pd_parent;
741 Evas_Public_Data *e; 741 Evas_Public_Data *e;
742 742
743 pd_parent = eo_data_scope_get(obj, EVAS_CANVAS3D_OBJECT_CLASS); 743 pd_parent = efl_data_scope_get(obj, EVAS_CANVAS3D_OBJECT_CLASS);
744 e = eo_data_scope_get(pd_parent->evas, EVAS_CANVAS_CLASS); 744 e = efl_data_scope_get(pd_parent->evas, EVAS_CANVAS_CLASS);
745 745
746 _pick_data_init(&data, e, x, y); 746 _pick_data_init(&data, e, x, y);
747 747
748 /* Update the scene graph. */ 748 /* Update the scene graph. */
749 evas_canvas3d_object_update((Eo *) obj); 749 evas_canvas3d_object_update((Eo *) obj);
750 pd_camera_node = eo_data_scope_get(pd->camera_node, EVAS_CANVAS3D_NODE_CLASS); 750 pd_camera_node = efl_data_scope_get(pd->camera_node, EVAS_CANVAS3D_NODE_CLASS);
751 pd_camera = eo_data_scope_get(pd_camera_node->data.camera.camera, EVAS_CANVAS3D_CAMERA_CLASS); 751 pd_camera = efl_data_scope_get(pd_camera_node->data.camera.camera, EVAS_CANVAS3D_CAMERA_CLASS);
752 eina_matrix4_multiply(&data.matrix_vp, 752 eina_matrix4_multiply(&data.matrix_vp,
753 &pd_camera->projection, 753 &pd_camera->projection,
754 &pd_camera_node->data.camera.matrix_world_to_eye); 754 &pd_camera_node->data.camera.matrix_world_to_eye);
diff --git a/src/lib/evas/canvas/evas_canvas3d_texture.c b/src/lib/evas/canvas/evas_canvas3d_texture.c
index d27a803..0e152e7 100644
--- a/src/lib/evas/canvas/evas_canvas3d_texture.c
+++ b/src/lib/evas/canvas/evas_canvas3d_texture.c
@@ -6,7 +6,7 @@
6static inline void 6static inline void
7_texture_proxy_set(Evas_Canvas3D_Texture *texture, Evas_Object *eo_src, Evas_Object_Protected_Data *src) 7_texture_proxy_set(Evas_Canvas3D_Texture *texture, Evas_Object *eo_src, Evas_Object_Protected_Data *src)
8{ 8{
9 Evas_Canvas3D_Texture_Data *pd = eo_data_scope_get(texture, MY_CLASS); 9 Evas_Canvas3D_Texture_Data *pd = efl_data_scope_get(texture, MY_CLASS);
10 EINA_COW_WRITE_BEGIN(evas_object_proxy_cow, src->proxy, Evas_Object_Proxy_Data, proxy_src) 10 EINA_COW_WRITE_BEGIN(evas_object_proxy_cow, src->proxy, Evas_Object_Proxy_Data, proxy_src)
11 { 11 {
12 proxy_src->proxy_textures = eina_list_append(proxy_src->proxy_textures, texture); 12 proxy_src->proxy_textures = eina_list_append(proxy_src->proxy_textures, texture);
@@ -20,7 +20,7 @@ _texture_proxy_set(Evas_Canvas3D_Texture *texture, Evas_Object *eo_src, Evas_Obj
20static inline void 20static inline void
21_texture_proxy_unset(Evas_Canvas3D_Texture_Data *texture) 21_texture_proxy_unset(Evas_Canvas3D_Texture_Data *texture)
22{ 22{
23 Evas_Object_Protected_Data *src = eo_data_scope_get(texture->source, EFL_CANVAS_OBJECT_CLASS); 23 Evas_Object_Protected_Data *src = efl_data_scope_get(texture->source, EFL_CANVAS_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 {
@@ -55,8 +55,8 @@ _texture_proxy_subrender(Evas_Canvas3D_Texture *obj)
55 /* Code taken from _proxy_subrender() in file evas_object_image.c */ 55 /* Code taken from _proxy_subrender() in file evas_object_image.c */
56 Eo *evas = NULL; 56 Eo *evas = NULL;
57 evas = evas_object_evas_get(obj); 57 evas = evas_object_evas_get(obj);
58 Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); 58 Evas_Public_Data *e = efl_data_scope_get(evas, EVAS_CANVAS_CLASS);
59 Evas_Canvas3D_Texture_Data *pd = eo_data_scope_get(obj, MY_CLASS); 59 Evas_Canvas3D_Texture_Data *pd = efl_data_scope_get(obj, MY_CLASS);
60 Evas_Object_Protected_Data *source; 60 Evas_Object_Protected_Data *source;
61 void *ctx; 61 void *ctx;
62 int w, h; 62 int w, h;
@@ -67,9 +67,9 @@ _texture_proxy_subrender(Evas_Canvas3D_Texture *obj)
67 67
68 // TODO: replace this function by evas_render_proxy_subrender (as appropriate) 68 // TODO: replace this function by evas_render_proxy_subrender (as appropriate)
69 69
70 source = eo_data_scope_get(pd->source, EFL_CANVAS_OBJECT_CLASS); 70 source = efl_data_scope_get(pd->source, EFL_CANVAS_OBJECT_CLASS);
71 71
72 is_image = eo_isa(pd->source, EFL_CANVAS_IMAGE_INTERNAL_CLASS); 72 is_image = efl_isa(pd->source, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
73 73
74 EINA_COW_WRITE_BEGIN(evas_object_proxy_cow, source->proxy, Evas_Object_Proxy_Data, proxy_write) 74 EINA_COW_WRITE_BEGIN(evas_object_proxy_cow, source->proxy, Evas_Object_Proxy_Data, proxy_write)
75 { 75 {
@@ -166,11 +166,11 @@ _texture_fini(Evas_Canvas3D_Texture *obj)
166 Evas_Canvas3D_Material_Data *material = NULL; 166 Evas_Canvas3D_Material_Data *material = NULL;
167 167
168 evas = evas_object_evas_get(obj); 168 evas = evas_object_evas_get(obj);
169 Evas_Canvas3D_Texture_Data *pd = eo_data_scope_get(obj, MY_CLASS); 169 Evas_Canvas3D_Texture_Data *pd = efl_data_scope_get(obj, MY_CLASS);
170 170
171 if (pd->engine_data) 171 if (pd->engine_data)
172 { 172 {
173 Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); 173 Evas_Public_Data *e = efl_data_scope_get(evas, EVAS_CANVAS_CLASS);
174 if (e->engine.func->texture_free) 174 if (e->engine.func->texture_free)
175 e->engine.func->texture_free(e->engine.data.output, pd->engine_data); 175 e->engine.func->texture_free(e->engine.data.output, pd->engine_data);
176 pd->engine_data = NULL; 176 pd->engine_data = NULL;
@@ -181,7 +181,7 @@ _texture_fini(Evas_Canvas3D_Texture *obj)
181 it = eina_hash_iterator_key_new(pd->materials); 181 it = eina_hash_iterator_key_new(pd->materials);
182 EINA_ITERATOR_FOREACH(it, data) 182 EINA_ITERATOR_FOREACH(it, data)
183 { 183 {
184 material = eo_data_scope_get(data, EVAS_CANVAS3D_MATERIAL_CLASS); 184 material = efl_data_scope_get(data, EVAS_CANVAS3D_MATERIAL_CLASS);
185 if (!material) continue; 185 if (!material) continue;
186 for (i = 0; i < EVAS_CANVAS3D_MATERIAL_ATTRIB_COUNT; i++) 186 for (i = 0; i < EVAS_CANVAS3D_MATERIAL_ATTRIB_COUNT; i++)
187 { 187 {
@@ -225,8 +225,8 @@ _evas_canvas3d_texture_evas_canvas3d_object_update_notify(Eo *obj, Evas_Canvas3D
225 { 225 {
226 Eo *evas = NULL; 226 Eo *evas = NULL;
227 evas = evas_object_evas_get(obj); 227 evas = evas_object_evas_get(obj);
228 Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); 228 Evas_Public_Data *e = efl_data_scope_get(evas, EVAS_CANVAS_CLASS);
229 Evas_Object_Protected_Data *src = eo_data_scope_get(pd->source, EFL_CANVAS_OBJECT_CLASS); 229 Evas_Object_Protected_Data *src = efl_data_scope_get(pd->source, EFL_CANVAS_OBJECT_CLASS);
230 230
231 if (pd->engine_data == NULL) 231 if (pd->engine_data == NULL)
232 { 232 {
@@ -270,7 +270,7 @@ void
270evas_canvas3d_texture_material_add(Evas_Canvas3D_Texture *texture, Evas_Canvas3D_Material *material) 270evas_canvas3d_texture_material_add(Evas_Canvas3D_Texture *texture, Evas_Canvas3D_Material *material)
271{ 271{
272 int count = 0; 272 int count = 0;
273 Evas_Canvas3D_Texture_Data *pd = eo_data_scope_get(texture, MY_CLASS); 273 Evas_Canvas3D_Texture_Data *pd = efl_data_scope_get(texture, MY_CLASS);
274 if (pd->materials == NULL) 274 if (pd->materials == NULL)
275 { 275 {
276 pd->materials = eina_hash_pointer_new(NULL); 276 pd->materials = eina_hash_pointer_new(NULL);
@@ -292,7 +292,7 @@ void
292evas_canvas3d_texture_material_del(Evas_Canvas3D_Texture *texture, Evas_Canvas3D_Material *material) 292evas_canvas3d_texture_material_del(Evas_Canvas3D_Texture *texture, Evas_Canvas3D_Material *material)
293{ 293{
294 int count = 0; 294 int count = 0;
295 Evas_Canvas3D_Texture_Data *pd = eo_data_scope_get(texture, MY_CLASS); 295 Evas_Canvas3D_Texture_Data *pd = efl_data_scope_get(texture, MY_CLASS);
296 if (pd->materials == NULL) 296 if (pd->materials == NULL)
297 { 297 {
298 ERR("No material to delete."); 298 ERR("No material to delete.");
@@ -313,7 +313,7 @@ evas_canvas3d_texture_add(Evas *e)
313 MAGIC_CHECK(e, Evas, MAGIC_EVAS); 313 MAGIC_CHECK(e, Evas, MAGIC_EVAS);
314 return NULL; 314 return NULL;
315 MAGIC_CHECK_END(); 315 MAGIC_CHECK_END();
316 Evas_Object *eo_obj = eo_add(MY_CLASS, e); 316 Evas_Object *eo_obj = efl_add(MY_CLASS, e);
317 return eo_obj; 317 return eo_obj;
318} 318}
319 319
@@ -321,7 +321,7 @@ evas_canvas3d_texture_add(Evas *e)
321EOLIAN static Eo * 321EOLIAN static Eo *
322_evas_canvas3d_texture_efl_object_constructor(Eo *obj, Evas_Canvas3D_Texture_Data *pd EINA_UNUSED) 322_evas_canvas3d_texture_efl_object_constructor(Eo *obj, Evas_Canvas3D_Texture_Data *pd EINA_UNUSED)
323{ 323{
324 obj = efl_constructor(eo_super(obj, MY_CLASS)); 324 obj = efl_constructor(efl_super(obj, MY_CLASS));
325 pd->atlas_enable = EINA_TRUE; 325 pd->atlas_enable = EINA_TRUE;
326 326
327 evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_TEXTURE); 327 evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_TEXTURE);
@@ -333,7 +333,7 @@ EOLIAN static void
333_evas_canvas3d_texture_efl_object_destructor(Eo *obj, Evas_Canvas3D_Texture_Data *pd EINA_UNUSED) 333_evas_canvas3d_texture_efl_object_destructor(Eo *obj, Evas_Canvas3D_Texture_Data *pd EINA_UNUSED)
334{ 334{
335 _texture_fini(obj); 335 _texture_fini(obj);
336 efl_destructor(eo_super(obj, MY_CLASS)); 336 efl_destructor(efl_super(obj, MY_CLASS));
337} 337}
338 338
339EOLIAN static void 339EOLIAN static void
@@ -344,7 +344,7 @@ _evas_canvas3d_texture_data_set(Eo *obj, Evas_Canvas3D_Texture_Data *pd,
344 Eo *evas = NULL; 344 Eo *evas = NULL;
345 void *image = NULL; 345 void *image = NULL;
346 evas = evas_object_evas_get(obj); 346 evas = evas_object_evas_get(obj);
347 Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); 347 Evas_Public_Data *e = efl_data_scope_get(evas, EVAS_CANVAS_CLASS);
348 348
349 if (!pd->engine_data && e->engine.func->texture_new) 349 if (!pd->engine_data && e->engine.func->texture_new)
350 pd->engine_data = e->engine.func->texture_new(e->engine.data.output, pd->atlas_enable); 350 pd->engine_data = e->engine.func->texture_new(e->engine.data.output, pd->atlas_enable);
@@ -379,7 +379,7 @@ _evas_canvas3d_texture_file_set(Eo *obj, Evas_Canvas3D_Texture_Data *pd, const c
379 void *image; 379 void *image;
380 380
381 evas = evas_object_evas_get(obj); 381 evas = evas_object_evas_get(obj);
382 Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); 382 Evas_Public_Data *e = efl_data_scope_get(evas, EVAS_CANVAS_CLASS);
383 383
384 if (!pd->engine_data && e->engine.func->texture_new) 384 if (!pd->engine_data && e->engine.func->texture_new)
385 pd->engine_data = e->engine.func->texture_new(e->engine.data.output, pd->atlas_enable); 385 pd->engine_data = e->engine.func->texture_new(e->engine.data.output, pd->atlas_enable);
@@ -407,7 +407,7 @@ _evas_canvas3d_texture_source_set(Eo *obj , Evas_Canvas3D_Texture_Data *pd, Evas
407{ 407{
408 Eo *evas = NULL; 408 Eo *evas = NULL;
409 evas = evas_object_evas_get(obj); 409 evas = evas_object_evas_get(obj);
410 Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); 410 Evas_Public_Data *e = efl_data_scope_get(evas, EVAS_CANVAS_CLASS);
411 Evas_Object_Protected_Data *src; 411 Evas_Object_Protected_Data *src;
412 412
413 if (source == pd->source) 413 if (source == pd->source)
@@ -424,7 +424,7 @@ _evas_canvas3d_texture_source_set(Eo *obj , Evas_Canvas3D_Texture_Data *pd, Evas
424 return; 424 return;
425 } 425 }
426 426
427 src = eo_data_scope_get(source, EFL_CANVAS_OBJECT_CLASS); 427 src = efl_data_scope_get(source, EFL_CANVAS_OBJECT_CLASS);
428 428
429 if (src->delete_me) 429 if (src->delete_me)
430 { 430 {
@@ -452,7 +452,7 @@ _evas_canvas3d_texture_source_visible_set(Eo *obj EINA_UNUSED, Evas_Canvas3D_Tex
452 if (pd->source == NULL) 452 if (pd->source == NULL)
453 return; 453 return;
454 454
455 src_obj = eo_data_scope_get(pd->source, EFL_CANVAS_OBJECT_CLASS); 455 src_obj = efl_data_scope_get(pd->source, EFL_CANVAS_OBJECT_CLASS);
456 456
457 if (src_obj->proxy->src_invisible == !visible) 457 if (src_obj->proxy->src_invisible == !visible)
458 return; 458 return;
@@ -474,7 +474,7 @@ _evas_canvas3d_texture_source_visible_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Tex
474 if (pd->source == NULL) 474 if (pd->source == NULL)
475 return EINA_FALSE; 475 return EINA_FALSE;
476 476
477 src_obj = eo_data_scope_get(pd->source, EFL_CANVAS_OBJECT_CLASS); 477 src_obj = efl_data_scope_get(pd->source, EFL_CANVAS_OBJECT_CLASS);
478 return !src_obj->proxy->src_invisible; 478 return !src_obj->proxy->src_invisible;
479} 479}
480 480
@@ -484,7 +484,7 @@ _evas_canvas3d_texture_color_format_get(const Eo *obj EINA_UNUSED, Evas_Canvas3D
484 Evas_Colorspace format = -1; 484 Evas_Colorspace format = -1;
485 Eo *evas = NULL; 485 Eo *evas = NULL;
486 evas = evas_object_evas_get(obj); 486 evas = evas_object_evas_get(obj);
487 Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); 487 Evas_Public_Data *e = efl_data_scope_get(evas, EVAS_CANVAS_CLASS);
488 488
489 if (e->engine.func->image_colorspace_get && 489 if (e->engine.func->image_colorspace_get &&
490 e->engine.func->texture_image_get) 490 e->engine.func->texture_image_get)
@@ -503,7 +503,7 @@ _evas_canvas3d_texture_size_get(const Eo *obj, Evas_Canvas3D_Texture_Data *pd, i
503{ 503{
504 Eo *evas = NULL; 504 Eo *evas = NULL;
505 evas = evas_object_evas_get(obj); 505 evas = evas_object_evas_get(obj);
506 Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); 506 Evas_Public_Data *e = efl_data_scope_get(evas, EVAS_CANVAS_CLASS);
507 if (e->engine.func->texture_size_get) 507 if (e->engine.func->texture_size_get)
508 { 508 {
509 e->engine.func->texture_size_get(e->engine.data.output, 509 e->engine.func->texture_size_get(e->engine.data.output,
@@ -516,7 +516,7 @@ _evas_canvas3d_texture_wrap_set(Eo *obj, Evas_Canvas3D_Texture_Data *pd, Evas_Ca
516{ 516{
517 Eo *evas = NULL; 517 Eo *evas = NULL;
518 evas = evas_object_evas_get(obj); 518 evas = evas_object_evas_get(obj);
519 Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); 519 Evas_Public_Data *e = efl_data_scope_get(evas, EVAS_CANVAS_CLASS);
520 if (e->engine.func->texture_wrap_set) 520 if (e->engine.func->texture_wrap_set)
521 { 521 {
522 e->engine.func->texture_wrap_set(e->engine.data.output, 522 e->engine.func->texture_wrap_set(e->engine.data.output,
@@ -530,7 +530,7 @@ _evas_canvas3d_texture_wrap_get(Eo *obj, Evas_Canvas3D_Texture_Data *pd, Evas_Ca
530{ 530{
531 Eo *evas = NULL; 531 Eo *evas = NULL;
532 evas = evas_object_evas_get(obj); 532 evas = evas_object_evas_get(obj);
533 Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); 533 Evas_Public_Data *e = efl_data_scope_get(evas, EVAS_CANVAS_CLASS);
534 if (e->engine.func->texture_wrap_set) 534 if (e->engine.func->texture_wrap_set)
535 { 535 {
536 e->engine.func->texture_wrap_get(e->engine.data.output, 536 e->engine.func->texture_wrap_get(e->engine.data.output,
@@ -543,7 +543,7 @@ _evas_canvas3d_texture_filter_set(Eo *obj, Evas_Canvas3D_Texture_Data *pd, Evas_
543{ 543{
544 Eo *evas = NULL; 544 Eo *evas = NULL;
545 evas = evas_object_evas_get(obj); 545 evas = evas_object_evas_get(obj);
546 Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); 546 Evas_Public_Data *e = efl_data_scope_get(evas, EVAS_CANVAS_CLASS);
547 if (e->engine.func->texture_filter_set) 547 if (e->engine.func->texture_filter_set)
548 { 548 {
549 e->engine.func->texture_filter_set(e->engine.data.output, 549 e->engine.func->texture_filter_set(e->engine.data.output,
@@ -557,7 +557,7 @@ _evas_canvas3d_texture_filter_get(const Eo *obj EINA_UNUSED, Evas_Canvas3D_Textu
557{ 557{
558 Eo *evas = NULL; 558 Eo *evas = NULL;
559 evas = evas_object_evas_get(obj); 559 evas = evas_object_evas_get(obj);
560 Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); 560 Evas_Public_Data *e = efl_data_scope_get(evas, EVAS_CANVAS_CLASS);
561 if (e->engine.func->texture_filter_get) 561 if (e->engine.func->texture_filter_get)
562 { 562 {
563 e->engine.func->texture_filter_get(e->engine.data.output, 563 e->engine.func->texture_filter_get(e->engine.data.output,
diff --git a/src/lib/evas/canvas/evas_clip.c b/src/lib/evas/canvas/evas_clip.c
index dd26c28..cb79f32 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, EFL_CANVAS_OBJECT_CLASS); 181 efl_data_scope_get(obj->smart.parent, EFL_CANVAS_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 }
@@ -233,7 +233,7 @@ _efl_canvas_object_clip_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Ob
233 233
234 evas_object_async_block(obj); 234 evas_object_async_block(obj);
235 235
236 clip = eo_data_scope_get(eo_clip, EFL_CANVAS_OBJECT_CLASS); 236 clip = efl_data_scope_get(eo_clip, EFL_CANVAS_OBJECT_CLASS);
237 if (obj->cur->clipper && obj->cur->clipper->object == eo_clip) return; 237 if (obj->cur->clipper && obj->cur->clipper->object == eo_clip) return;
238 if (eo_obj == eo_clip) 238 if (eo_obj == eo_clip)
239 { 239 {
@@ -483,7 +483,7 @@ static void
483_clipper_del_cb(void *data, const Eo_Event *event) 483_clipper_del_cb(void *data, const Eo_Event *event)
484{ 484{
485 Evas_Object *eo_obj = data; 485 Evas_Object *eo_obj = data;
486 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 486 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
487 487
488 if (!obj) return; 488 if (!obj) return;
489 489
diff --git a/src/lib/evas/canvas/evas_device.c b/src/lib/evas/canvas/evas_device.c
index a0eb26f..0b9a438 100644
--- a/src/lib/evas/canvas/evas_device.c
+++ b/src/lib/evas/canvas/evas_device.c
@@ -42,12 +42,12 @@ evas_device_add(Evas *eo_e)
42 42
43 SAFETY_CHECK(eo_e, EVAS_CANVAS_CLASS, NULL); 43 SAFETY_CHECK(eo_e, EVAS_CANVAS_CLASS, NULL);
44 44
45 dev = eo_add(EFL_INPUT_DEVICE_CLASS, eo_e); 45 dev = efl_add(EFL_INPUT_DEVICE_CLASS, eo_e);
46 46
47 d = eo_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS); 47 d = efl_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS);
48 d->evas = eo_e; 48 d->evas = eo_e;
49 49
50 e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); 50 e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
51 e->devices = eina_list_append(e->devices, dev); 51 e->devices = eina_list_append(e->devices, dev);
52 efl_event_callback_add(dev, EFL_EVENT_DEL, _del_cb, e); 52 efl_event_callback_add(dev, EFL_EVENT_DEL, _del_cb, e);
53 53
@@ -61,7 +61,7 @@ evas_device_del(Evas_Device *dev)
61{ 61{
62 SAFETY_CHECK(dev, EFL_INPUT_DEVICE_CLASS); 62 SAFETY_CHECK(dev, EFL_INPUT_DEVICE_CLASS);
63 63
64 eo_unref(dev); 64 efl_unref(dev);
65} 65}
66 66
67EAPI void 67EAPI void
@@ -70,13 +70,13 @@ evas_device_push(Evas *eo_e, Evas_Device *dev)
70 SAFETY_CHECK(eo_e, EVAS_CANVAS_CLASS); 70 SAFETY_CHECK(eo_e, EVAS_CANVAS_CLASS);
71 SAFETY_CHECK(dev, EFL_INPUT_DEVICE_CLASS); 71 SAFETY_CHECK(dev, EFL_INPUT_DEVICE_CLASS);
72 72
73 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); 73 Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
74 if (!e->cur_device) 74 if (!e->cur_device)
75 { 75 {
76 e->cur_device = eina_array_new(4); 76 e->cur_device = eina_array_new(4);
77 if (!e->cur_device) return; 77 if (!e->cur_device) return;
78 } 78 }
79 eo_ref(dev); 79 efl_ref(dev);
80 eina_array_push(e->cur_device, dev); 80 eina_array_push(e->cur_device, dev);
81} 81}
82 82
@@ -87,9 +87,9 @@ evas_device_pop(Evas *eo_e)
87 87
88 SAFETY_CHECK(eo_e, EVAS_CANVAS_CLASS); 88 SAFETY_CHECK(eo_e, EVAS_CANVAS_CLASS);
89 89
90 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); 90 Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
91 dev = eina_array_pop(e->cur_device); 91 dev = eina_array_pop(e->cur_device);
92 if (dev) eo_unref(dev); 92 if (dev) efl_unref(dev);
93} 93}
94 94
95EAPI const Eina_List * 95EAPI const Eina_List *
@@ -101,11 +101,11 @@ evas_device_list(Evas *eo_e, const Evas_Device *dev)
101 { 101 {
102 SAFETY_CHECK(dev, EFL_INPUT_DEVICE_CLASS, NULL); 102 SAFETY_CHECK(dev, EFL_INPUT_DEVICE_CLASS, NULL);
103 103
104 Efl_Input_Device_Data *d = eo_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS); 104 Efl_Input_Device_Data *d = efl_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS);
105 return d->children; 105 return d->children;
106 } 106 }
107 107
108 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); 108 Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
109 return e->devices; 109 return e->devices;
110} 110}
111 111
@@ -114,7 +114,7 @@ evas_device_name_set(Evas_Device *dev, const char *name)
114{ 114{
115 SAFETY_CHECK(dev, EFL_INPUT_DEVICE_CLASS); 115 SAFETY_CHECK(dev, EFL_INPUT_DEVICE_CLASS);
116 116
117 Efl_Input_Device_Data *d = eo_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS); 117 Efl_Input_Device_Data *d = efl_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS);
118 118
119 efl_input_device_name_set(dev, name); 119 efl_input_device_name_set(dev, name);
120 evas_event_callback_call(d->evas, EVAS_CALLBACK_DEVICE_CHANGED, dev); 120 evas_event_callback_call(d->evas, EVAS_CALLBACK_DEVICE_CHANGED, dev);
@@ -133,7 +133,7 @@ evas_device_description_set(Evas_Device *dev, const char *desc)
133 133
134 efl_input_device_description_set(dev, desc); 134 efl_input_device_description_set(dev, desc);
135 135
136 Efl_Input_Device_Data *d = eo_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS); 136 Efl_Input_Device_Data *d = efl_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS);
137 evas_event_callback_call(d->evas, EVAS_CALLBACK_DEVICE_CHANGED, dev); 137 evas_event_callback_call(d->evas, EVAS_CALLBACK_DEVICE_CHANGED, dev);
138} 138}
139 139
@@ -148,8 +148,8 @@ evas_device_parent_set(Evas_Device *dev, Evas_Device *parent)
148{ 148{
149 SAFETY_CHECK(dev, EFL_INPUT_DEVICE_CLASS); 149 SAFETY_CHECK(dev, EFL_INPUT_DEVICE_CLASS);
150 150
151 Efl_Input_Device_Data *d = eo_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS); 151 Efl_Input_Device_Data *d = efl_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS);
152 Evas_Public_Data *e = eo_data_scope_get(d->evas, EVAS_CANVAS_CLASS); 152 Evas_Public_Data *e = efl_data_scope_get(d->evas, EVAS_CANVAS_CLASS);
153 if (parent) 153 if (parent)
154 { 154 {
155 SAFETY_CHECK(parent, EFL_INPUT_DEVICE_CLASS); 155 SAFETY_CHECK(parent, EFL_INPUT_DEVICE_CLASS);
@@ -159,7 +159,7 @@ evas_device_parent_set(Evas_Device *dev, Evas_Device *parent)
159 if (d->parent == parent) return; 159 if (d->parent == parent) return;
160 if (d->parent) 160 if (d->parent)
161 { 161 {
162 Efl_Input_Device_Data *p = eo_data_scope_get(d->parent, EFL_INPUT_DEVICE_CLASS); 162 Efl_Input_Device_Data *p = efl_data_scope_get(d->parent, EFL_INPUT_DEVICE_CLASS);
163 p->children = eina_list_remove(p->children, dev); 163 p->children = eina_list_remove(p->children, dev);
164 } 164 }
165 else if (parent) 165 else if (parent)
@@ -167,7 +167,7 @@ evas_device_parent_set(Evas_Device *dev, Evas_Device *parent)
167 d->parent = parent; 167 d->parent = parent;
168 if (parent) 168 if (parent)
169 { 169 {
170 Efl_Input_Device_Data *p = eo_data_scope_get(parent, EFL_INPUT_DEVICE_CLASS); 170 Efl_Input_Device_Data *p = efl_data_scope_get(parent, EFL_INPUT_DEVICE_CLASS);
171 p->children = eina_list_append(p->children, dev); 171 p->children = eina_list_append(p->children, dev);
172 } 172 }
173 else 173 else
@@ -187,7 +187,7 @@ evas_device_class_set(Evas_Device *dev, Evas_Device_Class clas)
187{ 187{
188 SAFETY_CHECK(dev, EFL_INPUT_DEVICE_CLASS); 188 SAFETY_CHECK(dev, EFL_INPUT_DEVICE_CLASS);
189 189
190 Efl_Input_Device_Data *d = eo_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS); 190 Efl_Input_Device_Data *d = efl_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS);
191 191
192 efl_input_device_type_set(dev, clas); 192 efl_input_device_type_set(dev, clas);
193 evas_event_callback_call(d->evas, EVAS_CALLBACK_DEVICE_CHANGED, dev); 193 evas_event_callback_call(d->evas, EVAS_CALLBACK_DEVICE_CHANGED, dev);
@@ -203,7 +203,7 @@ EAPI void
203evas_device_subclass_set(Evas_Device *dev, Evas_Device_Subclass clas) 203evas_device_subclass_set(Evas_Device *dev, Evas_Device_Subclass clas)
204{ 204{
205 SAFETY_CHECK(dev, EFL_INPUT_DEVICE_CLASS); 205 SAFETY_CHECK(dev, EFL_INPUT_DEVICE_CLASS);
206 Efl_Input_Device_Data *d = eo_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS); 206 Efl_Input_Device_Data *d = efl_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS);
207 207
208 efl_input_device_subtype_set(dev, clas); 208 efl_input_device_subtype_set(dev, clas);
209 evas_event_callback_call(d->evas, EVAS_CALLBACK_DEVICE_CHANGED, dev); 209 evas_event_callback_call(d->evas, EVAS_CALLBACK_DEVICE_CHANGED, dev);
@@ -219,7 +219,7 @@ EAPI void
219evas_device_emulation_source_set(Evas_Device *dev, Evas_Device *src) 219evas_device_emulation_source_set(Evas_Device *dev, Evas_Device *src)
220{ 220{
221 SAFETY_CHECK(dev, EFL_INPUT_DEVICE_CLASS); 221 SAFETY_CHECK(dev, EFL_INPUT_DEVICE_CLASS);
222 Efl_Input_Device_Data *d = eo_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS); 222 Efl_Input_Device_Data *d = efl_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS);
223 223
224 efl_input_device_source_set(dev, src); 224 efl_input_device_source_set(dev, src);
225 evas_event_callback_call(d->evas, EVAS_CALLBACK_DEVICE_CHANGED, dev); 225 evas_event_callback_call(d->evas, EVAS_CALLBACK_DEVICE_CHANGED, dev);
@@ -236,11 +236,11 @@ _evas_device_cleanup(Evas *eo_e)
236{ 236{
237 Evas_Device *dev; 237 Evas_Device *dev;
238 238
239 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); 239 Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
240 if (e->cur_device) 240 if (e->cur_device)
241 { 241 {
242 while ((dev = eina_array_pop(e->cur_device))) 242 while ((dev = eina_array_pop(e->cur_device)))
243 eo_unref(dev); 243 efl_unref(dev);
244 eina_array_free(e->cur_device); 244 eina_array_free(e->cur_device);
245 e->cur_device = NULL; 245 e->cur_device = NULL;
246 } 246 }
@@ -255,7 +255,7 @@ _evas_device_top_get(const Evas *eo_e)
255{ 255{
256 int num; 256 int num;
257 257
258 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); 258 Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
259 if (!e->cur_device) return NULL; 259 if (!e->cur_device) return NULL;
260 num = eina_array_count(e->cur_device); 260 num = eina_array_count(e->cur_device);
261 if (num < 1) return NULL; 261 if (num < 1) return NULL;
diff --git a/src/lib/evas/canvas/evas_events.c b/src/lib/evas/canvas/evas_events.c
index 67d4ed9..c0b5348 100644
--- a/src/lib/evas/canvas/evas_events.c
+++ b/src/lib/evas/canvas/evas_events.c
@@ -31,7 +31,7 @@ _evas_event_havemap_adjust(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Protecte
31{ 31{
32 if (obj->smart.parent) 32 if (obj->smart.parent)
33 { 33 {
34 Evas_Object_Protected_Data *smart_parent_obj = eo_data_scope_get(obj->smart.parent, EFL_CANVAS_OBJECT_CLASS); 34 Evas_Object_Protected_Data *smart_parent_obj = efl_data_scope_get(obj->smart.parent, EFL_CANVAS_OBJECT_CLASS);
35 _evas_event_havemap_adjust(obj->smart.parent, smart_parent_obj, x, y, mouse_grabbed); 35 _evas_event_havemap_adjust(obj->smart.parent, smart_parent_obj, x, y, mouse_grabbed);
36 } 36 }
37 37
@@ -132,7 +132,7 @@ _efl_event_desc_get(Evas_Callback_Type type)
132 if (_info_pflags) *_info_pflags = efl_event_flags_get(_eoev); \ 132 if (_info_pflags) *_info_pflags = efl_event_flags_get(_eoev); \
133 } while (0) 133 } while (0)
134#define EV_RESET(a) do { if (a) efl_event_reset(a); } while (0) 134#define EV_RESET(a) do { if (a) efl_event_reset(a); } while (0)
135#define EV_DEL(a) do { if (a) { eo_unref(a); } a = NULL; } while (0) 135#define EV_DEL(a) do { if (a) { efl_unref(a); } a = NULL; } while (0)
136 136
137#if 0 137#if 0
138# define DDD_DO 1 138# define DDD_DO 1
@@ -456,10 +456,10 @@ _evas_event_source_mouse_down_events(Evas_Object *eo_obj, Evas *eo_e,
456 Evas_Event_Mouse_Down *ev, int event_id, 456 Evas_Event_Mouse_Down *ev, int event_id,
457 Efl_Event_Pointer *parent_pe) 457 Efl_Event_Pointer *parent_pe)
458{ 458{
459 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 459 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
460 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); 460 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
461 Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS); 461 Evas_Object_Protected_Data *src = efl_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
462 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); 462 Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
463 Evas_Coord_Point canvas = ev->canvas; 463 Evas_Coord_Point canvas = ev->canvas;
464 Evas_Object_Protected_Data *child; 464 Evas_Object_Protected_Data *child;
465 Efl_Event_Pointer *pe = NULL; 465 Efl_Event_Pointer *pe = NULL;
@@ -497,7 +497,7 @@ _evas_event_source_mouse_down_events(Evas_Object *eo_obj, Evas *eo_e,
497 497
498 EINA_LIST_FOREACH(src->proxy->src_event_in, l, eo_child) 498 EINA_LIST_FOREACH(src->proxy->src_event_in, l, eo_child)
499 { 499 {
500 child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS); 500 child = efl_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
501 if ((child->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) || 501 if ((child->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) ||
502 (child->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN)) 502 (child->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN))
503 { 503 {
@@ -516,7 +516,7 @@ _evas_event_source_mouse_down_events(Evas_Object *eo_obj, Evas *eo_e,
516 copy = evas_event_list_copy(src->proxy->src_event_in); 516 copy = evas_event_list_copy(src->proxy->src_event_in);
517 EINA_LIST_FOREACH(copy, l, eo_child) 517 EINA_LIST_FOREACH(copy, l, eo_child)
518 { 518 {
519 child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS); 519 child = efl_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
520 ev->canvas = point; 520 ev->canvas = point;
521 _evas_event_havemap_adjust(eo_child, child, &ev->canvas.x, 521 _evas_event_havemap_adjust(eo_child, child, &ev->canvas.x,
522 &ev->canvas.y, 522 &ev->canvas.y,
@@ -536,10 +536,10 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e,
536 Evas_Event_Mouse_Move *ev, int event_id, 536 Evas_Event_Mouse_Move *ev, int event_id,
537 Efl_Event_Pointer *parent_pe) 537 Efl_Event_Pointer *parent_pe)
538{ 538{
539 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 539 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
540 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); 540 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
541 Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS); 541 Evas_Object_Protected_Data *src = efl_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
542 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); 542 Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
543 Evas_Coord_Point canvas = ev->cur.canvas; 543 Evas_Coord_Point canvas = ev->cur.canvas;
544 Efl_Event_Pointer *pe = NULL; 544 Efl_Event_Pointer *pe = NULL;
545 545
@@ -561,7 +561,7 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e,
561 Eina_List *copy = evas_event_list_copy(src->proxy->src_event_in); 561 Eina_List *copy = evas_event_list_copy(src->proxy->src_event_in);
562 EINA_LIST_FOREACH(copy, l, eo_child) 562 EINA_LIST_FOREACH(copy, l, eo_child)
563 { 563 {
564 child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS); 564 child = efl_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
565 565
566 if ((evas_object_clippers_is_visible(eo_child, child) || 566 if ((evas_object_clippers_is_visible(eo_child, child) ||
567 child->mouse_grabbed) && 567 child->mouse_grabbed) &&
@@ -587,7 +587,7 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e,
587 { 587 {
588 eo_child = outs->data; 588 eo_child = outs->data;
589 outs = eina_list_remove(outs, eo_child); 589 outs = eina_list_remove(outs, eo_child);
590 child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS); 590 child = efl_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
591 if ((child->mouse_grabbed == 0) && (!e->delete_me)) 591 if ((child->mouse_grabbed == 0) && (!e->delete_me))
592 { 592 {
593 if (child->mouse_in) continue; 593 if (child->mouse_in) continue;
@@ -621,7 +621,7 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e,
621 621
622 EINA_LIST_FOREACH(copy, l, eo_child) 622 EINA_LIST_FOREACH(copy, l, eo_child)
623 { 623 {
624 child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS); 624 child = efl_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
625 625
626 ev->cur.canvas = point; 626 ev->cur.canvas = point;
627 627
@@ -667,7 +667,7 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e,
667 int event_id2 = _evas_event_counter; 667 int event_id2 = _evas_event_counter;
668 EINA_LIST_FOREACH(ins, l, eo_child) 668 EINA_LIST_FOREACH(ins, l, eo_child)
669 { 669 {
670 child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS); 670 child = efl_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
671 if (!eina_list_data_find(src->proxy->src_event_in, eo_child)) 671 if (!eina_list_data_find(src->proxy->src_event_in, eo_child))
672 { 672 {
673 if (!child->mouse_in) 673 if (!child->mouse_in)
@@ -709,10 +709,10 @@ _evas_event_source_mouse_up_events(Evas_Object *eo_obj, Evas *eo_e,
709 Evas_Event_Mouse_Up *ev, int event_id, 709 Evas_Event_Mouse_Up *ev, int event_id,
710 Efl_Event_Pointer *parent_pe) 710 Efl_Event_Pointer *parent_pe)
711{ 711{
712 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 712 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
713 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); 713 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
714 Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS); 714 Evas_Object_Protected_Data *src = efl_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
715 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); 715 Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
716 Evas_Coord_Point canvas = ev->canvas; 716 Evas_Coord_Point canvas = ev->canvas;
717 Efl_Event_Pointer *pe = NULL; 717 Efl_Event_Pointer *pe = NULL;
718 718
@@ -731,7 +731,7 @@ _evas_event_source_mouse_up_events(Evas_Object *eo_obj, Evas *eo_e,
731 EINA_LIST_FOREACH(copy, l, eo_child) 731 EINA_LIST_FOREACH(copy, l, eo_child)
732 { 732 {
733 if (src->delete_me) break; 733 if (src->delete_me) break;
734 child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS); 734 child = efl_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
735 if (((child->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) || 735 if (((child->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) ||
736 (child->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN)) || 736 (child->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN)) ||
737 (child->mouse_grabbed > 0)) 737 (child->mouse_grabbed > 0))
@@ -764,9 +764,9 @@ static void
764_evas_event_source_hold_events(Evas_Object *eo_obj, Evas *eo_e EINA_UNUSED, void *ev, 764_evas_event_source_hold_events(Evas_Object *eo_obj, Evas *eo_e EINA_UNUSED, void *ev,
765 int event_id, Efl_Event_Hold *parent_he) 765 int event_id, Efl_Event_Hold *parent_he)
766{ 766{
767 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 767 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
768 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); 768 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
769 Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS); 769 Evas_Object_Protected_Data *src = efl_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
770 Evas_Object_Protected_Data *child; 770 Evas_Object_Protected_Data *child;
771 Efl_Event_Hold *he = NULL; 771 Efl_Event_Hold *he = NULL;
772 Evas_Object *eo_child; 772 Evas_Object *eo_child;
@@ -777,7 +777,7 @@ _evas_event_source_hold_events(Evas_Object *eo_obj, Evas *eo_e EINA_UNUSED, void
777 EINA_LIST_FOREACH(src->proxy->src_event_in, l, eo_child) 777 EINA_LIST_FOREACH(src->proxy->src_event_in, l, eo_child)
778 { 778 {
779 if (src->delete_me) return; 779 if (src->delete_me) return;
780 child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS); 780 child = efl_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
781 EV_CALL(eo_child, child, EVAS_CALLBACK_HOLD, ev, event_id, he, parent_he); 781 EV_CALL(eo_child, child, EVAS_CALLBACK_HOLD, ev, event_id, he, parent_he);
782 if (src->layer->evas->delete_me) break; 782 if (src->layer->evas->delete_me) break;
783 } 783 }
@@ -790,10 +790,10 @@ _evas_event_source_wheel_events(Evas_Object *eo_obj, Evas *eo_e,
790 Evas_Event_Mouse_Wheel *ev, int event_id, 790 Evas_Event_Mouse_Wheel *ev, int event_id,
791 Efl_Event_Pointer *parent_pe) 791 Efl_Event_Pointer *parent_pe)
792{ 792{
793 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 793 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
794 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); 794 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
795 Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS); 795 Evas_Object_Protected_Data *src = efl_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
796 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); 796 Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
797 Evas_Coord_Point canvas = ev->canvas; 797 Evas_Coord_Point canvas = ev->canvas;
798 Efl_Event_Pointer *pe = NULL; 798 Efl_Event_Pointer *pe = NULL;
799 799
@@ -810,7 +810,7 @@ _evas_event_source_wheel_events(Evas_Object *eo_obj, Evas *eo_e,
810 EINA_LIST_FOREACH(copy, l, eo_child) 810 EINA_LIST_FOREACH(copy, l, eo_child)
811 { 811 {
812 if (src->delete_me) return; 812 if (src->delete_me) return;
813 child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS); 813 child = efl_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
814 ev->canvas = point; 814 ev->canvas = point;
815 _evas_event_havemap_adjust(eo_child, child, 815 _evas_event_havemap_adjust(eo_child, child,
816 &ev->canvas.x, 816 &ev->canvas.x,
@@ -829,10 +829,10 @@ _evas_event_source_multi_down_events(Evas_Object *eo_obj, Evas *eo_e,
829 Evas_Event_Multi_Down *ev, int event_id, 829 Evas_Event_Multi_Down *ev, int event_id,
830 Efl_Event_Pointer *parent_pe) 830 Efl_Event_Pointer *parent_pe)
831{ 831{
832 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 832 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
833 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); 833 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
834 Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS); 834 Evas_Object_Protected_Data *src = efl_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
835 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); 835 Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
836 Evas_Coord_Precision_Point canvas = ev->canvas; 836 Evas_Coord_Precision_Point canvas = ev->canvas;
837 Efl_Event_Pointer *pe = NULL; 837 Efl_Event_Pointer *pe = NULL;
838 838
@@ -850,7 +850,7 @@ _evas_event_source_multi_down_events(Evas_Object *eo_obj, Evas *eo_e,
850 850
851 EINA_LIST_FOREACH(src->proxy->src_event_in, l, eo_child) 851 EINA_LIST_FOREACH(src->proxy->src_event_in, l, eo_child)
852 { 852 {
853 child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS); 853 child = efl_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
854 if (child->pointer_mode != EVAS_OBJECT_POINTER_MODE_NOGRAB) 854 if (child->pointer_mode != EVAS_OBJECT_POINTER_MODE_NOGRAB)
855 { 855 {
856 child->mouse_grabbed += (addgrab + 1); 856 child->mouse_grabbed += (addgrab + 1);
@@ -868,7 +868,7 @@ _evas_event_source_multi_down_events(Evas_Object *eo_obj, Evas *eo_e,
868 &ev->canvas.x, 868 &ev->canvas.x,
869 &ev->canvas.y, 869 &ev->canvas.y,
870 child->mouse_grabbed); 870 child->mouse_grabbed);
871 child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS); 871 child = efl_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
872 EV_CALL(eo_child, child, EVAS_CALLBACK_MULTI_DOWN, ev, event_id, pe, parent_pe); 872 EV_CALL(eo_child, child, EVAS_CALLBACK_MULTI_DOWN, ev, event_id, pe, parent_pe);
873 if (e->delete_me) break; 873 if (e->delete_me) break;
874 } 874 }
@@ -883,10 +883,10 @@ _evas_event_source_multi_up_events(Evas_Object *eo_obj, Evas *eo_e,
883 Evas_Event_Multi_Up *ev, int event_id, 883 Evas_Event_Multi_Up *ev, int event_id,
884 Efl_Event_Pointer *parent_pe) 884 Efl_Event_Pointer *parent_pe)
885{ 885{
886 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 886 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
887 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); 887 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
888 Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS); 888 Evas_Object_Protected_Data *src = efl_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
889 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); 889 Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
890 Evas_Coord_Precision_Point canvas = ev->canvas; 890 Evas_Coord_Precision_Point canvas = ev->canvas;
891 Efl_Event_Pointer *pe = NULL; 891 Efl_Event_Pointer *pe = NULL;
892 892
@@ -905,7 +905,7 @@ _evas_event_source_multi_up_events(Evas_Object *eo_obj, Evas *eo_e,
905 EINA_LIST_FOREACH(copy, l, eo_child) 905 EINA_LIST_FOREACH(copy, l, eo_child)
906 { 906 {
907 ev->canvas = point; 907 ev->canvas = point;
908 child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS); 908 child = efl_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
909 if (((child->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) || 909 if (((child->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) ||
910 (child->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN)) || 910 (child->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN)) ||
911 (child->mouse_grabbed > 0)) 911 (child->mouse_grabbed > 0))
@@ -931,10 +931,10 @@ _evas_event_source_multi_move_events(Evas_Object *eo_obj, Evas *eo_e,
931 Evas_Event_Multi_Move *ev, int event_id, 931 Evas_Event_Multi_Move *ev, int event_id,
932 Efl_Event_Pointer *parent_pe) 932 Efl_Event_Pointer *parent_pe)
933{ 933{
934 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 934 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
935 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); 935 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
936 Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS); 936 Evas_Object_Protected_Data *src = efl_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
937 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); 937 Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
938 Evas_Coord_Precision_Point canvas = ev->cur.canvas; 938 Evas_Coord_Precision_Point canvas = ev->cur.canvas;
939 Efl_Event_Pointer *pe = NULL; 939 Efl_Event_Pointer *pe = NULL;
940 940
@@ -957,7 +957,7 @@ _evas_event_source_multi_move_events(Evas_Object *eo_obj, Evas *eo_e,
957 Eina_List *copy = evas_event_list_copy(src->proxy->src_event_in); 957 Eina_List *copy = evas_event_list_copy(src->proxy->src_event_in);
958 EINA_LIST_FOREACH(copy, l, eo_child) 958 EINA_LIST_FOREACH(copy, l, eo_child)
959 { 959 {
960 child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS); 960 child = efl_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
961 if (((evas_object_clippers_is_visible(eo_child, child)) || 961 if (((evas_object_clippers_is_visible(eo_child, child)) ||
962 ((child->mouse_grabbed) && 962 ((child->mouse_grabbed) &&
963 (!evas_event_passes_through(eo_child, child)) && 963 (!evas_event_passes_through(eo_child, child)) &&
@@ -969,7 +969,7 @@ _evas_event_source_multi_move_events(Evas_Object *eo_obj, Evas *eo_e,
969 &ev->cur.canvas.x, 969 &ev->cur.canvas.x,
970 &ev->cur.canvas.y, 970 &ev->cur.canvas.y,
971 child->mouse_grabbed); 971 child->mouse_grabbed);
972 child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS); 972 child = efl_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
973 EV_CALL(eo_child, child, EVAS_CALLBACK_MULTI_MOVE, ev, event_id, pe, parent_pe); 973 EV_CALL(eo_child, child, EVAS_CALLBACK_MULTI_MOVE, ev, event_id, pe, parent_pe);
974 if (e->delete_me || e->is_frozen) break; 974 if (e->delete_me || e->is_frozen) break;
975 } 975 }
@@ -990,7 +990,7 @@ _evas_event_source_multi_move_events(Evas_Object *eo_obj, Evas *eo_e,
990 Eina_List *copy = evas_event_list_copy(src->proxy->src_event_in); 990 Eina_List *copy = evas_event_list_copy(src->proxy->src_event_in);
991 EINA_LIST_FOREACH(copy, l, eo_child) 991 EINA_LIST_FOREACH(copy, l, eo_child)
992 { 992 {
993 child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS); 993 child = efl_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
994 ev->cur.canvas = point; 994 ev->cur.canvas = point;
995 995
996 if (evas_object_is_in_output_rect(eo_child, child, 996 if (evas_object_is_in_output_rect(eo_child, child,
@@ -1010,7 +1010,7 @@ _evas_event_source_multi_move_events(Evas_Object *eo_obj, Evas *eo_e,
1010 &ev->cur.canvas.x, 1010 &ev->cur.canvas.x,
1011 &ev->cur.canvas.y, 1011 &ev->cur.canvas.y,
1012 child->mouse_grabbed); 1012 child->mouse_grabbed);
1013 child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS); 1013 child = efl_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS);
1014 EV_CALL(eo_child, child, EVAS_CALLBACK_MULTI_MOVE, ev, event_id, pe, parent_pe); 1014 EV_CALL(eo_child, child, EVAS_CALLBACK_MULTI_MOVE, ev, event_id, pe, parent_pe);
1015 if (e->delete_me || e->is_frozen) break; 1015 if (e->delete_me || e->is_frozen) break;
1016 } 1016 }
@@ -1038,10 +1038,10 @@ _evas_event_source_mouse_in_events(Evas_Object *eo_obj, Evas *eo_e,
1038 Evas_Event_Mouse_In *ev, int event_id, 1038 Evas_Event_Mouse_In *ev, int event_id,
1039 Efl_Event_Pointer *parent_pe) 1039 Efl_Event_Pointer *parent_pe)
1040{ 1040{
1041 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 1041 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
1042 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); 1042 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
1043 Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS); 1043 Evas_Object_Protected_Data *src = efl_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
1044 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); 1044 Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
1045 Evas_Coord_Point canvas = ev->canvas; 1045 Evas_Coord_Point canvas = ev->canvas;
1046 Efl_Event_Pointer *pe = NULL; 1046 Efl_Event_Pointer *pe = NULL;
1047 Evas_Object *eo_child; 1047 Evas_Object *eo_child;
@@ -1067,7 +1067,7 @@ _evas_event_source_mouse_in_events(Evas_Object *eo_obj, Evas *eo_e,
1067 point = ev->canvas; 1067 point = ev->canvas;
1068 EINA_LIST_FOREACH(ins, l, eo_child) 1068 EINA_LIST_FOREACH(ins, l, eo_child)
1069 { 1069 {
1070 Evas_Object_Protected_Data *child = eo_data_scope_get(eo_child, 1070 Evas_Object_Protected_Data *child = efl_data_scope_get(eo_child,
1071 EFL_CANVAS_OBJECT_CLASS); 1071 EFL_CANVAS_OBJECT_CLASS);
1072 if (!eina_list_data_find(src->proxy->src_event_in, eo_child)) 1072 if (!eina_list_data_find(src->proxy->src_event_in, eo_child))
1073 { 1073 {
@@ -1100,10 +1100,10 @@ _evas_event_source_mouse_out_events(Evas_Object *eo_obj, Evas *eo_e,
1100 Evas_Event_Mouse_Out *ev, int event_id, 1100 Evas_Event_Mouse_Out *ev, int event_id,
1101 Efl_Event_Pointer *parent_pe) 1101 Efl_Event_Pointer *parent_pe)
1102{ 1102{
1103 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 1103 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
1104 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); 1104 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
1105 Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS); 1105 Evas_Object_Protected_Data *src = efl_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
1106 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); 1106 Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
1107 Evas_Coord_Point canvas = ev->canvas; 1107 Evas_Coord_Point canvas = ev->canvas;
1108 Efl_Event_Pointer *pe = NULL; 1108 Efl_Event_Pointer *pe = NULL;
1109 Evas_Object *eo_child; 1109 Evas_Object *eo_child;
@@ -1122,7 +1122,7 @@ _evas_event_source_mouse_out_events(Evas_Object *eo_obj, Evas *eo_e,
1122 1122
1123 EINA_LIST_FOREACH(copy, l, eo_child) 1123 EINA_LIST_FOREACH(copy, l, eo_child)
1124 { 1124 {
1125 Evas_Object_Protected_Data *child = eo_data_scope_get(eo_child, 1125 Evas_Object_Protected_Data *child = efl_data_scope_get(eo_child,
1126 EFL_CANVAS_OBJECT_CLASS); 1126 EFL_CANVAS_OBJECT_CLASS);
1127 if (!child->mouse_in) continue; 1127 if (!child->mouse_in) continue;
1128 child->mouse_in = 0; 1128 child->mouse_in = 0;
@@ -1160,7 +1160,7 @@ _evas_event_object_list_in_get(Evas *eo_e, Eina_List *in,
1160static Eina_List * 1160static Eina_List *
1161_evas_event_objects_event_list_no_frozen_check(Evas *eo_e, Evas_Object *stop, int x, int y) 1161_evas_event_objects_event_list_no_frozen_check(Evas *eo_e, Evas_Object *stop, int x, int y)
1162{ 1162{
1163 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); 1163 Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
1164 Evas_Layer *lay; 1164 Evas_Layer *lay;
1165 Eina_List *in = NULL; 1165 Eina_List *in = NULL;
1166 1166
@@ -1188,7 +1188,7 @@ _evas_canvas_tree_objects_at_xy_get(Eo *eo_e, Evas_Public_Data *e EINA_UNUSED, E
1188Eina_List * 1188Eina_List *
1189evas_event_objects_event_list(Evas *eo_e, Evas_Object *stop, int x, int y) 1189evas_event_objects_event_list(Evas *eo_e, Evas_Object *stop, int x, int y)
1190{ 1190{
1191 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); 1191 Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
1192 1192
1193 if ((!e->layers) || (e->is_frozen)) return NULL; 1193 if ((!e->layers) || (e->is_frozen)) return NULL;
1194 D("------------------------------GET EVETNS AT ............... %i %i\n", x, y); 1194 D("------------------------------GET EVETNS AT ............... %i %i\n", x, y);
@@ -1247,7 +1247,7 @@ evas_event_thaw(Evas *eo_e)
1247EOLIAN void 1247EOLIAN void
1248_evas_canvas_efl_object_event_freeze(Eo *eo_e, Evas_Public_Data *e) 1248_evas_canvas_efl_object_event_freeze(Eo *eo_e, Evas_Public_Data *e)
1249{ 1249{
1250 efl_event_freeze(eo_super(eo_e, EVAS_CANVAS_CLASS)); 1250 efl_event_freeze(efl_super(eo_e, EVAS_CANVAS_CLASS));
1251 e->is_frozen = EINA_TRUE; 1251 e->is_frozen = EINA_TRUE;
1252} 1252}
1253 1253
@@ -1255,8 +1255,8 @@ EOLIAN void
1255_evas_canvas_efl_object_event_thaw(Eo *eo_e, Evas_Public_Data *e) 1255_evas_canvas_efl_object_event_thaw(Eo *eo_e, Evas_Public_Data *e)
1256{ 1256{
1257 int fcount = -1; 1257 int fcount = -1;
1258 efl_event_thaw(eo_super(eo_e, EVAS_CANVAS_CLASS)); 1258 efl_event_thaw(efl_super(eo_e, EVAS_CANVAS_CLASS));
1259 fcount = efl_event_freeze_count_get(eo_super(eo_e, EVAS_CANVAS_CLASS)); 1259 fcount = efl_event_freeze_count_get(efl_super(eo_e, EVAS_CANVAS_CLASS));
1260 if (0 == fcount) 1260 if (0 == fcount)
1261 { 1261 {
1262 Evas_Layer *lay; 1262 Evas_Layer *lay;
@@ -1294,7 +1294,7 @@ evas_event_thaw_eval(Evas *eo_e)
1294 MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS); 1294 MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS);
1295 return; 1295 return;
1296 MAGIC_CHECK_END(); 1296 MAGIC_CHECK_END();
1297 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); 1297 Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
1298 if (0 == evas_event_freeze_get(eo_e)) 1298 if (0 == evas_event_freeze_get(eo_e))
1299 { 1299 {
1300 _canvas_event_thaw_eval_internal(eo_e, e); 1300 _canvas_event_thaw_eval_internal(eo_e, e);
@@ -1306,7 +1306,7 @@ _canvas_event_feed_mouse_down_internal(Eo *eo_e, int b, Evas_Button_Flags flags,
1306 unsigned int timestamp, const void *data, 1306 unsigned int timestamp, const void *data,
1307 Efl_Event_Pointer *parent_pe) 1307 Efl_Event_Pointer *parent_pe)
1308{ 1308{
1309 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); 1309 Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
1310 Efl_Event_Pointer *pe = NULL; 1310 Efl_Event_Pointer *pe = NULL;
1311 Eina_List *l, *copy; 1311 Eina_List *l, *copy;
1312 Evas_Event_Mouse_Down ev; 1312 Evas_Event_Mouse_Down ev;
@@ -1338,7 +1338,7 @@ _canvas_event_feed_mouse_down_internal(Eo *eo_e, int b, Evas_Button_Flags flags,
1338 ev.timestamp = timestamp; 1338 ev.timestamp = timestamp;
1339 ev.event_flags = e->default_event_flags; 1339 ev.event_flags = e->default_event_flags;
1340 ev.dev = _evas_device_top_get(eo_e); 1340 ev.dev = _evas_device_top_get(eo_e);
1341 if (ev.dev) eo_ref(ev.dev); 1341 if (ev.dev) efl_ref(ev.dev);
1342 1342
1343 _evas_walk(e); 1343 _evas_walk(e);
1344 /* append new touch point to the touch point list */ 1344 /* append new touch point to the touch point list */
@@ -1362,7 +1362,7 @@ _canvas_event_feed_mouse_down_internal(Eo *eo_e, int b, Evas_Button_Flags flags,
1362 copy = evas_event_list_copy(e->pointer.object.in); 1362 copy = evas_event_list_copy(e->pointer.object.in);
1363 EINA_LIST_FOREACH(copy, l, eo_obj) 1363 EINA_LIST_FOREACH(copy, l, eo_obj)
1364 { 1364 {
1365 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 1365 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
1366 if ((obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) || 1366 if ((obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) ||
1367 (obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN)) 1367 (obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN))
1368 { 1368 {
@@ -1377,7 +1377,7 @@ _canvas_event_feed_mouse_down_internal(Eo *eo_e, int b, Evas_Button_Flags flags,
1377 } 1377 }
1378 EINA_LIST_FOREACH(copy, l, eo_obj) 1378 EINA_LIST_FOREACH(copy, l, eo_obj)
1379 { 1379 {
1380 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 1380 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
1381 if (obj->delete_me) continue; 1381 if (obj->delete_me) continue;
1382 ev.canvas.x = e->pointer.x; 1382 ev.canvas.x = e->pointer.x;
1383 ev.canvas.y = e->pointer.y; 1383 ev.canvas.y = e->pointer.y;
@@ -1394,7 +1394,7 @@ _canvas_event_feed_mouse_down_internal(Eo *eo_e, int b, Evas_Button_Flags flags,
1394 _evas_post_event_callback_call(eo_e, e); 1394 _evas_post_event_callback_call(eo_e, e);
1395 /* update touch point's state to EVAS_TOUCH_POINT_STILL */ 1395 /* update touch point's state to EVAS_TOUCH_POINT_STILL */
1396 _evas_touch_point_update(eo_e, 0, e->pointer.x, e->pointer.y, EVAS_TOUCH_POINT_STILL); 1396 _evas_touch_point_update(eo_e, 0, e->pointer.x, e->pointer.y, EVAS_TOUCH_POINT_STILL);
1397 if (ev.dev) eo_unref(ev.dev); 1397 if (ev.dev) efl_unref(ev.dev);
1398 _evas_unwalk(e); 1398 _evas_unwalk(e);
1399 EV_DEL(pe); 1399 EV_DEL(pe);
1400} 1400}
@@ -1409,7 +1409,7 @@ static int
1409_post_up_handle(Evas *eo_e, unsigned int timestamp, const void *data, 1409_post_up_handle(Evas *eo_e, unsigned int timestamp, const void *data,
1410 Efl_Event_Pointer *parent_pe) 1410 Efl_Event_Pointer *parent_pe)
1411{ 1411{
1412 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); 1412 Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
1413 Efl_Event_Pointer *pe = NULL; 1413 Efl_Event_Pointer *pe = NULL;
1414 Eina_List *l, *copy, *ins, *ll; 1414 Eina_List *l, *copy, *ins, *ll;
1415 Evas_Event_Mouse_Out ev; 1415 Evas_Event_Mouse_Out ev;
@@ -1431,7 +1431,7 @@ _post_up_handle(Evas *eo_e, unsigned int timestamp, const void *data,
1431 ev.timestamp = timestamp; 1431 ev.timestamp = timestamp;
1432 ev.event_flags = e->default_event_flags; 1432 ev.event_flags = e->default_event_flags;
1433 ev.dev = _evas_device_top_get(eo_e); 1433 ev.dev = _evas_device_top_get(eo_e);
1434 if (ev.dev) eo_ref(ev.dev); 1434 if (ev.dev) efl_ref(ev.dev);
1435 1435
1436 /* get new list of ins */ 1436 /* get new list of ins */
1437 ins = evas_event_objects_event_list(eo_e, NULL, e->pointer.x, e->pointer.y); 1437 ins = evas_event_objects_event_list(eo_e, NULL, e->pointer.x, e->pointer.y);
@@ -1439,7 +1439,7 @@ _post_up_handle(Evas *eo_e, unsigned int timestamp, const void *data,
1439 copy = evas_event_list_copy(e->pointer.object.in); 1439 copy = evas_event_list_copy(e->pointer.object.in);
1440 EINA_LIST_FOREACH(copy, ll, eo_obj) 1440 EINA_LIST_FOREACH(copy, ll, eo_obj)
1441 { 1441 {
1442 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 1442 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
1443 if ((!eina_list_data_find(ins, eo_obj)) || (!e->pointer.inside)) 1443 if ((!eina_list_data_find(ins, eo_obj)) || (!e->pointer.inside))
1444 { 1444 {
1445 if (!obj->mouse_in) continue; 1445 if (!obj->mouse_in) continue;
@@ -1483,7 +1483,7 @@ _post_up_handle(Evas *eo_e, unsigned int timestamp, const void *data,
1483 1483
1484 EINA_LIST_FOREACH(ins, l, eo_obj_itr) 1484 EINA_LIST_FOREACH(ins, l, eo_obj_itr)
1485 { 1485 {
1486 Evas_Object_Protected_Data *obj_itr = eo_data_scope_get(eo_obj_itr, EFL_CANVAS_OBJECT_CLASS); 1486 Evas_Object_Protected_Data *obj_itr = efl_data_scope_get(eo_obj_itr, EFL_CANVAS_OBJECT_CLASS);
1487 if (!eina_list_data_find(e->pointer.object.in, eo_obj_itr)) 1487 if (!eina_list_data_find(e->pointer.object.in, eo_obj_itr))
1488 { 1488 {
1489 if (obj_itr->mouse_in) continue; 1489 if (obj_itr->mouse_in) continue;
@@ -1523,7 +1523,7 @@ _post_up_handle(Evas *eo_e, unsigned int timestamp, const void *data,
1523 } 1523 }
1524 if (e->pointer.inside) 1524 if (e->pointer.inside)
1525 _canvas_event_feed_mouse_move_internal(eo_e, e, e->pointer.x, e->pointer.y, timestamp, data, pe); 1525 _canvas_event_feed_mouse_move_internal(eo_e, e, e->pointer.x, e->pointer.y, timestamp, data, pe);
1526 if (ev.dev) eo_unref(ev.dev); 1526 if (ev.dev) efl_unref(ev.dev);
1527 EV_DEL(pe); 1527 EV_DEL(pe);
1528 1528
1529 return post_called; 1529 return post_called;
@@ -1534,7 +1534,7 @@ _canvas_event_feed_mouse_up_internal(Eo *eo_e, int b, Evas_Button_Flags flags,
1534 unsigned int timestamp, const void *data, 1534 unsigned int timestamp, const void *data,
1535 Efl_Event_Pointer *parent_pe) 1535 Efl_Event_Pointer *parent_pe)
1536{ 1536{
1537 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); 1537 Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
1538 Efl_Event_Pointer *pe = NULL; 1538 Efl_Event_Pointer *pe = NULL;
1539 Eina_List *l, *copy; 1539 Eina_List *l, *copy;
1540 1540
@@ -1568,7 +1568,7 @@ _canvas_event_feed_mouse_up_internal(Eo *eo_e, int b, Evas_Button_Flags flags,
1568 ev.timestamp = timestamp; 1568 ev.timestamp = timestamp;
1569 ev.event_flags = e->default_event_flags; 1569 ev.event_flags = e->default_event_flags;
1570 ev.dev = _evas_device_top_get(eo_e); 1570 ev.dev = _evas_device_top_get(eo_e);
1571 if (ev.dev) eo_ref(ev.dev); 1571 if (ev.dev) efl_ref(ev.dev);
1572 1572
1573 _evas_walk(e); 1573 _evas_walk(e);
1574 /* update released touch point */ 1574 /* update released touch point */
@@ -1576,7 +1576,7 @@ _canvas_event_feed_mouse_up_internal(Eo *eo_e, int b, Evas_Button_Flags flags,
1576 copy = evas_event_list_copy(e->pointer.object.in); 1576 copy = evas_event_list_copy(e->pointer.object.in);
1577 EINA_LIST_FOREACH(copy, l, eo_obj) 1577 EINA_LIST_FOREACH(copy, l, eo_obj)
1578 { 1578 {
1579 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 1579 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
1580 if (((obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) || 1580 if (((obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) ||
1581 (obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN)) && 1581 (obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN)) &&
1582 (obj->mouse_grabbed > 0)) 1582 (obj->mouse_grabbed > 0))
@@ -1609,7 +1609,7 @@ _canvas_event_feed_mouse_up_internal(Eo *eo_e, int b, Evas_Button_Flags flags,
1609 eina_list_free(copy); 1609 eina_list_free(copy);
1610 e->last_mouse_up_counter++; 1610 e->last_mouse_up_counter++;
1611 _evas_post_event_callback_call(eo_e, e); 1611 _evas_post_event_callback_call(eo_e, e);
1612 if (ev.dev) eo_unref(ev.dev); 1612 if (ev.dev) efl_unref(ev.dev);
1613 } 1613 }
1614 1614
1615 if (e->pointer.mouse_grabbed == 0) 1615 if (e->pointer.mouse_grabbed == 0)
@@ -1639,7 +1639,7 @@ static void
1639_canvas_event_feed_mouse_cancel_internal(Eo *eo_e, unsigned int timestamp, const void *data, 1639_canvas_event_feed_mouse_cancel_internal(Eo *eo_e, unsigned int timestamp, const void *data,
1640 Efl_Event_Pointer *parent_pe) 1640 Efl_Event_Pointer *parent_pe)
1641{ 1641{
1642 Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); 1642 Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
1643 Evas_Coord_Touch_Point *point; 1643 Evas_Coord_Touch_Point *p