aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/evas
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/evas')
-rw-r--r--src/lib/evas/canvas/evas_callbacks.c20
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_camera.c19
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_light.c35
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_material.c17
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_mesh.c51
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_node.c155
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_object.c16
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_primitive.c9
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_scene.c43
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_texture.c45
-rw-r--r--src/lib/evas/canvas/evas_clip.c4
-rw-r--r--src/lib/evas/canvas/evas_data.c6
-rw-r--r--src/lib/evas/canvas/evas_events.c14
-rw-r--r--src/lib/evas/canvas/evas_filter_mixin.c14
-rw-r--r--src/lib/evas/canvas/evas_focus.c2
-rw-r--r--src/lib/evas/canvas/evas_layer.c4
-rw-r--r--src/lib/evas/canvas/evas_main.c7
-rw-r--r--src/lib/evas/canvas/evas_object_box.c63
-rw-r--r--src/lib/evas/canvas/evas_object_grid.c7
-rw-r--r--src/lib/evas/canvas/evas_object_image.c65
-rw-r--r--src/lib/evas/canvas/evas_object_line.c5
-rw-r--r--src/lib/evas/canvas/evas_object_main.c88
-rw-r--r--src/lib/evas/canvas/evas_object_polygon.c7
-rw-r--r--src/lib/evas/canvas/evas_object_rectangle.c5
-rw-r--r--src/lib/evas/canvas/evas_object_smart.c34
-rw-r--r--src/lib/evas/canvas/evas_object_smart_clipped.c6
-rw-r--r--src/lib/evas/canvas/evas_object_table.c17
-rw-r--r--src/lib/evas/canvas/evas_object_text.c55
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c29
-rw-r--r--src/lib/evas/canvas/evas_object_textgrid.c23
-rw-r--r--src/lib/evas/canvas/evas_object_vg.c13
-rw-r--r--src/lib/evas/canvas/evas_out.c15
-rw-r--r--src/lib/evas/canvas/evas_render.c8
-rw-r--r--src/lib/evas/canvas/evas_stack.c12
-rw-r--r--src/lib/evas/canvas/evas_vg_container.c23
-rw-r--r--src/lib/evas/canvas/evas_vg_gradient.c16
-rw-r--r--src/lib/evas/canvas/evas_vg_gradient_linear.c40
-rw-r--r--src/lib/evas/canvas/evas_vg_gradient_radial.c48
-rw-r--r--src/lib/evas/canvas/evas_vg_node.c62
-rw-r--r--src/lib/evas/canvas/evas_vg_private.h2
-rw-r--r--src/lib/evas/canvas/evas_vg_root_node.c10
-rw-r--r--src/lib/evas/canvas/evas_vg_shape.c141
-rw-r--r--src/lib/evas/canvas/render2/evas_render2.c6
-rw-r--r--src/lib/evas/common3d/primitives/primitive_common.c24
-rw-r--r--src/lib/evas/common3d/primitives/primitive_common.h16
-rw-r--r--src/lib/evas/filters/evas_filter_parser.c10
46 files changed, 665 insertions, 646 deletions
diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c
index 224b1e3a50..a1ada65f22 100644
--- a/src/lib/evas/canvas/evas_callbacks.c
+++ b/src/lib/evas/canvas/evas_callbacks.c
@@ -153,7 +153,7 @@ evas_object_event_callback_all_del(Evas_Object *eo_obj)
if (!obj->callbacks) return;
EINA_INLIST_FOREACH_SAFE(obj->callbacks, itr, info)
{
- eo_do(eo_obj, eo_event_callback_del(
+ eo_do(eo_obj, eo_event_callback_del(eo_obj,
_legacy_evas_callback_table[info->type], _eo_evas_object_cb, info));
obj->callbacks =
@@ -180,7 +180,7 @@ evas_event_callback_all_del(Evas *eo_e)
EINA_INLIST_FOREACH_SAFE(e->callbacks, itr, info)
{
- eo_do(eo_e, eo_event_callback_del(
+ eo_do(eo_e, eo_event_callback_del(eo_e,
_legacy_evas_callback_table[info->type], _eo_evas_cb, info));
e->callbacks =
@@ -198,7 +198,7 @@ evas_event_callback_cleanup(Evas *eo_e)
void
evas_event_callback_call(Evas *eo_e, Evas_Callback_Type type, void *event_info)
{
- eo_do(eo_e, eo_event_callback_call(_legacy_evas_callback_table[type], event_info));
+ eo_do(eo_e, eo_event_callback_call(eo_e, _legacy_evas_callback_table[type], event_info));
}
void
@@ -259,7 +259,7 @@ evas_object_event_callback_call(Evas_Object *eo_obj, Evas_Object_Protected_Data
break;
}
- eo_do(eo_obj, eo_event_callback_call(_legacy_evas_callback_table[type], event_info));
+ eo_do(eo_obj, eo_event_callback_call(eo_obj, _legacy_evas_callback_table[type], event_info));
if (type == EVAS_CALLBACK_MOUSE_DOWN)
{
@@ -310,7 +310,7 @@ evas_object_event_callback_priority_add(Evas_Object *eo_obj, Evas_Callback_Type
cb_info->type = type;
const Eo_Event_Description *desc = _legacy_evas_callback_table[type];
- eo_do(eo_obj, eo_event_callback_priority_add(desc, priority, _eo_evas_object_cb, cb_info));
+ eo_do(eo_obj, eo_event_callback_priority_add(eo_obj, desc, priority, _eo_evas_object_cb, cb_info));
obj->callbacks =
eina_inlist_append(obj->callbacks, EINA_INLIST_GET(cb_info));
@@ -336,7 +336,7 @@ evas_object_event_callback_del(Evas_Object *eo_obj, Evas_Callback_Type type, Eva
if ((info->func == func) && (info->type == type))
{
void *tmp = info->data;
- eo_do(eo_obj, eo_event_callback_del(
+ eo_do(eo_obj, eo_event_callback_del(eo_obj,
_legacy_evas_callback_table[type], _eo_evas_object_cb, info));
obj->callbacks =
@@ -368,7 +368,7 @@ evas_object_event_callback_del_full(Evas_Object *eo_obj, Evas_Callback_Type type
if ((info->func == func) && (info->type == type) && info->data == data)
{
void *tmp = info->data;
- eo_do(eo_obj, eo_event_callback_del(
+ eo_do(eo_obj, eo_event_callback_del(eo_obj,
_legacy_evas_callback_table[type], _eo_evas_object_cb, info));
obj->callbacks =
@@ -404,7 +404,7 @@ evas_event_callback_priority_add(Evas *eo_e, Evas_Callback_Type type, Evas_Callb
cb_info->type = type;
const Eo_Event_Description *desc = _legacy_evas_callback_table[type];
- eo_do(eo_e, eo_event_callback_priority_add(desc, priority, _eo_evas_cb, cb_info));
+ eo_do(eo_e, eo_event_callback_priority_add(eo_e, desc, priority, _eo_evas_cb, cb_info));
e->callbacks = eina_inlist_append(e->callbacks, EINA_INLIST_GET(cb_info));
}
@@ -429,7 +429,7 @@ evas_event_callback_del(Evas *eo_e, Evas_Callback_Type type, Evas_Event_Cb func)
if ((info->func == func) && (info->type == type))
{
void *tmp = info->data;
- eo_do(eo_e, eo_event_callback_del(
+ eo_do(eo_e, eo_event_callback_del(eo_e,
_legacy_evas_callback_table[type], _eo_evas_cb, info));
e->callbacks =
@@ -461,7 +461,7 @@ evas_event_callback_del_full(Evas *eo_e, Evas_Callback_Type type, Evas_Event_Cb
if ((info->func == func) && (info->type == type) && (info->data == data))
{
void *tmp = info->data;
- eo_do(eo_e, eo_event_callback_del(
+ eo_do(eo_e, eo_event_callback_del(eo_e,
_legacy_evas_callback_table[type], _eo_evas_cb, info));
e->callbacks =
diff --git a/src/lib/evas/canvas/evas_canvas3d_camera.c b/src/lib/evas/canvas/evas_canvas3d_camera.c
index 802bccf57f..1b2ff40e4f 100644
--- a/src/lib/evas/canvas/evas_canvas3d_camera.c
+++ b/src/lib/evas/canvas/evas_canvas3d_camera.c
@@ -8,7 +8,7 @@ _camera_node_change_notify(const Eina_Hash *hash EINA_UNUSED, const void *key,
void *data EINA_UNUSED, void *fdata)
{
Evas_Canvas3D_Node *n = *(Evas_Canvas3D_Node **)key;
- eo_do(n, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_CAMERA, (Evas_Canvas3D_Object *)fdata));
+ eo_do(n, evas_canvas3d_object_change(n, EVAS_CANVAS3D_STATE_NODE_CAMERA, (Evas_Canvas3D_Object *)fdata));
return EINA_TRUE;
}
@@ -66,8 +66,8 @@ EOLIAN static Eo *
_evas_canvas3d_camera_eo_base_constructor(Eo *obj,
Evas_Canvas3D_Camera_Data *pd EINA_UNUSED)
{
- obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
- eo_do(obj, evas_canvas3d_object_type_set(EVAS_CANVAS3D_OBJECT_TYPE_CAMERA));
+ obj = eo_super_eo_constructor( MY_CLASS, obj);
+ eo_do(obj, evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_CAMERA));
return obj;
}
@@ -92,7 +92,7 @@ _evas_canvas3d_camera_eo_base_destructor(Eo *obj,
eina_hash_free(pd->nodes);
}
- eo_do_super(obj, MY_CLASS, eo_destructor());
+ eo_super_eo_destructor(MY_CLASS, obj);
}
EAPI Evas_Canvas3D_Camera *
@@ -101,7 +101,8 @@ evas_canvas3d_camera_add(Evas *e)
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return NULL;
MAGIC_CHECK_END();
- Evas_Object *eo_obj = eo_add(MY_CLASS, e);
+ Evas_Object *eo_obj;
+ eo_add(eo_obj, MY_CLASS, e);
return eo_obj;
}
@@ -110,7 +111,7 @@ _evas_canvas3d_camera_projection_matrix_set(Eo *obj, Evas_Canvas3D_Camera_Data *
const Evas_Real *matrix)
{
evas_mat4_array_set(&pd->projection, matrix);
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_CAMERA_PROJECTION, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_CAMERA_PROJECTION, NULL));
}
EOLIAN static void
@@ -133,7 +134,7 @@ _evas_canvas3d_camera_projection_perspective_set(Eo *obj, Evas_Canvas3D_Camera_D
xmax = ymax * aspect;
evas_mat4_frustum_set(&pd->projection, -xmax, xmax, -ymax, ymax, dnear, dfar);
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_CAMERA_PROJECTION, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_CAMERA_PROJECTION, NULL));
}
EOLIAN static void
@@ -143,7 +144,7 @@ _evas_canvas3d_camera_projection_frustum_set(Eo *obj, Evas_Canvas3D_Camera_Data
Evas_Real dnear, Evas_Real dfar)
{
evas_mat4_frustum_set(&pd->projection, left, right, bottom, top, dnear, dfar);
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_CAMERA_PROJECTION, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_CAMERA_PROJECTION, NULL));
}
EOLIAN static void
@@ -153,7 +154,7 @@ _evas_canvas3d_camera_projection_ortho_set(Eo *obj, Evas_Canvas3D_Camera_Data *p
Evas_Real dnear, Evas_Real dfar)
{
evas_mat4_ortho_set(&pd->projection, left, right, bottom, top, dnear, dfar);
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_CAMERA_PROJECTION, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_CAMERA_PROJECTION, NULL));
}
EOLIAN static Eina_Bool
diff --git a/src/lib/evas/canvas/evas_canvas3d_light.c b/src/lib/evas/canvas/evas_canvas3d_light.c
index d207d9b62f..f050669cbe 100644
--- a/src/lib/evas/canvas/evas_canvas3d_light.c
+++ b/src/lib/evas/canvas/evas_canvas3d_light.c
@@ -8,7 +8,7 @@ _light_node_change_notify(const Eina_Hash *hash EINA_UNUSED, const void *key,
void *data EINA_UNUSED, void *fdata)
{
Evas_Canvas3D_Node *n = *(Evas_Canvas3D_Node **)key;
- eo_do(n, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_LIGHT, (Evas_Canvas3D_Object *)fdata));
+ eo_do(n, evas_canvas3d_object_change(n, EVAS_CANVAS3D_STATE_NODE_LIGHT, (Evas_Canvas3D_Object *)fdata));
return EINA_TRUE;
}
@@ -72,15 +72,16 @@ evas_canvas3d_light_add(Evas *e)
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return NULL;
MAGIC_CHECK_END();
- Evas_Object *eo_obj = eo_add(MY_CLASS, e);
+ Evas_Object *eo_obj;
+ eo_add(eo_obj, MY_CLASS, e);
return eo_obj;
}
EOLIAN static Eo *
_evas_canvas3d_light_eo_base_constructor(Eo *obj, Evas_Canvas3D_Light_Data *pd)
{
- obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
- eo_do(obj, evas_canvas3d_object_type_set(EVAS_CANVAS3D_OBJECT_TYPE_LIGHT));
+ obj = eo_super_eo_constructor( MY_CLASS, obj);
+ eo_do(obj, evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_LIGHT));
evas_color_set(&pd->ambient, 0.0, 0.0, 0.0, 1.0);
evas_color_set(&pd->diffuse, 1.0, 1.0, 1.0, 1.0);
evas_color_set(&pd->specular, 1.0, 1.0, 1.0, 1.0);
@@ -115,7 +116,7 @@ _evas_canvas3d_light_eo_base_destructor(Eo *obj, Evas_Canvas3D_Light_Data *pd)
eina_hash_free(pd->nodes);
}
- eo_do_super(obj, MY_CLASS, eo_destructor());
+ eo_super_eo_destructor(MY_CLASS, obj);
}
@@ -125,7 +126,7 @@ _evas_canvas3d_light_directional_set(Eo *obj, Evas_Canvas3D_Light_Data *pd, Eina
if (pd->directional != directional)
{
pd->directional = directional;
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_ANY, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_ANY, NULL));
}
}
@@ -143,7 +144,7 @@ _evas_canvas3d_light_ambient_set(Eo *obj, Evas_Canvas3D_Light_Data *pd, Evas_Rea
pd->ambient.b = b;
pd->ambient.a = a;
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_LIGHT_AMBIENT, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_LIGHT_AMBIENT, NULL));
}
EOLIAN static void
@@ -163,7 +164,7 @@ _evas_canvas3d_light_diffuse_set(Eo *obj, Evas_Canvas3D_Light_Data *pd, Evas_Rea
pd->diffuse.b = b;
pd->diffuse.a = a;
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_LIGHT_DIFFUSE, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_LIGHT_DIFFUSE, NULL));
}
EOLIAN static void
@@ -183,7 +184,7 @@ _evas_canvas3d_light_specular_set(Eo *obj, Evas_Canvas3D_Light_Data *pd, Evas_Re
pd->specular.b = b;
pd->specular.a = a;
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_LIGHT_SPECULAR, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_LIGHT_SPECULAR, NULL));
}
EOLIAN static void
@@ -199,7 +200,7 @@ EOLIAN static void
_evas_canvas3d_light_spot_exponent_set(Eo *obj, Evas_Canvas3D_Light_Data *pd, Evas_Real exponent)
{
pd->spot_exp = exponent;
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_LIGHT_SPOT_EXP, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_LIGHT_SPOT_EXP, NULL));
}
EOLIAN static Evas_Real
@@ -213,7 +214,7 @@ _evas_canvas3d_light_spot_cutoff_set(Eo *obj, Evas_Canvas3D_Light_Data *pd, Evas
{
pd->spot_cutoff = cutoff;
pd->spot_cutoff_cos = cos(cutoff * M_PI / 180.0);
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_LIGHT_SPOT_CUTOFF, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_LIGHT_SPOT_CUTOFF, NULL));
}
EOLIAN static Evas_Real
@@ -228,7 +229,7 @@ _evas_canvas3d_light_attenuation_set(Eo *obj, Evas_Canvas3D_Light_Data *pd, Evas
pd->atten_const = constant;
pd->atten_linear = linear;
pd->atten_quad = quadratic;
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_LIGHT_ATTENUATION, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_LIGHT_ATTENUATION, NULL));
}
EOLIAN static void
@@ -245,7 +246,7 @@ _evas_canvas3d_light_attenuation_enable_set(Eo *obj, Evas_Canvas3D_Light_Data *p
if (pd->enable_attenuation != enable)
{
pd->enable_attenuation = enable;
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_LIGHT_ATTENUATION, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_LIGHT_ATTENUATION, NULL));
}
}
@@ -260,7 +261,7 @@ _evas_canvas3d_light_projection_matrix_set(Eo *obj, Evas_Canvas3D_Light_Data *pd
const Evas_Real *matrix)
{
evas_mat4_array_set(&pd->projection, matrix);
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_LIGHT_PROJECTION, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_LIGHT_PROJECTION, NULL));
}
EOLIAN static void
@@ -283,7 +284,7 @@ _evas_canvas3d_light_projection_perspective_set(Eo *obj, Evas_Canvas3D_Light_Dat
xmax = ymax * aspect;
evas_mat4_frustum_set(&pd->projection, -xmax, xmax, -ymax, ymax, dnear, dfar);
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_LIGHT_PROJECTION, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_LIGHT_PROJECTION, NULL));
}
EOLIAN static void
@@ -293,7 +294,7 @@ _evas_canvas3d_light_projection_frustum_set(Eo *obj, Evas_Canvas3D_Light_Data *p
Evas_Real dnear, Evas_Real dfar)
{
evas_mat4_frustum_set(&pd->projection, left, right, bottom, top, dnear, dfar);
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_LIGHT_PROJECTION, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_LIGHT_PROJECTION, NULL));
}
EOLIAN static void
@@ -303,7 +304,7 @@ _evas_canvas3d_light_projection_ortho_set(Eo *obj, Evas_Canvas3D_Light_Data *pd,
Evas_Real dnear, Evas_Real dfar)
{
evas_mat4_ortho_set(&pd->projection, left, right, bottom, top, dnear, dfar);
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_LIGHT_PROJECTION, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_LIGHT_PROJECTION, NULL));
}
diff --git a/src/lib/evas/canvas/evas_canvas3d_material.c b/src/lib/evas/canvas/evas_canvas3d_material.c
index 8ce248670a..8c8710d5e1 100644
--- a/src/lib/evas/canvas/evas_canvas3d_material.c
+++ b/src/lib/evas/canvas/evas_canvas3d_material.c
@@ -8,7 +8,7 @@ _material_mesh_change_notify(const Eina_Hash *hash EINA_UNUSED, const void *key,
void *data EINA_UNUSED, void *fdata)
{
Evas_Canvas3D_Mesh *m = *(Evas_Canvas3D_Mesh **)key;
- eo_do(m, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_MATERIAL, (Evas_Canvas3D_Object *)fdata));
+ eo_do(m, evas_canvas3d_object_change(m, EVAS_CANVAS3D_STATE_MESH_MATERIAL, (Evas_Canvas3D_Object *)fdata));
return EINA_TRUE;
}
@@ -29,7 +29,7 @@ _evas_canvas3d_material_evas_canvas3d_object_update_notify(Eo *obj EINA_UNUSED,
{
if (pd->attribs[i].texture)
{
- eo_do(pd->attribs[i].texture, evas_canvas3d_object_update());
+ eo_do(pd->attribs[i].texture, evas_canvas3d_object_update(pd->attribs[i].texture));
}
}
}
@@ -84,15 +84,16 @@ evas_canvas3d_material_add(Evas *e)
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return NULL;
MAGIC_CHECK_END();
- Evas_Object *eo_obj = eo_add(MY_CLASS, e);
+ Evas_Object *eo_obj;
+ eo_add(eo_obj, MY_CLASS, e);
return eo_obj;
}
EOLIAN static Eo *
_evas_canvas3d_material_eo_base_constructor(Eo *obj EINA_UNUSED, Evas_Canvas3D_Material_Data *pd)
{
- obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
- eo_do(obj, evas_canvas3d_object_type_set(EVAS_CANVAS3D_OBJECT_TYPE_MATERIAL));
+ obj = eo_super_eo_constructor( MY_CLASS, obj);
+ eo_do(obj, evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_MATERIAL));
evas_color_set(&pd->attribs[EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT].color, 0.2, 0.2, 0.2, 1.0);
evas_color_set(&pd->attribs[EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE].color, 0.8, 0.8, 0.8, 1.0);
@@ -136,7 +137,7 @@ _evas_canvas3d_material_eo_base_destructor(Eo *obj, Evas_Canvas3D_Material_Data
evas_canvas3d_texture_material_del(pd->attribs[i].texture, obj);
}
}
- eo_do_super(obj, MY_CLASS, eo_destructor());
+ eo_super_eo_destructor(MY_CLASS, obj);
}
EOLIAN static void
@@ -155,7 +156,7 @@ EOLIAN static void
_evas_canvas3d_material_color_set(Eo *obj, Evas_Canvas3D_Material_Data *pd, Evas_Canvas3D_Material_Attrib attrib, Evas_Real r, Evas_Real g, Evas_Real b, Evas_Real a)
{
evas_color_set(&pd->attribs[attrib].color, r, g, b, a);
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MATERIAL_COLOR, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MATERIAL_COLOR, NULL));
}
EOLIAN static void
@@ -195,7 +196,7 @@ _evas_canvas3d_material_texture_set(Eo *obj, Evas_Canvas3D_Material_Data *pd, Ev
eo_ref(texture);
}
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MATERIAL_TEXTURE, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MATERIAL_TEXTURE, NULL));
}
EOLIAN static Evas_Canvas3D_Texture *
diff --git a/src/lib/evas/canvas/evas_canvas3d_mesh.c b/src/lib/evas/canvas/evas_canvas3d_mesh.c
index e7bc091202..bd6c330199 100644
--- a/src/lib/evas/canvas/evas_canvas3d_mesh.c
+++ b/src/lib/evas/canvas/evas_canvas3d_mesh.c
@@ -165,7 +165,7 @@ _mesh_node_geometry_change_notify(const Eina_Hash *hash EINA_UNUSED, const void
void *data EINA_UNUSED, void *fdata)
{
Evas_Canvas3D_Node *n = *(Evas_Canvas3D_Node **)key;
- eo_do(n, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_MESH_GEOMETRY, (Evas_Canvas3D_Object *)fdata));
+ eo_do(n, evas_canvas3d_object_change(n, EVAS_CANVAS3D_STATE_NODE_MESH_GEOMETRY, (Evas_Canvas3D_Object *)fdata));
return EINA_TRUE;
}
@@ -174,7 +174,7 @@ _mesh_node_material_change_notify(const Eina_Hash *hash EINA_UNUSED, const void
void *data EINA_UNUSED, void *fdata)
{
Evas_Canvas3D_Node *n = *(Evas_Canvas3D_Node **)key;
- eo_do(n, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_MESH_MATERIAL, (Evas_Canvas3D_Object *)fdata));
+ eo_do(n, evas_canvas3d_object_change(n, EVAS_CANVAS3D_STATE_NODE_MESH_MATERIAL, (Evas_Canvas3D_Object *)fdata));
return EINA_TRUE;
}
@@ -203,7 +203,7 @@ _evas_canvas3d_mesh_evas_canvas3d_object_update_notify(Eo *obj EINA_UNUSED, Evas
{
if (f->material)
{
- eo_do(f->material, evas_canvas3d_object_update());
+ eo_do(f->material, evas_canvas3d_object_update(f->material));
}
}
}
@@ -256,15 +256,16 @@ evas_canvas3d_mesh_add(Evas *e)
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return NULL;
MAGIC_CHECK_END();
- Evas_Object *eo_obj = eo_add(MY_CLASS, e);
+ Evas_Object *eo_obj;
+ eo_add(eo_obj, MY_CLASS, e);
return eo_obj;
}
EOLIAN static Eo *
_evas_canvas3d_mesh_eo_base_constructor(Eo *obj, Evas_Canvas3D_Mesh_Data *pd)
{
- obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
- eo_do (obj, evas_canvas3d_object_type_set(EVAS_CANVAS3D_OBJECT_TYPE_MESH));
+ obj = eo_super_eo_constructor( MY_CLASS, obj);
+ eo_do (obj, evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_MESH));
_mesh_init(pd);
return obj;
@@ -274,7 +275,7 @@ EOLIAN static void
_evas_canvas3d_mesh_eo_base_destructor(Eo *obj, Evas_Canvas3D_Mesh_Data *pd)
{
_mesh_fini(pd);
- eo_do_super(obj, MY_CLASS, eo_destructor());
+ eo_super_eo_destructor(MY_CLASS, obj);
}
EOLIAN static void
@@ -283,7 +284,7 @@ _evas_canvas3d_mesh_shade_mode_set(Eo *obj EINA_UNUSED, Evas_Canvas3D_Mesh_Data
if (pd->shade_mode != mode)
{
pd->shade_mode = mode;
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_SHADE_MODE, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_SHADE_MODE, NULL));
}
}
@@ -297,7 +298,7 @@ EOLIAN static void
_evas_canvas3d_mesh_vertex_count_set(Eo *obj, Evas_Canvas3D_Mesh_Data *pd, unsigned int count)
{
pd->vertex_count = count;
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_VERTEX_COUNT, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_VERTEX_COUNT, NULL));
}
EOLIAN static unsigned int
@@ -335,7 +336,7 @@ _evas_canvas3d_mesh_frame_add(Eo *obj, Evas_Canvas3D_Mesh_Data *pd, int frame)
f->frame = frame;
pd->frames = eina_list_append(pd->frames, f);
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_FRAME, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_FRAME, NULL));
}
EOLIAN static void
@@ -351,7 +352,7 @@ _evas_canvas3d_mesh_frame_del(Eo *obj, Evas_Canvas3D_Mesh_Data *pd, int frame)
pd->frames = eina_list_remove(pd->frames, f);
evas_canvas3d_mesh_frame_free(f);
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_FRAME, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_FRAME, NULL));
}
EOLIAN static void
@@ -376,7 +377,7 @@ _evas_canvas3d_mesh_frame_material_set(Eo *obj, Evas_Canvas3D_Mesh_Data *pd, int
f->material = material;
eo_ref(material);
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_MATERIAL, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_MATERIAL, NULL));
evas_canvas3d_material_mesh_add(material, obj);
}
@@ -479,7 +480,7 @@ _evas_canvas3d_mesh_frame_vertex_data_set(Eo *obj, Evas_Canvas3D_Mesh_Data *pd,
f->vertices[attrib].owns_data = EINA_FALSE;
f->vertices[attrib].element_count = element_count;
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_VERTEX_DATA, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_VERTEX_DATA, NULL));
}
EOLIAN static void
@@ -603,7 +604,7 @@ _evas_canvas3d_mesh_frame_vertex_data_copy_set(Eo *obj, Evas_Canvas3D_Mesh_Data
ERR("Axis-Aligned Bounding Box wasn't added in frame %d ", frame);
}
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_VERTEX_DATA, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_VERTEX_DATA, NULL));
}
EOLIAN static void *
@@ -673,7 +674,7 @@ _evas_canvas3d_mesh_index_data_set(Eo *obj, Evas_Canvas3D_Mesh_Data *pd, Evas_Ca
pd->indices = (void *)indices;
pd->owns_indices = EINA_FALSE;
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_INDEX_DATA, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_INDEX_DATA, NULL));
}
EOLIAN static void
@@ -760,7 +761,7 @@ EOLIAN static void
_evas_canvas3d_mesh_vertex_assembly_set(Eo *obj, Evas_Canvas3D_Mesh_Data *pd, Evas_Canvas3D_Vertex_Assembly assembly)
{
pd->assembly = assembly;
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_VERTEX_ASSEMBLY, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_VERTEX_ASSEMBLY, NULL));
}
EOLIAN static Evas_Canvas3D_Vertex_Assembly
@@ -773,7 +774,7 @@ EOLIAN static void
_evas_canvas3d_mesh_fog_color_set(Eo *obj, Evas_Canvas3D_Mesh_Data *pd, Evas_Real r, Evas_Real g, Evas_Real b, Evas_Real a)
{
evas_color_set(&pd->fog_color, r, g, b, a);
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_FOG, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_FOG, NULL));
}
EOLIAN static void
@@ -790,7 +791,7 @@ EOLIAN static void
_evas_canvas3d_mesh_fog_enable_set(Eo *obj, Evas_Canvas3D_Mesh_Data *pd, Eina_Bool enabled)
{
pd->fog_enabled = enabled;
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_FOG, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_FOG, NULL));
}
EOLIAN static Eina_Bool
@@ -803,7 +804,7 @@ EOLIAN static void
_evas_canvas3d_mesh_blending_enable_set(Eo *obj, Evas_Canvas3D_Mesh_Data *pd, Eina_Bool blending)
{
pd->blending = blending;
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_BLENDING, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_BLENDING, NULL));
}
EOLIAN static Eina_Bool
@@ -817,7 +818,7 @@ _evas_canvas3d_mesh_blending_func_set(Eo *obj, Evas_Canvas3D_Mesh_Data *pd, Evas
{
pd->blend_sfactor = sfactor;
pd->blend_dfactor = dfactor;
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_BLENDING, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_BLENDING, NULL));
}
EOLIAN static void
@@ -836,7 +837,7 @@ _evas_canvas3d_mesh_alpha_func_set(Eo *obj, Evas_Canvas3D_Mesh_Data *pd, Evas_Ca
return;
pd->alpha_comparison = comparison;
pd->alpha_ref_value = ref_value;
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_ALPHA_TEST, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_ALPHA_TEST, NULL));
}
EOLIAN static void
@@ -852,7 +853,7 @@ EOLIAN static void
_evas_canvas3d_mesh_alpha_test_enable_set(Eo *obj, Evas_Canvas3D_Mesh_Data *pd, Eina_Bool enabled)
{
pd->alpha_test_enabled = enabled;
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_ALPHA_TEST, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_ALPHA_TEST, NULL));
}
EOLIAN static Eina_Bool
@@ -1089,7 +1090,7 @@ _evas_canvas3d_mesh_color_pick_enable_set(Eo *obj, Evas_Canvas3D_Mesh_Data *pd,
{
if (pd->color_pick_enabled != enabled)
pd->color_pick_enabled = enabled;
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_COLOR_PICK, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_COLOR_PICK, NULL));
}
EOLIAN static void
@@ -1100,7 +1101,7 @@ _evas_canvas3d_mesh_shadows_edges_filtering_set(Eo *obj, Evas_Canvas3D_Mesh_Data
pd->shadows_edges_filtering_level = blur_level;
if (edges_size >= 0)
pd->shadows_edges_size = edges_size;
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_SHADOWS_EDGES_FILTERING, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_SHADOWS_EDGES_FILTERING, NULL));
}
EOLIAN static void
@@ -1118,7 +1119,7 @@ _evas_canvas3d_mesh_shadows_constant_bias_set(Eo *obj EINA_UNUSED, Evas_Canvas3D
if (pd->shadows_constant_bias != bias)
{
pd->shadows_constant_bias = bias;
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MESH_SHADOWS_CONSTANT_BIAS, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_MESH_SHADOWS_CONSTANT_BIAS, NULL));
}
}
diff --git a/src/lib/evas/canvas/evas_canvas3d_node.c b/src/lib/evas/canvas/evas_canvas3d_node.c
index a484928318..b665f5756a 100644
--- a/src/lib/evas/canvas/evas_canvas3d_node.c
+++ b/src/lib/evas/canvas/evas_canvas3d_node.c
@@ -98,7 +98,7 @@ _evas_canvas3d_node_private_callback_collision(void *data, Eo *obj EINA_UNUSED,
{
pd = eo_data_scope_get(n, EVAS_CANVAS3D_NODE_CLASS);
if (box_intersection_box(&pd_target->aabb, &pd->aabb))
- eo_do(target_node, ret = eo_event_callback_call(eo_desc, n));
+ eo_do(target_node, ret = eo_event_callback_call(target_node, eo_desc, n));
}
return ret;
}
@@ -111,7 +111,7 @@ _evas_canvas3d_node_private_callback_clicked(void *data EINA_UNUSED, Eo *obj EIN
{
Eina_Bool ret = EINA_FALSE;
const Eo_Event_Description *eo_desc = eo_base_legacy_only_event_description_get("clicked");
- eo_do((Eo *)event_info, ret = eo_event_callback_call(eo_desc, event_info));
+ eo_do((Eo *)event_info, ret = eo_event_callback_call((Eo*)event_info, eo_desc, event_info));
return ret;
}
@@ -151,7 +151,7 @@ _node_scene_root_change_notify(const Eina_Hash *hash EINA_UNUSED, const void *ke
void *data EINA_UNUSED, void *fdata)
{
Evas_Canvas3D_Scene *s = *(Evas_Canvas3D_Scene **)key;
- eo_do(s, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_SCENE_ROOT_NODE, (Evas_Canvas3D_Object *)fdata));
+ eo_do(s, evas_canvas3d_object_change(s, EVAS_CANVAS3D_STATE_SCENE_ROOT_NODE, (Evas_Canvas3D_Object *)fdata));
return EINA_TRUE;
}
@@ -160,7 +160,7 @@ _node_scene_camera_change_notify(const Eina_Hash *hash EINA_UNUSED, const void *
void *data EINA_UNUSED, void *fdata)
{
Evas_Canvas3D_Scene *s = *(Evas_Canvas3D_Scene **)key;
- eo_do(s, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_SCENE_CAMERA_NODE, (Evas_Canvas3D_Object *)fdata));
+ eo_do(s, evas_canvas3d_object_change(s, EVAS_CANVAS3D_STATE_SCENE_CAMERA_NODE, (Evas_Canvas3D_Object *)fdata));
return EINA_TRUE;
}
@@ -188,7 +188,7 @@ _evas_canvas3d_node_evas_canvas3d_object_change_notify(Eo *obj, Evas_Canvas3D_No
/* Notify parent that a member has changed. */
if (pd->parent && !parent_change)
{
- eo_do(pd->parent, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_MEMBER, obj));
+ eo_do(pd->parent, evas_canvas3d_object_change(pd->parent, EVAS_CANVAS3D_STATE_NODE_MEMBER, obj));
}
orientation = (state == EVAS_CANVAS3D_STATE_NODE_TRANSFORM_ORIENTATION)
@@ -202,7 +202,7 @@ _evas_canvas3d_node_evas_canvas3d_object_change_notify(Eo *obj, Evas_Canvas3D_No
if (scale)
EINA_LIST_FOREACH(pd->members, l, n)
{
- eo_do(n, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_PARENT_SCALE, obj));
+ eo_do(n, evas_canvas3d_object_change(n, EVAS_CANVAS3D_STATE_NODE_PARENT_SCALE, obj));
}
if (orientation && !(pd->billboard_target))
EINA_LIST_FOREACH(pd->members, l, n)
@@ -211,12 +211,12 @@ _evas_canvas3d_node_evas_canvas3d_object_change_notify(Eo *obj, Evas_Canvas3D_No
Evas_Canvas3D_Node_Data *pdm = eo_data_scope_get(n, EVAS_CANVAS3D_NODE_CLASS);
if (pdm->billboard_target)
continue;
- eo_do(n, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_PARENT_ORIENTATION, obj));
+ eo_do(n, evas_canvas3d_object_change(n, EVAS_CANVAS3D_STATE_NODE_PARENT_ORIENTATION, obj));
}
if (position)
EINA_LIST_FOREACH(pd->members, l, n)
{
- eo_do(n, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_PARENT_POSITION, obj));
+ eo_do(n, evas_canvas3d_object_change(n, EVAS_CANVAS3D_STATE_NODE_PARENT_POSITION, obj));
}
}
@@ -229,7 +229,7 @@ _evas_canvas3d_node_evas_canvas3d_object_callback_register(Eo *obj, Evas_Canvas3
GET_CALLBACK_TYPE(tcb, event)
if (tcb != PRIVATE_CALLBACK_NONE)
- eo_do(obj, eo_event_callback_add(&evas_canvas3d_node_private_event_desc[tcb],
+ eo_do(obj, eo_event_callback_add(obj, &evas_canvas3d_node_private_event_desc[tcb],
evas_canvas3d_node_private_callback_functions[tcb], data));
}
@@ -243,7 +243,7 @@ _evas_canvas3d_node_evas_canvas3d_object_callback_unregister(Eo *obj, Evas_Canva
GET_CALLBACK_TYPE(tcb, event)
if (tcb != PRIVATE_CALLBACK_NONE)
- eo_do(obj, eo_event_callback_del(&evas_canvas3d_node_private_event_desc[tcb],
+ eo_do(obj, eo_event_callback_del(obj, &evas_canvas3d_node_private_event_desc[tcb],
evas_canvas3d_node_private_callback_functions[tcb], NULL));
}
@@ -254,12 +254,12 @@ _node_transform_update(Evas_Canvas3D_Node *node, void *data EINA_UNUSED)
Eina_Bool transform_dirty = EINA_FALSE, parent_dirty = EINA_FALSE;
eo_do(node,
- transform_dirty = evas_canvas3d_object_dirty_get(EVAS_CANVAS3D_STATE_NODE_TRANSFORM_ORIENTATION),
- transform_dirty|= evas_canvas3d_object_dirty_get(EVAS_CANVAS3D_STATE_NODE_TRANSFORM_POSITION),
- transform_dirty|= evas_canvas3d_object_dirty_get(EVAS_CANVAS3D_STATE_NODE_TRANSFORM_SCALE),
- parent_dirty = evas_canvas3d_object_dirty_get(EVAS_CANVAS3D_STATE_NODE_PARENT_ORIENTATION),
- parent_dirty |= evas_canvas3d_object_dirty_get(EVAS_CANVAS3D_STATE_NODE_PARENT_POSITION),
- parent_dirty |= evas_canvas3d_object_dirty_get(EVAS_CANVAS3D_STATE_NODE_PARENT_SCALE));
+ transform_dirty = evas_canvas3d_object_dirty_get(node, EVAS_CANVAS3D_STATE_NODE_TRANSFORM_ORIENTATION),
+ transform_dirty|= evas_canvas3d_object_dirty_get(node, EVAS_CANVAS3D_STATE_NODE_TRANSFORM_POSITION),
+ transform_dirty|= evas_canvas3d_object_dirty_get(node, EVAS_CANVAS3D_STATE_NODE_TRANSFORM_SCALE),
+ parent_dirty = evas_canvas3d_object_dirty_get(node, EVAS_CANVAS3D_STATE_NODE_PARENT_ORIENTATION),
+ parent_dirty |= evas_canvas3d_object_dirty_get(node, EVAS_CANVAS3D_STATE_NODE_PARENT_POSITION),
+ parent_dirty |= evas_canvas3d_object_dirty_get(node, EVAS_CANVAS3D_STATE_NODE_PARENT_SCALE));
if (transform_dirty || parent_dirty)
{
@@ -385,14 +385,14 @@ _node_item_update(Evas_Canvas3D_Node *node, void *data EINA_UNUSED)
{
if (pd->data.camera.camera)
{
- eo_do(pd->data.camera.camera, evas_canvas3d_object_update());
+ eo_do(pd->data.camera.camera, evas_canvas3d_object_update(pd->data.camera.camera));
}
}
else if (pd->type == EVAS_CANVAS3D_NODE_TYPE_LIGHT)
{
if (pd->data.light.light)
{
- eo_do(pd->data.light.light, evas_canvas3d_object_update());
+ eo_do(pd->data.light.light, evas_canvas3d_object_update(pd->data.light.light));
}
}
else if (pd->type == EVAS_CANVAS3D_NODE_TYPE_MESH)
@@ -401,7 +401,7 @@ _node_item_update(Evas_Canvas3D_Node *node, void *data EINA_UNUSED)
Evas_Canvas3D_Mesh *m;
EINA_LIST_FOREACH(pd->data.mesh.meshes, l, m)
{
- eo_do(m, evas_canvas3d_object_update());
+ eo_do(m, evas_canvas3d_object_update(m));
}
}
@@ -518,10 +518,10 @@ _pack_meshes_vertex_data(Evas_Canvas3D_Node *node, Evas_Vec3 **vertices, int *co
Evas_Real pos_weight;
*count = 0;
- eo_do(node, m = (Eina_List *)evas_canvas3d_node_mesh_list_get());
+ eo_do(node, m = (Eina_List *)evas_canvas3d_node_mesh_list_get(node));
EINA_LIST_FOREACH(m, l, mesh)
{
- eo_do(node, frame = evas_canvas3d_node_mesh_frame_get(mesh));
+ eo_do(node, frame = evas_canvas3d_node_mesh_frame_get(node, mesh));
evas_canvas3d_mesh_interpolate_vertex_buffer_get(mesh, frame, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION,
&pos0, &pos1, &pos_weight);
if(!pos0.data) continue;
@@ -544,7 +544,7 @@ _pack_meshes_vertex_data(Evas_Canvas3D_Node *node, Evas_Vec3 **vertices, int *co
EINA_LIST_FOREACH(m, l, mesh)
{
- eo_do(node, frame = evas_canvas3d_node_mesh_frame_get(mesh));
+ eo_do(node, frame = evas_canvas3d_node_mesh_frame_get(node, mesh));
evas_canvas3d_mesh_interpolate_vertex_buffer_get(mesh, frame, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION,
&pos0, &pos1, &pos_weight);
if(!pos0.data) continue;
@@ -593,12 +593,12 @@ _update_node_shapes(Evas_Canvas3D_Node *node)
}
eo_do(node,
- transform_orientation_dirty = evas_canvas3d_object_dirty_get(EVAS_CANVAS3D_STATE_NODE_TRANSFORM_ORIENTATION),
- transform_orientation_dirty |= evas_canvas3d_object_dirty_get(EVAS_CANVAS3D_STATE_NODE_PARENT_ORIENTATION),
- transform_scale_dirty = evas_canvas3d_object_dirty_get(EVAS_CANVAS3D_STATE_NODE_TRANSFORM_SCALE),
- transform_scale_dirty |= evas_canvas3d_object_dirty_get(EVAS_CANVAS3D_STATE_NODE_PARENT_SCALE),
- mesh_geom_dirty = evas_canvas3d_object_dirty_get(EVAS_CANVAS3D_STATE_NODE_MESH_GEOMETRY),
- mesh_geom_dirty |= evas_canvas3d_object_dirty_get(EVAS_CANVAS3D_STATE_NODE_MESH_FRAME));
+ transform_orientation_dirty = evas_canvas3d_object_dirty_get(node, EVAS_CANVAS3D_STATE_NODE_TRANSFORM_ORIENTATION),
+ transform_orientation_dirty |= evas_canvas3d_object_dirty_get(node, EVAS_CANVAS3D_STATE_NODE_PARENT_ORIENTATION),
+ transform_scale_dirty = evas_canvas3d_object_dirty_get(node, EVAS_CANVAS3D_STATE_NODE_TRANSFORM_SCALE),
+ transform_scale_dirty |= evas_canvas3d_object_dirty_get(node, EVAS_CANVAS3D_STATE_NODE_PARENT_SCALE),
+ mesh_geom_dirty = evas_canvas3d_object_dirty_get(node, EVAS_CANVAS3D_STATE_NODE_MESH_GEOMETRY),
+ mesh_geom_dirty |= evas_canvas3d_object_dirty_get(node, EVAS_CANVAS3D_STATE_NODE_MESH_FRAME));
if ( transform_orientation_dirty || transform_scale_dirty || mesh_geom_dirty)
{
@@ -641,15 +641,15 @@ _node_aabb_update(Evas_Canvas3D_Node *node, void *data EINA_UNUSED)
const Eo_Event_Description *eo_desc = NULL;
eo_do(node,
- need_recalc = evas_canvas3d_object_dirty_get(EVAS_CANVAS3D_STATE_NODE_TRANSFORM_ORIENTATION),
- need_recalc |= evas_canvas3d_object_dirty_get(EVAS_CANVAS3D_STATE_NODE_PARENT_ORIENTATION),
- need_recalc |= evas_canvas3d_object_dirty_get(EVAS_CANVAS3D_STATE_NODE_TRANSFORM_POSITION),
- need_recalc |= evas_canvas3d_object_dirty_get(EVAS_CANVAS3D_STATE_NODE_PARENT_POSITION),
- need_recalc |= evas_canvas3d_object_dirty_get(EVAS_CANVAS3D_STATE_NODE_TRANSFORM_SCALE),
- need_recalc |= evas_canvas3d_object_dirty_get(EVAS_CANVAS3D_STATE_NODE_PARENT_SCALE),
- need_recalc |= evas_canvas3d_object_dirty_get(EVAS_CANVAS3D_STATE_NODE_MESH_GEOMETRY),
- need_recalc |= evas_canvas3d_object_dirty_get(EVAS_CANVAS3D_STATE_NODE_MESH_FRAME),
- need_recalc |= evas_canvas3d_object_dirty_get(EVAS_CANVAS3D_STATE_NODE_MEMBER));
+ need_recalc = evas_canvas3d_object_dirty_get(node, EVAS_CANVAS3D_STATE_NODE_TRANSFORM_ORIENTATION),
+ need_recalc |= evas_canvas3d_object_dirty_get(node, EVAS_CANVAS3D_STATE_NODE_PARENT_ORIENTATION),
+ need_recalc |= evas_canvas3d_object_dirty_get(node, EVAS_CANVAS3D_STATE_NODE_TRANSFORM_POSITION),
+ need_recalc |= evas_canvas3d_object_dirty_get(node, EVAS_CANVAS3D_STATE_NODE_PARENT_POSITION),
+ need_recalc |= evas_canvas3d_object_dirty_get(node, EVAS_CANVAS3D_STATE_NODE_TRANSFORM_SCALE),
+ need_recalc |= evas_canvas3d_object_dirty_get(node, EVAS_CANVAS3D_STATE_NODE_PARENT_SCALE),
+ need_recalc |= evas_canvas3d_object_dirty_get(node, EVAS_CANVAS3D_STATE_NODE_MESH_GEOMETRY),
+ need_recalc |= evas_canvas3d_object_dirty_get(node, EVAS_CANVAS3D_STATE_NODE_MESH_FRAME),
+ need_recalc |= evas_canvas3d_object_dirty_get(node, EVAS_CANVAS3D_STATE_NODE_MEMBER));
if (!need_recalc) return EINA_TRUE;
@@ -664,7 +664,7 @@ _node_aabb_update(Evas_Canvas3D_Node *node, void *data EINA_UNUSED)
evas_build_sphere(&pd->aabb, &pd->bsphere);
eo_desc = eo_base_legacy_only_event_description_get("collision,private");
- eo_do(node, eo_event_callback_call(eo_desc, (void *)node));
+ eo_do(node, eo_event_callback_call(node, eo_desc, (void *)node));
return EINA_TRUE;
}
@@ -720,7 +720,7 @@ _node_free(Evas_Canvas3D_Object *obj)
if (pd->parent)
{
- eo_do(pd->parent, evas_canvas3d_node_member_del(obj));
+ eo_do(pd->parent, evas_canvas3d_node_member_del(pd->parent, obj));
}
if (pd->type == EVAS_CANVAS3D_NODE_TYPE_MESH && pd->data.mesh.meshes)
@@ -1043,7 +1043,7 @@ evas_canvas3d_node_mesh_collect(Evas_Canvas3D_Node *node, void *data)
scene_data->mesh_nodes = eina_list_append(scene_data->mesh_nodes, node);
/* calculation of tangent space for all meshes */
- eo_do (node, list_meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get());
+ eo_do (node, list_meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get(node));
EINA_LIST_FOREACH(list_meshes, l, mesh)
{
mesh_pd = eo_data_scope_get(mesh, MY_CLASS);
@@ -1082,7 +1082,7 @@ evas_canvas3d_node_mesh_collect(Evas_Canvas3D_Node *node, void *data)
evas_tangent_space_get(vertex_data, tex_data, normal_data, index, mesh_pd->vertex_count,
mesh_pd->index_count, stride, tex_stride, normal_stride, &tangent_data);
- eo_do(mesh, evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TANGENT, 3 * sizeof(float), tangent_data));
+ eo_do(mesh, evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TANGENT, 3 * sizeof(float), tangent_data));
free(tangent_data);
}
}
@@ -1113,15 +1113,15 @@ evas_canvas3d_node_color_node_mesh_collect(Evas_Canvas3D_Node *node, void *data)
if (pd->type == EVAS_CANVAS3D_NODE_TYPE_MESH)
{
eo_do(camera,
- visible = evas_canvas3d_camera_node_visible_get(scene_data->camera_node,
+ visible = evas_canvas3d_camera_node_visible_get(camera, scene_data->camera_node,
node, EVAS_CANVAS3D_FRUSTUM_MODE_BSPHERE));
if (visible)
{
- eo_do (node, list_meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get());
+ eo_do (node, list_meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get(node));
EINA_LIST_FOREACH(list_meshes, l, mesh)
{
Eina_Bool tmp;
- if (eo_do_ret(mesh, tmp, evas_canvas3d_mesh_color_pick_enable_get()))
+ if (eo_do_ret(mesh, tmp, evas_canvas3d_mesh_color_pick_enable_get(mesh)))
{
color = calloc(1, sizeof(Evas_Color));
@@ -1164,14 +1164,15 @@ evas_canvas3d_node_add(Evas *e, Evas_Canvas3D_Node_Type type)
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return NULL;
MAGIC_CHECK_END();
- Evas_Object *eo_obj = eo_add(MY_CLASS, e, evas_canvas3d_node_constructor(type));
+ Evas_Object *eo_obj;
+ eo_add(eo_obj, MY_CLASS, e, evas_canvas3d_node_constructor(NULL, type));
return eo_obj;
}
EOLIAN static void
_evas_canvas3d_node_constructor(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas3D_Node_Type type)
{
- eo_do(obj, evas_canvas3d_object_type_set(EVAS_CANVAS3D_OBJECT_TYPE_NODE));
+ eo_do(obj, evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_NODE));
evas_vec3_set(&pd->position, 0.0, 0.0, 0.0);
evas_vec4_set(&pd->orientation, 0.0, 0.0, 0.0, 1.0);
@@ -1207,7 +1208,7 @@ _evas_canvas3d_node_eo_base_destructor(Eo *obj, Evas_Canvas3D_Node_Data *pd EINA
{
_node_free(obj);
- eo_do_super(obj, MY_CLASS, eo_destructor());
+ eo_super_eo_destructor(MY_CLASS, obj);
}
EOLIAN static Evas_Canvas3D_Node_Type
@@ -1235,7 +1236,7 @@ _evas_canvas3d_node_member_add(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas
pdmemberparent->members = eina_list_remove(pdmemberparent->members, member);
/* Mark changed. */
- eo_do(pdmember->parent, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_MEMBER, NULL));
+ eo_do(pdmember->parent, evas_canvas3d_object_change(pdmember->parent, EVAS_CANVAS3D_STATE_NODE_MEMBER, NULL));
}
else
{
@@ -1248,10 +1249,10 @@ _evas_canvas3d_node_member_add(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas
pdmember->parent = obj;
/* Mark changed. */
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_MEMBER, NULL));
- eo_do(member, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_PARENT_ORIENTATION, NULL));
- eo_do(member, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_PARENT_POSITION, NULL));
- eo_do(member, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_PARENT_SCALE, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_MEMBER, NULL));
+ eo_do(member, evas_canvas3d_object_change(member, EVAS_CANVAS3D_STATE_NODE_PARENT_ORIENTATION, NULL));
+ eo_do(member, evas_canvas3d_object_change(member, EVAS_CANVAS3D_STATE_NODE_PARENT_POSITION, NULL));
+ eo_do(member, evas_canvas3d_object_change(member, EVAS_CANVAS3D_STATE_NODE_PARENT_SCALE, NULL));
}
EOLIAN static void
@@ -1269,10 +1270,10 @@ _evas_canvas3d_node_member_del(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas
pdmember->parent = NULL;
/* Mark modified object as changed. */
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_MEMBER, NULL));
- eo_do(member, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_PARENT_ORIENTATION, NULL));
- eo_do(member, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_PARENT_POSITION, NULL));
- eo_do(member, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_PARENT_SCALE, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_MEMBER, NULL));
+ eo_do(member, evas_canvas3d_object_change(member, EVAS_CANVAS3D_STATE_NODE_PARENT_ORIENTATION, NULL));
+ eo_do(member, evas_canvas3d_object_change(member, EVAS_CANVAS3D_STATE_NODE_PARENT_POSITION, NULL));
+ eo_do(member, evas_canvas3d_object_change(member, EVAS_CANVAS3D_STATE_NODE_PARENT_SCALE, NULL));
/* Decrease reference count. */
eo_unref(member);
@@ -1297,7 +1298,7 @@ _evas_canvas3d_node_position_set(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Real
pd->position.y = y;
pd->position.z = z;
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_TRANSFORM_POSITION, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_TRANSFORM_POSITION, NULL));
}
EOLIAN static void
@@ -1308,7 +1309,7 @@ _evas_canvas3d_node_orientation_set(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_R
pd->orientation.z = z;
pd->orientation.w = w;
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_TRANSFORM_ORIENTATION, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_TRANSFORM_ORIENTATION, NULL));
}
EOLIAN static void
@@ -1327,7 +1328,7 @@ _evas_canvas3d_node_orientation_angle_axis_set(Eo *obj, Evas_Canvas3D_Node_Data
pd->orientation.y = s * axis.y;
pd->orientation.z = s * axis.z;
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_TRANSFORM_ORIENTATION, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_TRANSFORM_ORIENTATION, NULL));
}
EOLIAN static void
@@ -1337,7 +1338,7 @@ _evas_canvas3d_node_scale_set(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Real x,
pd->scale.y = y;
pd->scale.z = z;
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_TRANSFORM_SCALE, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_TRANSFORM_SCALE, NULL));
}
EOLIAN static void
@@ -1358,7 +1359,7 @@ _evas_canvas3d_node_position_get(const Eo *obj, Evas_Canvas3D_Node_Data *pd, Eva
}
else if (space == EVAS_CANVAS3D_SPACE_WORLD)
{
- eo_do(obj, evas_canvas3d_object_update());
+ eo_do(obj, evas_canvas3d_object_update(obj));
if (x) *x = pd->position_world.x;
if (y) *y = pd->position_world.y;
@@ -1386,7 +1387,7 @@ _evas_canvas3d_node_orientation_get(const Eo *obj, Evas_Canvas3D_Node_Data *pd,
}
else if (space == EVAS_CANVAS3D_SPACE_WORLD)
{
- eo_do(obj, evas_canvas3d_object_update());
+ eo_do(obj, evas_canvas3d_object_update(obj));
if (x) *x = pd->orientation_world.x;
if (y) *y = pd->orientation_world.y;
@@ -1414,7 +1415,7 @@ _evas_canvas3d_node_scale_get(const Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_C
}
else if (space == EVAS_CANVAS3D_SPACE_WORLD)
{
- eo_do(obj, evas_canvas3d_object_update());
+ eo_do(obj, evas_canvas3d_object_update(obj));
if (x) *x = pd->scale_world.x;
if (y) *y = pd->scale_world.y;
@@ -1426,21 +1427,21 @@ EOLIAN static void
_evas_canvas3d_node_position_inherit_set(Eo *obj, Evas_Canvas3D_Node_Data *pd, Eina_Bool inherit)
{
pd->position_inherit = inherit;
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_TRANSFORM_POSITION, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_TRANSFORM_POSITION, NULL));
}
EOLIAN static void
_evas_canvas3d_node_orientation_inherit_set(Eo *obj, Evas_Canvas3D_Node_Data *pd, Eina_Bool inherit)
{
pd->orientation_inherit = inherit;
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_TRANSFORM_ORIENTATION, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_TRANSFORM_ORIENTATION, NULL));
}
EOLIAN static void
_evas_canvas3d_node_scale_inherit_set(Eo *obj, Evas_Canvas3D_Node_Data *pd, Eina_Bool inherit)
{
pd->scale_inherit = inherit;
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_TRANSFORM_SCALE, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_TRANSFORM_SCALE, NULL));
}
EOLIAN static Eina_Bool
@@ -1575,7 +1576,7 @@ _evas_canvas3d_node_look_at_set(Eo *obj, Evas_Canvas3D_Node_Data *pd,
_look_at_set(pd, &target, &up);
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_TRANSFORM_ORIENTATION, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_TRANSFORM_ORIENTATION, NULL));
}
EOLIAN static void
@@ -1604,7 +1605,7 @@ _evas_canvas3d_node_camera_set(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas
evas_canvas3d_camera_node_add(camera, obj);
/* Mark changed. */
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_CAMERA, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_CAMERA, NULL));
}
EOLIAN static Evas_Canvas3D_Camera *
@@ -1639,7 +1640,7 @@ _evas_canvas3d_node_light_set(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas3
evas_canvas3d_light_node_add(light, obj);
/* Mark changed. */
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_LIGHT, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_LIGHT, NULL));
}
EOLIAN static Evas_Canvas3D_Light *
@@ -1686,8 +1687,8 @@ _evas_canvas3d_node_mesh_add(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas3D
evas_canvas3d_mesh_node_add(mesh, obj);
/* Mark changed. */
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_MESH_GEOMETRY, NULL));
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_MESH_MATERIAL, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_MESH_GEOMETRY, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_MESH_MATERIAL, NULL));
}
EOLIAN static void
@@ -1709,8 +1710,8 @@ _evas_canvas3d_node_mesh_del(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canvas3D
evas_canvas3d_mesh_node_del(mesh, obj);
eo_unref(mesh);
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_MESH_GEOMETRY, NULL));
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_MESH_MATERIAL, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_MESH_GEOMETRY, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_MESH_MATERIAL, NULL));
}
EOLIAN static const Eina_List *
@@ -1737,7 +1738,7 @@ _evas_canvas3d_node_mesh_frame_set(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Ca
}
nm->frame = frame;
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_MESH_FRAME, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_MESH_FRAME, NULL));
}
EOLIAN static int
@@ -1763,7 +1764,7 @@ _evas_canvas3d_node_mesh_frame_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Node_Data
EOLIAN static void
_evas_canvas3d_node_bounding_box_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Node_Data *pd, Evas_Real *x, Evas_Real *y, Evas_Real *z, Evas_Real *x2, Evas_Real *y2, Evas_Real *z2)
{
- eo_do(obj, evas_canvas3d_object_update());
+ eo_do(obj, evas_canvas3d_object_update(obj));
if (x) *x = pd->aabb.p0.x;
if (y) *y = pd->aabb.p0.y;
if (z) *z = pd->aabb.p0.z;
@@ -1775,7 +1776,7 @@ _evas_canvas3d_node_bounding_box_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Node_Dat
EOLIAN static void
_evas_canvas3d_node_bounding_sphere_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Node_Data *pd, Evas_Real *x, Evas_Real *y, Evas_Real *z, Evas_Real *r)
{
- eo_do(obj, evas_canvas3d_object_update());
+ eo_do(obj, evas_canvas3d_object_update(obj));
if (x) *x = pd->bsphere.center.x;
if (y) *y = pd->bsphere.center.y;
if (z) *z = pd->bsphere.center.z;
@@ -1789,7 +1790,7 @@ _evas_canvas3d_node_billboard_target_set(Eo *obj EINA_UNUSED, Evas_Canvas3D_Node
if (pd->billboard_target != target)
{
pd->billboard_target = target;
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_NODE_PARENT_BILLBOARD, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_NODE_PARENT_BILLBOARD, NULL));
}
}
diff --git a/src/lib/evas/canvas/evas_canvas3d_object.c b/src/lib/evas/canvas/evas_canvas3d_object.c
index 3cba61c44e..3bae6b6a5e 100644
--- a/src/lib/evas/canvas/evas_canvas3d_object.c
+++ b/src/lib/evas/canvas/evas_canvas3d_object.c
@@ -7,8 +7,8 @@ EOLIAN static Eo *
_evas_canvas3d_object_eo_base_constructor(Eo *obj, Evas_Canvas3D_Object_Data *pd)
{
Eo *e = NULL;
- obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
- eo_do(obj, e = eo_parent_get());
+ obj = eo_super_eo_constructor( MY_CLASS, obj);
+ eo_do(obj, e = eo_parent_get(obj));
pd->evas = e;
pd->type = EVAS_CANVAS3D_OBJECT_TYPE_INVALID;
memset(&pd->dirty[0], 0x00, sizeof(Eina_Bool) * EVAS_CANVAS3D_STATE_MAX);
@@ -50,7 +50,7 @@ _evas_canvas3d_object_change(Eo *obj, Evas_Canvas3D_Object_Data *pd, Evas_Canvas
pd->dirty[state] = EINA_TRUE;
pd->dirty[EVAS_CANVAS3D_STATE_ANY] = EINA_TRUE;
- eo_do(obj, evas_canvas3d_object_change_notify(state, ref));
+ eo_do(obj, evas_canvas3d_object_change_notify(obj, state, ref));
}
EOLIAN static void
@@ -59,7 +59,7 @@ _evas_canvas3d_object_update(Eo *obj, Evas_Canvas3D_Object_Data *pd)
if (!pd->dirty[EVAS_CANVAS3D_STATE_ANY])
return;
- eo_do(obj, evas_canvas3d_object_update_notify());
+ eo_do(obj, evas_canvas3d_object_update_notify(obj));
memset(&pd->dirty[0], 0x00, sizeof(Eina_Bool) * EVAS_CANVAS3D_STATE_MAX);
}
@@ -72,8 +72,8 @@ _evas_canvas3d_object_eo_base_event_callback_priority_add(Eo *obj,
Eo_Event_Cb func,
const void *user_data)
{
- eo_do_super(obj, MY_CLASS, eo_event_callback_priority_add(desc, priority, func, user_data));
- eo_do(obj, evas_canvas3d_object_callback_register(desc->name, user_data));
+ eo_super_eo_event_callback_priority_add(MY_CLASS, obj, desc, priority, func, user_data);
+ eo_do(obj, evas_canvas3d_object_callback_register(obj, desc->name, user_data));
}
EOLIAN static void
@@ -82,8 +82,8 @@ _evas_canvas3d_object_eo_base_event_callback_del(Eo *obj, Evas_Canvas3D_Object_D
Eo_Event_Cb func,
const void *user_data)
{
- eo_do_super(obj, MY_CLASS, eo_event_callback_del(desc, func, user_data));
- eo_do(obj, evas_canvas3d_object_callback_unregister(desc->name));
+ eo_super_eo_event_callback_del(MY_CLASS, obj, desc, func, user_data);
+ eo_do(obj, evas_canvas3d_object_callback_unregister(obj, desc->name));
}
#include "canvas/evas_canvas3d_object.eo.c"
diff --git a/src/lib/evas/canvas/evas_canvas3d_primitive.c b/src/lib/evas/canvas/evas_canvas3d_primitive.c
index 28e747ce5a..36aae70f84 100644
--- a/src/lib/evas/canvas/evas_canvas3d_primitive.c
+++ b/src/lib/evas/canvas/evas_canvas3d_primitive.c
@@ -20,15 +20,16 @@ evas_canvas3d_primitive_add(Evas *e)
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return NULL;
MAGIC_CHECK_END();
- Evas_Object *eo_obj = eo_add(MY_CLASS, e);
+ Evas_Object *eo_obj;
+ eo_add(eo_obj, MY_CLASS, e);
return eo_obj;
}
EOLIAN static Eo *
_evas_canvas3d_primitive_eo_base_constructor(Eo *obj, Evas_Canvas3D_Primitive_Data *pd)
{
- obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
- eo_do(obj, evas_canvas3d_object_type_set(EVAS_CANVAS3D_OBJECT_TYPE_PRIMITIVE));
+ obj = eo_super_eo_constructor( MY_CLASS, obj);
+ eo_do(obj, evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_PRIMITIVE));
_primitive_init(pd);
return obj;
@@ -37,7 +38,7 @@ _evas_canvas3d_primitive_eo_base_constructor(Eo *obj, Evas_Canvas3D_Primitive_Da
EOLIAN static void
_evas_canvas3d_primitive_eo_base_destructor(Eo *obj, Evas_Canvas3D_Primitive_Data *pd EINA_UNUSED)
{
- eo_do_super(obj, MY_CLASS, eo_destructor());
+ eo_super_eo_destructor(MY_CLASS, obj);
}
EOLIAN static void
diff --git a/src/lib/evas/canvas/evas_canvas3d_scene.c b/src/lib/evas/canvas/evas_canvas3d_scene.c
index 13dd68af22..de9c05252f 100644
--- a/src/lib/evas/canvas/evas_canvas3d_scene.c
+++ b/src/lib/evas/canvas/evas_canvas3d_scene.c
@@ -43,15 +43,15 @@ _evas_canvas3d_scene_evas_canvas3d_object_update_notify(Eo *obj EINA_UNUSED, Eva
{
if (pd->root_node)
{
- eo_do(pd->root_node, evas_canvas3d_object_update());
+ eo_do(pd->root_node, evas_canvas3d_object_update(pd->root_node));
}
if (pd->camera_node)
{
- eo_do(pd->camera_node, evas_canvas3d_object_update());
+ eo_do(pd->camera_node, evas_canvas3d_object_update(pd->camera_node));
}
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_SCENE_UPDATED, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_SCENE_UPDATED, NULL));
}
EAPI Evas_Canvas3D_Scene *
@@ -60,15 +60,16 @@ evas_canvas3d_scene_add(Evas *e)
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return NULL;
MAGIC_CHECK_END();
- Evas_Object *eo_obj = eo_add(MY_CLASS, e);
+ Evas_Object *eo_obj;
+ eo_add(eo_obj, MY_CLASS, e);
return eo_obj;
}
EOLIAN static Eo *
_evas_canvas3d_scene_eo_base_constructor(Eo *obj, Evas_Canvas3D_Scene_Data *pd)
{
- obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
- eo_do(obj, evas_canvas3d_object_type_set(EVAS_CANVAS3D_OBJECT_TYPE_SCENE));
+ obj = eo_super_eo_constructor( MY_CLASS, obj);
+ eo_do(obj, evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_SCENE));
evas_color_set(&pd->bg_color, 0.0, 0.0, 0.0, 0.0);
pd->shadows_enabled = EINA_FALSE;
pd->color_pick_enabled = EINA_FALSE;
@@ -100,7 +101,7 @@ _evas_canvas3d_scene_root_node_set(Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_C
evas_canvas3d_node_scene_root_add(node, obj);
}
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_SCENE_ROOT_NODE, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_SCENE_ROOT_NODE, NULL));
}
EOLIAN static Evas_Canvas3D_Node *
@@ -129,7 +130,7 @@ _evas_canvas3d_scene_camera_node_set(Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas
evas_canvas3d_node_scene_camera_add(node, obj);
}
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_SCENE_CAMERA_NODE, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_SCENE_CAMERA_NODE, NULL));
}
EOLIAN static Evas_Canvas3D_Node *
@@ -143,7 +144,7 @@ _evas_canvas3d_scene_size_set(Eo *obj EINA_UNUSED, Evas_Canvas3D_Scene_Data *pd,
{
pd->w = w;
pd->h = h;
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_SCENE_SIZE, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_SCENE_SIZE, NULL));
}
EOLIAN static void
@@ -158,7 +159,7 @@ _evas_canvas3d_scene_background_color_set(Eo *obj EINA_UNUSED, Evas_Canvas3D_Sce
Evas_Real r, Evas_Real g, Evas_Real b, Evas_Real a)
{
evas_color_set(&pd->bg_color, r, g, b, a);
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_SCENE_BACKGROUND_COLOR, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_SCENE_BACKGROUND_COLOR, NULL));
}
EOLIAN static void
@@ -631,7 +632,7 @@ _evas_canvas3d_scene_pick(const Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_Real
scene_data.shadows_enabled = pd->shadows_enabled;
scene_data.camera_node = pd->camera_node;
scene_data.color_pick_enabled = pd->color_pick_enabled;
- eo_do(obj, update_scene = evas_canvas3d_object_dirty_get(EVAS_CANVAS3D_STATE_SCENE_UPDATED));
+ eo_do(obj, update_scene = evas_canvas3d_object_dirty_get(obj, EVAS_CANVAS3D_STATE_SCENE_UPDATED));
if (update_scene)
{
if (pd->node_mesh_colors)
@@ -671,7 +672,7 @@ _evas_canvas3d_scene_pick(const Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_Real
/*Calling callback clicked*/
eo_desc = eo_base_legacy_only_event_description_get("clicked,private");
- eo_do(picked_node, eo_event_callback_call(eo_desc, picked_node));
+ eo_do(picked_node, eo_event_callback_call(picked_node, eo_desc, picked_node));
return EINA_TRUE;
}
@@ -687,7 +688,7 @@ _evas_canvas3d_scene_pick(const Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_Real
return EINA_FALSE;
}
/* Update the scene graph. */
- eo_do(obj, evas_canvas3d_object_update());
+ eo_do(obj, evas_canvas3d_object_update(obj));
pd_camera_node = eo_data_scope_get(pd->camera_node, EVAS_CANVAS3D_NODE_CLASS);
pd_camera = eo_data_scope_get(pd_camera_node->data.camera.camera, EVAS_CANVAS3D_CAMERA_CLASS);
evas_mat4_multiply(&data.matrix_vp,
@@ -710,7 +711,7 @@ _evas_canvas3d_scene_pick(const Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_Real
/*Calling callback clicked*/
eo_desc = eo_base_legacy_only_event_description_get("clicked,private");
- eo_do(data.node, eo_event_callback_call(eo_desc, data.node));
+ eo_do(data.node, eo_event_callback_call(data.node, eo_desc, data.node));
return EINA_TRUE;
}
@@ -733,7 +734,7 @@ _evas_canvas3d_scene_exist(const Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_Rea
data.t = 0.0;
/* Update the scene graph. */
- eo_do(obj, evas_canvas3d_object_update());
+ eo_do(obj, evas_canvas3d_object_update(obj));
pd_camera_node = eo_data_scope_get(pd->camera_node, EVAS_CANVAS3D_NODE_CLASS);
pd_camera = eo_data_scope_get(pd_camera_node->data.camera.camera, EVAS_CANVAS3D_CAMERA_CLASS);
evas_mat4_multiply(&data.matrix_vp,
@@ -759,18 +760,18 @@ _evas_canvas3d_scene_pick_member_list_get(const Eo *obj, Evas_Canvas3D_Scene_Dat
Eina_Bool pick = EINA_FALSE;
/* Check pick for given scene. */
- eo_do(obj, pick = evas_canvas3d_scene_pick(x, y, NULL, NULL, NULL, NULL));
+ eo_do(obj, pick = evas_canvas3d_scene_pick(obj, x, y, NULL, NULL, NULL, NULL));
if (!pick)
return NULL;
/* Get all members from root node. */
- eo_do(pd->root_node, list = evas_canvas3d_node_member_list_get());
+ eo_do(pd->root_node, list = evas_canvas3d_node_member_list_get(pd->root_node));
EINA_LIST_FOREACH(list, l, node)
{
Evas_Canvas3D_Node *exists;
- if (eo_do_ret(obj, exists, evas_canvas3d_scene_exist(x, y, node)))
+ if (eo_do_ret(obj, exists, evas_canvas3d_scene_exist(obj, x, y, node)))
picked_nodes = eina_list_append(picked_nodes, l);
}
@@ -787,7 +788,7 @@ EOLIAN static void
_evas_canvas3d_scene_shadows_enable_set(Eo *obj EINA_UNUSED, Evas_Canvas3D_Scene_Data *pd, Eina_Bool _shadows_enabled)
{
pd->shadows_enabled = _shadows_enabled;
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_SCENE_SHADOWS_ENABLED, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_SCENE_SHADOWS_ENABLED, NULL));
}
EOLIAN static Eina_Bool
@@ -802,7 +803,7 @@ _evas_canvas3d_scene_color_pick_enable_set(Eo *obj EINA_UNUSED, Evas_Canvas3D_Sc
if (pd->color_pick_enabled != _enabled)
pd->color_pick_enabled = _enabled;
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_SCENE_UPDATED, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_SCENE_UPDATED, NULL));
return EINA_TRUE;
}
@@ -812,7 +813,7 @@ _evas_canvas3d_scene_shadows_depth_set(Eo *obj EINA_UNUSED, Evas_Canvas3D_Scene_
{
pd->depth_offset = depth_offset;
pd->depth_constant = depth_constant;
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_SCENE_SHADOWS_DEPTH, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_SCENE_SHADOWS_DEPTH, NULL));
}
EOLIAN static void
diff --git a/src/lib/evas/canvas/evas_canvas3d_texture.c b/src/lib/evas/canvas/evas_canvas3d_texture.c
index e01762d3b7..8893bf4942 100644
--- a/src/lib/evas/canvas/evas_canvas3d_texture.c
+++ b/src/lib/evas/canvas/evas_canvas3d_texture.c
@@ -54,7 +54,7 @@ _texture_proxy_subrender(Evas_Canvas3D_Texture *obj)
{
/* Code taken from _proxy_subrender() in file evas_object_image.c */
Eo *evas = NULL;
- eo_do(obj, evas = evas_common_evas_get());
+ eo_do(obj, evas = evas_common_evas_get(obj));
Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
Evas_Canvas3D_Texture_Data *pd = eo_data_scope_get(obj, MY_CLASS);
Evas_Object_Protected_Data *source;
@@ -165,7 +165,7 @@ _texture_fini(Evas_Canvas3D_Texture *obj)
void *data = NULL;
Evas_Canvas3D_Material_Data *material = NULL;
- eo_do(obj, evas = evas_common_evas_get());
+ eo_do(obj, evas = evas_common_evas_get(obj));
Evas_Canvas3D_Texture_Data *pd = eo_data_scope_get(obj, MY_CLASS);
if (pd->engine_data)
@@ -206,7 +206,7 @@ _texture_material_change_notify(const Eina_Hash *hash EINA_UNUSED, const void *k
void *data EINA_UNUSED, void *fdata)
{
Evas_Canvas3D_Material *m = *(Evas_Canvas3D_Material **)key;
- eo_do(m, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_MATERIAL_TEXTURE, (Evas_Canvas3D_Object *)fdata));
+ eo_do(m, evas_canvas3d_object_change(m, EVAS_CANVAS3D_STATE_MATERIAL_TEXTURE, (Evas_Canvas3D_Object *)fdata));
return EINA_TRUE;
}
@@ -224,7 +224,7 @@ _evas_canvas3d_texture_evas_canvas3d_object_update_notify(Eo *obj, Evas_Canvas3D
if (pd->source)
{
Eo *evas = NULL;
- eo_do(obj, evas = evas_common_evas_get());
+ eo_do(obj, evas = evas_common_evas_get(obj));
Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
Evas_Object_Protected_Data *src = eo_data_scope_get(pd->source, EVAS_OBJECT_CLASS);
@@ -313,7 +313,8 @@ evas_canvas3d_texture_add(Evas *e)
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return NULL;
MAGIC_CHECK_END();
- Evas_Object *eo_obj = eo_add(MY_CLASS, e);
+ Evas_Object *eo_obj;
+ eo_add(eo_obj, MY_CLASS, e);
return eo_obj;
}
@@ -321,10 +322,10 @@ evas_canvas3d_texture_add(Evas *e)
EOLIAN static Eo *
_evas_canvas3d_texture_eo_base_constructor(Eo *obj, Evas_Canvas3D_Texture_Data *pd EINA_UNUSED)
{
- obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
+ obj = eo_super_eo_constructor( MY_CLASS, obj);
pd->atlas_enable = EINA_TRUE;
- eo_do(obj, evas_canvas3d_object_type_set(EVAS_CANVAS3D_OBJECT_TYPE_TEXTURE));
+ eo_do(obj, evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_TEXTURE));
return obj;
}
@@ -333,7 +334,7 @@ EOLIAN static void
_evas_canvas3d_texture_eo_base_destructor(Eo *obj, Evas_Canvas3D_Texture_Data *pd EINA_UNUSED)
{
_texture_fini(obj);
- eo_do_super(obj, MY_CLASS, eo_destructor());
+ eo_super_eo_destructor(MY_CLASS, obj);
}
EOLIAN static void
@@ -343,7 +344,7 @@ _evas_canvas3d_texture_data_set(Eo *obj, Evas_Canvas3D_Texture_Data *pd,
{
Eo *evas = NULL;
void *image = NULL;
- eo_do(obj, evas = evas_common_evas_get());
+ eo_do(obj, evas = evas_common_evas_get(obj));
Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
if (!pd->engine_data && e->engine.func->texture_new)
@@ -366,7 +367,7 @@ _evas_canvas3d_texture_data_set(Eo *obj, Evas_Canvas3D_Texture_Data *pd,
pd->engine_data,
image);
e->engine.func->image_free(e->engine.data.output, image);
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_TEXTURE_DATA, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_TEXTURE_DATA, NULL));
}
EOLIAN static void
@@ -378,7 +379,7 @@ _evas_canvas3d_texture_file_set(Eo *obj, Evas_Canvas3D_Texture_Data *pd, const c
Eo *evas = NULL;
void *image;
- eo_do(obj, evas = evas_common_evas_get());
+ eo_do(obj, evas = evas_common_evas_get(obj));
Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
if (!pd->engine_data && e->engine.func->texture_new)
@@ -399,14 +400,14 @@ _evas_canvas3d_texture_file_set(Eo *obj, Evas_Canvas3D_Texture_Data *pd, const c
image);
e->engine.func->image_free(e->engine.data.output, image);
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_TEXTURE_DATA, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_TEXTURE_DATA, NULL));
}
EAPI void
_evas_canvas3d_texture_source_set(Eo *obj , Evas_Canvas3D_Texture_Data *pd, Evas_Object *source)
{
Eo *evas = NULL;
- eo_do(obj, evas = evas_common_evas_get());
+ eo_do(obj, evas = evas_common_evas_get(obj));
Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
Evas_Object_Protected_Data *src;
@@ -441,7 +442,7 @@ _evas_canvas3d_texture_source_set(Eo *obj , Evas_Canvas3D_Texture_Data *pd, Evas
pd->engine_data = e->engine.func->texture_new(e->engine.data.output, pd->atlas_enable);
_texture_proxy_set(obj, source, src);
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_TEXTURE_DATA, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_TEXTURE_DATA, NULL));
}
EOLIAN static void
@@ -483,7 +484,7 @@ _evas_canvas3d_texture_color_format_get(const Eo *obj EINA_UNUSED, Evas_Canvas3D
{
Evas_Colorspace format = -1;
Eo *evas = NULL;
- eo_do(obj, evas = evas_common_evas_get());
+ eo_do(obj, evas = evas_common_evas_get(obj));
Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
if (e->engine.func->image_colorspace_get &&
@@ -502,7 +503,7 @@ EOLIAN static void
_evas_canvas3d_texture_size_get(const Eo *obj, Evas_Canvas3D_Texture_Data *pd, int *w, int *h)
{
Eo *evas = NULL;
- eo_do(obj, evas = evas_common_evas_get());
+ eo_do(obj, evas = evas_common_evas_get(obj));
Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
if (e->engine.func->texture_size_get)
{
@@ -515,21 +516,21 @@ EOLIAN static void
_evas_canvas3d_texture_wrap_set(Eo *obj, Evas_Canvas3D_Texture_Data *pd, Evas_Canvas3D_Wrap_Mode s, Evas_Canvas3D_Wrap_Mode t)
{
Eo *evas = NULL;
- eo_do(obj, evas = evas_common_evas_get());
+ eo_do(obj, evas = evas_common_evas_get(obj));
Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
if (e->engine.func->texture_wrap_set)
{
e->engine.func->texture_wrap_set(e->engine.data.output,
pd->engine_data, s, t);
}
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_TEXTURE_WRAP, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_TEXTURE_WRAP, NULL));
}
EOLIAN static void
_evas_canvas3d_texture_wrap_get(Eo *obj, Evas_Canvas3D_Texture_Data *pd, Evas_Canvas3D_Wrap_Mode *s, Evas_Canvas3D_Wrap_Mode *t)
{
Eo *evas = NULL;
- eo_do(obj, evas = evas_common_evas_get());
+ eo_do(obj, evas = evas_common_evas_get(obj));
Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
if (e->engine.func->texture_wrap_set)
{
@@ -542,21 +543,21 @@ EOLIAN static void
_evas_canvas3d_texture_filter_set(Eo *obj, Evas_Canvas3D_Texture_Data *pd, Evas_Canvas3D_Texture_Filter min, Evas_Canvas3D_Texture_Filter mag)
{
Eo *evas = NULL;
- eo_do(obj, evas = evas_common_evas_get());
+ eo_do(obj, evas = evas_common_evas_get(obj));
Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
if (e->engine.func->texture_filter_set)
{
e->engine.func->texture_filter_set(e->engine.data.output,
pd->engine_data, min, mag);
}
- eo_do(obj, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_TEXTURE_FILTER, NULL));
+ eo_do(obj, evas_canvas3d_object_change(obj, EVAS_CANVAS3D_STATE_TEXTURE_FILTER, NULL));
}
EOLIAN static void
_evas_canvas3d_texture_filter_get(const Eo *obj EINA_UNUSED, Evas_Canvas3D_Texture_Data *pd, Evas_Canvas3D_Texture_Filter *min, Evas_Canvas3D_Texture_Filter *mag)
{
Eo *evas = NULL;
- eo_do(obj, evas = evas_common_evas_get());
+ eo_do(obj, evas = evas_common_evas_get(obj));
Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS);
if (e->engine.func->texture_filter_get)
{
diff --git a/src/lib/evas/canvas/evas_clip.c b/src/lib/evas/canvas/evas_clip.c
index 874beb8b7b..19522b1ce6 100644
--- a/src/lib/evas/canvas/evas_clip.c
+++ b/src/lib/evas/canvas/evas_clip.c
@@ -277,7 +277,7 @@ _evas_object_clip_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Object *
}
if (obj->is_smart)
{
- eo_do(eo_obj, evas_obj_smart_clip_set(eo_clip));
+ eo_do(eo_obj, evas_obj_smart_clip_set(eo_obj, eo_clip));
}
if (obj->cur->clipper)
{
@@ -409,7 +409,7 @@ _evas_object_clip_unset(Eo *eo_obj, Evas_Object_Protected_Data *obj)
if (evas_object_intercept_call_clip_unset(eo_obj, obj)) return;
if (obj->is_smart)
{
- eo_do(eo_obj, evas_obj_smart_clip_unset());
+ eo_do(eo_obj, evas_obj_smart_clip_unset(eo_obj));
}
if (obj->cur->clipper)
{
diff --git a/src/lib/evas/canvas/evas_data.c b/src/lib/evas/canvas/evas_data.c
index 38bc53741b..fe9b163221 100644
--- a/src/lib/evas/canvas/evas_data.c
+++ b/src/lib/evas/canvas/evas_data.c
@@ -8,7 +8,7 @@ evas_object_data_set(Evas_Object *obj, const char *key, const void *data)
MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
return;
MAGIC_CHECK_END();
- eo_do(obj, eo_key_data_set(key, data));
+ eo_do(obj, eo_key_data_set(obj, key, data));
}
EAPI void *
@@ -18,7 +18,7 @@ evas_object_data_get(const Evas_Object *obj, const char *key)
return NULL;
MAGIC_CHECK_END();
void *data = NULL;
- eo_do((Evas_Object *)obj, data = eo_key_data_get(key));
+ eo_do((Evas_Object *)obj, data = eo_key_data_get(obj, key));
return data;
}
@@ -29,6 +29,6 @@ evas_object_data_del(Evas_Object *obj, const char *key)
return NULL;
MAGIC_CHECK_END();
void *data = NULL;
- eo_do(obj, data = eo_key_data_get(key), eo_key_data_del(key));
+ eo_do(obj, data = eo_key_data_get(obj, key), eo_key_data_del(obj, key));
return data;
}
diff --git a/src/lib/evas/canvas/evas_events.c b/src/lib/evas/canvas/evas_events.c
index c60526f6a8..bb5395b4ed 100644
--- a/src/lib/evas/canvas/evas_events.c
+++ b/src/lib/evas/canvas/evas_events.c
@@ -937,7 +937,7 @@ evas_event_freeze(Evas *eo_e)
MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS);
return;
MAGIC_CHECK_END();
- eo_do(eo_e, eo_event_freeze());
+ eo_do(eo_e, eo_event_freeze(eo_e));
}
EAPI void
@@ -946,13 +946,13 @@ evas_event_thaw(Evas *eo_e)
MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS);
return;
MAGIC_CHECK_END();
- eo_do(eo_e, eo_event_thaw());
+ eo_do(eo_e, eo_event_thaw(eo_e));
}
EOLIAN void
_evas_canvas_eo_base_event_freeze(Eo *eo_e, Evas_Public_Data *e)
{
- eo_do_super(eo_e, EVAS_CANVAS_CLASS, eo_event_freeze());
+ eo_super_eo_event_freeze(EVAS_CANVAS_CLASS, eo_e);
e->is_frozen = EINA_TRUE;
}
@@ -960,10 +960,8 @@ EOLIAN void
_evas_canvas_eo_base_event_thaw(Eo *eo_e, Evas_Public_Data *e)
{
int fcount = -1;
- eo_do_super(eo_e, EVAS_CANVAS_CLASS,
- eo_event_thaw());
- eo_do_super(eo_e, EVAS_CANVAS_CLASS,
- fcount = eo_event_freeze_count_get());
+ eo_super_eo_event_thaw(EVAS_CANVAS_CLASS, eo_e);
+ fcount = eo_super_eo_event_freeze_count_get(EVAS_CANVAS_CLASS, eo_e);
if (0 == fcount)
{
Evas_Layer *lay;
@@ -991,7 +989,7 @@ evas_event_freeze_get(const Evas *eo_e)
return 0;
MAGIC_CHECK_END();
int ret = 0;
- eo_do((Eo *)eo_e, ret = eo_event_freeze_count_get());
+ eo_do((Eo *)eo_e, ret = eo_event_freeze_count_get(eo_e));
return ret;
}
diff --git a/src/lib/evas/canvas/evas_filter_mixin.c b/src/lib/evas/canvas/evas_filter_mixin.c
index e93fa703e2..3eaabf2010 100644
--- a/src/lib/evas/canvas/evas_filter_mixin.c
+++ b/src/lib/evas/canvas/evas_filter_mixin.c
@@ -32,8 +32,8 @@ _filter_cb(Evas_Filter_Context *ctx, void *data, Eina_Bool success)
ERR("Filter failed at runtime!");
eo_do(eo_obj,
- evas_filter_invalid_set(EINA_TRUE);
- evas_filter_dirty());
+ evas_filter_invalid_set(eo_obj, EINA_TRUE);
+ evas_filter_dirty(eo_obj));
evas_object_change(eo_obj, obj);
evas_object_clip_dirty(eo_obj, obj);
evas_object_coords_recalc(eo_obj, obj);
@@ -242,7 +242,7 @@ evas_filter_object_render(Eo *eo_obj, Evas_Object_Protected_Data *obj,
// Request rendering from the object itself (child class)
evas_filter_program_padding_get(pd->data->chain, &l, &r, &t, &b);
- eo_do(eo_obj, evas_filter_input_render(filter, drawctx, l, r, t, b, do_async));
+ eo_do(eo_obj, evas_filter_input_render(eo_obj, filter, drawctx, l, r, t, b, do_async));
ENFN->context_free(ENDT, drawctx);
@@ -293,7 +293,7 @@ _evas_filter_efl_gfx_filter_program_set(Eo *eo_obj, Evas_Filter_Data *pd,
eina_stringshare_replace(&fcow->name, name);
if (code)
{
- eo_do(eo_obj, alpha = evas_filter_input_alpha());
+ eo_do(eo_obj, alpha = evas_filter_input_alpha(eo_obj));
pgm = evas_filter_program_new(fcow->name, alpha);
evas_filter_program_source_set_all(pgm, fcow->sources);
evas_filter_program_data_set_all(pgm, fcow->data);
@@ -316,7 +316,7 @@ _evas_filter_efl_gfx_filter_program_set(Eo *eo_obj, Evas_Filter_Data *pd,
FCOW_END(fcow, pd);
// Update object
- eo_do(eo_obj, evas_filter_dirty());
+ eo_do(eo_obj, evas_filter_dirty(eo_obj));
evas_object_change(eo_obj, obj);
evas_object_clip_dirty(eo_obj, obj);
evas_object_coords_recalc(eo_obj, obj);
@@ -410,7 +410,7 @@ update:
FCOW_END(fcow, pd);
}
- eo_do(eo_obj, evas_filter_dirty());
+ eo_do(eo_obj, evas_filter_dirty(eo_obj));
evas_object_change(eo_obj, obj);
evas_object_clip_dirty(eo_obj, obj);
evas_object_coords_recalc(eo_obj, obj);
@@ -456,7 +456,7 @@ _evas_filter_efl_gfx_filter_state_set(Eo *eo_obj, Evas_Filter_Data *pd,
}
// Mark as changed
- eo_do(eo_obj, evas_filter_dirty());
+ eo_do(eo_obj, evas_filter_dirty(eo_obj));
evas_object_change(eo_obj, obj);
evas_object_clip_dirty(eo_obj, obj);
evas_object_coords_recalc(eo_obj, obj);
diff --git a/src/lib/evas/canvas/evas_focus.c b/src/lib/evas/canvas/evas_focus.c
index 880791bdd2..2ab06ef7a4 100644
--- a/src/lib/evas/canvas/evas_focus.c
+++ b/src/lib/evas/canvas/evas_focus.c
@@ -24,7 +24,7 @@ _evas_object_focus_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bool fo
if (focus)
{
if (obj->layer->evas->focused)
- eo_do(obj->layer->evas->focused, evas_obj_focus_set(0));
+ eo_do(obj->layer->evas->focused, evas_obj_focus_set(obj->layer->evas->focused, 0));
if (obj->layer->evas->focused) goto end;
obj->focused = 1;
diff --git a/src/lib/evas/canvas/evas_layer.c b/src/lib/evas/canvas/evas_layer.c
index 3731078a04..41b2b55888 100644
--- a/src/lib/evas/canvas/evas_layer.c
+++ b/src/lib/evas/canvas/evas_layer.c
@@ -181,7 +181,7 @@ _evas_object_layer_set_child(Evas_Object *eo_obj, Evas_Object *par, short l)
EAPI void
evas_object_layer_set(Evas_Object *obj, short l)
{
- eo_do((Evas_Object *)obj, efl_gfx_stack_layer_set(l));
+ eo_do((Evas_Object *)obj, efl_gfx_stack_layer_set(obj, l));
}
EOLIAN void
@@ -249,7 +249,7 @@ evas_object_layer_get(const Evas_Object *obj)
{
short ret;
- return eo_do_ret((Evas_Object *)obj, ret, efl_gfx_stack_layer_get());
+ return eo_do_ret((Evas_Object *)obj, ret, efl_gfx_stack_layer_get(obj));
}
EOLIAN short
diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c
index bdafc3128c..025f04afe0 100644
--- a/src/lib/evas/canvas/evas_main.c
+++ b/src/lib/evas/canvas/evas_main.c
@@ -151,14 +151,15 @@ evas_shutdown(void)
EAPI Evas *
evas_new(void)
{
- Evas_Object *eo_obj = eo_add(EVAS_CANVAS_CLASS, NULL);
+ Evas_Object *eo_obj;
+ eo_add(eo_obj, EVAS_CANVAS_CLASS, NULL);
return eo_obj;
}
EOLIAN static Eo *
_evas_canvas_eo_base_constructor(Eo *eo_obj, Evas_Public_Data *e)
{
- eo_obj = eo_do_super_ret(eo_obj, MY_CLASS, eo_obj, eo_constructor());
+ eo_obj = eo_super_eo_constructor( MY_CLASS, eo_obj);
e->evas = eo_obj;
e->output.render_method = RENDER_METHOD_INVALID;
@@ -320,7 +321,7 @@ _evas_canvas_eo_base_destructor(Eo *eo_e, Evas_Public_Data *e)
eina_spinlock_free(&(e->render.lock));
e->magic = 0;
- eo_do_super(eo_e, MY_CLASS, eo_destructor());
+ eo_super_eo_destructor(MY_CLASS, eo_e);
}
EOLIAN static void
diff --git a/src/lib/evas/canvas/evas_object_box.c b/src/lib/evas/canvas/evas_object_box.c
index 3510fb05a4..e35cee14f6 100644
--- a/src/lib/evas/canvas/evas_object_box.c
+++ b/src/lib/evas/canvas/evas_object_box.c
@@ -125,7 +125,7 @@ _on_child_del(void *data, Eo *o, const Eo_Event_Description *desc EINA_UNUSED, v
Evas_Object *box = data;
Evas_Object *ret = NULL;
- eo_do(box, ret = evas_obj_box_internal_remove(o));
+ eo_do(box, ret = evas_obj_box_internal_remove(box, o));
if (!ret)
ERR("child removal failed");
evas_object_smart_changed(box);
@@ -157,7 +157,7 @@ _evas_object_box_option_new(Evas_Object *o, Evas_Object_Box_Data *priv EINA_UNUS
{
Evas_Object_Box_Option *opt = NULL;
- eo_do(o, opt = evas_obj_box_internal_option_new(child));
+ eo_do(o, opt = evas_obj_box_internal_option_new(o, child));
if (!opt)
{
ERR("option_new failed");
@@ -177,7 +177,7 @@ static const Eo_Callback_Array_Item evas_object_box_callbacks[] = {
static void
_evas_object_box_child_callbacks_unregister(Evas_Object *obj, Evas_Object *parent)
{
- eo_do(obj, eo_event_callback_array_del(evas_object_box_callbacks, parent));
+ eo_do(obj, eo_event_callback_array_del(obj, evas_object_box_callbacks, parent));
}
static Evas_Object_Box_Option *
@@ -185,7 +185,7 @@ _evas_object_box_option_callbacks_register(Evas_Object *o, Evas_Object_Box_Data
{
Evas_Object *obj = opt->obj;
- eo_do(obj, eo_event_callback_array_add(evas_object_box_callbacks, o));
+ eo_do(obj, eo_event_callback_array_add(obj, evas_object_box_callbacks, o));
return opt;
}
@@ -221,7 +221,7 @@ _evas_box_internal_append(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *child)
priv->children = eina_list_append(priv->children, opt);
priv->children_changed = EINA_TRUE;
- eo_do(o, eo_event_callback_call(EVAS_BOX_EVENT_CHILD_ADDED, opt));
+ eo_do(o, eo_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, opt));
return opt;
}
@@ -237,7 +237,7 @@ _evas_box_internal_prepend(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *child
priv->children = eina_list_prepend(priv->children, opt);
priv->children_changed = EINA_TRUE;
- eo_do(o, eo_event_callback_call(EVAS_BOX_EVENT_CHILD_ADDED, opt));
+ eo_do(o, eo_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, opt));
return opt;
}
@@ -261,7 +261,7 @@ _evas_box_internal_insert_before(Eo *o, Evas_Object_Box_Data *priv, Evas_Object
priv->children = eina_list_prepend_relative
(priv->children, new_opt, opt);
priv->children_changed = EINA_TRUE;
- eo_do(o, eo_event_callback_call(EVAS_BOX_EVENT_CHILD_ADDED, new_opt));
+ eo_do(o, eo_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, new_opt));
return new_opt;
}
}
@@ -288,7 +288,7 @@ _evas_box_internal_insert_after(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *
priv->children = eina_list_append_relative
(priv->children, new_opt, opt);
priv->children_changed = EINA_TRUE;
- eo_do(o, eo_event_callback_call(EVAS_BOX_EVENT_CHILD_ADDED, new_opt));
+ eo_do(o, eo_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, new_opt));
return new_opt;
}
}
@@ -311,7 +311,7 @@ _evas_box_internal_insert_at(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *chi
priv->children = eina_list_prepend(priv->children, new_opt);
priv->children_changed = EINA_TRUE;
- eo_do(o, eo_event_callback_call(EVAS_BOX_EVENT_CHILD_ADDED, new_opt));
+ eo_do(o, eo_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, new_opt));
return new_opt;
}
@@ -330,7 +330,7 @@ _evas_box_internal_insert_at(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *chi
priv->children = eina_list_prepend_relative
(priv->children, new_opt, opt);
priv->children_changed = EINA_TRUE;
- eo_do(o, eo_event_callback_call(EVAS_BOX_EVENT_CHILD_ADDED, new_opt));
+ eo_do(o, eo_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, new_opt));
return new_opt;
}
}
@@ -350,9 +350,9 @@ _evas_box_internal_remove(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *child)
if (obj == child)
{
priv->children = eina_list_remove(priv->children, opt);
- eo_do(o, evas_obj_box_internal_option_free(opt));
+ eo_do(o, evas_obj_box_internal_option_free(o, opt));
priv->children_changed = EINA_TRUE;
- eo_do(o, eo_event_callback_call(EVAS_BOX_EVENT_CHILD_REMOVED, obj));
+ eo_do(o, eo_event_callback_call(o, EVAS_BOX_EVENT_CHILD_REMOVED, obj));
return obj;
}
@@ -378,16 +378,16 @@ _evas_box_internal_remove_at(Eo *o, Evas_Object_Box_Data *priv, unsigned int pos
obj = opt->obj;
priv->children = eina_list_remove_list(priv->children, node);
- eo_do(o, evas_obj_box_internal_option_free(opt));
+ eo_do(o, evas_obj_box_internal_option_free(o, opt));
priv->children_changed = EINA_TRUE;
- eo_do(o, eo_event_callback_call(EVAS_BOX_EVENT_CHILD_REMOVED, obj));
+ eo_do(o, eo_event_callback_call(o, EVAS_BOX_EVENT_CHILD_REMOVED, obj));
return obj;
}
EOLIAN static void
_evas_box_evas_object_smart_add(Eo *o, Evas_Object_Box_Data *priv)
{
- eo_do_super(o, MY_CLASS, evas_obj_smart_add());
+ eo_super_evas_obj_smart_add(MY_CLASS, o);
evas_object_event_callback_add
(o, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _on_hints_changed, o);
@@ -412,14 +412,14 @@ _evas_box_evas_object_smart_del(Eo *o, Evas_Object_Box_Data *priv)
Evas_Object_Box_Option *opt = l->data;
_evas_object_box_child_callbacks_unregister(opt->obj, o);
- eo_do(o, evas_obj_box_internal_option_free(opt));
+ eo_do(o, evas_obj_box_internal_option_free(o, opt));
l = eina_list_remove_list(l, l);
}
if (priv->layout.data && priv->layout.free_data)
priv->layout.free_data(priv->layout.data);
- eo_do_super(o, MY_CLASS, evas_obj_smart_del());
+ eo_super_evas_obj_smart_del(MY_CLASS, o);
}
EOLIAN static void
@@ -458,17 +458,18 @@ evas_object_box_add(Evas *evas)
MAGIC_CHECK(evas, Evas, MAGIC_EVAS);
return NULL;
MAGIC_CHECK_END();
- Evas_Object *obj = eo_add(MY_CLASS, evas);
+ Evas_Object *obj;
+ eo_add(obj, MY_CLASS, evas);
return obj;
}
EOLIAN static Eo *
_evas_box_eo_base_constructor(Eo *obj, Evas_Object_Box_Data *class_data EINA_UNUSED)
{
- obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
+ obj = eo_super_eo_constructor( MY_CLASS, obj);
eo_do(obj,
- evas_obj_smart_callbacks_descriptions_set(_signals),
- evas_obj_type_set(MY_CLASS_NAME_LEGACY));
+ evas_obj_smart_callbacks_descriptions_set(obj, _signals),
+ evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY));
return obj;
}
@@ -1696,7 +1697,7 @@ _evas_box_append(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *child)
if (!child)
return NULL;
- eo_do(o, opt = evas_obj_box_internal_append(child));
+ eo_do(o, opt = evas_obj_box_internal_append(o, child));
if (opt)
{
@@ -1715,7 +1716,7 @@ _evas_box_prepend(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *child)
if (!child)
return NULL;
- eo_do(o, opt = evas_obj_box_internal_prepend(child));
+ eo_do(o, opt = evas_obj_box_internal_prepend(o, child));
if (opt)
{
@@ -1733,7 +1734,7 @@ _evas_box_insert_before(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *child, c
if (!child)
return NULL;
- eo_do(o, opt = evas_obj_box_internal_insert_before(child, reference));
+ eo_do(o, opt = evas_obj_box_internal_insert_before(o, child, reference));
if (opt)
{
@@ -1752,7 +1753,7 @@ _evas_box_insert_after(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *child, co
if (!child)
return NULL;
- eo_do(o, opt = evas_obj_box_internal_insert_after(child, reference));
+ eo_do(o, opt = evas_obj_box_internal_insert_after(o, child, reference));
if (opt)
{
@@ -1771,7 +1772,7 @@ _evas_box_insert_at(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *child, unsig
if (!child)
return NULL;
- eo_do(o, opt = evas_obj_box_internal_insert_at(child, pos));
+ eo_do(o, opt = evas_obj_box_internal_insert_at(o, child, pos));
if (opt)
{
@@ -1788,7 +1789,7 @@ _evas_box_remove(Eo *o, Evas_Object_Box_Data *_pd EINA_UNUSED, Evas_Object *chil
{
Evas_Object *obj = NULL;
- eo_do(o, obj = evas_obj_box_internal_remove(child));
+ eo_do(o, obj = evas_obj_box_internal_remove(o, child));
if (obj)
{
@@ -1806,7 +1807,7 @@ _evas_box_remove_at(Eo *o, Evas_Object_Box_Data *_pd EINA_UNUSED, unsigned int p
{
Evas_Object *obj = NULL;
- eo_do(o, obj = evas_obj_box_internal_remove_at(pos));
+ eo_do(o, obj = evas_obj_box_internal_remove_at(o, pos));
if (obj)
{
@@ -1829,7 +1830,7 @@ _evas_box_remove_all(Eo *o, Evas_Object_Box_Data *priv, Eina_Bool clear)
Evas_Object_Box_Option *opt = priv->children->data;
Evas_Object *obj = NULL;
- eo_do(o, obj = evas_obj_box_internal_remove(opt->obj));
+ eo_do(o, obj = evas_obj_box_internal_remove(o, opt->obj));
if (obj)
{
_evas_object_box_child_callbacks_unregister(obj, o);
@@ -1931,7 +1932,7 @@ EAPI Eina_Bool
evas_object_box_option_property_vset(Evas_Object *o, Evas_Object_Box_Option *opt, int property, va_list args)
{
Eina_Bool ret = EINA_FALSE;
- eo_do(o, ret = evas_obj_box_option_property_vset(opt, property, (va_list *) &args));
+ eo_do(o, ret = evas_obj_box_option_property_vset(o, opt, property, (va_list *) &args));
return ret;
}
@@ -1958,7 +1959,7 @@ EAPI Eina_Bool
evas_object_box_option_property_vget(const Evas_Object *o, Evas_Object_Box_Option *opt, int property, va_list args)
{
Eina_Bool ret = EINA_FALSE;
- eo_do((Eo *)o, ret = evas_obj_box_option_property_vget(opt, property, (va_list *) &args));
+ eo_do((Eo *)o, ret = evas_obj_box_option_property_vget(o, opt, property, (va_list *) &args));
return ret;
}
diff --git a/src/lib/evas/canvas/evas_object_grid.c b/src/lib/evas/canvas/evas_object_grid.c
index 4c1b95a6ca..302586ad0f 100644
--- a/src/lib/evas/canvas/evas_object_grid.c
+++ b/src/lib/evas/canvas/evas_object_grid.c
@@ -265,15 +265,16 @@ evas_object_grid_add(Evas *evas)
MAGIC_CHECK(evas, Evas, MAGIC_EVAS);
return NULL;
MAGIC_CHECK_END();
- Evas_Object *obj = eo_add(MY_CLASS, evas);
+ Evas_Object *obj;
+ eo_add(obj, MY_CLASS, evas);
return obj;
}
EOLIAN static Eo *
_evas_grid_eo_base_constructor(Eo *obj, Evas_Grid_Data *class_data EINA_UNUSED)
{
- obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
- eo_do(obj, evas_obj_smart_attach(_evas_object_grid_smart_class_new()));
+ obj = eo_super_eo_constructor( MY_CLASS, obj);
+ eo_do(obj, evas_obj_smart_attach(obj, _evas_object_grid_smart_class_new()));
return obj;
// return evas_object_smart_add(evas, _evas_object_grid_smart_class_new());
diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c
index fdf31c7317..79228d558a 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -350,7 +350,7 @@ _evas_image_eo_base_constructor(Eo *eo_obj, Evas_Image_Data *o)
Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
Evas_Colorspace cspace;
- eo_obj = eo_do_super_ret(eo_obj, MY_CLASS, eo_obj, eo_constructor());
+ eo_obj = eo_super_eo_constructor( MY_CLASS, eo_obj);
evas_object_image_init(eo_obj);
@@ -371,7 +371,7 @@ _evas_image_eo_base_constructor(Eo *eo_obj, Evas_Image_Data *o)
EINA_COW_IMAGE_STATE_WRITE_END(o, state_write);
}
- eo_do(eo_obj, evas_filter_constructor());
+ eo_do(eo_obj, evas_filter_constructor(eo_obj));
return eo_obj;
}
@@ -385,7 +385,8 @@ evas_object_image_add(Evas *eo_e)
Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
EINA_SAFETY_ON_NULL_RETURN_VAL(e, NULL);
EINA_SAFETY_ON_NULL_RETURN_VAL(e->engine.func, NULL);
- Evas_Object *eo_obj = eo_add(EVAS_IMAGE_CLASS, eo_e);
+ Evas_Object *eo_obj;
+ eo_add(eo_obj, EVAS_IMAGE_CLASS, eo_e);
return eo_obj;
}
@@ -409,7 +410,7 @@ evas_object_image_memfile_set(Evas_Object *eo_obj, void *data, int size, char *f
f = eina_file_virtualize(NULL, data, size, EINA_TRUE);
if (!f) return ;
- eo_do(eo_obj, efl_file_mmap_set(f, key));
+ eo_do(eo_obj, efl_file_mmap_set(eo_obj, f, key));
eina_file_close(f);
}
@@ -734,7 +735,7 @@ EAPI Eina_Bool
evas_object_image_source_unset(Evas_Object *eo_obj)
{
Eina_Bool result = EINA_FALSE;
- eo_do(eo_obj, result = evas_obj_image_source_set(NULL));
+ eo_do(eo_obj, result = evas_obj_image_source_set(eo_obj, NULL));
return result;
}
@@ -788,7 +789,7 @@ _evas_image_source_events_get(Eo *eo_obj, Evas_Image_Data *_pd EINA_UNUSED)
EOLIAN static void
_evas_image_eo_base_dbg_info_get(Eo *eo_obj, Evas_Image_Data *o, Eo_Dbg_Info *root)
{
- eo_do_super(eo_obj, MY_CLASS, eo_dbg_info_get(root));
+ eo_super_eo_dbg_info_get(MY_CLASS, eo_obj, root);
Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME);
const char *file, *key;
@@ -806,7 +807,7 @@ _evas_image_eo_base_dbg_info_get(Eo *eo_obj, Evas_Image_Data *o, Eo_Dbg_Info *ro
if (evas_object_image_load_error_get(eo_obj) != EVAS_LOAD_ERROR_NONE)
{
Evas_Load_Error error = EVAS_LOAD_ERROR_GENERIC;
- eo_do(eo_obj, error = evas_obj_image_load_error_get());
+ eo_do(eo_obj, error = evas_obj_image_load_error_get(eo_obj));
EO_DBG_INFO_APPEND(group, "Load Error", EINA_VALUE_TYPE_STRING,
evas_load_error_str(error));
}
@@ -988,7 +989,7 @@ evas_object_image_fill_set(Evas_Image *obj,
Evas_Coord x, Evas_Coord y,
Evas_Coord w, Evas_Coord h)
{
- eo_do((Evas_Image *)obj, efl_gfx_fill_set(x, y, w, h));
+ eo_do((Evas_Image *)obj, efl_gfx_fill_set(obj, x, y, w, h));
}
EOLIAN static void
@@ -1027,7 +1028,7 @@ evas_object_image_fill_get(const Evas_Image *obj,
Evas_Coord *x, Evas_Coord *y,
Evas_Coord *w, Evas_Coord *h)
{
- eo_do((Evas_Image *)obj, efl_gfx_fill_get(x, y, w, h));
+ eo_do((Evas_Image *)obj, efl_gfx_fill_get(obj, x, y, w, h));
}
EOLIAN static void
@@ -1043,7 +1044,7 @@ _evas_image_efl_gfx_fill_fill_get(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o,
EAPI void
evas_object_image_fill_spread_set(Evas_Image *obj, Evas_Fill_Spread spread)
{
- eo_do((Evas_Image *)obj, efl_gfx_fill_spread_set(spread));
+ eo_do((Evas_Image *)obj, efl_gfx_fill_spread_set(obj, spread));
}
EOLIAN static void
@@ -1068,7 +1069,7 @@ evas_object_image_fill_spread_get(const Evas_Image *obj)
{
Evas_Fill_Spread ret;
- return eo_do_ret((Evas_Image *)obj, ret, efl_gfx_fill_spread_get());
+ return eo_do_ret((Evas_Image *)obj, ret, efl_gfx_fill_spread_get(obj));
}
EOLIAN static Efl_Gfx_Fill_Spread
@@ -1081,7 +1082,7 @@ _evas_image_efl_gfx_fill_fill_spread_get(Eo *eo_obj EINA_UNUSED,
EAPI void
evas_object_image_size_set(Evas_Image *obj, int w, int h)
{
- eo_do((Evas_Image *)obj, efl_gfx_view_size_set(w, h));
+ eo_do((Evas_Image *)obj, efl_gfx_view_size_set(obj, w, h));
}
EOLIAN static void
@@ -1151,7 +1152,7 @@ _evas_image_efl_gfx_view_size_set(Eo *eo_obj, Evas_Image_Data *o, int w, int h)
EAPI void
evas_object_image_size_get(const Evas_Image *obj, int *w, int *h)
{
- eo_do((Evas_Image *)obj, efl_gfx_view_size_get(w, h));
+ eo_do((Evas_Image *)obj, efl_gfx_view_size_get(obj, w, h));
}
EOLIAN static void
@@ -1385,9 +1386,9 @@ evas_object_image_preload(Evas_Object *eo_obj, Eina_Bool cancel)
return;
MAGIC_CHECK_END();
if (cancel)
- eo_do(eo_obj, evas_obj_image_preload_cancel());
+ eo_do(eo_obj, evas_obj_image_preload_cancel(eo_obj));
else
- eo_do(eo_obj, evas_obj_image_preload_begin());
+ eo_do(eo_obj, evas_obj_image_preload_begin(eo_obj));
}
static void
@@ -2119,7 +2120,7 @@ evas_object_image_native_surface_set(Evas_Object *eo_obj, Evas_Native_Surface *s
if (surf) // We need to unset native surf on del to remove shared hash refs
evas_object_event_callback_add
(eo_obj, EVAS_CALLBACK_DEL, _on_image_native_surface_del, NULL);
- eo_do(eo_obj, evas_obj_image_native_surface_set(surf));
+ eo_do(eo_obj, evas_obj_image_native_surface_set(eo_obj, surf));
}
EOLIAN static void
@@ -2697,7 +2698,7 @@ _3d_render(Evas *eo_e, Evas_Object *eo_obj EINA_UNUSED,
scene_data.depth_constant = pd_scene->depth_constant;
/* Phase 1 - Update scene graph tree. */
- eo_do(scene, evas_canvas3d_object_update());
+ eo_do(scene, evas_canvas3d_object_update(scene));
/* Phase 2 - Do frustum culling and get visible model nodes. */
evas_canvas3d_node_tree_traverse(pd_scene->root_node,
@@ -2895,7 +2896,7 @@ _evas_image_eo_base_destructor(Eo *eo_obj, Evas_Image_Data *_pd EINA_UNUSED)
evas_object_image_video_surface_set(eo_obj, NULL);
evas_object_image_free(eo_obj, obj);
- eo_do_super(eo_obj, MY_CLASS, eo_destructor());
+ eo_super_eo_destructor(MY_CLASS, eo_obj);
}
void
@@ -2960,7 +2961,7 @@ evas_object_image_free(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
EINA_COW_PIXEL_WRITE_END(o, pixi_write);
}
- eo_do(eo_obj, evas_filter_destructor());
+ eo_do(eo_obj, evas_filter_destructor(eo_obj));
}
static void
@@ -3341,7 +3342,7 @@ _evas_image_render(Eo *eo_obj, Evas_Object_Protected_Data *obj,
if (oi->has_filter)
{
void *output_buffer = NULL;
- eo_do(source->object, output_buffer = evas_filter_output_buffer_get());
+ eo_do(source->object, output_buffer = evas_filter_output_buffer_get(source->object));
if (output_buffer)
pixels = output_buffer;
}
@@ -3682,7 +3683,7 @@ evas_object_image_render_pre(Evas_Object *eo_obj,
Evas_Canvas3D_Scene *scene = o->cur->scene;
Eina_Bool dirty;
- eo_do(scene, dirty = evas_canvas3d_object_dirty_get(EVAS_CANVAS3D_STATE_ANY));
+ eo_do(scene, dirty = evas_canvas3d_object_dirty_get(scene, EVAS_CANVAS3D_STATE_ANY));
if (dirty)
{
evas_object_render_pre_prev_cur_add(&e->clip_changes, eo_obj, obj);
@@ -4830,71 +4831,71 @@ _evas_object_image_surface_get(Evas_Object *eo, Evas_Object_Protected_Data *obj)
EAPI void
evas_object_image_file_set(Eo *obj, const char *file, const char *key)
{
- eo_do((Eo *) obj, efl_file_set(file, key));
+ eo_do((Eo *) obj, efl_file_set(obj, file, key));
}
EAPI void
evas_object_image_file_get(const Eo *obj, const char **file, const char **key)
{
- eo_do((Eo *) obj, efl_file_get(file, key));
+ eo_do((Eo *) obj, efl_file_get(obj, file, key));
}
EAPI void
evas_object_image_mmap_set(Evas_Image *obj, const Eina_File *f, const char *key)
{
- eo_do((Evas_Image *)obj, efl_file_mmap_set(f, key));
+ eo_do((Evas_Image *)obj, efl_file_mmap_set(obj, f, key));
}
EAPI void
evas_object_image_mmap_get(const Evas_Image *obj, const Eina_File **f, const char **key)
{
- eo_do((Evas_Image *)obj, efl_file_mmap_get(f, key));
+ eo_do((Evas_Image *)obj, efl_file_mmap_get(obj, f, key));
}
EAPI Eina_Bool
evas_object_image_save(const Eo *obj, const char *file, const char *key, const char *flags)
{
Eina_Bool ret;
- return eo_do_ret((Eo *) obj, ret, efl_file_save(file, key, flags));
+ return eo_do_ret((Eo *) obj, ret, efl_file_save(obj, file, key, flags));
}
EAPI Eina_Bool
evas_object_image_animated_get(const Eo *obj)
{
Eina_Bool ret;
- return eo_do_ret((Eo *) obj, ret, efl_image_animated_get());
+ return eo_do_ret((Eo *) obj, ret, efl_image_animated_get(obj));
}
EAPI void
evas_object_image_load_size_set(Eo *obj, int w, int h)
{
- eo_do((Eo *) obj, efl_image_load_size_set(w, h));
+ eo_do((Eo *) obj, efl_image_load_size_set(obj, w, h));
}
EAPI void
evas_object_image_load_size_get(const Eo *obj, int *w, int *h)
{
- eo_do((Eo *) obj, efl_image_load_size_get(w, h));
+ eo_do((Eo *) obj, efl_image_load_size_get(obj, w, h));
}
EAPI void
evas_object_image_smooth_scale_set(Eo *obj, Eina_Bool smooth_scale)
{
- eo_do((Eo *) obj, efl_image_smooth_scale_set(smooth_scale));
+ eo_do((Eo *) obj, efl_image_smooth_scale_set(obj, smooth_scale));
}
EAPI Eina_Bool
evas_object_image_smooth_scale_get(const Eo *obj)
{
Eina_Bool ret;
- return eo_do_ret((Eo *) obj, ret, efl_image_smooth_scale_get());
+ return eo_do_ret((Eo *) obj, ret, efl_image_smooth_scale_get(obj));
}
EOLIAN void
_evas_image_efl_gfx_filter_program_set(Eo *obj, Evas_Image_Data *pd EINA_UNUSED, const char *code, const char *name)
{
pd->has_filter = (code != NULL);
- eo_do_super(obj, MY_CLASS, efl_gfx_filter_program_set(code, name));
+ eo_super_efl_gfx_filter_program_set(MY_CLASS, obj, code, name);
}
#include "canvas/evas_image.eo.c"
diff --git a/src/lib/evas/canvas/evas_object_line.c b/src/lib/evas/canvas/evas_object_line.c
index bc4209ea20..6063c79589 100644
--- a/src/lib/evas/canvas/evas_object_line.c
+++ b/src/lib/evas/canvas/evas_object_line.c
@@ -97,7 +97,8 @@ evas_object_line_add(Evas *e)
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return NULL;
MAGIC_CHECK_END();
- Evas_Object *eo_obj = eo_add(EVAS_LINE_CLASS, e);
+ Evas_Object *eo_obj;
+ eo_add(eo_obj, EVAS_LINE_CLASS, e);
return eo_obj;
}
@@ -220,7 +221,7 @@ _evas_line_eo_base_constructor(Eo *eo_obj, Evas_Line_Data *class_data EINA_UNUSE
{
Evas_Line_Data *o;
- eo_obj = eo_do_super_ret(eo_obj, MY_CLASS, eo_obj, eo_constructor());
+ eo_obj = eo_super_eo_constructor( MY_CLASS, eo_obj);
evas_object_line_init(eo_obj);
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index 7ff20b89da..d21f1226af 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -87,11 +87,11 @@ _evas_object_eo_base_constructor(Eo *eo_obj, Evas_Object_Protected_Data *obj)
{
Eo *parent = NULL;
- eo_obj = eo_do_super_ret(eo_obj, MY_CLASS, eo_obj, eo_constructor());
- eo_do(eo_obj, evas_obj_type_set(MY_CLASS_NAME));
+ eo_obj = eo_super_eo_constructor( MY_CLASS, eo_obj);
+ eo_do(eo_obj, evas_obj_type_set(eo_obj, MY_CLASS_NAME));
eo_manual_free_set(eo_obj, EINA_TRUE);
- eo_do(eo_obj, parent = eo_parent_get());
+ eo_do(eo_obj, parent = eo_parent_get(eo_obj));
if (!obj || !_init_cow() || !eo_isa(parent, EVAS_COMMON_INTERFACE_INTERFACE))
{
@@ -285,7 +285,7 @@ evas_object_change(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
}
EINA_LIST_FOREACH(obj->proxy->proxy_textures, l, texture)
{
- eo_do(texture, evas_canvas3d_object_change(EVAS_CANVAS3D_STATE_TEXTURE_DATA, NULL));
+ eo_do(texture, evas_canvas3d_object_change(texture, EVAS_CANVAS3D_STATE_TEXTURE_DATA, NULL));
}
if (obj->smart.parent)
{
@@ -717,7 +717,7 @@ _evas_object_eo_base_destructor(Eo *eo_obj, Evas_Object_Protected_Data *obj)
if (eo_isa(proxy, EVAS_IMAGE_CLASS))
evas_object_image_source_unset(proxy);
else if (eo_isa(proxy, EVAS_TEXT_CLASS))
- eo_do(proxy, efl_gfx_filter_source_set(NULL, eo_obj));
+ eo_do(proxy, efl_gfx_filter_source_set(proxy, NULL, eo_obj));
}
/* Eina_Cow has no way to know if we are going to really change something
@@ -728,7 +728,7 @@ _evas_object_eo_base_destructor(Eo *eo_obj, Evas_Object_Protected_Data *obj)
Evas_Object_Proxy_Data, proxy_src)
{
EINA_LIST_FREE(proxy_src->proxy_textures, texture)
- eo_do(texture, evas_canvas3d_texture_source_set(NULL));
+ eo_do(texture, evas_canvas3d_texture_source_set(texture, NULL));
}
EINA_COW_WRITE_END(evas_object_proxy_cow, obj->proxy, proxy_src);
}
@@ -747,7 +747,7 @@ end:
evas_object_event_callback_all_del(eo_obj);
evas_object_event_callback_cleanup(eo_obj);
- eo_do_super(eo_obj, MY_CLASS, eo_destructor());
+ eo_super_eo_destructor(MY_CLASS, eo_obj);
}
EAPI void
@@ -757,14 +757,14 @@ evas_object_geometry_set(Evas_Object *eo_obj, Evas_Coord x, Evas_Coord y, Evas_C
return;
MAGIC_CHECK_END();
eo_do(eo_obj,
- efl_gfx_position_set(x, y),
- efl_gfx_size_set(w, h));
+ efl_gfx_position_set(eo_obj, x, y),
+ efl_gfx_size_set(eo_obj, w, h));
}
EAPI void
evas_object_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
{
- eo_do((Evas_Object *)obj, efl_gfx_position_set(x, y));
+ eo_do((Evas_Object *)obj, efl_gfx_position_set(obj, x, y));
}
EOLIAN static void
@@ -791,7 +791,7 @@ _evas_object_efl_gfx_base_position_set(Eo *eo_obj, Evas_Object_Protected_Data *o
if ((obj->cur->geometry.x == x) && (obj->cur->geometry.y == y)) return;
Evas_Map *map;
- eo_do(eo_obj, map = (Evas_Map *) evas_obj_map_get());
+ eo_do(eo_obj, map = (Evas_Map *) evas_obj_map_get(eo_obj));
if (map && map->move_sync.enabled)
{
Evas_Coord diff_x = x - obj->cur->geometry.x;
@@ -813,7 +813,7 @@ _evas_object_efl_gfx_base_position_set(Eo *eo_obj, Evas_Object_Protected_Data *o
if (obj->is_smart)
{
- eo_do(eo_obj, evas_obj_smart_move(x, y));
+ eo_do(eo_obj, evas_obj_smart_move(eo_obj, x, y));
}
EINA_COW_STATE_WRITE_BEGIN(obj, state_write, cur)
@@ -855,7 +855,7 @@ _evas_object_efl_gfx_base_position_set(Eo *eo_obj, Evas_Object_Protected_Data *o
EAPI void
evas_object_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
{
- eo_do((Evas_Object *)obj, efl_gfx_size_set(w, h));
+ eo_do((Evas_Object *)obj, efl_gfx_size_set(obj, w, h));
}
EOLIAN static void
@@ -895,7 +895,7 @@ _evas_object_efl_gfx_base_size_set(Eo *eo_obj, Evas_Object_Protected_Data *obj,
if (obj->is_smart)
{
- eo_do(eo_obj, evas_obj_smart_resize(w, h));
+ eo_do(eo_obj, evas_obj_smart_resize(eo_obj, w, h));
}
EINA_COW_STATE_WRITE_BEGIN(obj, state_write, cur)
@@ -944,7 +944,7 @@ evas_object_geometry_get(const Evas_Object *eo_obj, Evas_Coord *x, Evas_Coord *y
if (x) *x = 0; if (y) *y = 0; if (w) *w = 0; if (h) *h = 0;
return;
MAGIC_CHECK_END();
- eo_do((Eo *)eo_obj, efl_gfx_position_get(x, y), efl_gfx_size_get(w, h));
+ eo_do((Eo *)eo_obj, efl_gfx_position_get(eo_obj, x, y), efl_gfx_size_get(eo_obj, w, h));
}
EOLIAN static void
@@ -1211,14 +1211,14 @@ evas_object_show(Evas_Object *eo_obj)
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
return;
MAGIC_CHECK_END();
- eo_do(eo_obj, efl_gfx_visible_set(EINA_TRUE));
+ eo_do(eo_obj, efl_gfx_visible_set(eo_obj, EINA_TRUE));
}
EAPI void
evas_object_hide(Evas_Object *eo_obj)
{
if (!eo_obj) return;
- eo_do(eo_obj, efl_gfx_visible_set(EINA_FALSE));
+ eo_do(eo_obj, efl_gfx_visible_set(eo_obj, EINA_FALSE));
}
EAPI Eina_Bool
@@ -1226,7 +1226,7 @@ evas_object_visible_get(const Evas_Object *obj)
{
Eina_Bool ret;
- return eo_do_ret((Evas_Object *)obj, ret, efl_gfx_visible_get());
+ return eo_do_ret((Evas_Object *)obj, ret, efl_gfx_visible_get(obj));
}
static void
@@ -1251,7 +1251,7 @@ _show(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
if (evas_object_intercept_call_show(eo_obj, obj)) return;
if (obj->is_smart)
{
- eo_do(eo_obj, evas_obj_smart_show());
+ eo_do(eo_obj, evas_obj_smart_show(eo_obj));
}
EINA_COW_STATE_WRITE_BEGIN(obj, state_write, cur)
{
@@ -1300,7 +1300,7 @@ _hide(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
if (evas_object_intercept_call_hide(eo_obj, obj)) return;
if (obj->is_smart)
{
- eo_do(eo_obj, evas_obj_smart_hide());
+ eo_do(eo_obj, evas_obj_smart_hide(eo_obj));
}
EINA_COW_STATE_WRITE_BEGIN(obj, state_write, cur)
@@ -1418,7 +1418,7 @@ _evas_object_efl_gfx_base_visible_get(Eo *eo_obj EINA_UNUSED,
EAPI void
evas_object_color_set(Evas_Object *obj, int r, int g, int b, int a)
{
- eo_do((Evas_Object *)obj, efl_gfx_color_set(r, g, b, a));
+ eo_do((Evas_Object *)obj, efl_gfx_color_set(obj, r, g, b, a));
}
EOLIAN static void
@@ -1450,7 +1450,7 @@ _evas_object_efl_gfx_base_color_set(Eo *eo_obj, Evas_Object_Protected_Data *obj,
if (evas_object_intercept_call_color_set(eo_obj, obj, r, g, b, a)) return;
if (obj->is_smart)
{
- eo_do(eo_obj, evas_obj_smart_color_set(r, g, b, a));
+ eo_do(eo_obj, evas_obj_smart_color_set(eo_obj, r, g, b, a));
}
if ((obj->cur->color.r == r) &&
(obj->cur->color.g == g) &&
@@ -1492,7 +1492,7 @@ _evas_object_efl_gfx_base_color_part_set(Eo *obj, Evas_Object_Protected_Data *pd
EAPI void
evas_object_color_get(const Evas_Object *obj, int *r, int *g, int *b, int *a)
{
- eo_do((Evas_Object *)obj, efl_gfx_color_get(r, g, b, a));
+ eo_do((Evas_Object *)obj, efl_gfx_color_get(obj, r, g, b, a));
}
EOLIAN static void
@@ -1597,7 +1597,7 @@ _evas_object_render_op_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *o
EOLIAN static void
_evas_object_eo_base_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Data *obj EINA_UNUSED, Eo_Dbg_Info *root)
{
- eo_do_super(eo_obj, MY_CLASS, eo_dbg_info_get(root));
+ eo_super_eo_dbg_info_get(MY_CLASS, eo_obj, root);
Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME);
Eo_Dbg_Info *node;
const char *name;
@@ -1620,24 +1620,24 @@ _evas_object_eo_base_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Data *obj EI
Eina_Bool clipees_has;
eo_do(eo_obj,
- visible = efl_gfx_visible_get(),
- layer = efl_gfx_stack_layer_get(),
- name = evas_obj_name_get(),
- efl_gfx_position_get(&x, &y),
- efl_gfx_size_get(&w, &h),
- scale = evas_obj_scale_get(),
- evas_obj_size_hint_min_get(&minw, &minh),
- evas_obj_size_hint_max_get(&maxw, &maxh),
- evas_obj_size_hint_request_get(&requestw, &requesth),
- evas_obj_size_hint_align_get(&dblx, &dbly),
- evas_obj_size_hint_weight_get(&dblw, &dblh),
- efl_gfx_color_get(&r, &g, &b, &a),
- focus = evas_obj_focus_get(),
- m = evas_obj_pointer_mode_get(),
- pass_event = evas_obj_pass_events_get(),
- repeat_event = evas_obj_repeat_events_get(),
- propagate_event = evas_obj_propagate_events_get(),
- clipees_has = evas_obj_clipees_has());
+ visible = efl_gfx_visible_get(eo_obj),
+ layer = efl_gfx_stack_layer_get(eo_obj),
+ name = evas_obj_name_get(eo_obj),
+ efl_gfx_position_get(eo_obj, &x, &y),
+ efl_gfx_size_get(eo_obj, &w, &h),
+ scale = evas_obj_scale_get(eo_obj),
+ evas_obj_size_hint_min_get(eo_obj, &minw, &minh),
+ evas_obj_size_hint_max_get(eo_obj, &maxw, &maxh),
+ evas_obj_size_hint_request_get(eo_obj, &requestw, &requesth),
+ evas_obj_size_hint_align_get(eo_obj, &dblx, &dbly),
+ evas_obj_size_hint_weight_get(eo_obj, &dblw, &dblh),
+ efl_gfx_color_get(eo_obj, &r, &g, &b, &a),
+ focus = evas_obj_focus_get(eo_obj),
+ m = evas_obj_pointer_mode_get(eo_obj),
+ pass_event = evas_obj_pass_events_get(eo_obj),
+ repeat_event = evas_obj_repeat_events_get(eo_obj),
+ propagate_event = evas_obj_propagate_events_get(eo_obj),
+ clipees_has = evas_obj_clipees_has(eo_obj));
EO_DBG_INFO_APPEND(group, "Visibility", EINA_VALUE_TYPE_CHAR, visible);
@@ -1712,7 +1712,7 @@ _evas_object_eo_base_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Data *obj EI
EO_DBG_INFO_APPEND(group, "Has clipees", EINA_VALUE_TYPE_CHAR, clipees_has);
Evas_Object *clipper = NULL;
- eo_do(eo_obj, clipper = evas_obj_clip_get());
+ eo_do(eo_obj, clipper = evas_obj_clip_get(eo_obj));
EO_DBG_INFO_APPEND(group, "Clipper", EINA_VALUE_TYPE_UINT64, (uintptr_t) clipper);
const Evas_Map *map = evas_object_map_get(eo_obj);
@@ -1788,7 +1788,7 @@ evas_object_top_at_pointer_get(const Evas *eo_e)
Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
Evas_Object *ret = NULL;
if (!e) return NULL;
- eo_do((Eo *)eo_e, ret = evas_canvas_object_top_at_xy_get(e->pointer.x, e->pointer.y, EINA_TRUE,
+ eo_do((Eo *)eo_e, ret = evas_canvas_object_top_at_xy_get(eo_e, e->pointer.x, e->pointer.y, EINA_TRUE,
EINA_TRUE));
return ret;
}
diff --git a/src/lib/evas/canvas/evas_object_polygon.c b/src/lib/evas/canvas/evas_object_polygon.c
index 406ae56680..4960920361 100644
--- a/src/lib/evas/canvas/evas_object_polygon.c
+++ b/src/lib/evas/canvas/evas_object_polygon.c
@@ -98,14 +98,15 @@ evas_object_polygon_add(Evas *e)
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return NULL;
MAGIC_CHECK_END();
- Evas_Object *eo_obj = eo_add(EVAS_POLYGON_CLASS, e);
+ Evas_Object *eo_obj;
+ eo_add(eo_obj, EVAS_POLYGON_CLASS, e);
return eo_obj;
}
EOLIAN static Eo *
_evas_polygon_eo_base_constructor(Eo *eo_obj, Evas_Polygon_Data *class_data EINA_UNUSED)
{
- eo_obj = eo_do_super_ret(eo_obj, MY_CLASS, eo_obj, eo_constructor());
+ eo_obj = eo_super_eo_constructor( MY_CLASS, eo_obj);
evas_object_polygon_init(eo_obj);
@@ -280,7 +281,7 @@ _evas_polygon_eo_base_destructor(Eo *eo_obj, Evas_Polygon_Data *_pd EINA_UNUSED)
Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
evas_object_polygon_free(eo_obj, obj, obj->private_data);
- eo_do_super(eo_obj, MY_CLASS, eo_destructor());
+ eo_super_eo_destructor(MY_CLASS, eo_obj);
}
static void
diff --git a/src/lib/evas/canvas/evas_object_rectangle.c b/src/lib/evas/canvas/evas_object_rectangle.c
index a22c990275..c57698a513 100644
--- a/src/lib/evas/canvas/evas_object_rectangle.c
+++ b/src/lib/evas/canvas/evas_object_rectangle.c
@@ -95,14 +95,15 @@ evas_object_rectangle_add(Evas *e)
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return NULL;
MAGIC_CHECK_END();
- Evas_Object *eo_obj = eo_add(EVAS_RECTANGLE_CLASS, e);
+ Evas_Object *eo_obj;
+ eo_add(eo_obj, EVAS_RECTANGLE_CLASS, e);
return eo_obj;
}
EOLIAN static Eo *
_evas_rectangle_eo_base_constructor(Eo *eo_obj, Evas_Rectangle_Data *class_data EINA_UNUSED)
{
- eo_obj = eo_do_super_ret(eo_obj, MY_CLASS, eo_obj, eo_constructor());
+ eo_obj = eo_super_eo_constructor( MY_CLASS, eo_obj);
evas_object_rectangle_init(eo_obj);
diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c
index 1529f75f1b..273bef6152 100644
--- a/src/lib/evas/canvas/evas_object_smart.c
+++ b/src/lib/evas/canvas/evas_object_smart.c
@@ -200,7 +200,7 @@ evas_object_smart_member_add(Evas_Object *eo_obj, Evas_Object *smart_obj)
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
return;
MAGIC_CHECK_END();
- eo_do(smart_obj, evas_obj_smart_member_add(eo_obj));
+ eo_do(smart_obj, evas_obj_smart_member_add(smart_obj, eo_obj));
}
EOLIAN static void
@@ -275,7 +275,7 @@ evas_object_smart_member_del(Evas_Object *eo_obj)
if (!obj->smart.parent) return;
Evas_Object *smart_obj = obj->smart.parent;
- eo_do(smart_obj, evas_obj_smart_member_del(eo_obj));
+ eo_do(smart_obj, evas_obj_smart_member_del(smart_obj, eo_obj));
}
EOLIAN static void
@@ -539,8 +539,8 @@ evas_object_smart_add(Evas *eo_e, Evas_Smart *s)
MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS);
return NULL;
MAGIC_CHECK_END();
- eo_obj = eo_add(EVAS_OBJECT_SMART_CLASS, eo_e);
- eo_do(eo_obj, evas_obj_smart_attach(s));
+ eo_add(eo_obj, EVAS_OBJECT_SMART_CLASS, eo_e);
+ eo_do(eo_obj, evas_obj_smart_attach(eo_obj, s));
return eo_obj;
}
@@ -552,12 +552,12 @@ _evas_object_smart_eo_base_constructor(Eo *eo_obj, Evas_Smart_Data *class_data E
smart = class_data;
smart->object = eo_obj;
- eo_obj = eo_do_super_ret(eo_obj, MY_CLASS, eo_obj, eo_constructor());
+ eo_obj = eo_super_eo_constructor( MY_CLASS, eo_obj);
evas_object_smart_init(eo_obj);
eo_do(eo_obj,
- evas_obj_type_set(MY_CLASS_NAME_LEGACY),
- evas_obj_smart_add());
+ evas_obj_type_set(eo_obj, MY_CLASS_NAME_LEGACY),
+ evas_obj_smart_add(eo_obj));
return eo_obj;
}
@@ -677,7 +677,7 @@ _evas_object_smart_attach(Eo *eo_obj, Evas_Smart_Data *_pd EINA_UNUSED, Evas_Sma
}
}
- eo_do(eo_obj, evas_obj_smart_add());
+ eo_do(eo_obj, evas_obj_smart_add(eo_obj));
}
EAPI void
@@ -709,7 +709,7 @@ evas_object_smart_callback_priority_add(Evas_Object *eo_obj, const char *event,
o->callbacks = eina_inlist_append(o->callbacks,
EINA_INLIST_GET(cb_info));
- eo_do(eo_obj, eo_event_callback_priority_add(eo_desc, priority, _eo_evas_smart_cb, cb_info));
+ eo_do(eo_obj, eo_event_callback_priority_add(eo_obj, eo_desc, priority, _eo_evas_smart_cb, cb_info));
}
EAPI void *
@@ -732,7 +732,7 @@ evas_object_smart_callback_del(Evas_Object *eo_obj, const char *event, Evas_Smar
if ((info->func == func) && (info->event == eo_desc))
{
void *tmp = info->data;
- eo_do(eo_obj, eo_event_callback_del(
+ eo_do(eo_obj, eo_event_callback_del(eo_obj,
eo_desc, _eo_evas_smart_cb, info));
o->callbacks =
@@ -764,7 +764,7 @@ evas_object_smart_callback_del_full(Evas_Object *eo_obj, const char *event, Evas
if ((info->func == func) && (info->event == eo_desc) && (info->data == data))
{
void *tmp = info->data;
- eo_do(eo_obj, eo_event_callback_del(
+ eo_do(eo_obj, eo_event_callback_del(eo_obj,
eo_desc, _eo_evas_smart_cb, info));
o->callbacks =
@@ -785,7 +785,7 @@ evas_object_smart_callback_call(Evas_Object *eo_obj, const char *event, void *ev
if (!event) return;
const Eo_Event_Description *eo_desc = eo_base_legacy_only_event_description_get(event);
- eo_do(eo_obj, eo_event_callback_call(eo_desc, event_info));
+ eo_do(eo_obj, eo_event_callback_call(eo_obj, eo_desc, event_info));
}
EOLIAN static Eina_Bool
@@ -948,7 +948,7 @@ evas_call_smarts_calculate(Evas *eo_e)
if (obj->smart.smart && obj->smart.smart->smart_class->calculate)
obj->smart.smart->smart_class->calculate(obj->object);
else
- eo_do(obj->object, evas_obj_smart_calculate());
+ eo_do(obj->object, evas_obj_smart_calculate(obj->object));
}
}
@@ -971,7 +971,7 @@ _evas_object_smart_changed(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED)
Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
evas_object_async_block(obj);
evas_object_change(eo_obj, obj);
- eo_do(eo_obj, evas_obj_smart_need_recalculate_set(1));
+ eo_do(eo_obj, evas_obj_smart_need_recalculate_set(eo_obj, 1));
}
Eina_Bool
@@ -1018,7 +1018,7 @@ evas_object_smart_del(Evas_Object *eo_obj)
if (s && s->smart_class->del)
s->smart_class->del(eo_obj);
else
- eo_do(eo_obj, evas_obj_smart_del());
+ eo_do(eo_obj, evas_obj_smart_del(eo_obj));
if (obj->smart.parent) evas_object_smart_member_del(eo_obj);
if (s)
@@ -1212,14 +1212,14 @@ evas_object_smart_cleanup(Evas_Object *eo_obj)
while (o->callbacks)
{
_eo_evas_smart_cb_info *info = (_eo_evas_smart_cb_info *)o->callbacks;
- eo_do(eo_obj, eo_event_callback_del(
+ eo_do(eo_obj, eo_event_callback_del(eo_obj,
info->event, _eo_evas_smart_cb, info));
o->callbacks = eina_inlist_remove(o->callbacks, EINA_INLIST_GET(info));
free(info);
}
evas_smart_cb_descriptions_resize(&o->callbacks_descriptions, 0);
- eo_do(eo_obj, evas_obj_smart_data_set(NULL));
+ eo_do(eo_obj, evas_obj_smart_data_set(eo_obj, NULL));
}
obj->smart.parent = NULL;
diff --git a/src/lib/evas/canvas/evas_object_smart_clipped.c b/src/lib/evas/canvas/evas_object_smart_clipped.c
index 6d4effd2d8..28d1ae0a3d 100644
--- a/src/lib/evas/canvas/evas_object_smart_clipped.c
+++ b/src/lib/evas/canvas/evas_object_smart_clipped.c
@@ -195,7 +195,7 @@ evas_object_smart_clipped_smart_member_add(Evas_Object *eo_obj, Evas_Object *mem
EOLIAN static void
_evas_smart_clipped_evas_object_smart_member_add(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED, Evas_Object *member)
{
- eo_do_super(eo_obj, MY_CLASS, evas_obj_smart_member_add(member));
+ eo_super_evas_obj_smart_member_add(MY_CLASS, eo_obj, member);
evas_object_smart_clipped_smart_member_add(eo_obj, member);
}
@@ -214,7 +214,7 @@ EOLIAN static void
_evas_smart_clipped_evas_object_smart_member_del(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED, Evas_Object *member)
{
evas_object_smart_clipped_smart_member_del(eo_obj, member);
- eo_do_super(eo_obj, MY_CLASS, evas_obj_smart_member_del(member));
+ eo_super_evas_obj_smart_member_del(MY_CLASS, eo_obj, member);
}
EAPI void
@@ -253,7 +253,7 @@ evas_object_smart_clipped_class_get(void)
EOLIAN static Eo *
_evas_smart_clipped_eo_base_constructor(Eo *obj, Evas_Object_Smart_Clipped_Data *class_data EINA_UNUSED)
{
- return eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
+ return eo_super_eo_constructor( MY_CLASS, obj);
}
#include "canvas/evas_smart_clipped.eo.c"
diff --git a/src/lib/evas/canvas/evas_object_table.c b/src/lib/evas/canvas/evas_object_table.c
index 5a4cfcbdde..f96506e47f 100644
--- a/src/lib/evas/canvas/evas_object_table.c
+++ b/src/lib/evas/canvas/evas_object_table.c
@@ -272,13 +272,13 @@ static const Eo_Callback_Array_Item evas_object_table_callbacks[] = {
static void
_evas_object_table_child_connect(Evas_Object *o, Evas_Object *child)
{
- eo_do(child, eo_event_callback_array_add(evas_object_table_callbacks, o));
+ eo_do(child, eo_event_callback_array_add(child, evas_object_table_callbacks, o));
}
static void
_evas_object_table_child_disconnect(Evas_Object *o, Evas_Object *child)
{
- eo_do(child, eo_event_callback_array_del(evas_object_table_callbacks, o));
+ eo_do(child, eo_event_callback_array_del(child, evas_object_table_callbacks, o));
}
static void
@@ -897,7 +897,7 @@ _evas_table_evas_object_smart_add(Eo *obj, Evas_Table_Data *priv)
priv->expand_h = 0;
priv->expand_v = 0;
- eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+ eo_super_evas_obj_smart_add(MY_CLASS, obj);
}
EOLIAN static void
@@ -921,7 +921,7 @@ _evas_table_evas_object_smart_del(Eo *obj, Evas_Table_Data *priv)
priv->cache = NULL;
}
- eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+ eo_super_evas_obj_smart_del(MY_CLASS, obj);
}
EOLIAN static void
@@ -962,15 +962,16 @@ evas_object_table_add(Evas *evas)
MAGIC_CHECK(evas, Evas, MAGIC_EVAS);
return NULL;
MAGIC_CHECK_END();
- Evas_Object *obj = eo_add(MY_CLASS, evas);
+ Evas_Object *obj;
+ eo_add(obj, MY_CLASS, evas);
return obj;
}
EOLIAN static Eo *
_evas_table_eo_base_constructor(Eo *obj, Evas_Table_Data *class_data EINA_UNUSED)
{
- obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
- eo_do(obj, evas_obj_type_set(MY_CLASS_NAME_LEGACY));
+ obj = eo_super_eo_constructor( MY_CLASS, obj);
+ eo_do(obj, evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY));
return obj;
}
@@ -1395,7 +1396,7 @@ _evas_table_mirrored_set(Eo *o, Evas_Table_Data *priv, Eina_Bool mirrored)
if (priv->is_mirrored != mirrored)
{
priv->is_mirrored = mirrored;
- eo_do(o, evas_obj_smart_calculate());
+ eo_do(o, evas_obj_smart_calculate(o));
}
}
diff --git a/src/lib/evas/canvas/evas_object_text.c b/src/lib/evas/canvas/evas_object_text.c
index 5eab0eb704..b0c770e34e 100644
--- a/src/lib/evas/canvas/evas_object_text.c
+++ b/src/lib/evas/canvas/evas_object_text.c
@@ -368,14 +368,15 @@ evas_object_text_add(Evas *e)
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return NULL;
MAGIC_CHECK_END();
- Evas_Object *eo_obj = eo_add(EVAS_TEXT_CLASS, e);
+ Evas_Object *eo_obj;
+ eo_add(eo_obj, EVAS_TEXT_CLASS, e);
return eo_obj;
}
EOLIAN static Eo *
_evas_text_eo_base_constructor(Eo *eo_obj, Evas_Text_Data *o EINA_UNUSED)
{
- eo_obj = eo_do_super_ret(eo_obj, MY_CLASS, eo_obj, eo_constructor());
+ eo_obj = eo_super_eo_constructor( MY_CLASS, eo_obj);
evas_object_text_init(eo_obj);
return eo_obj;
@@ -470,7 +471,7 @@ _evas_text_efl_text_properties_font_set(Eo *eo_obj, Evas_Text_Data *o, const cha
_evas_object_text_recalc(eo_obj, o->cur.text);
o->changed = 1;
if (o->has_filter)
- eo_do(eo_obj, evas_filter_changed_set(EINA_TRUE));
+ eo_do(eo_obj, evas_filter_changed_set(eo_obj, EINA_TRUE));
evas_object_change(eo_obj, obj);
evas_object_clip_dirty(eo_obj, obj);
evas_object_coords_recalc(eo_obj, obj);
@@ -666,7 +667,7 @@ _evas_object_text_pad_get(const Eo *eo_obj, Evas_Text_Data *o, int *l, int *r, i
if (!o->has_filter)
evas_text_style_pad_get(o->cur.style, l, r, t, b);
else
- eo_do(eo_obj, efl_gfx_filter_padding_get(l, r, t, b));
+ eo_do(eo_obj, efl_gfx_filter_padding_get(eo_obj, l, r, t, b));
}
/**
@@ -952,7 +953,7 @@ _evas_text_ellipsis_set(Eo *eo_obj, Evas_Text_Data *o, double ellipsis)
o->cur.ellipsis = ellipsis;
o->changed = 1;
if (o->has_filter)
- eo_do(eo_obj, evas_filter_changed_set(EINA_TRUE));
+ eo_do(eo_obj, evas_filter_changed_set(eo_obj, EINA_TRUE));
evas_object_change(eo_obj, obj);
evas_object_clip_dirty(eo_obj, obj);
}
@@ -966,19 +967,19 @@ _evas_text_ellipsis_get(Eo *eo_obj EINA_UNUSED, Evas_Text_Data *o)
EOLIAN static void
_evas_text_eo_base_dbg_info_get(Eo *eo_obj, Evas_Text_Data *o EINA_UNUSED, Eo_Dbg_Info *root)
{
- eo_do_super(eo_obj, MY_CLASS, eo_dbg_info_get(root));
+ eo_super_eo_dbg_info_get(MY_CLASS, eo_obj, root);
Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME);
const char *text;
int size;
- eo_do(eo_obj, efl_text_properties_font_get(&text, &size));
+ eo_do(eo_obj, efl_text_properties_font_get(eo_obj, &text, &size));
EO_DBG_INFO_APPEND(group, "Font", EINA_VALUE_TYPE_STRING, text);
EO_DBG_INFO_APPEND(group, "Text size", EINA_VALUE_TYPE_INT, size);
- eo_do(eo_obj, text = efl_text_properties_font_source_get());
+ eo_do(eo_obj, text = efl_text_properties_font_source_get(eo_obj));
EO_DBG_INFO_APPEND(group, "Font source", EINA_VALUE_TYPE_STRING, text);
- eo_do(eo_obj, text = efl_text_get());
+ eo_do(eo_obj, text = efl_text_get(eo_obj));
EO_DBG_INFO_APPEND(group, "Text", EINA_VALUE_TYPE_STRING, text);
}
@@ -1011,7 +1012,7 @@ _evas_text_efl_text_text_set(Eo *eo_obj, Evas_Text_Data *o, const char *_text)
o->changed = 1;
if (o->has_filter)
- eo_do(eo_obj, evas_filter_changed_set(EINA_TRUE));
+ eo_do(eo_obj, evas_filter_changed_set(eo_obj, EINA_TRUE));
evas_object_change(eo_obj, obj);
evas_object_clip_dirty(eo_obj, obj);
evas_object_coords_recalc(eo_obj, obj);
@@ -1233,8 +1234,7 @@ _evas_text_style_set(Eo *eo_obj, Evas_Text_Data *o, Evas_Text_Style_Type style)
if (o->items) w = obj->cur->geometry.w + (l - pl) + (r - pr);
h = obj->cur->geometry.h + (t - pt) + (b - pb);
- eo_do_super(eo_obj, MY_CLASS,
- efl_gfx_size_set(w, h));
+ eo_super_efl_gfx_size_set(MY_CLASS, eo_obj, w, h);
evas_object_change(eo_obj, obj);
}
@@ -1531,7 +1531,7 @@ evas_object_text_init(Evas_Object *eo_obj)
o->bidi_par_props = evas_bidi_paragraph_props_new();
#endif
- eo_do(eo_obj, evas_filter_constructor());
+ eo_do(eo_obj, evas_filter_constructor(eo_obj));
}
EOLIAN static void
@@ -1539,7 +1539,7 @@ _evas_text_eo_base_destructor(Eo *eo_obj, Evas_Text_Data *o EINA_UNUSED)
{
Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
evas_object_text_free(eo_obj, obj);
- eo_do_super(eo_obj, MY_CLASS, eo_destructor());
+ eo_super_eo_destructor(MY_CLASS, eo_obj);
}
static void
@@ -1548,7 +1548,7 @@ evas_object_text_free(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
Evas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
/* free obj */
- eo_do(eo_obj, evas_filter_destructor());
+ eo_do(eo_obj, evas_filter_destructor(eo_obj));
_evas_object_text_items_clear(o);
if (o->cur.utf8_text) eina_stringshare_del(o->cur.utf8_text);
if (o->cur.font) eina_stringshare_del(o->cur.font);
@@ -2086,7 +2086,7 @@ _evas_object_text_rehint(Evas_Object *eo_obj)
_evas_object_text_recalc(eo_obj, o->cur.text);
o->changed = 1;
if (o->has_filter)
- eo_do(eo_obj, evas_filter_changed_set(EINA_TRUE));
+ eo_do(eo_obj, evas_filter_changed_set(eo_obj, EINA_TRUE));
evas_object_change(eo_obj, obj);
evas_object_clip_dirty(eo_obj, obj);
evas_object_coords_recalc(eo_obj, obj);
@@ -2168,13 +2168,11 @@ _evas_object_text_recalc(Evas_Object *eo_obj, Eina_Unicode *text)
int min;
min = w + l + r < obj->cur->geometry.w || obj->cur->geometry.w == 0 ? w + l + r : obj->cur->geometry.w;
- eo_do_super(eo_obj, MY_CLASS,
- efl_gfx_size_set(min, h + t + b));
+ eo_super_efl_gfx_size_set(MY_CLASS, eo_obj, min, h + t + b);
}
else
{
- eo_do_super(eo_obj, MY_CLASS,
- efl_gfx_size_set(w + l + r, h + t + b));
+ eo_super_efl_gfx_size_set(MY_CLASS, eo_obj, w + l + r, h + t + b);
}
//// obj->cur->cache.geometry.validity = 0;
}
@@ -2182,8 +2180,7 @@ _evas_object_text_recalc(Evas_Object *eo_obj, Eina_Unicode *text)
{
int t = 0, b = 0, l = 0, r = 0;
_evas_object_text_pad_get(eo_obj, o, &l, &r, &t, &b);
- eo_do_super(eo_obj, MY_CLASS,
- efl_gfx_size_set(0, o->max_ascent + o->max_descent + t + b));
+ eo_super_efl_gfx_size_set(MY_CLASS, eo_obj, 0, o->max_ascent + o->max_descent + t + b);
//// obj->cur->cache.geometry.validity = 0;
}
o->last_computed.w = obj->cur->geometry.w;
@@ -2193,47 +2190,47 @@ _evas_object_text_recalc(Evas_Object *eo_obj, Eina_Unicode *text)
EAPI void
evas_object_text_font_source_set(Eo *obj, const char *font_source)
{
- eo_do((Eo *) obj, efl_text_properties_font_source_set(font_source));
+ eo_do((Eo *) obj, efl_text_properties_font_source_set(obj, font_source));
}
EAPI const char *
evas_object_text_font_source_get(const Eo *obj)
{
const char *font_source = 0;
- eo_do((Eo *) obj, font_source = efl_text_properties_font_source_get());
+ eo_do((Eo *) obj, font_source = efl_text_properties_font_source_get(obj));
return font_source;
}
EAPI void
evas_object_text_font_set(Eo *obj, const char *font, Evas_Font_Size size)
{
- eo_do((Eo *) obj, efl_text_properties_font_set(font, size));
+ eo_do((Eo *) obj, efl_text_properties_font_set(obj, font, size));
}
EAPI void
evas_object_text_font_get(const Eo *obj, const char **font, Evas_Font_Size *size)
{
- eo_do((Eo *) obj, efl_text_properties_font_get(font, size));
+ eo_do((Eo *) obj, efl_text_properties_font_get(obj, font, size));
}
EAPI void
evas_object_text_text_set(Eo *obj, const char *text)
{
- eo_do((Eo *) obj, efl_text_set(text));
+ eo_do((Eo *) obj, efl_text_set(obj, text));
}
EAPI const char *
evas_object_text_text_get(const Eo *obj)
{
const char *ret;
- return eo_do_ret((Eo *) obj, ret, efl_text_get());
+ return eo_do_ret((Eo *) obj, ret, efl_text_get(obj));
}
EOLIAN void
_evas_text_efl_gfx_filter_program_set(Eo *obj, Evas_Text_Data *pd EINA_UNUSED, const char *code, const char *name)
{
pd->has_filter = (code != NULL);
- eo_do_super(obj, MY_CLASS, efl_gfx_filter_program_set(code, name));
+ eo_super_efl_gfx_filter_program_set(MY_CLASS, obj, code, name);
}
#include "canvas/evas_text.eo.c"
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index ca37af462b..28531855b8 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -5913,7 +5913,8 @@ evas_object_textblock_add(Evas *e)
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return NULL;
MAGIC_CHECK_END();
- Evas_Object *eo_obj = eo_add(EVAS_TEXTBLOCK_CLASS, e);
+ Evas_Object *eo_obj;
+ eo_add(eo_obj, EVAS_TEXTBLOCK_CLASS, e);
return eo_obj;
}
@@ -5923,7 +5924,7 @@ _evas_textblock_eo_base_constructor(Eo *eo_obj, Evas_Textblock_Data *class_data
Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
Evas_Textblock_Data *o;
- eo_obj = eo_do_super_ret(eo_obj, MY_CLASS, eo_obj, eo_constructor());
+ eo_obj = eo_super_eo_constructor( MY_CLASS, eo_obj);
/* set up methods (compulsory) */
obj->func = &object_func;
@@ -7002,8 +7003,8 @@ _obstacle_update(Evas_Textblock_Obstacle *obs, Eo *eo_obj)
Evas_Coord ox, oy, ow, oh;
Eo *eo_obs = obs->eo_obs;
- eo_do(eo_obs, efl_gfx_position_get(&ox, &oy), efl_gfx_size_get(&ow, &oh));
- eo_do(eo_obj, efl_gfx_position_get(&x, &y));
+ eo_do(eo_obs, efl_gfx_position_get(eo_obs, &ox, &oy), efl_gfx_size_get(eo_obs, &ow, &oh));
+ eo_do(eo_obj, efl_gfx_position_get(eo_obs, &x, &y));
obs->x = ox - x;
obs->y = oy - y;
@@ -7065,7 +7066,7 @@ _obstacle_del_cb(void *data, Eo *eo_obs,
static void
_obstacle_clear(Eo *eo_obj, Evas_Textblock_Obstacle *obs)
{
- eo_do(obs->eo_obs, eo_event_callback_del(EVAS_OBJECT_EVENT_DEL,
+ eo_do(obs->eo_obs, eo_event_callback_del(obs->eo_obs, EVAS_OBJECT_EVENT_DEL,
_obstacle_del_cb, eo_obj));
}
@@ -7102,7 +7103,7 @@ _evas_textblock_obstacle_add(Eo *eo_obj,
if (!obs) return EINA_FALSE;
obs->eo_obs = eo_obs;
- eo_do(eo_obs, eo_event_callback_add(EVAS_OBJECT_EVENT_DEL,_obstacle_del_cb,
+ eo_do(eo_obs, eo_event_callback_add(eo_obs, EVAS_OBJECT_EVENT_DEL,_obstacle_del_cb,
eo_obj));
obj->obstacles = eina_list_append(obj->obstacles, obs);
@@ -7153,7 +7154,7 @@ _layout_item_obstacle_get(Ctxt *c, Evas_Object_Textblock_Item *it)
EINA_LIST_FOREACH(c->o->obstacles, i, obs)
{
Eina_Bool is_visible;
- eo_do(obs->eo_obs, is_visible = efl_gfx_visible_get());
+ eo_do(obs->eo_obs, is_visible = efl_gfx_visible_get(obs->eo_obs));
if (!is_visible)
continue;
if ((obs->y < c->y + it->h) &&
@@ -11114,7 +11115,7 @@ _evas_textblock_line_number_geometry_get(const Eo *eo_obj, Evas_Textblock_Data *
static void
_evas_object_textblock_clear_all(Evas_Object *eo_obj)
{
- eo_do(eo_obj, evas_obj_textblock_clear());
+ eo_do(eo_obj, evas_obj_textblock_clear(eo_obj));
}
EOLIAN static void
@@ -11445,7 +11446,7 @@ _evas_textblock_style_insets_get(Eo *eo_obj, Evas_Textblock_Data *o, Evas_Coord
EOLIAN static void
_evas_textblock_eo_base_dbg_info_get(Eo *eo_obj, Evas_Textblock_Data *o EINA_UNUSED, Eo_Dbg_Info *root)
{
- eo_do_super(eo_obj, MY_CLASS, eo_dbg_info_get(root));
+ eo_super_eo_dbg_info_get(MY_CLASS, eo_obj, root);
if (!root) return;
Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME);
Eo_Dbg_Info *node;
@@ -11455,9 +11456,9 @@ _evas_textblock_eo_base_dbg_info_get(Eo *eo_obj, Evas_Textblock_Data *o EINA_UNU
char shorttext[48];
const Evas_Textblock_Style *ts = NULL;
- eo_do(eo_obj, ts = evas_obj_textblock_style_get());
+ eo_do(eo_obj, ts = evas_obj_textblock_style_get(eo_obj));
style = evas_textblock_style_get(ts);
- eo_do(eo_obj, text = evas_obj_textblock_text_markup_get());
+ eo_do(eo_obj, text = evas_obj_textblock_text_markup_get(eo_obj));
strncpy(shorttext, text, 38);
if (shorttext[37])
strcpy(shorttext + 37, "\xe2\x80\xa6"); /* HORIZONTAL ELLIPSIS */
@@ -11467,7 +11468,7 @@ _evas_textblock_eo_base_dbg_info_get(Eo *eo_obj, Evas_Textblock_Data *o EINA_UNU
{
int w, h;
- eo_do(eo_obj, evas_obj_textblock_size_formatted_get(&w, &h));
+ eo_do(eo_obj, evas_obj_textblock_size_formatted_get(eo_obj, &w, &h));
node = EO_DBG_INFO_LIST_APPEND(group, "Formatted size");
EO_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, w);
EO_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, h);
@@ -11475,7 +11476,7 @@ _evas_textblock_eo_base_dbg_info_get(Eo *eo_obj, Evas_Textblock_Data *o EINA_UNU
{
int w, h;
- eo_do(eo_obj, evas_obj_textblock_size_native_get(&w, &h));
+ eo_do(eo_obj, evas_obj_textblock_size_native_get(eo_obj, &w, &h));
node = EO_DBG_INFO_LIST_APPEND(group, "Native size");
EO_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, w);
EO_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, h);
@@ -11508,7 +11509,7 @@ EOLIAN static void
_evas_textblock_eo_base_destructor(Eo *eo_obj, Evas_Textblock_Data *o EINA_UNUSED)
{
evas_object_textblock_free(eo_obj);
- eo_do_super(eo_obj, MY_CLASS, eo_destructor());
+ eo_super_eo_destructor(MY_CLASS, eo_obj);
}
static void
diff --git a/src/lib/evas/canvas/evas_object_textgrid.c b/src/lib/evas/canvas/evas_object_textgrid.c
index 0e10f3c522..14268a87d1 100644
--- a/src/lib/evas/canvas/evas_object_textgrid.c
+++ b/src/lib/evas/canvas/evas_object_textgrid.c
@@ -479,7 +479,7 @@ _evas_textgrid_eo_base_destructor(Eo *eo_obj, Evas_Textgrid_Data *o EINA_UNUSED)
Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
evas_object_textgrid_free(eo_obj, obj);
eo_data_unref(eo_obj, obj->private_data);
- eo_do_super(eo_obj, MY_CLASS, eo_destructor());
+ eo_super_eo_destructor(MY_CLASS, eo_obj);
}
static void
@@ -1055,14 +1055,15 @@ evas_object_textgrid_add(Evas *e)
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return NULL;
MAGIC_CHECK_END();
- Evas_Object *eo_obj = eo_add(EVAS_TEXTGRID_CLASS, e);
+ Evas_Object *eo_obj;
+ eo_add(eo_obj, EVAS_TEXTGRID_CLASS, e);
return eo_obj;
}
EOLIAN static Eo *
_evas_textgrid_eo_base_constructor(Eo *eo_obj, Evas_Textgrid_Data *class_data EINA_UNUSED)
{
- eo_obj = eo_do_super_ret(eo_obj, MY_CLASS, eo_obj, eo_constructor());
+ eo_obj = eo_super_eo_constructor( MY_CLASS, eo_obj);
evas_object_textgrid_init(eo_obj);
@@ -1487,22 +1488,22 @@ _evas_textgrid_update_add(Eo *eo_obj, Evas_Textgrid_Data *o, int x, int y, int w
EOLIAN static void
_evas_textgrid_eo_base_dbg_info_get(Eo *eo_obj, Evas_Textgrid_Data *o EINA_UNUSED, Eo_Dbg_Info *root)
{
- eo_do_super(eo_obj, MY_CLASS, eo_dbg_info_get(root));
+ eo_super_eo_dbg_info_get(MY_CLASS, eo_obj, root);
Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME);
Eo_Dbg_Info *node;
const char *text;
int size;
- eo_do(eo_obj, efl_text_properties_font_get(&text, &size));
+ eo_do(eo_obj, efl_text_properties_font_get(eo_obj, &text, &size));
EO_DBG_INFO_APPEND(group, "Font", EINA_VALUE_TYPE_STRING, text);
EO_DBG_INFO_APPEND(group, "Text size", EINA_VALUE_TYPE_INT, size);
- eo_do(eo_obj, text = efl_text_properties_font_source_get());
+ eo_do(eo_obj, text = efl_text_properties_font_source_get(eo_obj));
EO_DBG_INFO_APPEND(group, "Font source", EINA_VALUE_TYPE_STRING, text);
{
int w, h;
- eo_do(eo_obj, evas_obj_textgrid_size_get(&w, &h));
+ eo_do(eo_obj, evas_obj_textgrid_size_get(eo_obj, &w, &h));
node = EO_DBG_INFO_LIST_APPEND(group, "Grid size");
EO_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, w);
EO_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, h);
@@ -1512,27 +1513,27 @@ _evas_textgrid_eo_base_dbg_info_get(Eo *eo_obj, Evas_Textgrid_Data *o EINA_UNUSE
EAPI void
evas_object_textgrid_font_source_set(Eo *obj, const char *font_source)
{
- eo_do((Eo *) obj, efl_text_properties_font_source_set(font_source));
+ eo_do((Eo *) obj, efl_text_properties_font_source_set(obj, font_source));
}
EAPI const char *
evas_object_textgrid_font_source_get(const Eo *obj)
{
const char *font_source = NULL;
- eo_do((Eo *) obj, font_source = efl_text_properties_font_source_get());
+ eo_do((Eo *) obj, font_source = efl_text_properties_font_source_get(obj));
return font_source;
}
EAPI void
evas_object_textgrid_font_set(Eo *obj, const char *font_name, Evas_Font_Size font_size)
{
- eo_do((Eo *) obj, efl_text_properties_font_set(font_name, font_size));
+ eo_do((Eo *) obj, efl_text_properties_font_set(obj, font_name, font_size));
}
EAPI void
evas_object_textgrid_font_get(const Eo *obj, const char **font_name, Evas_Font_Size *font_size)
{
- eo_do((Eo *) obj, efl_text_properties_font_get(font_name, font_size));
+ eo_do((Eo *) obj, efl_text_properties_font_get(obj, font_name, font_size));
}
#include "canvas/evas_textgrid.eo.c"
diff --git a/src/lib/evas/canvas/evas_object_vg.c b/src/lib/evas/canvas/evas_object_vg.c
index e50d787277..1533d6cc85 100644
--- a/src/lib/evas/canvas/evas_object_vg.c
+++ b/src/lib/evas/canvas/evas_object_vg.c
@@ -81,7 +81,8 @@ evas_object_vg_add(Evas *e)
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return NULL;
MAGIC_CHECK_END();
- Evas_Object *eo_obj = eo_add(MY_CLASS, e);
+ Evas_Object *eo_obj;
+ eo_add(eo_obj, MY_CLASS, e);
// Ask backend to return the main Ector_Surface
@@ -115,11 +116,11 @@ _evas_vg_eo_base_destructor(Eo *eo_obj, Evas_VG_Data *pd)
{
Evas *e = evas_object_evas_get(eo_obj);
- eo_do(e, eo_event_callback_del(EVAS_CANVAS_EVENT_RENDER_POST, _cleanup_reference, pd));
+ eo_do(e, eo_event_callback_del(e, EVAS_CANVAS_EVENT_RENDER_POST, _cleanup_reference, pd));
eo_unref(pd->root);
pd->root = NULL;
- eo_do_super(eo_obj, MY_CLASS, eo_destructor());
+ eo_super_eo_destructor(MY_CLASS, eo_obj);
}
Eo *
@@ -127,7 +128,7 @@ _evas_vg_eo_base_constructor(Eo *eo_obj, Evas_VG_Data *pd)
{
Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
- eo_obj = eo_do_super_ret(eo_obj, MY_CLASS, eo_obj, eo_constructor());
+ eo_obj = eo_super_eo_constructor( MY_CLASS, NULL);
/* set up methods (compulsory) */
obj->func = &object_func;
@@ -135,7 +136,7 @@ _evas_vg_eo_base_constructor(Eo *eo_obj, Evas_VG_Data *pd)
obj->type = o_type;
/* root node */
- pd->root = eo_add(EFL_VG_ROOT_NODE_CLASS, eo_obj);
+ eo_add(pd->root, EFL_VG_ROOT_NODE_CLASS, eo_obj);
eo_ref(pd->root);
eina_array_step_set(&pd->cleanup, sizeof(pd->cleanup), 8);
@@ -150,7 +151,7 @@ _evas_vg_eo_base_finalize(Eo *obj, Evas_VG_Data *pd)
// TODO: If we start to have to many Evas_Object_VG per canvas, it may be nice
// to actually have one event per canvas and one array per canvas to.
- eo_do(e, eo_event_callback_add(EVAS_CANVAS_EVENT_RENDER_POST, _cleanup_reference, pd));
+ eo_do(e, eo_event_callback_add(e, EVAS_CANVAS_EVENT_RENDER_POST, _cleanup_reference, pd));
return obj;
}
diff --git a/src/lib/evas/canvas/evas_out.c b/src/lib/evas/canvas/evas_out.c
index 1558a90ed8..f06da23948 100644
--- a/src/lib/evas/canvas/evas_out.c
+++ b/src/lib/evas/canvas/evas_out.c
@@ -19,7 +19,8 @@ evas_out_add(Evas *e)
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return NULL;
MAGIC_CHECK_END();
- Evas_Object *eo_obj = eo_add(MY_CLASS, e);
+ Evas_Object *eo_obj;
+ eo_add(eo_obj, MY_CLASS, e);
return eo_obj;
}
@@ -29,11 +30,11 @@ _evas_out_eo_base_constructor(Eo *eo_obj, Evas_Out_Data *eo_dat)
Eo *eo_parent = NULL;
Evas_Public_Data *e;
- eo_do(eo_obj, eo_parent = eo_parent_get());
+ eo_do(eo_obj, eo_parent = eo_parent_get(eo_obj));
e = eo_data_scope_get(eo_parent, EVAS_CANVAS_CLASS);
evas_canvas_async_block(e);
- eo_obj = eo_do_super_ret(eo_obj, MY_CLASS, eo_obj, eo_constructor());
+ eo_obj = eo_super_eo_constructor( MY_CLASS, eo_obj);
if (!e) return NULL;
e->outputs = eina_list_append(e->outputs, eo_obj);
@@ -57,7 +58,7 @@ _evas_out_eo_base_destructor(Eo *eo_obj, Evas_Out_Data *eo_dat)
Eo *eo_parent = NULL;
Evas_Public_Data *e;
- eo_do(eo_obj, eo_parent = eo_parent_get());
+ eo_do(eo_obj, eo_parent = eo_parent_get(eo_obj));
e = eo_data_scope_get(eo_parent, EVAS_CANVAS_CLASS);
evas_canvas_async_block(e);
if (!e) return;
@@ -66,7 +67,7 @@ _evas_out_eo_base_destructor(Eo *eo_obj, Evas_Out_Data *eo_dat)
// e->engine.func->output_free(eo_dat->output);
e->engine.func->info_free(eo_parent, eo_dat->info);
e->outputs = eina_list_remove(e->outputs, eo_obj);
- eo_do_super(eo_obj, MY_CLASS, eo_destructor());
+ eo_super_eo_destructor(MY_CLASS, eo_obj);
}
EOLIAN static void
@@ -74,7 +75,7 @@ _evas_out_view_set(Eo *eo_e, Evas_Out_Data *eo_dat, Evas_Coord x, Evas_Coord y,
{
Eo *eo_parent = NULL;
Evas_Public_Data *e;
- eo_do(eo_e, eo_parent = eo_parent_get());
+ eo_do(eo_e, eo_parent = eo_parent_get(eo_e));
e = eo_data_scope_get(eo_parent, EVAS_CANVAS_CLASS);
evas_canvas_async_block(e);
eo_dat->x = x;
@@ -99,7 +100,7 @@ _evas_out_engine_info_set(Eo *eo_e, Evas_Out_Data *eo_dat, Evas_Engine_Info *inf
{
Eo *eo_parent = NULL;
Evas_Public_Data *e;
- eo_do(eo_e, eo_parent = eo_parent_get());
+ eo_do(eo_e, eo_parent = eo_parent_get(eo_e));
e = eo_data_scope_get(eo_parent, EVAS_CANVAS_CLASS);
evas_canvas_async_block(e);
if (eo_dat->info != info) return EINA_FALSE;
diff --git a/src/lib/evas/canvas/evas_render.c b/src/lib/evas/canvas/evas_render.c
index 721a4204fe..6eb255b343 100644
--- a/src/lib/evas/canvas/evas_render.c
+++ b/src/lib/evas/canvas/evas_render.c
@@ -1877,7 +1877,7 @@ evas_render_proxy_subrender(Evas *eo_e, Evas_Object *eo_source, Evas_Object *eo_
ENFN->context_free(ENDT, ctx);
if (eo_isa(eo_proxy, EVAS_IMAGE_CLASS))
- eo_do(eo_proxy, source_clip = evas_obj_image_source_clip_get());
+ eo_do(eo_proxy, source_clip = evas_obj_image_source_clip_get(eo_proxy));
Evas_Proxy_Render_Data proxy_render_data = {
.eo_proxy = eo_proxy,
@@ -2219,10 +2219,10 @@ _cb_always_call(Evas *eo_e, Evas_Callback_Type type, void *event_info)
{
int freeze_num = 0, i;
- eo_do(eo_e, freeze_num = eo_event_freeze_count_get());
- for (i = 0; i < freeze_num; i++) eo_do(eo_e, eo_event_thaw());
+ eo_do(eo_e, freeze_num = eo_event_freeze_count_get(eo_e));
+ for (i = 0; i < freeze_num; i++) eo_do(eo_e, eo_event_thaw(eo_e));
evas_event_callback_call(eo_e, type, event_info);
- for (i = 0; i < freeze_num; i++) eo_do(eo_e, eo_event_freeze());
+ for (i = 0; i < freeze_num; i++) eo_do(eo_e, eo_event_freeze(eo_e));
}
static Eina_Bool
diff --git a/src/lib/evas/canvas/evas_stack.c b/src/lib/evas/canvas/evas_stack.c
index 84fa6d8a51..52a2bfa866 100644
--- a/src/lib/evas/canvas/evas_stack.c
+++ b/src/lib/evas/canvas/evas_stack.c
@@ -40,7 +40,7 @@ evas_object_below_get_internal(const Evas_Object_Protected_Data *obj)
EAPI void
evas_object_raise(Evas_Object *obj)
{
- eo_do((Evas_Object *)obj, efl_gfx_stack_raise());
+ eo_do((Evas_Object *)obj, efl_gfx_stack_raise(obj));
}
EOLIAN void
@@ -93,7 +93,7 @@ _evas_object_efl_gfx_stack_raise(Eo *eo_obj, Evas_Object_Protected_Data *obj)
EAPI void
evas_object_lower(Evas_Object *obj)
{
- eo_do((Evas_Object *)obj, efl_gfx_stack_lower());
+ eo_do((Evas_Object *)obj, efl_gfx_stack_lower(obj));
}
EOLIAN void
@@ -147,7 +147,7 @@ _evas_object_efl_gfx_stack_lower(Eo *eo_obj, Evas_Object_Protected_Data *obj)
EAPI void
evas_object_stack_above(Evas_Object *obj, Evas_Object *above)
{
- eo_do((Evas_Object *)obj, efl_gfx_stack_above(above));
+ eo_do((Evas_Object *)obj, efl_gfx_stack_above(obj, above));
}
EOLIAN void
@@ -229,7 +229,7 @@ _evas_object_efl_gfx_stack_stack_above(Eo *eo_obj, Evas_Object_Protected_Data *o
EAPI void
evas_object_stack_below(Evas_Object *obj, Evas_Object *below)
{
- eo_do((Evas_Object *)obj, efl_gfx_stack_below(below));
+ eo_do((Evas_Object *)obj, efl_gfx_stack_below(obj, below));
}
EOLIAN void
@@ -313,7 +313,7 @@ evas_object_above_get(const Evas_Object *obj)
{
Evas_Object *ret;
- return eo_do_ret((Evas_Object *)obj, ret, efl_gfx_stack_above_get());
+ return eo_do_ret((Evas_Object *)obj, ret, efl_gfx_stack_above_get(obj));
}
EOLIAN Efl_Gfx_Stack *
@@ -344,7 +344,7 @@ evas_object_below_get(const Evas_Object *obj)
{
Evas_Object *ret;
- return eo_do_ret((Evas_Object *)obj, ret, efl_gfx_stack_below_get());
+ return eo_do_ret((Evas_Object *)obj, ret, efl_gfx_stack_below_get(obj));
}
EOLIAN Efl_Gfx_Stack *
diff --git a/src/lib/evas/canvas/evas_vg_container.c b/src/lib/evas/canvas/evas_vg_container.c
index 32ffbfa98d..12de25eab3 100644
--- a/src/lib/evas/canvas/evas_vg_container.c
+++ b/src/lib/evas/canvas/evas_vg_container.c
@@ -33,7 +33,7 @@ _efl_vg_container_eo_base_constructor(Eo *obj,
pd->names = eina_hash_stringshared_new(NULL);
- obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
+ obj = eo_super_eo_constructor( MY_CLASS, obj);
nd = eo_data_scope_get(obj, EFL_VG_BASE_CLASS);
nd->render_pre = _efl_vg_container_render_pre;
@@ -46,7 +46,7 @@ static void
_efl_vg_container_eo_base_destructor(Eo *obj,
Efl_VG_Container_Data *pd EINA_UNUSED)
{
- eo_do_super(obj, MY_CLASS, eo_destructor());
+ eo_super_eo_destructor(MY_CLASS, obj);
eina_hash_free(pd->names);
pd->names = NULL;
@@ -68,12 +68,12 @@ _efl_vg_container_efl_vg_base_bounds_get(Eo *obj EINA_UNUSED,
{
if (first)
{
- eo_do(child, efl_vg_bounds_get(r));
+ eo_do(child, efl_vg_bounds_get(child, r));
first = EINA_FALSE;
}
else
{
- eo_do(child, efl_vg_bounds_get(&s));
+ eo_do(child, efl_vg_bounds_get(child, &s));
eina_rectangle_union(r, &s);
}
}
@@ -109,7 +109,7 @@ _efl_vg_container_efl_vg_base_interpolate(Eo *obj,
Eina_Hash_Tuple *tuple;
Eina_Bool r;
- eo_do_super(obj, EFL_VG_CONTAINER_CLASS, r = efl_vg_interpolate(from, to, pos_map));
+ r = eo_super_efl_vg_interpolate(EFL_VG_CONTAINER_CLASS, obj, from, to, pos_map);
if (!r) return EINA_FALSE;
@@ -128,7 +128,7 @@ _efl_vg_container_efl_vg_base_interpolate(Eo *obj,
if (!toc || !fromc) continue ;
if (eo_class_get(toc) != eo_class_get(fromc)) continue ;
- eo_do(cc, r &= efl_vg_interpolate(fromc, toc, pos_map));
+ eo_do(cc, r &= efl_vg_interpolate(cc, fromc, toc, pos_map));
}
eina_iterator_free(it);
@@ -144,7 +144,7 @@ _efl_vg_container_efl_vg_base_dup(Eo *obj,
Eina_List *l;
Eo *child;
- eo_do_super(obj, EFL_VG_CONTAINER_CLASS, efl_vg_dup(from));
+ eo_super_efl_vg_dup(EFL_VG_CONTAINER_CLASS, obj, from);
fromd = eo_data_scope_get(from, EFL_VG_CONTAINER_CLASS);
@@ -155,16 +155,19 @@ _efl_vg_container_efl_vg_base_dup(Eo *obj,
{
// By setting parent, we automatically reference
// this new object as a child of obj. Magic at work !
- eo_add_ref(eo_class_get(child),
+ Eo* tmp;
+ eo_add_ref(tmp, eo_class_get(child),
obj,
- efl_vg_dup(child));
+ efl_vg_dup(eo_class_get(child), child));
}
}
EAPI Efl_VG*
evas_vg_container_add(Efl_VG *parent)
{
- return eo_add(EFL_VG_CONTAINER_CLASS, parent);
+ Eo* o;
+ eo_add(o, EFL_VG_CONTAINER_CLASS, parent);
+ return o;
}
#include "efl_vg_container.eo.c"
diff --git a/src/lib/evas/canvas/evas_vg_gradient.c b/src/lib/evas/canvas/evas_vg_gradient.c
index dff4738575..e950c31296 100644
--- a/src/lib/evas/canvas/evas_vg_gradient.c
+++ b/src/lib/evas/canvas/evas_vg_gradient.c
@@ -63,7 +63,7 @@ _efl_vg_gradient_efl_vg_base_interpolate(Eo *obj,
double from_map;
Eina_Bool r;
- eo_do_super(obj, EFL_VG_GRADIENT_CLASS, r = efl_vg_interpolate(from, to, pos_map));
+ r = eo_super_efl_vg_interpolate(EFL_VG_GRADIENT_CLASS, obj, from, to, pos_map);
fromd = eo_data_scope_get(from, EFL_VG_GRADIENT_CLASS);
tod = eo_data_scope_get(to, EFL_VG_GRADIENT_CLASS);
@@ -101,31 +101,31 @@ _efl_vg_gradient_efl_vg_base_dup(Eo *obj,
{
Efl_VG_Gradient_Data *fromd;
- eo_do_super(obj, EFL_VG_GRADIENT_CLASS, efl_vg_dup(from));
+ eo_super_efl_vg_dup(EFL_VG_GRADIENT_CLASS, obj, from);
fromd = eo_data_scope_get(from, EFL_VG_GRADIENT_CLASS);
eo_do(obj,
- efl_gfx_gradient_stop_set(fromd->colors, fromd->colors_count),
- efl_gfx_gradient_spread_set(fromd->s));
+ efl_gfx_gradient_stop_set(obj, fromd->colors, fromd->colors_count),
+ efl_gfx_gradient_spread_set(obj, fromd->s));
}
EAPI void
evas_vg_gradient_stop_set(Eo *obj, const Efl_Gfx_Gradient_Stop *colors, unsigned int length)
{
- eo_do(obj, efl_gfx_gradient_stop_set(colors, length));
+ eo_do(obj, efl_gfx_gradient_stop_set(obj, colors, length));
}
EAPI void
evas_vg_gradient_stop_get(Eo *obj, const Efl_Gfx_Gradient_Stop **colors, unsigned int *length)
{
- eo_do(obj, efl_gfx_gradient_stop_get(colors, length));
+ eo_do(obj, efl_gfx_gradient_stop_get(obj, colors, length));
}
EAPI void
evas_vg_gradient_spread_set(Eo *obj, Efl_Gfx_Gradient_Spread s)
{
- eo_do(obj, efl_gfx_gradient_spread_set(s));
+ eo_do(obj, efl_gfx_gradient_spread_set(obj, s));
}
EAPI Efl_Gfx_Gradient_Spread
@@ -133,7 +133,7 @@ evas_vg_gradient_spread_get(Eo *obj)
{
Efl_Gfx_Gradient_Spread ret;
- return eo_do_ret(obj, ret, efl_gfx_gradient_spread_get());
+ return eo_do_ret(obj, ret, efl_gfx_gradient_spread_get(obj));
}
#include "efl_vg_gradient.eo.c"
diff --git a/src/lib/evas/canvas/evas_vg_gradient_linear.c b/src/lib/evas/canvas/evas_vg_gradient_linear.c
index 7234d4bb22..df765eb77d 100644
--- a/src/lib/evas/canvas/evas_vg_gradient_linear.c
+++ b/src/lib/evas/canvas/evas_vg_gradient_linear.c
@@ -73,19 +73,19 @@ _efl_vg_gradient_linear_render_pre(Eo *obj,
if (!nd->renderer)
{
- eo_do(s, nd->renderer = ector_surface_renderer_factory_new(ECTOR_RENDERER_GENERIC_GRADIENT_LINEAR_MIXIN));
+ eo_do(s, nd->renderer = ector_surface_renderer_factory_new(s, ECTOR_RENDERER_GENERIC_GRADIENT_LINEAR_MIXIN));
}
eo_do(nd->renderer,
- ector_renderer_transformation_set(current),
- ector_renderer_origin_set(nd->x, nd->y),
- ector_renderer_color_set(nd->r, nd->g, nd->b, nd->a),
- ector_renderer_visibility_set(nd->visibility),
- efl_gfx_gradient_stop_set(gd->colors, gd->colors_count),
- efl_gfx_gradient_spread_set(gd->s),
- efl_gfx_gradient_linear_start_set(pd->start.x, pd->start.y),
- efl_gfx_gradient_linear_end_set(pd->end.x, pd->end.y),
- ector_renderer_prepare());
+ ector_renderer_transformation_set(nd->renderer, current),
+ ector_renderer_origin_set(nd->renderer, nd->x, nd->y),
+ ector_renderer_color_set(nd->renderer, nd->r, nd->g, nd->b, nd->a),
+ ector_renderer_visibility_set(nd->renderer, nd->visibility),
+ efl_gfx_gradient_stop_set(nd->renderer, gd->colors, gd->colors_count),
+ efl_gfx_gradient_spread_set(nd->renderer, gd->s),
+ efl_gfx_gradient_linear_start_set(nd->renderer, pd->start.x, pd->start.y),
+ efl_gfx_gradient_linear_end_set(nd->renderer, pd->end.x, pd->end.y),
+ ector_renderer_prepare(nd->renderer));
}
static Eo *
@@ -94,7 +94,7 @@ _efl_vg_gradient_linear_eo_base_constructor(Eo *obj,
{
Efl_VG_Base_Data *nd;
- obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
+ obj = eo_super_eo_constructor( MY_CLASS, obj);
nd = eo_data_scope_get(obj, EFL_VG_BASE_CLASS);
nd->render_pre = _efl_vg_gradient_linear_render_pre;
@@ -106,7 +106,7 @@ _efl_vg_gradient_linear_eo_base_constructor(Eo *obj,
static void
_efl_vg_gradient_linear_eo_base_destructor(Eo *obj, Efl_VG_Gradient_Linear_Data *pd EINA_UNUSED)
{
- eo_do_super(obj, MY_CLASS, eo_destructor());
+ eo_super_eo_destructor(MY_CLASS, obj);
}
static void
@@ -130,7 +130,7 @@ _efl_vg_gradient_linear_efl_vg_base_interpolate(Eo *obj,
double from_map;
Eina_Bool r;
- eo_do_super(obj, EFL_VG_GRADIENT_LINEAR_CLASS, r = efl_vg_interpolate(from, to, pos_map));
+ r = eo_super_efl_vg_interpolate(EFL_VG_GRADIENT_LINEAR_CLASS, obj, from, to, pos_map);
if (!r) return EINA_FALSE;
@@ -158,37 +158,37 @@ _efl_vg_gradient_linear_efl_vg_base_dup(Eo *obj,
{
Efl_VG_Gradient_Linear_Data *fromd;
- eo_do_super(obj, EFL_VG_GRADIENT_LINEAR_CLASS, efl_vg_dup(from));
+ eo_super_efl_vg_dup(EFL_VG_GRADIENT_LINEAR_CLASS, obj, from);
fromd = eo_data_scope_get(from, EFL_VG_GRADIENT_LINEAR_CLASS);
eo_do(obj,
- efl_gfx_gradient_linear_start_set(fromd->start.x, fromd->start.y),
- efl_gfx_gradient_linear_end_set(fromd->end.x, fromd->end.y));
+ efl_gfx_gradient_linear_start_set(obj, fromd->start.x, fromd->start.y),
+ efl_gfx_gradient_linear_end_set(obj, fromd->end.x, fromd->end.y));
}
EAPI void
evas_vg_gradient_linear_start_set(Eo *obj, double x, double y)
{
- eo_do(obj, efl_gfx_gradient_linear_start_set(x, y));
+ eo_do(obj, efl_gfx_gradient_linear_start_set(obj, x, y));
}
EAPI void
evas_vg_gradient_linear_start_get(Eo *obj, double *x, double *y)
{
- eo_do(obj, efl_gfx_gradient_linear_start_get(x, y));
+ eo_do(obj, efl_gfx_gradient_linear_start_get(obj, x, y));
}
EAPI void
evas_vg_gradient_linear_end_set(Eo *obj, double x, double y)
{
- eo_do(obj, efl_gfx_gradient_linear_end_set(x, y));
+ eo_do(obj, efl_gfx_gradient_linear_end_set(obj, x, y));
}
EAPI void
evas_vg_gradient_linear_end_get(Eo *obj, double *x, double *y)
{
- eo_do(obj, efl_gfx_gradient_linear_end_get(x, y));
+ eo_do(obj, efl_gfx_gradient_linear_end_get(obj, x, y));
}
#include "efl_vg_gradient_linear.eo.c"
diff --git a/src/lib/evas/canvas/evas_vg_gradient_radial.c b/src/lib/evas/canvas/evas_vg_gradient_radial.c
index d6d62c5857..57e7292a6e 100644
--- a/src/lib/evas/canvas/evas_vg_gradient_radial.c
+++ b/src/lib/evas/canvas/evas_vg_gradient_radial.c
@@ -89,20 +89,20 @@ _efl_vg_gradient_radial_render_pre(Eo *obj,
if (!nd->renderer)
{
- eo_do(s, nd->renderer = ector_surface_renderer_factory_new(ECTOR_RENDERER_GENERIC_GRADIENT_RADIAL_MIXIN));
+ eo_do(s, nd->renderer = ector_surface_renderer_factory_new(s, ECTOR_RENDERER_GENERIC_GRADIENT_RADIAL_MIXIN));
}
eo_do(nd->renderer,
- ector_renderer_transformation_set(current),
- ector_renderer_origin_set(nd->x, nd->y),
- ector_renderer_color_set(nd->r, nd->g, nd->b, nd->a),
- ector_renderer_visibility_set(nd->visibility),
- efl_gfx_gradient_stop_set(gd->colors, gd->colors_count),
- efl_gfx_gradient_spread_set(gd->s),
- efl_gfx_gradient_radial_center_set(pd->center.x, pd->center.y),
- efl_gfx_gradient_radial_focal_set(pd->focal.x, pd->focal.y),
- efl_gfx_gradient_radial_radius_set(pd->radius),
- ector_renderer_prepare());
+ ector_renderer_transformation_set(nd->renderer, current),
+ ector_renderer_origin_set(nd->renderer, nd->x, nd->y),
+ ector_renderer_color_set(nd->renderer, nd->r, nd->g, nd->b, nd->a),
+ ector_renderer_visibility_set(nd->renderer, nd->visibility),
+ efl_gfx_gradient_stop_set(nd->renderer, gd->colors, gd->colors_count),
+ efl_gfx_gradient_spread_set(nd->renderer, gd->s),
+ efl_gfx_gradient_radial_center_set(nd->renderer, pd->center.x, pd->center.y),
+ efl_gfx_gradient_radial_focal_set(nd->renderer, pd->focal.x, pd->focal.y),
+ efl_gfx_gradient_radial_radius_set(nd->renderer, pd->radius),
+ ector_renderer_prepare(nd->renderer));
}
static Eo *
@@ -110,7 +110,7 @@ _efl_vg_gradient_radial_eo_base_constructor(Eo *obj, Efl_VG_Gradient_Radial_Data
{
Efl_VG_Base_Data *nd;
- obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
+ obj = eo_super_eo_constructor( MY_CLASS, obj);
nd = eo_data_scope_get(obj, EFL_VG_BASE_CLASS);
nd->render_pre = _efl_vg_gradient_radial_render_pre;
@@ -123,7 +123,7 @@ static void
_efl_vg_gradient_radial_eo_base_destructor(Eo *obj,
Efl_VG_Gradient_Radial_Data *pd EINA_UNUSED)
{
- eo_do_super(obj, MY_CLASS, eo_destructor());
+ eo_super_eo_destructor(MY_CLASS, obj);
}
static void
@@ -148,7 +148,7 @@ _efl_vg_gradient_radial_efl_vg_base_interpolate(Eo *obj,
double from_map;
Eina_Bool r;
- eo_do_super(obj, EFL_VG_GRADIENT_RADIAL_CLASS, r = efl_vg_interpolate(from, to, pos_map));
+ r = eo_super_efl_vg_interpolate(EFL_VG_GRADIENT_RADIAL_CLASS, obj, from, to, pos_map);
if (!r) return EINA_FALSE;
@@ -177,32 +177,32 @@ _efl_vg_gradient_radial_efl_vg_base_dup(Eo *obj,
{
Efl_VG_Gradient_Radial_Data *fromd;
- eo_do_super(obj, EFL_VG_GRADIENT_RADIAL_CLASS, efl_vg_dup(from));
+ eo_super_efl_vg_dup(EFL_VG_GRADIENT_RADIAL_CLASS, obj, from);
fromd = eo_data_scope_get(from, EFL_VG_GRADIENT_RADIAL_CLASS);
eo_do(obj,
- efl_gfx_gradient_radial_focal_set(fromd->focal.x, fromd->focal.y),
- efl_gfx_gradient_radial_center_set(fromd->center.x, fromd->center.y),
- efl_gfx_gradient_radial_radius_set(fromd->radius));
+ efl_gfx_gradient_radial_focal_set(obj, fromd->focal.x, fromd->focal.y),
+ efl_gfx_gradient_radial_center_set(obj, fromd->center.x, fromd->center.y),
+ efl_gfx_gradient_radial_radius_set(obj, fromd->radius));
}
EAPI void
evas_vg_gradient_radial_center_set(Eo *obj, double x, double y)
{
- eo_do(obj, efl_gfx_gradient_radial_center_set(x, y));
+ eo_do(obj, efl_gfx_gradient_radial_center_set(obj, x, y));
}
EAPI void
evas_vg_gradient_radial_center_get(Eo *obj, double *x, double *y)
{
- eo_do(obj, efl_gfx_gradient_radial_center_get(x, y));
+ eo_do(obj, efl_gfx_gradient_radial_center_get(obj, x, y));
}
EAPI void
evas_vg_gradient_radial_radius_set(Eo *obj, double r)
{
- eo_do(obj, efl_gfx_gradient_radial_radius_set(r));
+ eo_do(obj, efl_gfx_gradient_radial_radius_set(obj, r));
}
EAPI double
@@ -210,19 +210,19 @@ evas_vg_gradient_radial_radius_get(Eo *obj)
{
double ret;
- return eo_do_ret(obj, ret, efl_gfx_gradient_radial_radius_get());
+ return eo_do_ret(obj, ret, efl_gfx_gradient_radial_radius_get(obj));
}
EAPI void
evas_vg_gradient_radial_focal_set(Eo *obj, double x, double y)
{
- eo_do(obj, efl_gfx_gradient_radial_focal_set(x, y));
+ eo_do(obj, efl_gfx_gradient_radial_focal_set(obj, x, y));
}
EAPI void
evas_vg_gradient_radial_focal_get(Eo *obj, double *x, double *y)
{
- eo_do(obj, efl_gfx_gradient_radial_focal_get(x, y));
+ eo_do(obj, efl_gfx_gradient_radial_focal_get(obj, x, y));
}
#include "efl_vg_gradient_radial.eo.c"
diff --git a/src/lib/evas/canvas/evas_vg_node.c b/src/lib/evas/canvas/evas_vg_node.c
index d160b45ce8..34c30ff438 100644
--- a/src/lib/evas/canvas/evas_vg_node.c
+++ b/src/lib/evas/canvas/evas_vg_node.c
@@ -26,8 +26,8 @@ _efl_vg_base_property_changed(void *data, Eo *obj, const Eo_Event_Description *d
if (pd->changed) return EINA_TRUE;
pd->changed = EINA_TRUE;
- eo_do(obj, parent = eo_parent_get());
- eo_do(parent, eo_event_callback_call(desc, event_info));
+ eo_do(obj, parent = eo_parent_get(obj));
+ eo_do(parent, eo_event_callback_call(parent, desc, event_info));
return EINA_TRUE;
}
@@ -215,7 +215,7 @@ _efl_vg_base_efl_gfx_base_size_get(Eo *obj,
{
Eina_Rectangle r = { 0, 0, 0, 0 };
- eo_do(obj, efl_vg_bounds_get(&r));
+ eo_do(obj, efl_vg_bounds_get(obj, &r));
if (w) *w = r.w;
if (h) *h = r.h;
}
@@ -227,7 +227,7 @@ _efl_vg_base_parent_checked_get(Eo *obj,
Efl_VG_Container_Data **cd)
{
*cd = NULL;
- eo_do(obj, *parent = eo_parent_get());
+ eo_do(obj, *parent = eo_parent_get(obj));
if (eo_isa(*parent, EFL_VG_CONTAINER_CLASS))
{
@@ -263,14 +263,14 @@ _efl_vg_base_eo_base_constructor(Eo *obj,
Efl_VG_Container_Data *cd = NULL;
Eo *parent;
- obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
+ obj = eo_super_eo_constructor( MY_CLASS, NULL);
if (!_efl_vg_base_parent_checked_get(obj, &parent, &cd)) {
ERR("Failed");
return NULL;
}
- eo_do(obj, eo_event_callback_add(EFL_GFX_CHANGED, _efl_vg_base_property_changed, pd));
+ eo_do(obj, eo_event_callback_add(obj, EFL_GFX_CHANGED, _efl_vg_base_property_changed, pd));
pd->changed = EINA_TRUE;
return obj;
@@ -296,7 +296,7 @@ _efl_vg_base_eo_base_destructor(Eo *obj, Efl_VG_Base_Data *pd)
pd->intp = NULL;
}
- eo_do_super(obj, MY_CLASS, eo_destructor());
+ eo_super_eo_destructor(MY_CLASS, obj);
}
static void
@@ -380,7 +380,7 @@ _efl_vg_base_eo_base_parent_set(Eo *obj,
if (pd->name) eina_hash_del(old_cd->names, pd->name, obj);
}
- eo_do_super(obj, MY_CLASS, eo_parent_set(parent));
+ eo_super_eo_parent_set(MY_CLASS, obj, parent);
if (cd)
{
cd->children = eina_list_append(cd->children, obj);
@@ -405,7 +405,7 @@ _efl_vg_base_efl_gfx_stack_raise(Eo *obj, Efl_VG_Base_Data *pd EINA_UNUSED)
Eina_List *lookup, *next;
Eo *parent;
- eo_do(obj, parent = eo_parent_get());
+ eo_do(obj, parent = eo_parent_get(obj));
if (!eo_isa(parent, EFL_VG_CONTAINER_CLASS)) goto on_error;
cd = eo_data_scope_get(parent, EFL_VG_CONTAINER_CLASS);
@@ -435,7 +435,7 @@ _efl_vg_base_efl_gfx_stack_stack_above(Eo *obj,
Eina_List *lookup, *ref;
Eo *parent;
- eo_do(obj, parent = eo_parent_get());
+ eo_do(obj, parent = eo_parent_get(obj));
if (!eo_isa(parent, EFL_VG_CONTAINER_CLASS)) goto on_error;
cd = eo_data_scope_get(parent, EFL_VG_CONTAINER_CLASS);
@@ -465,7 +465,7 @@ _efl_vg_base_efl_gfx_stack_stack_below(Eo *obj,
Eina_List *lookup, *ref;
Eo *parent;
- eo_do(obj, parent = eo_parent_get());
+ eo_do(obj, parent = eo_parent_get(obj));
if (!eo_isa(parent, EFL_VG_CONTAINER_CLASS)) goto on_error;
cd = eo_data_scope_get(parent, EFL_VG_CONTAINER_CLASS);
@@ -493,7 +493,7 @@ _efl_vg_base_efl_gfx_stack_lower(Eo *obj, Efl_VG_Base_Data *pd EINA_UNUSED)
Eina_List *lookup, *prev;
Eo *parent;
- eo_do(obj, parent = eo_parent_get());
+ eo_do(obj, parent = eo_parent_get(obj));
if (!eo_isa(parent, EFL_VG_CONTAINER_CLASS)) goto on_error;
cd = eo_data_scope_get(parent, EFL_VG_CONTAINER_CLASS);
@@ -522,7 +522,7 @@ _efl_vg_base_root_parent_get(Eo *obj)
if (eo_isa(obj, EFL_VG_ROOT_NODE_CLASS))
return obj;
- eo_do(obj, parent = eo_parent_get());
+ eo_do(obj, parent = eo_parent_get(obj));
if (!parent) return NULL;
return _efl_vg_base_root_parent_get(parent);
@@ -533,7 +533,7 @@ _efl_vg_base_walk_down_at(Eo *root, Eina_Array *a, Eina_Rectangle *r)
{
Eina_Rectangle bounds;
- eo_do(root, efl_vg_bounds_get(&bounds));
+ eo_do(root, efl_vg_bounds_get(root, &bounds));
if (!eina_rectangles_intersect(&bounds, r)) return ;
eina_array_push(a, root);
@@ -571,7 +571,7 @@ _efl_vg_base_efl_gfx_stack_below_get(Eo *obj, Efl_VG_Base_Data *pd EINA_UNUSED)
Eina_Array_Iterator iterator;
unsigned int i;
- eo_do(obj, efl_vg_bounds_get(&r));
+ eo_do(obj, efl_vg_bounds_get(obj, &r));
eina_array_step_set(&a, sizeof (Eina_Array), 8);
@@ -601,7 +601,7 @@ _efl_vg_base_efl_gfx_stack_above_get(Eo *obj, Efl_VG_Base_Data *pd EINA_UNUSED)
Eina_Array_Iterator iterator;
unsigned int i;
- eo_do(obj, efl_vg_bounds_get(&r));
+ eo_do(obj, efl_vg_bounds_get(obj, &r));
eina_array_step_set(&a, sizeof (Eina_Array), 8);
@@ -728,7 +728,7 @@ _efl_vg_base_interpolate(Eo *obj,
if (fromd->mask && tod->mask && pd->mask)
{
eo_do(pd->mask,
- r &= efl_vg_interpolate(fromd->mask, tod->mask, pos_map));
+ r &= efl_vg_interpolate(pd->mask, fromd->mask, tod->mask, pos_map));
}
_efl_vg_base_changed(obj);
@@ -779,9 +779,9 @@ _efl_vg_base_dup(Eo *obj, Efl_VG_Base_Data *pd, const Efl_VG_Base *from)
_efl_vg_clean_object(&pd->mask);
if (fromd->mask)
{
- pd->mask = eo_add(eo_class_get(fromd->mask),
+ eo_add(pd->mask, eo_class_get(fromd->mask),
obj,
- efl_vg_dup(pd->mask));
+ efl_vg_dup(NULL, pd->mask));
}
pd->x = fromd->x;
@@ -800,65 +800,65 @@ evas_vg_node_visible_get(Eo *obj)
{
Eina_Bool ret;
- return eo_do_ret(obj, ret, efl_gfx_visible_get());
+ return eo_do_ret(obj, ret, efl_gfx_visible_get(obj));
}
EAPI void
evas_vg_node_visible_set(Eo *obj, Eina_Bool v)
{
- eo_do(obj, efl_gfx_visible_set(v));
+ eo_do(obj, efl_gfx_visible_set(obj, v));
}
EAPI void
evas_vg_node_color_get(Eo *obj, int *r, int *g, int *b, int *a)
{
- eo_do(obj, efl_gfx_color_get(r, g, b, a));
+ eo_do(obj, efl_gfx_color_get(obj, r, g, b, a));
}
EAPI void
evas_vg_node_color_set(Eo *obj, int r, int g, int b, int a)
{
- eo_do(obj, efl_gfx_color_set(r, g, b, a));
+ eo_do(obj, efl_gfx_color_set(obj, r, g, b, a));
}
EAPI void
evas_vg_node_geometry_get(Eo *obj, int *x, int *y, int *w, int *h)
{
eo_do(obj,
- efl_gfx_position_get(x, y),
- efl_gfx_size_get(w, h));
+ efl_gfx_position_get(obj, x, y),
+ efl_gfx_size_get(obj, w, h));
}
EAPI void
evas_vg_node_geometry_set(Eo *obj, int x, int y, int w, int h)
{
eo_do(obj,
- efl_gfx_position_set(x, y),
- efl_gfx_size_set(w, h));
+ efl_gfx_position_set(obj, x, y),
+ efl_gfx_size_set(obj, w, h));
}
EAPI void
evas_vg_node_stack_below(Eo *obj, Eo *below)
{
- eo_do(obj, efl_gfx_stack_below(below));
+ eo_do(obj, efl_gfx_stack_below(obj, below));
}
EAPI void
evas_vg_node_stack_above(Eo *obj, Eo *above)
{
- eo_do(obj, efl_gfx_stack_above(above));
+ eo_do(obj, efl_gfx_stack_above(obj, above));
}
EAPI void
evas_vg_node_raise(Eo *obj)
{
- eo_do(obj, efl_gfx_stack_raise());
+ eo_do(obj, efl_gfx_stack_raise(obj));
}
EAPI void
evas_vg_node_lower(Eo *obj)
{
- eo_do(obj, efl_gfx_stack_lower());
+ eo_do(obj, efl_gfx_stack_lower(obj));
}
#include "efl_vg_base.eo.c"
diff --git a/src/lib/evas/canvas/evas_vg_private.h b/src/lib/evas/canvas/evas_vg_private.h
index 102de5b078..55958a3d88 100644
--- a/src/lib/evas/canvas/evas_vg_private.h
+++ b/src/lib/evas/canvas/evas_vg_private.h
@@ -70,7 +70,7 @@ _evas_vg_render_pre(Efl_VG *child, Ector_Surface *s, Eina_Matrix3 *m)
static inline void
_efl_vg_base_changed(Eo *obj)
{
- eo_do(obj, eo_event_callback_call(EFL_GFX_CHANGED, NULL));
+ eo_do(obj, eo_event_callback_call(obj, EFL_GFX_CHANGED, NULL));
}
static inline void *
diff --git a/src/lib/evas/canvas/evas_vg_root_node.c b/src/lib/evas/canvas/evas_vg_root_node.c
index 6e50cdb430..647107deae 100644
--- a/src/lib/evas/canvas/evas_vg_root_node.c
+++ b/src/lib/evas/canvas/evas_vg_root_node.c
@@ -53,7 +53,7 @@ _efl_vg_root_node_eo_base_parent_set(Eo *obj,
Eo *parent)
{
// Nice little hack, jump over parent parent_set in Efl_VG_Root
- eo_do_super(obj, EFL_VG_BASE_CLASS, eo_parent_set(parent));
+ eo_super_eo_parent_set(EFL_VG_BASE_CLASS, obj, parent);
if (parent && !eo_isa(parent, EVAS_VG_CLASS))
{
ERR("Parent of VG_ROOT_NODE must be a VG_CLASS");
@@ -80,10 +80,10 @@ _efl_vg_root_node_eo_base_constructor(Eo *obj,
cd->names = eina_hash_stringshared_new(NULL);
// Nice little hack, jump over parent constructor in Efl_VG_Root
- obj = eo_do_super_ret(obj, EFL_VG_BASE_CLASS, obj, eo_constructor());
+ obj = eo_super_eo_constructor( EFL_VG_BASE_CLASS, obj);
eo_do(obj,
- parent = eo_parent_get(),
- efl_vg_name_set("root"));
+ parent = eo_parent_get(obj),
+ efl_vg_name_set(obj, "root"));
if (!eo_isa(parent, EVAS_VG_CLASS)) {
ERR("Parent of VG_ROOT_NODE must be a VG_CLASS");
return NULL;
@@ -93,7 +93,7 @@ _efl_vg_root_node_eo_base_constructor(Eo *obj,
nd->render_pre = _evas_vg_root_node_render_pre;
nd->data = cd;
- eo_do(obj, eo_event_callback_add(EFL_GFX_CHANGED, _evas_vg_root_node_changed, pd));
+ eo_do(obj, eo_event_callback_add(obj, EFL_GFX_CHANGED, _evas_vg_root_node_changed, pd));
return obj;
}
diff --git a/src/lib/evas/canvas/evas_vg_shape.c b/src/lib/evas/canvas/evas_vg_shape.c
index 520c68436f..c61b1cf293 100644
--- a/src/lib/evas/canvas/evas_vg_shape.c
+++ b/src/lib/evas/canvas/evas_vg_shape.c
@@ -34,7 +34,7 @@ _efl_vg_shape_efl_vg_base_bounds_get(Eo *obj,
Eina_Rectangle *r)
{
// FIXME: Use the renderer bounding box when it has been created instead of an estimation
- eo_do(obj, efl_gfx_shape_bounds_get(r));
+ eo_do(obj, efl_gfx_shape_bounds_get(obj, r));
}
static void
@@ -99,8 +99,8 @@ _efl_vg_shape_efl_gfx_base_color_part_set(Eo *obj, Efl_VG_Shape_Data *pd,
return EINA_TRUE;
}
- eo_do_super(obj, EFL_VG_SHAPE_CLASS,
- ret = efl_gfx_color_part_set(part, r, g, b, a));
+
+ ret = eo_super_efl_gfx_color_part_set(EFL_VG_SHAPE_CLASS, obj, part, r, g, b, a);
return ret;
}
@@ -129,8 +129,7 @@ _efl_vg_shape_efl_gfx_base_color_part_get(Eo *obj, Efl_VG_Shape_Data *pd,
return EINA_TRUE;
}
- eo_do_super(obj, EFL_VG_SHAPE_CLASS,
- ret = efl_gfx_color_part_get(part, r, g, b, a));
+ ret = eo_super_efl_gfx_color_part_get(EFL_VG_SHAPE_CLASS, obj, part, r, g, b, a);
return ret;
}
@@ -300,20 +299,20 @@ _efl_vg_shape_render_pre(Eo *obj EINA_UNUSED,
if (!nd->renderer)
{
- eo_do(s, nd->renderer = ector_surface_renderer_factory_new(ECTOR_RENDERER_GENERIC_SHAPE_MIXIN));
+ eo_do(s, nd->renderer = ector_surface_renderer_factory_new(s, ECTOR_RENDERER_GENERIC_SHAPE_MIXIN));
}
eo_do(nd->renderer,
- ector_renderer_transformation_set(current),
- ector_renderer_origin_set(xn, yn),
- ector_renderer_color_set(nd->r, nd->g, nd->b, nd->a),
- ector_renderer_visibility_set(nd->visibility),
- ector_renderer_mask_set(mask ? mask->renderer : NULL),
- ector_renderer_shape_fill_set(fill ? fill->renderer : NULL),
- ector_renderer_shape_stroke_fill_set(stroke_fill ? stroke_fill->renderer : NULL),
- ector_renderer_shape_stroke_marker_set(stroke_marker ? stroke_marker->renderer : NULL),
- efl_gfx_shape_dup(obj),
- ector_renderer_prepare());
+ ector_renderer_transformation_set(nd->renderer, current),
+ ector_renderer_origin_set(nd->renderer, xn, yn),
+ ector_renderer_color_set(nd->renderer, nd->r, nd->g, nd->b, nd->a),
+ ector_renderer_visibility_set(nd->renderer, nd->visibility),
+ ector_renderer_mask_set(nd->renderer, mask ? mask->renderer : NULL),
+ ector_renderer_shape_fill_set(nd->renderer, fill ? fill->renderer : NULL),
+ ector_renderer_shape_stroke_fill_set(nd->renderer, stroke_fill ? stroke_fill->renderer : NULL),
+ ector_renderer_shape_stroke_marker_set(nd->renderer, stroke_marker ? stroke_marker->renderer : NULL),
+ efl_gfx_shape_dup(nd->renderer, obj),
+ ector_renderer_prepare(nd->renderer));
}
static Eo *
@@ -321,7 +320,7 @@ _efl_vg_shape_eo_base_constructor(Eo *obj, Efl_VG_Shape_Data *pd)
{
Efl_VG_Base_Data *nd;
- obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
+ obj = eo_super_eo_constructor( MY_CLASS, NULL);
pd->stroke.cap = EFL_GFX_CAP_BUTT;
pd->stroke.join = EFL_GFX_JOIN_MITER;
@@ -338,7 +337,7 @@ _efl_vg_shape_eo_base_constructor(Eo *obj, Efl_VG_Shape_Data *pd)
static void
_efl_vg_shape_eo_base_destructor(Eo *obj, Efl_VG_Shape_Data *pd EINA_UNUSED)
{
- eo_do_super(obj, MY_CLASS, eo_destructor());
+ eo_super_eo_destructor(MY_CLASS, obj);
}
static Eina_Bool
@@ -353,23 +352,23 @@ _efl_vg_shape_efl_vg_base_interpolate(Eo *obj,
fromd = eo_data_scope_get(from, EFL_VG_SHAPE_CLASS);
tod = eo_data_scope_get(to, EFL_VG_SHAPE_CLASS);
- eo_do_super(obj, MY_CLASS, r = efl_vg_interpolate(from, to, pos_map));
+ r = eo_super_efl_vg_interpolate(MY_CLASS, obj, from, to, pos_map);
- eo_do(obj, r &= efl_gfx_shape_interpolate(from, to, pos_map));
+ eo_do(obj, r &= efl_gfx_shape_interpolate(obj, from, to, pos_map));
if (fromd->fill && tod->fill && pd->fill)
{
- eo_do(pd->fill, r &= efl_vg_interpolate(fromd->fill, tod->fill, pos_map));
+ eo_do(pd->fill, r &= efl_vg_interpolate(pd->fill, fromd->fill, tod->fill, pos_map));
}
if (fromd->stroke.fill && tod->stroke.fill && pd->stroke.fill)
{
eo_do(pd->stroke.fill,
- r &= efl_vg_interpolate(fromd->stroke.fill, tod->stroke.fill, pos_map));
+ r &= efl_vg_interpolate(pd->stroke.fill, fromd->stroke.fill, tod->stroke.fill, pos_map));
}
if (fromd->stroke.marker && tod->stroke.marker && pd->stroke.marker)
{
eo_do(pd->stroke.marker,
- r &= efl_vg_interpolate(fromd->stroke.marker, tod->stroke.marker, pos_map));
+ r &= efl_vg_interpolate(pd->stroke.marker, fromd->stroke.marker, tod->stroke.marker, pos_map));
}
return r;
@@ -382,38 +381,38 @@ _efl_vg_shape_efl_vg_base_dup(Eo *obj, Efl_VG_Shape_Data *pd EINA_UNUSED, const
Eo *parent;
Eo *fill = NULL, *stroke_fill = NULL, *stroke_marker = NULL;
- eo_do_super(obj, MY_CLASS, efl_vg_dup(from));
+ eo_super_efl_vg_dup(MY_CLASS, obj, from);
- eo_do(obj, parent = eo_parent_get());
+ eo_do(obj, parent = eo_parent_get(obj));
fromd = eo_data_scope_get(from, MY_CLASS);
if (fromd->fill)
{
- fill = eo_add(eo_class_get(fromd->fill),
+ eo_add(fill, eo_class_get(fromd->fill),
parent,
- efl_vg_dup(fromd->fill));
+ efl_vg_dup(NULL, fromd->fill));
}
if (fromd->stroke.fill)
{
- stroke_fill = eo_add(eo_class_get(fromd->stroke.fill),
+ eo_add(stroke_fill, eo_class_get(fromd->stroke.fill),
parent,
- efl_vg_dup(fromd->stroke.fill));
+ efl_vg_dup(NULL, fromd->stroke.fill));
}
if (fromd->stroke.marker)
{
- stroke_marker = eo_add(eo_class_get(fromd->stroke.marker),
+ eo_add(stroke_marker, eo_class_get(fromd->stroke.marker),
parent,
- efl_vg_dup(fromd->stroke.marker));
+ efl_vg_dup(NULL, fromd->stroke.marker));
}
eo_do(obj,
- efl_vg_shape_fill_set(fill),
- efl_vg_shape_stroke_fill_set(stroke_fill),
- efl_vg_shape_stroke_marker_set(stroke_marker),
- efl_gfx_shape_dup(from));
+ efl_vg_shape_fill_set(obj, fill),
+ efl_vg_shape_stroke_fill_set(obj, stroke_fill),
+ efl_vg_shape_stroke_marker_set(obj, stroke_marker),
+ efl_gfx_shape_dup(obj, from));
}
EAPI double
@@ -421,25 +420,25 @@ evas_vg_shape_stroke_scale_get(Eo *obj)
{
double ret;
- return eo_do_ret(obj, ret, efl_gfx_shape_stroke_scale_get());
+ return eo_do_ret(obj, ret, efl_gfx_shape_stroke_scale_get(obj));
}
EAPI void
evas_vg_shape_stroke_scale_set(Eo *obj, double s)
{
- eo_do(obj, efl_gfx_shape_stroke_scale_set(s));
+ eo_do(obj, efl_gfx_shape_stroke_scale_set(obj, s));
}
EAPI void
evas_vg_shape_stroke_color_get(Eo *obj, int *r, int *g, int *b, int *a)
{
- eo_do(obj, efl_gfx_shape_stroke_color_get(r, g, b, a));
+ eo_do(obj, efl_gfx_shape_stroke_color_get(obj, r, g, b, a));
}
EAPI void
evas_vg_shape_stroke_color_set(Eo *obj, int r, int g, int b, int a)
{
- eo_do(obj, efl_gfx_shape_stroke_color_set(r, g, b, a));
+ eo_do(obj, efl_gfx_shape_stroke_color_set(obj, r, g, b, a));
}
EAPI double
@@ -447,13 +446,13 @@ evas_vg_shape_stroke_width_get(Eo *obj)
{
double ret;
- return eo_do_ret(obj, ret, efl_gfx_shape_stroke_width_get());
+ return eo_do_ret(obj, ret, efl_gfx_shape_stroke_width_get(obj));
}
EAPI void
evas_vg_shape_stroke_width_set(Eo *obj, double w)
{
- eo_do(obj, efl_gfx_shape_stroke_width_set(w));
+ eo_do(obj, efl_gfx_shape_stroke_width_set(obj, w));
}
EAPI double
@@ -461,25 +460,25 @@ evas_vg_shape_stroke_location_get(Eo *obj)
{
double ret;
- return eo_do_ret(obj, ret, efl_gfx_shape_stroke_location_get());
+ return eo_do_ret(obj, ret, efl_gfx_shape_stroke_location_get(obj));
}
EAPI void
evas_vg_shape_stroke_location_set(Eo *obj, double centered)
{
- eo_do(obj, efl_gfx_shape_stroke_location_set(centered));
+ eo_do(obj, efl_gfx_shape_stroke_location_set(obj, centered));
}
EAPI void
evas_vg_shape_stroke_dash_get(Eo *obj, const Efl_Gfx_Dash **dash, unsigned int *length)
{
- eo_do(obj, efl_gfx_shape_stroke_dash_get(dash, length));
+ eo_do(obj, efl_gfx_shape_stroke_dash_get(obj, dash, length));
}
EAPI void
evas_vg_shape_stroke_dash_set(Eo *obj, const Efl_Gfx_Dash *dash, unsigned int length)
{
- eo_do(obj, efl_gfx_shape_stroke_dash_set(dash, length));
+ eo_do(obj, efl_gfx_shape_stroke_dash_set(obj, dash, length));
}
EAPI Efl_Gfx_Cap
@@ -487,13 +486,13 @@ evas_vg_shape_stroke_cap_get(Eo *obj)
{
Efl_Gfx_Cap ret;
- return eo_do_ret(obj, ret, efl_gfx_shape_stroke_cap_get());
+ return eo_do_ret(obj, ret, efl_gfx_shape_stroke_cap_get(obj));
}
EAPI void
evas_vg_shape_stroke_cap_set(Eo *obj, Efl_Gfx_Cap c)
{
- eo_do(obj, efl_gfx_shape_stroke_cap_set(c));
+ eo_do(obj, efl_gfx_shape_stroke_cap_set(obj, c));
}
EAPI Efl_Gfx_Join
@@ -501,121 +500,121 @@ evas_vg_shape_stroke_join_get(Eo *obj)
{
Efl_Gfx_Join ret;
- return eo_do_ret(obj, ret, efl_gfx_shape_stroke_join_get());
+ return eo_do_ret(obj, ret, efl_gfx_shape_stroke_join_get(obj));
}
EAPI void
evas_vg_shape_stroke_join_set(Eo *obj, Efl_Gfx_Join j)
{
- eo_do(obj, efl_gfx_shape_stroke_join_set(j));
+ eo_do(obj, efl_gfx_shape_stroke_join_set(obj, j));
}
EAPI void
evas_vg_shape_shape_path_set(Eo *obj, const Efl_Gfx_Path_Command *op, const double *points)
{
- eo_do(obj, efl_gfx_shape_path_set(op, points));
+ eo_do(obj, efl_gfx_shape_path_set(obj, op, points));
}
EAPI void
evas_vg_shape_shape_path_get(Eo *obj, const Efl_Gfx_Path_Command **op, const double **points)
{
- eo_do(obj, efl_gfx_shape_path_get(op, points));
+ eo_do(obj, efl_gfx_shape_path_get(obj, op, points));
}
EAPI void
evas_vg_shape_shape_path_length_get(Eo *obj, unsigned int *commands, unsigned int *points)
{
- eo_do(obj, efl_gfx_shape_path_length_get(commands, points));
+ eo_do(obj, efl_gfx_shape_path_length_get(obj, commands, points));
}
EAPI void
evas_vg_shape_shape_current_get(Eo *obj, double *x, double *y)
{
- eo_do(obj, efl_gfx_shape_current_get(x, y));
+ eo_do(obj, efl_gfx_shape_current_get(obj, x, y));
}
EAPI void
evas_vg_shape_shape_current_ctrl_get(Eo *obj, double *x, double *y)
{
- eo_do(obj, efl_gfx_shape_current_ctrl_get(x, y));
+ eo_do(obj, efl_gfx_shape_current_ctrl_get(obj, x, y));
}
EAPI void
evas_vg_shape_shape_dup(Eo *obj, Eo *dup_from)
{
- eo_do(obj, efl_gfx_shape_dup(dup_from));
+ eo_do(obj, efl_gfx_shape_dup(obj, dup_from));
}
EAPI void
evas_vg_shape_shape_reset(Eo *obj)
{
- eo_do(obj, efl_gfx_shape_reset());
+ eo_do(obj, efl_gfx_shape_reset(obj));
}
EAPI void
evas_vg_shape_shape_append_move_to(Eo *obj, double x, double y)
{
- eo_do(obj, efl_gfx_shape_append_move_to(x, y));
+ eo_do(obj, efl_gfx_shape_append_move_to(obj, x, y));
}
EAPI void
evas_vg_shape_shape_append_line_to(Eo *obj, double x, double y)
{
- eo_do(obj, efl_gfx_shape_append_line_to(x, y));
+ eo_do(obj, efl_gfx_shape_append_line_to(obj, x, y));
}
EAPI void
evas_vg_shape_shape_append_quadratic_to(Eo *obj, double x, double y, double ctrl_x, double ctrl_y)
{
- eo_do(obj, efl_gfx_shape_append_quadratic_to(x, y, ctrl_x, ctrl_y));
+ eo_do(obj, efl_gfx_shape_append_quadratic_to(obj, x, y, ctrl_x, ctrl_y));
}
EAPI void
evas_vg_shape_shape_append_squadratic_to(Eo *obj, double x, double y)
{
- eo_do(obj, efl_gfx_shape_append_squadratic_to(x, y));
+ eo_do(obj, efl_gfx_shape_append_squadratic_to(obj, x, y));
}
EAPI void
evas_vg_shape_shape_append_cubic_to(Eo *obj, double x, double y, double ctrl_x0, double ctrl_y0, double ctrl_x1, double ctrl_y1)
{
- eo_do(obj, efl_gfx_shape_append_cubic_to(x, y, ctrl_x0, ctrl_y0, ctrl_x1, ctrl_y1));
+ eo_do(obj, efl_gfx_shape_append_cubic_to(obj, x, y, ctrl_x0, ctrl_y0, ctrl_x1, ctrl_y1));
}
EAPI void
evas_vg_shape_shape_append_scubic_to(Eo *obj, double x, double y, double ctrl_x, double ctrl_y)
{
- eo_do(obj, efl_gfx_shape_append_scubic_to(x, y, ctrl_x, ctrl_y));
+ eo_do(obj, efl_gfx_shape_append_scubic_to(obj, x, y, ctrl_x, ctrl_y));
}
EAPI void
evas_vg_shape_shape_append_arc_to(Eo *obj, double x, double y, double rx, double ry, double angle, Eina_Bool large_arc, Eina_Bool sweep)
{
- eo_do(obj, efl_gfx_shape_append_arc_to(x, y, rx, ry, angle, large_arc, sweep));
+ eo_do(obj, efl_gfx_shape_append_arc_to(obj, x, y, rx, ry, angle, large_arc, sweep));
}
EAPI void
evas_vg_shape_shape_append_close(Eo *obj)
{
- eo_do(obj, efl_gfx_shape_append_close());
+ eo_do(obj, efl_gfx_shape_append_close(obj));
}
EAPI void
evas_vg_shape_shape_append_circle(Eo *obj, double x, double y, double radius)
{
- eo_do(obj, efl_gfx_shape_append_circle(x, y, radius));
+ eo_do(obj, efl_gfx_shape_append_circle(obj, x, y, radius));
}
EAPI void
evas_vg_shape_shape_append_rect(Eo *obj, double x, double y, double w, double h, double rx, double ry)
{
- eo_do(obj, efl_gfx_shape_append_rect(x, y, w, h, rx, ry));
+ eo_do(obj, efl_gfx_shape_append_rect(obj, x, y, w, h, rx, ry));
}
EAPI void
evas_vg_shape_shape_append_svg_path(Eo *obj, const char *svg_path_data)
{
- eo_do(obj, efl_gfx_shape_append_svg_path(svg_path_data));
+ eo_do(obj, efl_gfx_shape_append_svg_path(obj, svg_path_data));
}
EAPI Eina_Bool
@@ -623,7 +622,7 @@ evas_vg_shape_shape_interpolate(Eo *obj, const Eo *from, const Eo *to, double po
{
Eina_Bool ret;
- return eo_do_ret(obj, ret, efl_gfx_shape_interpolate(from, to, pos_map));
+ return eo_do_ret(obj, ret, efl_gfx_shape_interpolate(obj, from, to, pos_map));
}
EAPI Eina_Bool
@@ -631,13 +630,15 @@ evas_vg_shape_shape_equal_commands(Eo *obj, const Eo *with)
{
Eina_Bool ret;
- return eo_do_ret(obj, ret, efl_gfx_shape_equal_commands(with));
+ return eo_do_ret(obj, ret, efl_gfx_shape_equal_commands(obj, with));
}
EAPI Efl_VG*
evas_vg_shape_add(Efl_VG *parent)
{
- return eo_add(EFL_VG_SHAPE_CLASS, parent);
+ Eo* o;
+ eo_add(o, EFL_VG_SHAPE_CLASS, parent);
+ return o;
}
#include "efl_vg_shape.eo.c"
diff --git a/src/lib/evas/canvas/render2/evas_render2.c b/src/lib/evas/canvas/render2/evas_render2.c
index 04549589bb..aefc0ae762 100644
--- a/src/lib/evas/canvas/render2/evas_render2.c
+++ b/src/lib/evas/canvas/render2/evas_render2.c
@@ -32,10 +32,10 @@ _always_call(Eo *eo_e, Evas_Callback_Type type, void *event_info)
{
int freeze_num = 0, i;
- eo_do(eo_e, freeze_num = eo_event_freeze_count_get());
- for (i = 0; i < freeze_num; i++) eo_do(eo_e, eo_event_thaw());
+ eo_do(eo_e, freeze_num = eo_event_freeze_count_get(eo_e));
+ for (i = 0; i < freeze_num; i++) eo_do(eo_e, eo_event_thaw(eo_e));
evas_event_callback_call(eo_e, type, event_info);
- for (i = 0; i < freeze_num; i++) eo_do(eo_e, eo_event_freeze());
+ for (i = 0; i < freeze_num; i++) eo_do(eo_e, eo_event_freeze(eo_e));
}
// a list of canvases currently rendering
diff --git a/src/lib/evas/common3d/primitives/primitive_common.c b/src/lib/evas/common3d/primitives/primitive_common.c
index 882e95216e..29d7cc3816 100644
--- a/src/lib/evas/common3d/primitives/primitive_common.c
+++ b/src/lib/evas/common3d/primitives/primitive_common.c
@@ -12,9 +12,9 @@ void _set_vertex_data_from_array(Evas_Canvas3D_Mesh *mesh,
float *address, *out;
int stride, i, j;
eo_do(mesh,
- evas_canvas3d_mesh_frame_vertex_data_copy_set(frame, attr, 0, NULL),
- address = (float *)evas_canvas3d_mesh_frame_vertex_data_map(frame, attr),
- stride = evas_canvas3d_mesh_frame_vertex_stride_get(frame, attr));
+ evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, frame, attr, 0, NULL),
+ address = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, frame, attr),
+ stride = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, frame, attr));
if (stride == 0) stride = sizeof(float) * attr_count;
for (i = 0; i < vcount; i++)
{
@@ -23,7 +23,7 @@ void _set_vertex_data_from_array(Evas_Canvas3D_Mesh *mesh,
out[j] = data[start + (line * i) + j];
}
eo_do(mesh,
- evas_canvas3d_mesh_frame_vertex_data_unmap(frame, attr));
+ evas_canvas3d_mesh_frame_vertex_data_unmap(mesh, frame, attr));
}
void
@@ -36,9 +36,9 @@ _set_vec3_vertex_data(Evas_Canvas3D_Mesh *mesh,
float *address, *out;
int stride, i;
eo_do(mesh,
- evas_canvas3d_mesh_frame_vertex_data_copy_set(frame, attr, 0, NULL),
- address = (float *)evas_canvas3d_mesh_frame_vertex_data_map(frame, attr),
- stride = evas_canvas3d_mesh_frame_vertex_stride_get(frame, attr));
+ evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, frame, attr, 0, NULL),
+ address = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, frame, attr),
+ stride = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, frame, attr));
if (stride == 0) stride = sizeof(float) * 3;
for (i = 0; i < vcount; i++)
{
@@ -49,7 +49,7 @@ _set_vec3_vertex_data(Evas_Canvas3D_Mesh *mesh,
}
free(data);
eo_do(mesh,
- evas_canvas3d_mesh_frame_vertex_data_unmap(frame, attr));
+ evas_canvas3d_mesh_frame_vertex_data_unmap(mesh, frame, attr));
}
void
@@ -62,9 +62,9 @@ _set_vec2_vertex_data(Evas_Canvas3D_Mesh *mesh,
float *address, *out;
int stride, i;
eo_do(mesh,
- evas_canvas3d_mesh_frame_vertex_data_copy_set(frame, attr, 0, NULL),
- address = (float *)evas_canvas3d_mesh_frame_vertex_data_map(frame, attr),
- stride = evas_canvas3d_mesh_frame_vertex_stride_get(frame, attr));
+ evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, frame, attr, 0, NULL),
+ address = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, frame, attr),
+ stride = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, frame, attr));
if (stride == 0) stride = sizeof(float) * 2;
for (i = 0; i < vcount; i++)
{
@@ -74,7 +74,7 @@ _set_vec2_vertex_data(Evas_Canvas3D_Mesh *mesh,
}
free(data);
eo_do(mesh,
- evas_canvas3d_mesh_frame_vertex_data_unmap(frame, attr));
+ evas_canvas3d_mesh_frame_vertex_data_unmap(mesh, frame, attr));
}
void
diff --git a/src/lib/evas/common3d/primitives/primitive_common.h b/src/lib/evas/common3d/primitives/primitive_common.h
index 50092d711f..63d2c69416 100644
--- a/src/lib/evas/common3d/primitives/primitive_common.h
+++ b/src/lib/evas/common3d/primitives/primitive_common.h
@@ -19,13 +19,13 @@
#define SET_VERTEX_DATA(frame) \
Eina_Bool frame_exist; \
eo_do(mesh, \
- frame_exist = evas_canvas3d_mesh_frame_exist(frame)); \
+ frame_exist = evas_canvas3d_mesh_frame_exist(mesh, frame)); \
if (!frame_exist) \
eo_do(mesh, \
- evas_canvas3d_mesh_frame_add(frame)); \
+ evas_canvas3d_mesh_frame_add(mesh, frame)); \
eo_do(mesh, \
- evas_canvas3d_mesh_vertex_count_set(vcount), \
- evas_canvas3d_mesh_index_data_copy_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, \
+ evas_canvas3d_mesh_vertex_count_set(mesh, vcount), \
+ evas_canvas3d_mesh_index_data_copy_set(mesh, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, \
icount, &indices[0])); \
_set_vec3_vertex_data(mesh, frame, vcount, vertices, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION); \
_set_vec3_vertex_data(mesh, frame, vcount, normals, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL); \
@@ -36,13 +36,13 @@
#define SET_VERTEX_DATA_FROM_ARRAY(mesh, frame, varray, vcount, indices, icount) \
Eina_Bool frame_exist; \
eo_do(mesh, \
- frame_exist = evas_canvas3d_mesh_frame_exist(frame)); \
+ frame_exist = evas_canvas3d_mesh_frame_exist(mesh, frame)); \
if (!frame_exist) \
eo_do(mesh, \
- evas_canvas3d_mesh_frame_add(frame)); \
+ evas_canvas3d_mesh_frame_add(mesh, frame)); \
eo_do(mesh, \
- evas_canvas3d_mesh_vertex_count_set(vcount), \
- evas_canvas3d_mesh_index_data_copy_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, \
+ evas_canvas3d_mesh_vertex_count_set(mesh, vcount), \
+ evas_canvas3d_mesh_index_data_copy_set(mesh, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, \
icount, &indices[0])); \
_set_vertex_data_from_array(mesh, frame, varray, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, \
0, 3, 15, vcount); \
diff --git a/src/lib/evas/filters/evas_filter_parser.c b/src/lib/evas/filters/evas_filter_parser.c
index fc333ad987..90db0cbce8 100644
--- a/src/lib/evas/filters/evas_filter_parser.c
+++ b/src/lib/evas/filters/evas_filter_parser.c
@@ -2989,7 +2989,7 @@ evas_filter_program_state_set(Evas_Filter_Program *pgm, Evas_Object *eo_obj,
pgm->state.next.value = next_val;
eo_do(eo_obj,
- efl_gfx_color_get(&pgm->state.color.r,
+ efl_gfx_color_get(eo_obj, &pgm->state.color.r,
&pgm->state.color.g,
&pgm->state.color.b,
&pgm->state.color.a));
@@ -2997,19 +2997,19 @@ evas_filter_program_state_set(Evas_Filter_Program *pgm, Evas_Object *eo_obj,
if (eo_isa(eo_obj, EVAS_TEXT_CLASS))
{
eo_do(eo_obj,
- evas_obj_text_shadow_color_get(&pgm->state.text.shadow.r,
+ evas_obj_text_shadow_color_get(eo_obj, &pgm->state.text.shadow.r,
&pgm->state.text.shadow.g,
&pgm->state.text.shadow.b,
&pgm->state.text.shadow.a),
- evas_obj_text_outline_color_get(&pgm->state.text.outline.r,
+ evas_obj_text_outline_color_get(eo_obj, &pgm->state.text.outline.r,
&pgm->state.text.outline.g,
&pgm->state.text.outline.b,
&pgm->state.text.outline.a),
- evas_obj_text_glow_color_get(&pgm->state.text.glow.r,
+ evas_obj_text_glow_color_get(eo_obj, &pgm->state.text.glow.r,
&pgm->state.text.glow.g,
&pgm->state.text.glow.b,
&pgm->state.text.glow.a),
- evas_obj_text_glow2_color_get(&pgm->state.text.glow2.r,
+ evas_obj_text_glow2_color_get(eo_obj, &pgm->state.text.glow2.r,
&pgm->state.text.glow2.g,
&pgm->state.text.glow2.b,
&pgm->state.text.glow2.a));