aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/ecore/ecore.c2
-rw-r--r--src/lib/ecore/ecore_anim.c20
-rw-r--r--src/lib/ecore/ecore_exe.c13
-rw-r--r--src/lib/ecore/ecore_exe_posix.c2
-rw-r--r--src/lib/ecore/ecore_idle_enterer.c12
-rw-r--r--src/lib/ecore/ecore_idle_exiter.c10
-rw-r--r--src/lib/ecore/ecore_idler.c10
-rw-r--r--src/lib/ecore/ecore_job.c11
-rw-r--r--src/lib/ecore/ecore_main.c2
-rw-r--r--src/lib/ecore/ecore_poller.c14
-rw-r--r--src/lib/ecore/ecore_timer.c24
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj.c2
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_in.c22
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c2
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_in_tone.c6
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_out.c10
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_out_core_audio.c8
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_out_pulse.c46
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c16
-rw-r--r--src/lib/ecore_con/ecore_con.c88
-rw-r--r--src/lib/ecore_con/ecore_con_eet.c38
-rw-r--r--src/lib/ecore_con/ecore_con_legacy.c4
-rw-r--r--src/lib/ecore_con/ecore_con_local_win32.c3
-rw-r--r--src/lib/ecore_con/ecore_con_url.c20
-rw-r--r--src/lib/ector/cairo/ector_cairo_private.h4
-rw-r--r--src/lib/ector/cairo/ector_cairo_surface.c16
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_base.c8
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c16
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c16
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_shape.c33
-rw-r--r--src/lib/ector/ector_private.h2
-rw-r--r--src/lib/ector/ector_renderer_base.c4
-rw-r--r--src/lib/ector/software/ector_renderer_software_gradient_linear.c14
-rw-r--r--src/lib/ector/software/ector_renderer_software_gradient_radial.c15
-rw-r--r--src/lib/ector/software/ector_renderer_software_shape.c28
-rw-r--r--src/lib/ector/software/ector_software_surface.c16
-rw-r--r--src/lib/edje/edje_calc.c196
-rw-r--r--src/lib/edje/edje_callbacks.c8
-rw-r--r--src/lib/edje/edje_edit.c10
-rw-r--r--src/lib/edje/edje_load.c6
-rw-r--r--src/lib/edje/edje_multisense.c36
-rw-r--r--src/lib/edje/edje_program.c4
-rw-r--r--src/lib/edje/edje_smart.c26
-rw-r--r--src/lib/edje/edje_text.c88
-rw-r--r--src/lib/edje/edje_util.c4
-rw-r--r--src/lib/efl/interfaces/efl_gfx_shape.c92
-rw-r--r--src/lib/eio/eio_model.c28
-rw-r--r--src/lib/emotion/emotion_smart.c78
-rw-r--r--src/lib/eo/Eo.h264
-rw-r--r--src/lib/eo/eo.c102
-rw-r--r--src/lib/eo/eo_base_class.c28
-rw-r--r--src/lib/eo/eo_private.h109
-rw-r--r--src/lib/eo/eo_ptr_indirection.c2
-rw-r--r--src/lib/eo/eo_ptr_indirection.x41
-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
100 files changed, 1605 insertions, 1385 deletions
diff --git a/src/lib/ecore/ecore.c b/src/lib/ecore/ecore.c
index f1212581a3..2d2309ec7b 100644
--- a/src/lib/ecore/ecore.c
+++ b/src/lib/ecore/ecore.c
@@ -262,7 +262,7 @@ ecore_init(void)
#if defined(GLIB_INTEGRATION_ALWAYS)
if (_ecore_glib_always_integrate) ecore_main_loop_glib_integrate();
#endif
- _ecore_parent = eo_add(ECORE_PARENT_CLASS, NULL);
+ eo_add(_ecore_parent, ECORE_PARENT_CLASS, NULL);
#if defined(HAVE_MALLINFO) || defined(HAVE_MALLOC_INFO)
if (getenv("ECORE_MEM_STAT"))
diff --git a/src/lib/ecore/ecore_anim.c b/src/lib/ecore/ecore_anim.c
index 23300906e0..2120a554ac 100644
--- a/src/lib/ecore/ecore_anim.c
+++ b/src/lib/ecore/ecore_anim.c
@@ -319,7 +319,7 @@ _do_tick(void)
eina_inlist_remove(EINA_INLIST_GET(animators),
EINA_INLIST_GET(animator));
- eo_do(animator->obj, eo_parent_set(NULL));
+ eo_do(animator->obj, eo_parent_set(animator->obj, NULL));
if (eo_destructed_is(animator->obj))
eo_manual_free(animator->obj);
else
@@ -372,8 +372,8 @@ ecore_animator_add(Ecore_Task_Cb func,
{
Ecore_Animator *animator = NULL;
- animator = eo_add(MY_CLASS, _ecore_parent,
- ecore_animator_constructor(func, data));
+ eo_add(animator, MY_CLASS, _ecore_parent,
+ ecore_animator_constructor(NULL, func, data));
return animator;
}
@@ -391,8 +391,8 @@ ecore_animator_timeline_add(double runtime,
const void *data)
{
Ecore_Animator *animator;
- animator = eo_add(MY_CLASS, _ecore_parent,
- ecore_animator_timeline_constructor(runtime, func, data));
+ eo_add(animator, MY_CLASS, _ecore_parent,
+ ecore_animator_timeline_constructor(NULL, runtime, func, data));
return animator;
}
@@ -690,7 +690,7 @@ _ecore_animator_eo_base_destructor(Eo *obj, Ecore_Animator_Data *pd)
pd->delete_me = EINA_TRUE;
animators_delete_me++;
- eo_do_super(obj, MY_CLASS, eo_destructor());
+ eo_super_eo_destructor(MY_CLASS, obj);
}
EOLIAN static Eo *
@@ -701,7 +701,7 @@ _ecore_animator_eo_base_finalize(Eo *obj, Ecore_Animator_Data *pd)
return NULL;
}
- return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize());
+ return eo_super_eo_finalize(MY_CLASS, obj);
}
EAPI void
@@ -729,7 +729,7 @@ EAPI void
ecore_animator_freeze(Ecore_Animator *animator)
{
ECORE_ANIMATOR_CHECK(animator);
- eo_do(animator, eo_event_freeze());
+ eo_do(animator, eo_event_freeze(animator));
}
EOLIAN static void
@@ -752,7 +752,7 @@ EAPI void
ecore_animator_thaw(Ecore_Animator *animator)
{
ECORE_ANIMATOR_CHECK(animator);
- eo_do(animator, eo_event_thaw());
+ eo_do(animator, eo_event_thaw(animator));
}
EOLIAN static void
@@ -838,7 +838,7 @@ _ecore_animator_shutdown(void)
if (animator->suspended) animators_suspended--;
animators = (Ecore_Animator_Data *)eina_inlist_remove(EINA_INLIST_GET(animators), EINA_INLIST_GET(animators));
- eo_do(animator->obj, eo_parent_set(NULL));
+ eo_do(animator->obj, eo_parent_set(animator->obj, NULL));
if (eo_destructed_is(animator->obj))
eo_manual_free(animator->obj);
else
diff --git a/src/lib/ecore/ecore_exe.c b/src/lib/ecore/ecore_exe.c
index e31f96e4bc..c6398f5d4c 100644
--- a/src/lib/ecore/ecore_exe.c
+++ b/src/lib/ecore/ecore_exe.c
@@ -67,7 +67,8 @@ ecore_exe_pipe_run(const char *exe_cmd,
Ecore_Exe_Flags flags,
const void *data)
{
- Ecore_Exe *ret = eo_add(MY_CLASS, NULL, ecore_obj_exe_command_set(exe_cmd, flags));
+ Ecore_Exe *ret;
+ eo_add(ret, MY_CLASS, NULL, ecore_obj_exe_command_set(NULL, exe_cmd, flags));
if (ret)
{
Ecore_Exe_Data *pd = eo_data_scope_get(ret, MY_CLASS);
@@ -95,7 +96,7 @@ EOLIAN static Eo *
_ecore_exe_eo_base_finalize(Eo *obj, Ecore_Exe_Data *exe)
{
EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
- eo_do_super(obj, MY_CLASS, obj = eo_finalize());
+ obj = eo_super_eo_finalize(MY_CLASS, obj);
if (!obj)
return obj;
@@ -216,7 +217,7 @@ ecore_exe_free(Ecore_Exe *obj)
EOLIAN static void
_ecore_exe_eo_base_destructor(Eo *obj, Ecore_Exe_Data *exe)
{
- eo_do_super(obj, ECORE_EXE_CLASS, eo_destructor());
+ eo_super_eo_destructor(ECORE_EXE_CLASS, obj);
_impl_ecore_exe_eo_base_destructor(obj, exe);
}
@@ -247,7 +248,7 @@ ecore_exe_cmd_get(const Ecore_Exe *obj)
EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
const char *ret = NULL;
- eo_do(obj, ecore_obj_exe_command_get(&ret, NULL));
+ eo_do(obj, ecore_obj_exe_command_get(obj, &ret, NULL));
return ret;
}
@@ -292,13 +293,13 @@ ecore_exe_flags_get(const Ecore_Exe *obj)
EAPI void
ecore_exe_pause(Ecore_Exe *obj)
{
- eo_do(obj, efl_control_suspend_set(EINA_TRUE));
+ eo_do(obj, efl_control_suspend_set(obj, EINA_TRUE));
}
EAPI void
ecore_exe_continue(Ecore_Exe *obj)
{
- eo_do(obj, efl_control_suspend_set(EINA_FALSE));
+ eo_do(obj, efl_control_suspend_set(obj, EINA_FALSE));
}
EOLIAN static void
diff --git a/src/lib/ecore/ecore_exe_posix.c b/src/lib/ecore/ecore_exe_posix.c
index e416e23b6d..12b4e2e6ff 100644
--- a/src/lib/ecore/ecore_exe_posix.c
+++ b/src/lib/ecore/ecore_exe_posix.c
@@ -1171,7 +1171,7 @@ _ecore_exe_data_generic_handler(void *data,
ecore_event_add(event_type, e,
_ecore_exe_event_exe_data_free,
NULL);
- eo_do(obj, eo_event_callback_call(eo_event, e));
+ eo_do(obj, eo_event_callback_call(obj, eo_event, e));
}
}
}
diff --git a/src/lib/ecore/ecore_idle_enterer.c b/src/lib/ecore/ecore_idle_enterer.c
index c4091eeea8..72f3b00178 100644
--- a/src/lib/ecore/ecore_idle_enterer.c
+++ b/src/lib/ecore/ecore_idle_enterer.c
@@ -61,7 +61,7 @@ ecore_idle_enterer_add(Ecore_Task_Cb func,
const void *data)
{
Ecore_Idle_Enterer *ie = NULL;
- ie = eo_add(MY_CLASS, _ecore_parent, ecore_idle_enterer_after_constructor(func, data));
+ eo_add(ie, MY_CLASS, _ecore_parent, ecore_idle_enterer_after_constructor(NULL, func, data));
return ie;
}
@@ -82,7 +82,7 @@ ecore_idle_enterer_before_add(Ecore_Task_Cb func,
const void *data)
{
Ecore_Idle_Enterer *ie = NULL;
- ie = eo_add(MY_CLASS, _ecore_parent, ecore_idle_enterer_before_constructor(func, data));
+ eo_add(ie, MY_CLASS, _ecore_parent, ecore_idle_enterer_before_constructor(NULL, func, data));
return ie;
}
@@ -130,7 +130,7 @@ _ecore_idle_enterer_eo_base_destructor(Eo *obj, Ecore_Idle_Enterer_Data *idle_en
idle_enterer->delete_me = 1;
idle_enterers_delete_me = 1;
- eo_do_super(obj, MY_CLASS, eo_destructor());
+ eo_super_eo_destructor(MY_CLASS, obj);
}
EOLIAN static Eo *
@@ -141,7 +141,7 @@ _ecore_idle_enterer_eo_base_finalize(Eo *obj, Ecore_Idle_Enterer_Data *idle_ente
return NULL;
}
- return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize());
+ return eo_super_eo_finalize(MY_CLASS, obj);
}
void
@@ -152,7 +152,7 @@ _ecore_idle_enterer_shutdown(void)
{
idle_enterers = (Ecore_Idle_Enterer_Data *)eina_inlist_remove(EINA_INLIST_GET(idle_enterers), EINA_INLIST_GET(idle_enterers));
- eo_do(ie->obj, eo_parent_set(NULL));
+ eo_do(ie->obj, eo_parent_set(ie->obj, NULL));
if (eo_destructed_is(ie->obj))
eo_manual_free(ie->obj);
else
@@ -214,7 +214,7 @@ _ecore_idle_enterer_call(void)
idle_enterers = (Ecore_Idle_Enterer_Data *)eina_inlist_remove(EINA_INLIST_GET(idle_enterers), EINA_INLIST_GET(ie));
- eo_do(ie->obj, eo_parent_set(NULL));
+ eo_do(ie->obj, eo_parent_set(ie->obj, NULL));
if (eo_destructed_is(ie->obj))
eo_manual_free(ie->obj);
else
diff --git a/src/lib/ecore/ecore_idle_exiter.c b/src/lib/ecore/ecore_idle_exiter.c
index f8aed55f7b..6d1ba9e40c 100644
--- a/src/lib/ecore/ecore_idle_exiter.c
+++ b/src/lib/ecore/ecore_idle_exiter.c
@@ -37,7 +37,7 @@ ecore_idle_exiter_add(Ecore_Task_Cb func,
const void *data)
{
Ecore_Idle_Exiter *ie = NULL;
- ie = eo_add(MY_CLASS, _ecore_parent, ecore_idle_exiter_constructor(func, data));
+ eo_add(ie, MY_CLASS, _ecore_parent, ecore_idle_exiter_constructor(NULL, func, data));
return ie;
}
@@ -99,7 +99,7 @@ _ecore_idle_exiter_eo_base_finalize(Eo *obj, Ecore_Idle_Exiter_Data *idle_exiter
return NULL;
}
- return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize());
+ return eo_super_eo_finalize(MY_CLASS, obj);
}
EOLIAN static void
@@ -109,7 +109,7 @@ _ecore_idle_exiter_eo_base_destructor(Eo *obj, Ecore_Idle_Exiter_Data *idle_exit
idle_exiter->delete_me = 1;
idle_exiters_delete_me = 1;
- eo_do_super(obj, MY_CLASS, eo_destructor());
+ eo_super_eo_destructor(MY_CLASS, obj);
}
void
@@ -120,7 +120,7 @@ _ecore_idle_exiter_shutdown(void)
{
idle_exiters = (Ecore_Idle_Exiter_Data *)eina_inlist_remove(EINA_INLIST_GET(idle_exiters), EINA_INLIST_GET(idle_exiters));
- eo_do(ie->obj, eo_parent_set(NULL));
+ eo_do(ie->obj, eo_parent_set(ie->obj, NULL));
if (eo_destructed_is(ie->obj))
eo_manual_free(ie->obj);
else
@@ -183,7 +183,7 @@ _ecore_idle_exiter_call(void)
idle_exiters = (Ecore_Idle_Exiter_Data *)eina_inlist_remove(EINA_INLIST_GET(idle_exiters), EINA_INLIST_GET(ie));
- eo_do(ie->obj, eo_parent_set(NULL));
+ eo_do(ie->obj, eo_parent_set(ie->obj, NULL));
if (eo_destructed_is(ie->obj))
eo_manual_free(ie->obj);
else
diff --git a/src/lib/ecore/ecore_idler.c b/src/lib/ecore/ecore_idler.c
index 7c4a73cfbe..eae71773c4 100644
--- a/src/lib/ecore/ecore_idler.c
+++ b/src/lib/ecore/ecore_idler.c
@@ -39,7 +39,7 @@ ecore_idler_add(Ecore_Task_Cb func,
_ecore_lock();
- ie = eo_add(MY_CLASS, _ecore_parent, ecore_idler_constructor(func, data));
+ eo_add(ie, MY_CLASS, _ecore_parent, ecore_idler_constructor(NULL, func, data));
_ecore_unlock();
return ie;
@@ -98,7 +98,7 @@ _ecore_idler_eo_base_destructor(Eo *obj, Ecore_Idler_Data *idler)
idler->delete_me = 1;
idlers_delete_me = 1;
- eo_do_super(obj, MY_CLASS, eo_destructor());
+ eo_super_eo_destructor(MY_CLASS, obj);
}
EOLIAN static Eo *
@@ -109,7 +109,7 @@ _ecore_idler_eo_base_finalize(Eo *obj, Ecore_Idler_Data *idler)
return NULL;
}
- return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize());
+ return eo_super_eo_finalize(MY_CLASS, obj);
}
void
@@ -120,7 +120,7 @@ _ecore_idler_shutdown(void)
{
idlers = (Ecore_Idler_Data *)eina_inlist_remove(EINA_INLIST_GET(idlers), EINA_INLIST_GET(idlers));
- eo_do(ie->obj, eo_parent_set(NULL));
+ eo_do(ie->obj, eo_parent_set(ie->obj, NULL));
if (eo_destructed_is(ie->obj))
eo_manual_free(ie->obj);
else
@@ -179,7 +179,7 @@ _ecore_idler_all_call(void)
idlers = (Ecore_Idler_Data *)eina_inlist_remove(EINA_INLIST_GET(idlers), EINA_INLIST_GET(ie));
- eo_do(ie->obj, eo_parent_set(NULL));
+ eo_do(ie->obj, eo_parent_set(ie->obj, NULL));
if (eo_destructed_is(ie->obj))
eo_manual_free(ie->obj);
else
diff --git a/src/lib/ecore/ecore_job.c b/src/lib/ecore/ecore_job.c
index ed988ab66c..e6afce4653 100644
--- a/src/lib/ecore/ecore_job.c
+++ b/src/lib/ecore/ecore_job.c
@@ -49,7 +49,8 @@ EAPI Ecore_Job *
ecore_job_add(Ecore_Cb func,
const void *data)
{
- Ecore_Job *job = eo_add(MY_CLASS, _ecore_parent, ecore_job_constructor(func, data));
+ Ecore_Job *job;
+ eo_add(job, MY_CLASS, _ecore_parent, ecore_job_constructor(NULL, func, data));
return job;
}
@@ -88,7 +89,7 @@ ecore_job_del(Ecore_Job *obj)
Ecore_Job_Data *job = eo_data_scope_get(obj, MY_CLASS);
data = job->data;
ecore_event_del(job->event);
- eo_do(obj, eo_parent_set(NULL));
+ eo_do(obj, eo_parent_set(obj, NULL));
return data;
}
@@ -96,7 +97,7 @@ EOLIAN static void
_ecore_job_eo_base_destructor(Eo *obj, Ecore_Job_Data *_pd EINA_UNUSED)
{
/*FIXME: check if ecore_event_del should be called from here*/
- eo_do_super(obj, MY_CLASS, eo_destructor());
+ eo_super_eo_destructor(MY_CLASS, obj);
}
EOLIAN static Eo *
@@ -107,7 +108,7 @@ _ecore_job_eo_base_finalize(Eo *obj, Ecore_Job_Data *pd)
return NULL;
}
- return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize());
+ return eo_super_eo_finalize(MY_CLASS, obj);
}
static Eina_Bool
@@ -126,7 +127,7 @@ static void
_ecore_job_event_free(void *data,
void *job EINA_UNUSED)
{
- eo_do(data, eo_parent_set(NULL));
+ eo_do(data, eo_parent_set(data, NULL));
Ecore_Job *obj = data;
diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c
index 97ddf5a895..d1f4e787f7 100644
--- a/src/lib/ecore/ecore_main.c
+++ b/src/lib/ecore/ecore_main.c
@@ -2323,7 +2323,7 @@ EAPI Eo *ecore_main_loop_get(void)
{
if (!_mainloop_singleton)
{
- _mainloop_singleton = eo_add(ECORE_MAINLOOP_CLASS, NULL);
+ eo_add(_mainloop_singleton, ECORE_MAINLOOP_CLASS, NULL);
}
return _mainloop_singleton;
diff --git a/src/lib/ecore/ecore_poller.c b/src/lib/ecore/ecore_poller.c
index 348a734dd7..1a605a38d0 100644
--- a/src/lib/ecore/ecore_poller.c
+++ b/src/lib/ecore/ecore_poller.c
@@ -173,7 +173,7 @@ _ecore_poller_cb_timer(void *data EINA_UNUSED)
{
pollers[i] = (Ecore_Poller_Data *)eina_inlist_remove(EINA_INLIST_GET(pollers[i]), EINA_INLIST_GET(poller));
- eo_do(poller->obj, eo_parent_set(NULL));
+ eo_do(poller->obj, eo_parent_set(poller->obj, NULL));
if (eo_destructed_is(poller->obj))
eo_manual_free(poller->obj);
else
@@ -237,8 +237,8 @@ ecore_poller_add(Ecore_Poller_Type type EINA_UNUSED,
const void *data)
{
Ecore_Poller *poller;
- poller = eo_add(MY_CLASS, _ecore_parent,
- ecore_poller_constructor(type, interval, func, data));
+ eo_add(poller, MY_CLASS, _ecore_parent,
+ ecore_poller_constructor(NULL, type, interval, func, data));
return poller;
}
@@ -352,7 +352,7 @@ ecore_poller_del(Ecore_Poller *obj)
data = poller->data;
pollers[poller->ibit] = (Ecore_Poller_Data *)eina_inlist_remove(EINA_INLIST_GET(pollers[poller->ibit]), EINA_INLIST_GET(poller));
- eo_do(poller->obj, eo_parent_set(NULL));
+ eo_do(poller->obj, eo_parent_set(poller->obj, NULL));
if (eo_destructed_is(poller->obj))
eo_manual_free(obj);
else
@@ -371,7 +371,7 @@ _ecore_poller_eo_base_destructor(Eo *obj, Ecore_Poller_Data *pd)
poller_delete_count++;
}
- eo_do_super(obj, MY_CLASS, eo_destructor());
+ eo_super_eo_destructor(MY_CLASS, obj);
}
EOLIAN static Eo *
@@ -382,7 +382,7 @@ _ecore_poller_eo_base_finalize(Eo *obj, Ecore_Poller_Data *pd)
return NULL;
}
- return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize());
+ return eo_super_eo_finalize(MY_CLASS, obj);
}
void
@@ -396,7 +396,7 @@ _ecore_poller_shutdown(void)
while ((poller = pollers[i]))
{
pollers[i] = (Ecore_Poller_Data *)eina_inlist_remove(EINA_INLIST_GET(pollers[i]), EINA_INLIST_GET(pollers[i]));
- eo_do(poller->obj, eo_parent_set(NULL));
+ eo_do(poller->obj, eo_parent_set(poller->obj, NULL));
if (eo_destructed_is(poller->obj))
eo_manual_free(poller->obj);
else
diff --git a/src/lib/ecore/ecore_timer.c b/src/lib/ecore/ecore_timer.c
index 9b828564ee..23c314ac76 100644
--- a/src/lib/ecore/ecore_timer.c
+++ b/src/lib/ecore/ecore_timer.c
@@ -97,7 +97,7 @@ ecore_timer_add(double in,
Ecore_Timer *timer = NULL;
EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
- timer = eo_add(MY_CLASS, _ecore_parent, ecore_obj_timer_constructor(in, func, data));
+ eo_add(timer, MY_CLASS, _ecore_parent, ecore_obj_timer_constructor(NULL, in, func, data));
return timer;
}
@@ -261,7 +261,7 @@ EAPI void
ecore_timer_freeze(Ecore_Timer *timer)
{
ECORE_TIMER_CHECK(timer);
- eo_do(timer, eo_event_freeze());
+ eo_do(timer, eo_event_freeze(timer));
}
EOLIAN static void
@@ -294,7 +294,7 @@ ecore_timer_freeze_get(Ecore_Timer *timer)
{
int r = 0;
- eo_do(timer, r = eo_event_freeze_count_get());
+ eo_do(timer, r = eo_event_freeze_count_get(timer));
return !!r;
}
@@ -310,7 +310,7 @@ EAPI void
ecore_timer_thaw(Ecore_Timer *timer)
{
ECORE_TIMER_CHECK(timer);
- eo_do(timer, eo_event_thaw());
+ eo_do(timer, eo_event_thaw(timer));
}
EOLIAN static void
@@ -396,7 +396,7 @@ _ecore_timer_loop_add(double in,
const void *data)
{
Ecore_Timer *timer = NULL;
- timer = eo_add(MY_CLASS, _ecore_parent, ecore_obj_timer_loop_constructor(in, func, data));
+ eo_add(timer, MY_CLASS, _ecore_parent, ecore_obj_timer_loop_constructor(NULL, in, func, data));
return timer;
}
@@ -436,7 +436,7 @@ _ecore_timer_del(Ecore_Timer *obj)
if (timer->delete_me)
timers_delete_me--;
- eo_do(obj, eo_parent_set(NULL));
+ eo_do(obj, eo_parent_set(obj, NULL));
if (eo_destructed_is(obj))
eo_manual_free(obj);
@@ -460,7 +460,7 @@ _ecore_timer_eo_base_destructor(Eo *obj, Ecore_Timer_Data *pd)
timers_delete_me++;
}
- eo_do_super(obj, MY_CLASS, eo_destructor());
+ eo_super_eo_destructor(MY_CLASS, obj);
}
EOLIAN static Eo *
@@ -471,7 +471,7 @@ _ecore_timer_eo_base_finalize(Eo *obj, Ecore_Timer_Data *pd)
return NULL;
}
- return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize());
+ return eo_super_eo_finalize(MY_CLASS, obj);
}
void
@@ -484,7 +484,7 @@ _ecore_timer_shutdown(void)
timers = (Ecore_Timer_Data *)eina_inlist_remove(EINA_INLIST_GET(timers), EINA_INLIST_GET(timers));
eo_data_unref(timer->obj, timer);
- eo_do(timer->obj, eo_parent_set(NULL));
+ eo_do(timer->obj, eo_parent_set(timer->obj, NULL));
if (eo_destructed_is(timer->obj))
eo_manual_free(timer->obj);
else
@@ -496,7 +496,7 @@ _ecore_timer_shutdown(void)
suspended = (Ecore_Timer_Data *)eina_inlist_remove(EINA_INLIST_GET(suspended), EINA_INLIST_GET(suspended));
eo_data_unref(timer->obj, timer);
- eo_do(timer->obj, eo_parent_set(NULL));
+ eo_do(timer->obj, eo_parent_set(timer->obj, NULL));
if (eo_destructed_is(timer->obj))
eo_manual_free(timer->obj);
else
@@ -528,7 +528,7 @@ _ecore_timer_cleanup(void)
timers = (Ecore_Timer_Data *)eina_inlist_remove(EINA_INLIST_GET(timers), EINA_INLIST_GET(timer));
eo_data_unref(timer->obj, timer);
- eo_do(timer->obj, eo_parent_set(NULL));
+ eo_do(timer->obj, eo_parent_set(timer->obj, NULL));
if (eo_destructed_is(timer->obj))
eo_manual_free(timer->obj);
else
@@ -553,7 +553,7 @@ _ecore_timer_cleanup(void)
suspended = (Ecore_Timer_Data *)eina_inlist_remove(EINA_INLIST_GET(suspended), EINA_INLIST_GET(timer));
eo_data_unref(timer->obj, timer);
- eo_do(timer->obj, eo_parent_set(NULL));
+ eo_do(timer->obj, eo_parent_set(timer->obj, NULL));
if (eo_destructed_is(timer->obj))
eo_manual_free(timer->obj);
else
diff --git a/src/lib/ecore_audio/ecore_audio_obj.c b/src/lib/ecore_audio/ecore_audio_obj.c
index 3607cd9fca..b3d1a5d01e 100644
--- a/src/lib/ecore_audio/ecore_audio_obj.c
+++ b/src/lib/ecore_audio/ecore_audio_obj.c
@@ -58,7 +58,7 @@ EOLIAN static Eo *
_ecore_audio_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Object *obj)
{
obj->volume = 1.0;
- return eo_do_super_ret(eo_obj, MY_CLASS, eo_obj, eo_constructor());
+ return eo_super_eo_constructor(MY_CLASS, eo_obj);
}
#include "ecore_audio.eo.c"
diff --git a/src/lib/ecore_audio/ecore_audio_obj_in.c b/src/lib/ecore_audio/ecore_audio_obj_in.c
index a6afa18781..9361970810 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_in.c
@@ -27,7 +27,7 @@ _ecore_audio_in_speed_set(Eo *eo_obj EINA_UNUSED, Ecore_Audio_Input *obj, double
obj->speed = speed;
- eo_do(eo_obj, eo_event_callback_call(ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, NULL));
+ eo_do(eo_obj, eo_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, NULL));
}
EOLIAN static double
@@ -41,7 +41,7 @@ _ecore_audio_in_samplerate_set(Eo *eo_obj EINA_UNUSED, Ecore_Audio_Input *obj, i
{
obj->samplerate = samplerate;
- eo_do(eo_obj, eo_event_callback_call(ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, NULL));
+ eo_do(eo_obj, eo_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, NULL));
}
EOLIAN static int
@@ -89,7 +89,7 @@ _ecore_audio_in_remaining_get(Eo *eo_obj, Ecore_Audio_Input *obj)
if (!obj->seekable) return -1;
else {
double ret = 0.0;
- eo_do(eo_obj, ret = ecore_audio_obj_in_seek(0, SEEK_CUR));
+ eo_do(eo_obj, ret = ecore_audio_obj_in_seek(eo_obj, 0, SEEK_CUR));
return obj->length - ret;
}
}
@@ -104,14 +104,14 @@ _ecore_audio_in_read(Eo *eo_obj, Ecore_Audio_Input *obj, void *buf, size_t len)
memset(buf, 0, len);
len_read = len;
} else {
- eo_do(eo_obj, len_read = ecore_audio_obj_in_read_internal(buf, len));
+ eo_do(eo_obj, len_read = ecore_audio_obj_in_read_internal(eo_obj, buf, len));
if (len_read == 0) {
if (!obj->looped || !obj->seekable) {
- eo_do(eo_obj, eo_event_callback_call(ECORE_AUDIO_IN_EVENT_IN_STOPPED, NULL));
+ eo_do(eo_obj, eo_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_STOPPED, NULL));
} else {
- eo_do(eo_obj, ecore_audio_obj_in_seek(0, SEEK_SET));
- eo_do(eo_obj, len_read = ecore_audio_obj_in_read_internal(buf, len));
- eo_do(eo_obj, eo_event_callback_call(ECORE_AUDIO_IN_EVENT_IN_LOOPED, NULL));
+ eo_do(eo_obj, ecore_audio_obj_in_seek(eo_obj, 0, SEEK_SET));
+ eo_do(eo_obj, len_read = ecore_audio_obj_in_read_internal(eo_obj, buf, len));
+ eo_do(eo_obj, eo_event_callback_call(eo_obj, ECORE_AUDIO_IN_EVENT_IN_LOOPED, NULL));
}
}
@@ -173,7 +173,7 @@ _ecore_audio_in_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Input *obj, Ecore_Au
EOLIAN static Eo *
_ecore_audio_in_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Input *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);
obj->speed = 1.0;
@@ -184,9 +184,9 @@ EOLIAN static void
_ecore_audio_in_eo_base_destructor(Eo *eo_obj, Ecore_Audio_Input *obj)
{
if(obj->output)
- eo_do(obj->output, ecore_audio_obj_out_input_detach(eo_obj));
+ eo_do(obj->output, ecore_audio_obj_out_input_detach(obj->output, eo_obj));
- eo_do_super(eo_obj, MY_CLASS, eo_destructor());
+ eo_super_eo_destructor(MY_CLASS, eo_obj);
}
#include "ecore_audio_in.eo.c"
diff --git a/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c b/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c
index 599ae27391..eac3b68c1d 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c
@@ -205,7 +205,7 @@ _ecore_audio_in_sndfile_eo_base_destructor(Eo *eo_obj, Ecore_Audio_In_Sndfile_Da
if (ea_obj->vio)
_free_vio(ea_obj);
- eo_do_super(eo_obj, MY_CLASS, eo_destructor());
+ eo_super_eo_destructor(MY_CLASS, eo_obj);
}
#include "ecore_audio_in_sndfile.eo.c"
diff --git a/src/lib/ecore_audio/ecore_audio_obj_in_tone.c b/src/lib/ecore_audio/ecore_audio_obj_in_tone.c
index 2b097f66f1..ca2d11160b 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in_tone.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_in_tone.c
@@ -90,7 +90,7 @@ _ecore_audio_in_tone_eo_base_key_data_set(Eo *eo_obj, Ecore_Audio_In_Tone_Data *
if (!strcmp(key, ECORE_AUDIO_ATTR_TONE_FREQ)) {
obj->freq = *(int *)val;
} else {
- eo_do_super(eo_obj, MY_CLASS, eo_key_data_set(key, val));
+ eo_super_eo_key_data_set(MY_CLASS, eo_obj, key, val);
}
}
@@ -102,7 +102,7 @@ _ecore_audio_in_tone_eo_base_key_data_get(Eo *eo_obj, Ecore_Audio_In_Tone_Data *
return (void *) (intptr_t) obj->freq;
} else {
void *ret = NULL;
- eo_do_super(eo_obj, MY_CLASS, ret = eo_key_data_get(key));
+ ret = eo_super_eo_key_data_get(MY_CLASS, eo_obj, key);
return ret;
}
}
@@ -112,7 +112,7 @@ _ecore_audio_in_tone_eo_base_constructor(Eo *eo_obj, Ecore_Audio_In_Tone_Data *o
{
Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS);
- eo_obj = eo_do_super_ret(eo_obj, MY_CLASS, eo_obj, eo_constructor());
+ eo_obj = eo_super_eo_constructor(MY_CLASS, eo_obj);
in_obj->channels = 1;
in_obj->samplerate = 44100;
diff --git a/src/lib/ecore_audio/ecore_audio_obj_out.c b/src/lib/ecore_audio/ecore_audio_obj_out.c
index 0414d668b5..fa497c8933 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_out.c
@@ -34,7 +34,7 @@ static Eina_Bool _write_cb(void *data)
/* FIXME: Multiple inputs */
in = eina_list_data_get(out_obj->inputs);
- eo_do(in, bread = ecore_audio_obj_in_read(buf, 4*1024));
+ eo_do(in, bread = ecore_audio_obj_in_read(in, buf, 4*1024));
if (bread == 0) {
ea_obj->paused = EINA_TRUE;
@@ -61,7 +61,7 @@ _ecore_audio_out_input_attach(Eo *eo_obj, Ecore_Audio_Output *obj, Eo *input)
if (in->output == eo_obj)
return EINA_FALSE;
- if (in->output) eo_do(in->output, ecore_audio_obj_out_input_detach(input));
+ if (in->output) eo_do(in->output, ecore_audio_obj_out_input_detach(in->output, input));
in->output = eo_obj;
/* TODO: Send event */
@@ -132,7 +132,7 @@ _ecore_audio_out_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Output *_pd EINA_UN
EOLIAN static Eo *
_ecore_audio_out_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Output *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);
obj->need_writer = EINA_TRUE;
@@ -146,10 +146,10 @@ _ecore_audio_out_eo_base_destructor(Eo *eo_obj, Ecore_Audio_Output *obj)
Eo *in;
EINA_LIST_FOREACH_SAFE(obj->inputs, cur, tmp, in) {
- eo_do(eo_obj, ecore_audio_obj_out_input_detach(in));
+ eo_do(eo_obj, ecore_audio_obj_out_input_detach(eo_obj, in));
}
- eo_do_super(eo_obj, MY_CLASS, eo_destructor());
+ eo_super_eo_destructor(MY_CLASS, eo_obj);
}
#include "ecore_audio_out.eo.c"
diff --git a/src/lib/ecore_audio/ecore_audio_obj_out_core_audio.c b/src/lib/ecore_audio/ecore_audio_obj_out_core_audio.c
index 1d2ead4566..b6a1c4b9b7 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out_core_audio.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_out_core_audio.c
@@ -219,7 +219,7 @@ EOLIAN static void
_ecore_audio_out_core_audio_ecore_audio_volume_set(Eo *obj, Ecore_Audio_Out_Core_Audio_Data *sd EINA_UNUSED, double volume)
{
// TODO Change volume of playing inputs
- eo_do_super(obj, MY_CLASS, ecore_audio_obj_volume_set(volume));
+ eo_super_ecore_audio_obj_volume_set(MY_CLASS, volume);
}
EOLIAN static Eina_Bool
@@ -230,7 +230,7 @@ _ecore_audio_out_core_audio_ecore_audio_out_input_attach(Eo *obj, Ecore_Audio_Ou
OSStatus err;
Eina_Bool chk;
- eo_do_super(obj, MY_CLASS, chk = ecore_audio_obj_out_input_attach(input));
+ chk = eo_super_ecore_audio_obj_out_input_attach(MY_CLASS, input);
if (EINA_UNLIKELY(!chk))
{
ERR("Failed to attach input (eo_do_super)");
@@ -322,7 +322,7 @@ free_proc_id:
free_helper:
free(helper);
detach:
- eo_do_super(obj, MY_CLASS, ecore_audio_obj_out_input_detach(input));
+ eo_super_ecore_audio_obj_out_input_detach(MY_CLASS, input);
return_failure:
return EINA_FALSE;
}
@@ -338,7 +338,7 @@ _ecore_audio_out_core_audio_ecore_audio_out_input_detach(Eo *obj, Ecore_Audio_Ou
eo_do(input, data = eo_key_data_get("coreaudio_data"));
_core_audio_helper_free(data);
- eo_do_super(obj, MY_CLASS, ret = ecore_audio_obj_out_input_detach(input));
+ ret = eo_super_ecore_audio_obj_out_input_detach(MY_CLASS, input);
return ret;
}
diff --git a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
index eab7464288..07fdfaa9ff 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
@@ -61,10 +61,10 @@ _ecore_audio_out_pulse_ecore_audio_volume_set(Eo *eo_obj, Ecore_Audio_Out_Pulse_
pa_cvolume_set(&pa_volume, 2, volume * PA_VOLUME_NORM);
- eo_do_super(eo_obj, MY_CLASS, ecore_audio_obj_volume_set(volume));
+ eo_super_ecore_audio_obj_volume_set(MY_CLASS, eo_obj, volume);
EINA_LIST_FOREACH(out_obj->inputs, input, in) {
- eo_do(in, stream = eo_key_data_get("pulse_data"));
+ eo_do(in, stream = eo_key_data_get(in, "pulse_data"));
idx = pa_stream_get_index(stream);
pa_operation_unref(pa_context_set_sink_input_volume(class_vars.context, idx, &pa_volume, NULL, NULL));
}
@@ -81,7 +81,7 @@ static void _write_cb(pa_stream *stream, size_t len, void *data)
pa_stream_begin_write(stream, &buf, &wlen);
- eo_do(in, bread = ecore_audio_obj_in_read(buf, wlen));
+ eo_do(in, bread = ecore_audio_obj_in_read(in, buf, wlen));
pa_stream_write(stream, buf, bread, NULL, 0, PA_SEEK_RELATIVE);
if (bread < (int)len)
@@ -96,10 +96,10 @@ static Eina_Bool _update_samplerate_cb(void *data EINA_UNUSED, Eo *eo_obj, const
int samplerate = 0;
double speed = 0;
- eo_do(eo_obj, samplerate = ecore_audio_obj_in_samplerate_get());
- eo_do(eo_obj, speed = ecore_audio_obj_in_speed_get());
+ eo_do(eo_obj, samplerate = ecore_audio_obj_in_samplerate_get(eo_obj));
+ eo_do(eo_obj, speed = ecore_audio_obj_in_speed_get(eo_obj));
- eo_do(eo_obj, stream = eo_key_data_get("pulse_data"));
+ eo_do(eo_obj, stream = eo_key_data_get(eo_obj, "pulse_data"));
pa_operation_unref(pa_stream_update_sample_rate(stream, samplerate * speed, NULL, NULL));
@@ -115,28 +115,28 @@ static Eina_Bool _input_attach_internal(Eo *eo_obj, Eo *in)
Eina_Bool ret = EINA_FALSE;
Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS);
- eo_do_super(eo_obj, MY_CLASS, ret = ecore_audio_obj_out_input_attach(in));
+ ret = eo_super_ecore_audio_obj_out_input_attach(MY_CLASS, eo_obj, in);
if (!ret)
return EINA_FALSE;
ss.format = PA_SAMPLE_FLOAT32LE;
- eo_do(in, ss.rate = ecore_audio_obj_in_samplerate_get());
- eo_do(in, speed = ecore_audio_obj_in_speed_get());
- eo_do(in, ss.channels = ecore_audio_obj_in_channels_get());
- eo_do(in, name = ecore_audio_obj_name_get());
+ eo_do(in, ss.rate = ecore_audio_obj_in_samplerate_get(in));
+ eo_do(in, speed = ecore_audio_obj_in_speed_get(in));
+ eo_do(in, ss.channels = ecore_audio_obj_in_channels_get(in));
+ eo_do(in, name = ecore_audio_obj_name_get(in));
ss.rate = ss.rate * speed;
stream = pa_stream_new(class_vars.context, name, &ss, NULL);
if (!stream) {
ERR("Could not create stream");
- eo_do_super(eo_obj, MY_CLASS, ecore_audio_obj_out_input_detach(in));
+ eo_super_ecore_audio_obj_out_input_detach(MY_CLASS, eo_obj, in);
return EINA_FALSE;
}
- eo_do(in, eo_event_callback_add(ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, _update_samplerate_cb, eo_obj));
+ eo_do(in, eo_event_callback_add(in, ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, _update_samplerate_cb, eo_obj));
- eo_do(in, eo_key_data_set("pulse_data", stream));
+ eo_do(in, eo_key_data_set(in, "pulse_data", stream));
pa_stream_set_write_callback(stream, _write_cb, in);
@@ -151,7 +151,7 @@ static Eina_Bool _input_attach_internal(Eo *eo_obj, Eo *in)
static Eina_Bool _delayed_attach_cb(void *data, Eo *eo_obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
{
Eo *in = data;
- eo_do(eo_obj, eo_event_callback_del(ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, _delayed_attach_cb, in));
+ eo_do(eo_obj, eo_event_callback_del(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, _delayed_attach_cb, in));
_input_attach_internal(eo_obj, in);
@@ -165,7 +165,7 @@ _ecore_audio_out_pulse_ecore_audio_out_input_attach(Eo *eo_obj, Ecore_Audio_Out_
if (class_vars.state != PA_CONTEXT_READY) {
DBG("Delaying input_attach because PA context is not ready.");
- eo_do(eo_obj, eo_event_callback_add(ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, _delayed_attach_cb, in));
+ eo_do(eo_obj, eo_event_callback_add(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, _delayed_attach_cb, in));
} else {
retval = _input_attach_internal(eo_obj, in);
}
@@ -186,11 +186,11 @@ _ecore_audio_out_pulse_ecore_audio_out_input_detach(Eo *eo_obj, Ecore_Audio_Out_
Eina_Bool ret2 = EINA_FALSE;
pa_operation *op;
- eo_do_super(eo_obj, MY_CLASS, ret2 = ecore_audio_obj_out_input_detach(in));
+ ret2 = eo_super_ecore_audio_obj_out_input_detach(MY_CLASS, eo_obj, in);
if (!ret2)
return EINA_FALSE;
- eo_do(in, stream = eo_key_data_get("pulse_data"));
+ eo_do(in, stream = eo_key_data_get(in, "pulse_data"));
pa_stream_set_write_callback(stream, NULL, NULL);
op = pa_stream_drain(stream, _drain_cb, NULL);
@@ -221,12 +221,12 @@ static void _state_cb(pa_context *context, void *data EINA_UNUSED)
if (state == PA_CONTEXT_READY) {
DBG("PA context ready.");
EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) {
- eo_do(eo_obj, eo_event_callback_call(ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, NULL));
+ eo_do(eo_obj, eo_event_callback_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY, NULL));
}
} else if ((state == PA_CONTEXT_FAILED) || (state == PA_CONTEXT_TERMINATED)) {
DBG("PA context fail.");
EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) {
- eo_do(eo_obj, eo_event_callback_call(ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, NULL));
+ eo_do(eo_obj, eo_event_callback_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, NULL));
}
} else {
DBG("Connection state %i", state);
@@ -252,7 +252,7 @@ static void _state_job(void *data EINA_UNUSED)
}
// the callback here can delete things in the list..
EINA_LIST_FOREACH(class_vars.outputs, out, eo_obj) {
- eo_do(eo_obj, eo_event_callback_call(ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, NULL));
+ eo_do(eo_obj, eo_event_callback_call(eo_obj, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, NULL));
}
// now unref everything safely
EINA_LIST_FOREACH_SAFE(class_vars.outputs, out, tmp, eo_obj) {
@@ -269,7 +269,7 @@ _ecore_audio_out_pulse_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Out_Pulse_Dat
char **argv;
Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS);
- eo_obj = eo_do_super_ret(eo_obj, MY_CLASS, eo_obj, eo_constructor());
+ eo_super_eo_constructor(MY_CLASS, eo_obj);
out_obj->need_writer = EINA_FALSE;
@@ -296,7 +296,7 @@ EOLIAN static void
_ecore_audio_out_pulse_eo_base_destructor(Eo *eo_obj, Ecore_Audio_Out_Pulse_Data *_pd EINA_UNUSED)
{
class_vars.outputs = eina_list_remove(class_vars.outputs, eo_obj);
- eo_do_super(eo_obj, MY_CLASS, eo_destructor());
+ eo_super_eo_destructor(MY_CLASS, eo_obj);
}
#include "ecore_audio_out_pulse.eo.c"
diff --git a/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c b/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c
index d986b67dbf..9fb1bb48f7 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c
@@ -43,7 +43,7 @@ static Eina_Bool _write_cb(void *data)
/* TODO: Support mixing of multiple inputs */
in = eina_list_data_get(out_obj->inputs);
- eo_do(in, bread = ecore_audio_obj_in_read(buf, 4*1024));
+ eo_do(in, bread = ecore_audio_obj_in_read(in, buf, 4*1024));
if (bread == 0) {
sf_write_sync(obj->handle);
@@ -66,19 +66,19 @@ _ecore_audio_out_sndfile_ecore_audio_out_input_attach(Eo *eo_obj, Ecore_Audio_Ou
Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS);
Eina_Bool ret2 = EINA_FALSE;
- eo_do_super(eo_obj, MY_CLASS, ret2 = ecore_audio_obj_out_input_attach(in));
+ ret2 = eo_super_ecore_audio_obj_out_input_attach(MY_CLASS, eo_obj, in);
if (!ret2)
return EINA_FALSE;
- eo_do(in, obj->sfinfo.samplerate = ecore_audio_obj_in_samplerate_get());
- eo_do(in, obj->sfinfo.channels = ecore_audio_obj_in_channels_get());
+ eo_do(in, obj->sfinfo.samplerate = ecore_audio_obj_in_samplerate_get(in));
+ eo_do(in, obj->sfinfo.channels = ecore_audio_obj_in_channels_get(in));
obj->handle = sf_open(ea_obj->source, SFM_WRITE, &obj->sfinfo);
if (!obj->handle) {
eina_stringshare_del(ea_obj->source);
ea_obj->source = NULL;
- eo_do_super(eo_obj, MY_CLASS, ecore_audio_obj_out_input_detach(in));
+ eo_super_ecore_audio_obj_out_input_detach(MY_CLASS, eo_obj, in);
return EINA_FALSE;
}
@@ -163,9 +163,9 @@ _ecore_audio_out_sndfile_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Out_Sndfile
{
Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS);
- eo_obj = eo_do_super_ret(eo_obj, MY_CLASS, eo_obj, eo_constructor());
+ eo_super_eo_constructor(MY_CLASS, eo_obj);
- eo_do(eo_obj, ecore_audio_obj_format_set(ECORE_AUDIO_FORMAT_OGG));
+ eo_do(eo_obj, ecore_audio_obj_format_set(eo_obj, ECORE_AUDIO_FORMAT_OGG));
// FIXME: Use writer from output
out_obj->need_writer = EINA_FALSE;
@@ -182,7 +182,7 @@ _ecore_audio_out_sndfile_eo_base_destructor(Eo *eo_obj, Ecore_Audio_Out_Sndfile_
if (out_obj->write_idler)
ecore_idler_del(out_obj->write_idler);
- eo_do_super(eo_obj, MY_CLASS, eo_destructor());
+ eo_super_eo_destructor(MY_CLASS, eo_obj);
}
#include "ecore_audio_out_sndfile.eo.c"
diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c
index 1582c26a2c..b407de84d2 100644
--- a/src/lib/ecore_con/ecore_con.c
+++ b/src/lib/ecore_con/ecore_con.c
@@ -109,7 +109,7 @@ static const char *_ecore_con_pretty_ip(struct sockaddr *client_addr);
#define EO_CONSTRUCTOR_CHECK_RETURN(obj) do { \
Eina_Bool finalized; \
- if (eo_do_ret(obj, finalized, eo_finalized_get())) \
+ if (eo_do_ret(obj, finalized, eo_finalized_get(obj))) \
{ \
ERR("This function is only allowed during construction."); \
return; \
@@ -306,10 +306,10 @@ _ecore_con_base_lookup(Eo *kls_obj EINA_UNUSED, void *pd EINA_UNUSED, const char
if (!name || !done_cb)
return EINA_FALSE;
- obj = eo_add(ECORE_CON_CONNECTOR_CLASS, NULL,
- ecore_con_server_obj_connection_type_set(ECORE_CON_REMOTE_TCP),
- ecore_con_server_obj_name_set(name),
- ecore_con_obj_port_set(1025));
+ eo_add(obj, ECORE_CON_CONNECTOR_CLASS, NULL,
+ ecore_con_server_obj_connection_type_set(NULL, ECORE_CON_REMOTE_TCP),
+ ecore_con_server_obj_name_set(NULL, name),
+ ecore_con_obj_port_set(NULL, 1025));
lk = malloc(sizeof (Ecore_Con_Lookup));
if (!lk)
@@ -363,10 +363,10 @@ ecore_con_server_add(Ecore_Con_Type compl_type,
/* local system socket: FILE: /tmp/.ecore_service|[name]|[port] */
/* remote system socket: TCP/IP: [name]:[port] */
- obj = eo_add(ECORE_CON_SERVER_CLASS, NULL,
- ecore_con_server_obj_connection_type_set(compl_type),
- ecore_con_server_obj_name_set(name),
- ecore_con_obj_port_set(port));
+ eo_add(obj, ECORE_CON_SERVER_CLASS, NULL,
+ ecore_con_server_obj_connection_type_set(NULL, compl_type),
+ ecore_con_server_obj_name_set(NULL, name),
+ ecore_con_obj_port_set(NULL, port));
ecore_con_server_data_set(obj, (void *) data);
@@ -376,7 +376,7 @@ ecore_con_server_add(Ecore_Con_Type compl_type,
EOLIAN static Eo *
_ecore_con_server_eo_base_constructor(Ecore_Con_Server *obj, Ecore_Con_Server_Data *svr)
{
- obj = eo_do_super_ret(obj, ECORE_CON_SERVER_CLASS, obj, eo_constructor());
+ eo_super_eo_constructor(ECORE_CON_SERVER_CLASS, obj);
svr->fd = -1;
svr->reject_excess_clients = EINA_FALSE;
@@ -392,7 +392,7 @@ _ecore_con_server_eo_base_finalize(Ecore_Con_Server *obj, Ecore_Con_Server_Data
Ecore_Con_Type compl_type = svr->type;
Ecore_Con_Type type;
- eo_do_super(obj, ECORE_CON_SERVER_CLASS, eo_finalize());
+ eo_super_eo_finalize(ECORE_CON_SERVER_CLASS, obj);
svr->created = EINA_TRUE;
svr->ppid = getpid();
@@ -462,10 +462,10 @@ ecore_con_server_connect(Ecore_Con_Type compl_type,
/* local user socket: FILE: ~/.ecore/[name]/[port] */
/* local system socket: FILE: /tmp/.ecore_service|[name]|[port] */
/* remote system socket: TCP/IP: [name]:[port] */
- obj = eo_add(ECORE_CON_CONNECTOR_CLASS, NULL,
- ecore_con_server_obj_connection_type_set(compl_type),
- ecore_con_server_obj_name_set(name),
- ecore_con_obj_port_set(port));
+ eo_add(obj, ECORE_CON_CONNECTOR_CLASS, NULL,
+ ecore_con_server_obj_connection_type_set(NULL, compl_type),
+ ecore_con_server_obj_name_set(NULL, name),
+ ecore_con_obj_port_set(NULL, port));
ecore_con_server_data_set(obj, (void *) data);
@@ -481,7 +481,7 @@ _ecore_con_connector_eo_base_finalize(Ecore_Con_Server *obj, void *pd EINA_UNUSE
/* XXX: We intentionally put SERVER class here and not connector, as we'd
* like to skip that one. */
- eo_do_super(obj, ECORE_CON_SERVER_CLASS, eo_finalize());
+ eo_super_eo_finalize(ECORE_CON_SERVER_CLASS, obj);
svr->use_cert = (compl_type & ECORE_CON_SSL & ECORE_CON_LOAD_CERT) == ECORE_CON_LOAD_CERT;
svr->disable_proxy = (compl_type & ECORE_CON_SUPER_SSL & ECORE_CON_NO_PROXY) == ECORE_CON_NO_PROXY;
@@ -548,7 +548,7 @@ error:
EAPI void
ecore_con_server_timeout_set(Ecore_Con *obj, double timeout)
{
- eo_do((Ecore_Con *)obj, ecore_con_obj_timeout_set(timeout));
+ eo_do((Ecore_Con *)obj, ecore_con_obj_timeout_set(obj, timeout));
}
EOLIAN static void
@@ -566,7 +566,7 @@ EAPI double
ecore_con_server_timeout_get(const Ecore_Con *obj)
{
double ret;
- return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_timeout_get());
+ return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_timeout_get(obj));
}
EOLIAN static double
@@ -620,7 +620,7 @@ EAPI Eina_Bool
ecore_con_server_connected_get(const Ecore_Con *obj)
{
Eina_Bool ret;
- return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_connected_get());
+ return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_connected_get(obj));
}
EOLIAN static Eina_Bool
@@ -670,7 +670,7 @@ EAPI int
ecore_con_server_port_get(const Ecore_Con *obj)
{
int ret;
- return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_port_get());
+ return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_port_get(obj));
}
EOLIAN static void
@@ -691,7 +691,7 @@ EAPI int
ecore_con_server_send(Ecore_Con *obj, const void *data, int size)
{
int ret;
- return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_send(data, size));
+ return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_send(obj, data, size));
}
EOLIAN static int
@@ -748,7 +748,7 @@ EAPI const char *
ecore_con_server_ip_get(const Ecore_Con *obj)
{
const char *ret;
- return eo_do_ret(obj, ret, ecore_con_obj_ip_get());
+ return eo_do_ret(obj, ret, ecore_con_obj_ip_get(obj));
}
EOLIAN static const char *
@@ -761,7 +761,7 @@ EAPI double
ecore_con_server_uptime_get(const Ecore_Con *obj)
{
double ret;
- return eo_do_ret(obj, ret, ecore_con_obj_uptime_get());
+ return eo_do_ret(obj, ret, ecore_con_obj_uptime_get(obj));
}
EOLIAN static double
@@ -773,7 +773,7 @@ _ecore_con_server_ecore_con_base_uptime_get(Eo *obj EINA_UNUSED, Ecore_Con_Serve
EAPI void
ecore_con_server_flush(Ecore_Con *obj)
{
- eo_do((Ecore_Con *)obj, ecore_con_obj_flush());
+ eo_do((Ecore_Con *)obj, ecore_con_obj_flush(obj));
}
EOLIAN static void
@@ -803,7 +803,7 @@ EAPI int
ecore_con_client_send(Ecore_Con *obj, const void *data, int size)
{
int ret;
- return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_send(data, size));
+ return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_send(obj, data, size));
}
EOLIAN static int
@@ -871,7 +871,7 @@ EAPI Eina_Bool
ecore_con_client_connected_get(const Ecore_Con *obj)
{
Eina_Bool ret;
- return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_connected_get());
+ return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_connected_get(obj));
}
EOLIAN static void
@@ -885,7 +885,7 @@ _ecore_con_client_ecore_con_base_timeout_set(Eo *obj, Ecore_Con_Client_Data *cl,
EAPI void
ecore_con_client_timeout_set(Ecore_Con *obj, double timeout)
{
- eo_do((Ecore_Con *)obj, ecore_con_obj_timeout_set(timeout));
+ eo_do((Ecore_Con *)obj, ecore_con_obj_timeout_set(obj, timeout));
}
EOLIAN static double
@@ -898,7 +898,7 @@ EAPI double
ecore_con_client_timeout_get(const Ecore_Con *obj)
{
double ret;
- return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_timeout_get());
+ return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_timeout_get(obj));
}
EAPI void *
@@ -950,7 +950,7 @@ EAPI const char *
ecore_con_client_ip_get(const Ecore_Con *obj)
{
const char *ret;
- return eo_do_ret(obj, ret, ecore_con_obj_ip_get());
+ return eo_do_ret(obj, ret, ecore_con_obj_ip_get(obj));
}
EOLIAN static int
@@ -978,7 +978,7 @@ EAPI int
ecore_con_client_port_get(const Ecore_Con *obj)
{
int ret;
- return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_port_get());
+ return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_port_get(obj));
}
EOLIAN static double
@@ -991,7 +991,7 @@ EAPI double
ecore_con_client_uptime_get(const Ecore_Con *obj)
{
double ret;
- return eo_do_ret(obj, ret, ecore_con_obj_uptime_get());
+ return eo_do_ret(obj, ret, ecore_con_obj_uptime_get(obj));
}
EOLIAN static void
@@ -1003,14 +1003,14 @@ _ecore_con_client_ecore_con_base_flush(Eo *obj, Ecore_Con_Client_Data *cl EINA_U
EAPI void
ecore_con_client_flush(Ecore_Con *obj)
{
- eo_do((Ecore_Con *)obj, ecore_con_obj_flush());
+ eo_do((Ecore_Con *)obj, ecore_con_obj_flush(obj));
}
EAPI int
ecore_con_server_fd_get(const Ecore_Con *obj)
{
int ret;
- return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_fd_get());
+ return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_fd_get(obj));
}
EOLIAN static int
@@ -1031,7 +1031,7 @@ EAPI int
ecore_con_client_fd_get(const Ecore_Con *obj)
{
int ret;
- return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_fd_get());
+ return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_fd_get(obj));
}
/**
@@ -1077,7 +1077,7 @@ ecore_con_event_server_add(Ecore_Con_Server *obj)
if (svr->upgrade) ev = ECORE_CON_EVENT_SERVER_UPGRADE;
ecore_event_add(ev, e,
_ecore_con_event_server_add_free, NULL);
- eo_do(obj, eo_event_callback_call(ECORE_CON_BASE_EVENT_CONNECTION_UPGRADED, NULL));
+ eo_do(obj, eo_event_callback_call(obj, ECORE_CON_BASE_EVENT_CONNECTION_UPGRADED, NULL));
_ecore_con_event_count++;
}
@@ -1156,7 +1156,7 @@ ecore_con_event_server_data(Ecore_Con_Server *obj, unsigned char *buf, int num,
Ecore_Con_Event_Data_Received event_info = { NULL, 0 };
event_info.data = e->data;
event_info.size = e->size;
- eo_do(obj, eo_event_callback_call(ECORE_CON_BASE_EVENT_DATA_RECEIVED, &event_info));
+ eo_do(obj, eo_event_callback_call(obj, ECORE_CON_BASE_EVENT_DATA_RECEIVED, &event_info));
}
_ecore_con_event_count++;
}
@@ -1181,7 +1181,7 @@ ecore_con_event_client_add(Ecore_Con_Client *obj)
if (cl->upgrade) ev = ECORE_CON_EVENT_CLIENT_UPGRADE;
ecore_event_add(ev, e,
(Ecore_End_Cb)_ecore_con_event_client_add_free, cl->host_server);
- eo_do(obj, eo_event_callback_call(ECORE_CON_BASE_EVENT_CONNECTION_UPGRADED, NULL));
+ eo_do(obj, eo_event_callback_call(obj, ECORE_CON_BASE_EVENT_CONNECTION_UPGRADED, NULL));
_ecore_con_event_count++;
}
@@ -1263,7 +1263,7 @@ ecore_con_event_client_data(Ecore_Con_Client *obj, unsigned char *buf, int num,
Ecore_Con_Event_Data_Received event_info = { NULL, 0 };
event_info.data = e->data;
event_info.size = e->size;
- eo_do(obj, eo_event_callback_call(ECORE_CON_BASE_EVENT_DATA_RECEIVED, &event_info));
+ eo_do(obj, eo_event_callback_call(obj, ECORE_CON_BASE_EVENT_DATA_RECEIVED, &event_info));
}
_ecore_con_event_count++;
}
@@ -1289,7 +1289,7 @@ _ecore_con_event_server_error(Ecore_Con_Server *obj, char *error, Eina_Bool dupl
DBG("%s", error);
svr->event_count = eina_list_append(svr->event_count, e);
ecore_event_add(ECORE_CON_EVENT_SERVER_ERROR, e, (Ecore_End_Cb)_ecore_con_event_server_error_free, NULL);
- eo_do(obj, eo_event_callback_call(ECORE_CON_BASE_EVENT_CONNECTION_ERROR, e->error));
+ eo_do(obj, eo_event_callback_call(obj, ECORE_CON_BASE_EVENT_CONNECTION_ERROR, e->error));
_ecore_con_event_count++;
}
@@ -1310,7 +1310,7 @@ ecore_con_event_client_error(Ecore_Con_Client *obj, const char *error)
cl->event_count = eina_list_append(cl->event_count, e);
host_server->event_count = eina_list_append(host_server->event_count, e);
ecore_event_add(ECORE_CON_EVENT_CLIENT_ERROR, e, (Ecore_End_Cb)_ecore_con_event_client_error_free, cl->host_server);
- eo_do(obj, eo_event_callback_call(ECORE_CON_BASE_EVENT_CONNECTION_ERROR, e->error));
+ eo_do(obj, eo_event_callback_call(obj, ECORE_CON_BASE_EVENT_CONNECTION_ERROR, e->error));
_ecore_con_event_count++;
}
@@ -1397,7 +1397,7 @@ _ecore_con_server_eo_base_destructor(Eo *obj, Ecore_Con_Server_Data *svr)
servers = eina_list_remove(servers, obj);
svr->data = NULL;
- eo_do_super(obj, ECORE_CON_SERVER_CLASS, eo_destructor());
+ eo_super_eo_destructor(ECORE_CON_SERVER_CLASS, obj);
end:
return;
}
@@ -1460,7 +1460,7 @@ _ecore_con_client_eo_base_destructor(Eo *obj, Ecore_Con_Client_Data *cl)
eina_stringshare_del(cl->ip);
cl->data = NULL;
- eo_do_super(obj, ECORE_CON_CLIENT_CLASS, eo_destructor());
+ eo_super_eo_destructor(ECORE_CON_CLIENT_CLASS, obj);
}
static Eina_Bool
@@ -2080,7 +2080,7 @@ _ecore_con_svr_tcp_handler(void *data,
/* a new client */
- obj = eo_add(ECORE_CON_CLIENT_CLASS, NULL);
+ eo_add(obj, ECORE_CON_CLIENT_CLASS, NULL);
Ecore_Con_Client_Data *cl = eo_data_scope_get(obj, ECORE_CON_CLIENT_CLASS);
if (!cl)
{
@@ -2355,7 +2355,7 @@ _ecore_con_svr_udp_handler(void *data,
}
/* Create a new client for use in the client data event */
- obj = eo_add(ECORE_CON_CLIENT_CLASS, NULL);
+ eo_add(obj, ECORE_CON_CLIENT_CLASS, NULL);
Ecore_Con_Client_Data *cl = eo_data_scope_get(obj, ECORE_CON_CLIENT_CLASS);
EINA_SAFETY_ON_NULL_RETURN_VAL(cl, ECORE_CALLBACK_RENEW);
diff --git a/src/lib/ecore_con/ecore_con_eet.c b/src/lib/ecore_con/ecore_con_eet.c
index c85e287fa2..609cf9fb6d 100644
--- a/src/lib/ecore_con/ecore_con_eet.c
+++ b/src/lib/ecore_con/ecore_con_eet.c
@@ -580,7 +580,7 @@ _ecore_con_eet_base_register(Eo *obj EINA_UNUSED, Ecore_Con_Eet_Base_Data *pd, c
EOLIAN static Eo_Base *
_ecore_con_eet_server_obj_eo_base_constructor(Eo *obj, Ecore_Con_Eet_Server_Obj_Data *pd EINA_UNUSED)
{
- obj = eo_do_super_ret(obj, ECORE_CON_EET_SERVER_OBJ_CLASS, obj, eo_constructor());
+ obj = eo_super_eo_constructor( ECORE_CON_EET_SERVER_OBJ_CLASS, obj);
if (!obj) return NULL;
@@ -615,13 +615,13 @@ _ecore_con_eet_server_obj_eo_base_destructor(Eo *obj, Ecore_Con_Eet_Server_Obj_D
ecore_event_handler_del(pd->handler_del);
ecore_event_handler_del(pd->handler_data);
- eo_do_super(obj, ECORE_CON_EET_SERVER_OBJ_CLASS, eo_destructor());
+ eo_super_eo_destructor(ECORE_CON_EET_SERVER_OBJ_CLASS, obj);
}
EOLIAN static Eo_Base *
_ecore_con_eet_client_obj_eo_base_constructor(Eo *obj, Ecore_Con_Eet_Client_Obj_Data *pd EINA_UNUSED)
{
- obj = eo_do_super_ret(obj, ECORE_CON_EET_CLIENT_OBJ_CLASS, obj, eo_constructor());
+ eo_super_eo_constructor(ECORE_CON_EET_CLIENT_OBJ_CLASS, obj);
if (!obj) return NULL;
@@ -654,13 +654,13 @@ _ecore_con_eet_client_obj_eo_base_destructor(Eo *obj, Ecore_Con_Eet_Client_Obj_D
ecore_event_handler_del(pd->handler_del);
ecore_event_handler_del(pd->handler_data);
- eo_do_super(obj, ECORE_CON_EET_CLIENT_OBJ_CLASS, eo_destructor());
+ eo_super_eo_destructor(ECORE_CON_EET_CLIENT_OBJ_CLASS, obj);
}
EOLIAN static Eo_Base *
_ecore_con_eet_base_eo_base_constructor(Eo *obj, Ecore_Con_Eet_Base_Data *pd)
{
- obj = eo_do_super_ret(obj, ECORE_CON_EET_BASE_CLASS, obj, eo_constructor());
+ obj = eo_super_eo_constructor(ECORE_CON_EET_BASE_CLASS, obj);
if (!obj) return NULL;
@@ -675,7 +675,7 @@ _ecore_con_eet_base_eo_base_constructor(Eo *obj, Ecore_Con_Eet_Base_Data *pd)
EOLIAN static void
_ecore_con_eet_base_eo_base_destructor(Eo *obj, Ecore_Con_Eet_Base_Data *pd)
{
- eo_do_super(obj, ECORE_CON_EET_BASE_CLASS, eo_destructor());
+ eo_super_eo_destructor(ECORE_CON_EET_BASE_CLASS, obj);
eet_data_descriptor_free(pd->edd);
eet_data_descriptor_free(pd->matching);
@@ -722,8 +722,8 @@ ecore_con_eet_server_new(Ecore_Con_Server *server)
if (!server) return NULL;
- ece_obj = eo_add(ECORE_CON_EET_SERVER_OBJ_CLASS, NULL,
- ecore_con_eet_base_server_set(server));
+ eo_add(ece_obj, ECORE_CON_EET_SERVER_OBJ_CLASS, NULL,
+ ecore_con_eet_base_server_set(NULL, server));
return ece_obj;
}
@@ -735,8 +735,8 @@ ecore_con_eet_client_new(Ecore_Con_Server *server)
if (!server) return NULL;
- ece_obj = eo_add(ECORE_CON_EET_CLIENT_OBJ_CLASS, NULL,
- ecore_con_eet_base_server_set(server));
+ eo_add(ece_obj, ECORE_CON_EET_CLIENT_OBJ_CLASS, NULL,
+ ecore_con_eet_base_server_set(NULL, server));
return ece_obj;
}
@@ -750,31 +750,31 @@ ecore_con_eet_server_free(Ecore_Con_Eet *r)
EAPI void
ecore_con_eet_register(Ecore_Con_Eet *ece, const char *name, Eet_Data_Descriptor *edd)
{
- eo_do(ece, ecore_con_eet_base_register(name, edd));
+ eo_do(ece, ecore_con_eet_base_register(ece, name, edd));
}
EAPI void
ecore_con_eet_data_callback_add(Ecore_Con_Eet *ece, const char *name, Ecore_Con_Eet_Data_Cb func, const void *data)
{
- eo_do(ece, ecore_con_eet_base_data_callback_set(name, func, data));
+ eo_do(ece, ecore_con_eet_base_data_callback_set(ece, name, func, data));
}
EAPI void
ecore_con_eet_data_callback_del(Ecore_Con_Eet *ece, const char *name)
{
- eo_do(ece, ecore_con_eet_base_data_callback_del(name));
+ eo_do(ece, ecore_con_eet_base_data_callback_del(ece, name));
}
EAPI void
ecore_con_eet_raw_data_callback_add(Ecore_Con_Eet *ece, const char *name, Ecore_Con_Eet_Raw_Data_Cb func, const void *data)
{
- eo_do(ece, ecore_con_eet_base_raw_data_callback_set(name, func, data));
+ eo_do(ece, ecore_con_eet_base_raw_data_callback_set(ece, name, func, data));
}
EAPI void
ecore_con_eet_raw_data_callback_del(Ecore_Con_Eet *ece, const char *name)
{
- eo_do(ece, ecore_con_eet_base_raw_data_callback_del(name));
+ eo_do(ece, ecore_con_eet_base_raw_data_callback_del(ece, name));
}
EAPI void
@@ -920,7 +920,7 @@ ecore_con_eet_server_disconnect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_S
EAPI void
ecore_con_eet_data_set(Ecore_Con_Eet *ece, const void *data)
{
- eo_do(ece,eo_key_data_set(ECORE_CON_EET_DATA_KEY, data));
+ eo_do(ece,eo_key_data_set(ece, ECORE_CON_EET_DATA_KEY, data));
}
EAPI const void *
@@ -928,7 +928,7 @@ ecore_con_eet_data_get(Ecore_Con_Eet *ece)
{
const void *temp;
- return eo_do_ret(ece, temp, eo_key_data_get(ECORE_CON_EET_DATA_KEY));
+ return eo_do_ret(ece, temp, eo_key_data_get(ece, ECORE_CON_EET_DATA_KEY));
}
EAPI Ecore_Con_Eet *
@@ -941,14 +941,14 @@ ecore_con_eet_reply(Ecore_Con_Reply *reply)
EAPI void
ecore_con_eet_send(Ecore_Con_Reply *reply, const char *name, void *value)
{
- eo_do(reply->ece, ecore_con_eet_base_send(reply, name, value));
+ eo_do(reply->ece, ecore_con_eet_base_send(reply->ece, reply, name, value));
}
EAPI void
ecore_con_eet_raw_send(Ecore_Con_Reply *reply, const char *protocol_name, const char *section, void *value, unsigned int length)
{
eo_do(reply->ece,
- ecore_con_eet_base_raw_send(reply, protocol_name, section, value,
+ ecore_con_eet_base_raw_send(reply->ece, reply, protocol_name, section, value,
length));
}
diff --git a/src/lib/ecore_con/ecore_con_legacy.c b/src/lib/ecore_con/ecore_con_legacy.c
index 0b84b90d45..23340fc8f8 100644
--- a/src/lib/ecore_con/ecore_con_legacy.c
+++ b/src/lib/ecore_con/ecore_con_legacy.c
@@ -5,7 +5,7 @@ EAPI Eina_Bool
ecore_con_url_url_set(Ecore_Con_Url *obj, const char *url)
{
Eina_Bool ret;
- eo_do((Ecore_Con_Url *)obj, ret = efl_network_url_set(url));
+ eo_do((Ecore_Con_Url *)obj, ret = efl_network_url_set(obj, url));
return ret;
}
@@ -13,7 +13,7 @@ EAPI const char *
ecore_con_url_url_get(const Ecore_Con_Url *obj)
{
const char * ret;
- eo_do((Ecore_Con_Url *)obj, ret = efl_network_url_get());
+ eo_do((Ecore_Con_Url *)obj, ret = efl_network_url_get(obj));
return ret;
}
diff --git a/src/lib/ecore_con/ecore_con_local_win32.c b/src/lib/ecore_con/ecore_con_local_win32.c
index 4d0dedbb46..453f016834 100644
--- a/src/lib/ecore_con/ecore_con_local_win32.c
+++ b/src/lib/ecore_con/ecore_con_local_win32.c
@@ -286,7 +286,8 @@ _ecore_con_local_win32_client_add(void *data, Ecore_Win32_Handler *wh)
(svr->client_count >= (unsigned int)svr->client_limit))
return ECORE_CALLBACK_CANCEL;
- Ecore_Con_Client *cl_obj = eo_add(ECORE_CON_CLIENT_CLASS, NULL);
+ Ecore_Con_Client *cl_obj;
+ eo_add(cl_obj, ECORE_CON_CLIENT_CLASS, NULL);
Ecore_Con_Client_Data *cl = eo_data_scope_get(obj, ECORE_CON_CLIENT_CLASS);
if (!cl)
{
diff --git a/src/lib/ecore_con/ecore_con_url.c b/src/lib/ecore_con/ecore_con_url.c
index d40fdc5bd6..e257f6c8d7 100644
--- a/src/lib/ecore_con/ecore_con_url.c
+++ b/src/lib/ecore_con/ecore_con_url.c
@@ -225,11 +225,11 @@ EAPI Ecore_Con_Url *
ecore_con_url_new(const char *url)
{
Ecore_Con_Url *url_obj;
- url_obj = eo_add(EFL_NETWORK_URL_CLASS, NULL,
- efl_network_url_set(url));
+ eo_add(url_obj, EFL_NETWORK_URL_CLASS, NULL,
+ efl_network_url_set(NULL, url));
eo_do(url_obj,
- eo_event_callback_array_add(efl_network_url_event_table_callbacks(),
+ eo_event_callback_array_add(url_obj, efl_network_url_event_table_callbacks(),
NULL));
return url_obj;
@@ -238,7 +238,7 @@ ecore_con_url_new(const char *url)
EOLIAN static Eo *
_efl_network_url_eo_base_constructor(Efl_Network_Url *url_obj, Efl_Network_Url_Data *url_con EINA_UNUSED)
{
- url_obj = eo_do_super_ret(url_obj, MY_CLASS, url_obj, eo_constructor());
+ url_obj = eo_super_eo_constructor( MY_CLASS, url_obj);
if (!_init_count || !_c_init())
{
@@ -338,7 +338,7 @@ _efl_network_url_eo_base_finalize(Efl_Network_Url *url_obj, Efl_Network_Url_Data
*/
_c->curl_easy_setopt(url_con->curl_easy, CURLOPT_CONNECTTIMEOUT, 30);
_c->curl_easy_setopt(url_con->curl_easy, CURLOPT_FOLLOWLOCATION, 1);
- return eo_do_super_ret(url_obj, MY_CLASS, url_obj, eo_finalize());
+ return eo_super_eo_finalize( MY_CLASS, url_obj);
}
EAPI Ecore_Con_Url *
@@ -376,7 +376,7 @@ ecore_con_url_free(Ecore_Con_Url *url_obj)
return;
eo_do(url_obj,
- eo_event_callback_array_del(efl_network_url_event_table_callbacks(),
+ eo_event_callback_array_del(url_obj, efl_network_url_event_table_callbacks(),
NULL));
eo_del(url_obj);
@@ -400,7 +400,7 @@ _ecore_con_url_free_internal(Ecore_Con_Url *url_obj)
EOLIAN static void
_efl_network_url_eo_base_destructor(Efl_Network_Url *url_obj, Efl_Network_Url_Data *url_con)
{
- eo_do_super(url_obj, MY_CLASS, eo_destructor());
+ eo_super_eo_destructor(MY_CLASS, url_obj);
if (!_c) return;
if (url_con->curl_easy)
@@ -1145,7 +1145,7 @@ _ecore_con_url_event_url_complete(Ecore_Con_Url *url_obj, CURLMsg *curlmsg)
e.status = status;
e.url_con = url_obj;
url_con->event_count++;
- eo_do(url_obj, eo_event_callback_call(EFL_NETWORK_URL_EVENT_COMPLETE, &e));
+ eo_do(url_obj, eo_event_callback_call(url_obj, EFL_NETWORK_URL_EVENT_COMPLETE, &e));
}
static void
@@ -1206,7 +1206,7 @@ _ecore_con_url_data_cb(void *buffer, size_t size, size_t nitems, void *userp)
e.size = real_size;
e.data = buffer;
url_con->event_count++;
- eo_do(url_obj, eo_event_callback_call(EFL_NETWORK_URL_EVENT_DATA, &e));
+ eo_do(url_obj, eo_event_callback_call(url_obj, EFL_NETWORK_URL_EVENT_DATA, &e));
}
else
{
@@ -1265,7 +1265,7 @@ _ecore_con_url_progress_cb(void *clientp, double dltotal, double dlnow, double u
e.up.total = ultotal;
e.up.now = ulnow;
url_con->event_count++;
- eo_do(url_obj, eo_event_callback_call(EFL_NETWORK_URL_EVENT_PROGRESS, &e));
+ eo_do(url_obj, eo_event_callback_call(url_obj, EFL_NETWORK_URL_EVENT_PROGRESS, &e));
return 0;
}
diff --git a/src/lib/ector/cairo/ector_cairo_private.h b/src/lib/ector/cairo/ector_cairo_private.h
index 2b5735a7e7..b45f2f53f4 100644
--- a/src/lib/ector/cairo/ector_cairo_private.h
+++ b/src/lib/ector/cairo/ector_cairo_private.h
@@ -63,10 +63,10 @@ _ector_cairo_symbol_get(Eo *obj, const char *name)
Eo *parent;
void *sym;
- eo_do(obj, parent = eo_parent_get());
+ eo_do(obj, parent = eo_parent_get(obj));
if (!parent) return NULL;
- eo_do(parent, sym = ector_cairo_surface_symbol_get(name));
+ eo_do(parent, sym = ector_cairo_surface_symbol_get(parent, name));
return sym;
}
diff --git a/src/lib/ector/cairo/ector_cairo_surface.c b/src/lib/ector/cairo/ector_cairo_surface.c
index bd44405f81..6005866dc5 100644
--- a/src/lib/ector/cairo/ector_cairo_surface.c
+++ b/src/lib/ector/cairo/ector_cairo_surface.c
@@ -61,14 +61,16 @@ _ector_cairo_surface_ector_generic_surface_renderer_factory_new(Eo *obj,
Ector_Cairo_Surface_Data *pd EINA_UNUSED,
const Eo_Class *type)
{
+ Eo* o = NULL;
if (type == ECTOR_RENDERER_GENERIC_SHAPE_MIXIN)
- return eo_add(ECTOR_RENDERER_CAIRO_SHAPE_CLASS, obj);
+ eo_add(o, ECTOR_RENDERER_CAIRO_SHAPE_CLASS, obj);
else if (type == ECTOR_RENDERER_GENERIC_GRADIENT_LINEAR_MIXIN)
- return eo_add(ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS, obj);
+ eo_add(o, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS, obj);
else if (type == ECTOR_RENDERER_GENERIC_GRADIENT_RADIAL_MIXIN)
- return eo_add(ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS, obj);
- ERR("Couldn't find class for type: %s\n", eo_class_name_get(type));
- return NULL;
+ eo_add(o, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS, obj);
+ else
+ ERR("Couldn't find class for type: %s\n", eo_class_name_get(type));
+ return o;
}
typedef struct _cairo_surface_t cairo_surface_t;
@@ -121,7 +123,7 @@ static Eo *
_ector_cairo_surface_eo_base_constructor(Eo *obj,
Ector_Cairo_Surface_Data *pd)
{
- obj = eo_do_super_ret(obj, ECTOR_CAIRO_SURFACE_CLASS, obj, eo_constructor());
+ obj = eo_super_eo_constructor( ECTOR_CAIRO_SURFACE_CLASS, obj);
_cairo_count++;
_ector_cairo_surface_context_set(obj, pd, NULL);
@@ -133,7 +135,7 @@ static void
_ector_cairo_surface_eo_base_destructor(Eo *obj EINA_UNUSED,
Ector_Cairo_Surface_Data *pd EINA_UNUSED)
{
- eo_do_super(obj, ECTOR_CAIRO_SURFACE_CLASS, eo_destructor());
+ eo_super_eo_destructor(ECTOR_CAIRO_SURFACE_CLASS, obj);
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_base.c b/src/lib/ector/cairo/ector_renderer_cairo_base.c
index 420ce1f908..73a9aaf0e7 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_base.c
+++ b/src/lib/ector/cairo/ector_renderer_cairo_base.c
@@ -101,7 +101,7 @@ _ector_renderer_cairo_base_ector_renderer_generic_base_prepare(Eo *obj, Ector_Re
{
Eo *parent;
- eo_do(obj, parent = eo_parent_get());
+ eo_do(obj, parent = eo_parent_get(obj));
if (!parent) return EINA_FALSE;
pd->parent = eo_data_xref(parent, ECTOR_CAIRO_SURFACE_CLASS, obj);
}
@@ -198,7 +198,7 @@ _ector_renderer_cairo_base_ector_renderer_generic_base_draw(Eo *obj,
static Eo *
_ector_renderer_cairo_base_eo_base_constructor(Eo *obj, Ector_Renderer_Cairo_Base_Data *pd EINA_UNUSED)
{
- obj = eo_do_super_ret(obj, ECTOR_RENDERER_CAIRO_BASE_CLASS, obj, eo_constructor());
+ obj = eo_super_eo_constructor( ECTOR_RENDERER_CAIRO_BASE_CLASS, obj);
pd->generic = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_BASE_CLASS, obj);
@@ -216,11 +216,11 @@ _ector_renderer_cairo_base_eo_base_destructor(Eo *obj, Ector_Renderer_Cairo_Base
free(pd->m);
- eo_do(obj, parent = eo_parent_get());
+ eo_do(obj, parent = eo_parent_get(obj));
eo_data_xunref(parent, pd->parent, obj);
eo_data_xunref(obj, pd->generic, obj);
- eo_do_super(obj, ECTOR_RENDERER_CAIRO_BASE_CLASS, eo_destructor());
+ eo_super_eo_destructor(ECTOR_RENDERER_CAIRO_BASE_CLASS, obj);
}
#include "ector_renderer_cairo_base.eo.c"
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c
index 21ba87861d..67eb0d9b53 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c
+++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c
@@ -51,13 +51,13 @@ static Eina_Bool
_ector_renderer_cairo_gradient_linear_ector_renderer_generic_base_prepare(Eo *obj,
Ector_Renderer_Cairo_Gradient_Linear_Data *pd)
{
- eo_do_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS, ector_renderer_prepare());
+ eo_super_ector_renderer_prepare(ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS, obj);
if (!pd->parent)
{
Eo *parent;
- eo_do(obj, parent = eo_parent_get());
+ eo_do(obj, parent = eo_parent_get(obj));
if (!parent) return EINA_FALSE;
pd->parent = eo_data_xref(parent, ECTOR_CAIRO_SURFACE_CLASS, obj);
}
@@ -82,7 +82,7 @@ _ector_renderer_cairo_gradient_linear_ector_renderer_generic_base_draw(Eo *obj,
pat = _ector_renderer_cairo_gradient_linear_prepare(obj, gld, gd, mul_col);
if (!pat) return EINA_FALSE;
- eo_do_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS, ector_renderer_draw(op, clips, mul_col));
+ eo_super_ector_renderer_draw(ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS, obj, op, clips, mul_col);
USE(obj, cairo_rectangle, EINA_FALSE);
USE(obj, cairo_fill, EINA_FALSE);
@@ -147,10 +147,10 @@ _ector_renderer_cairo_gradient_linear_eo_base_destructor(Eo *obj,
{
Eo *parent;
- eo_do(obj, parent = eo_parent_get());
+ eo_do(obj, parent = eo_parent_get(obj));
eo_data_xunref(parent, pd->parent, obj);
- eo_do_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS, eo_destructor());
+ eo_super_eo_destructor(ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS, obj);
}
void
@@ -159,8 +159,7 @@ _ector_renderer_cairo_gradient_linear_efl_gfx_gradient_base_stop_set(Eo *obj,
const Efl_Gfx_Gradient_Stop *colors,
unsigned int length)
{
- eo_do_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS,
- efl_gfx_gradient_stop_set(colors, length));
+ eo_super_efl_gfx_gradient_stop_set(ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS, obj, colors, length);
}
static unsigned int
@@ -170,8 +169,7 @@ _ector_renderer_cairo_gradient_linear_ector_renderer_generic_base_crc_get(Eo *ob
Ector_Renderer_Generic_Gradient_Data *gd;
unsigned int crc;
- eo_do_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS,
- crc = ector_renderer_crc_get());
+ crc = eo_super_ector_renderer_crc_get(ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS, obj);
gld = eo_data_scope_get(obj, ECTOR_RENDERER_GENERIC_GRADIENT_LINEAR_MIXIN);
gd = eo_data_scope_get(obj, ECTOR_RENDERER_GENERIC_GRADIENT_MIXIN);
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c b/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c
index 4f8754f79e..c8932190b6 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c
+++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c
@@ -34,13 +34,13 @@ struct _Ector_Renderer_Cairo_Gradient_Radial_Data
static Eina_Bool
_ector_renderer_cairo_gradient_radial_ector_renderer_generic_base_prepare(Eo *obj, Ector_Renderer_Cairo_Gradient_Radial_Data *pd)
{
- eo_do_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS, ector_renderer_prepare());
+ eo_super_ector_renderer_prepare(ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS, obj);
if (!pd->parent)
{
Eo *parent;
- eo_do(obj, parent = eo_parent_get());
+ eo_do(obj, parent = eo_parent_get(obj));
if (!parent) return EINA_FALSE;
pd->parent = eo_data_xref(parent, ECTOR_CAIRO_SURFACE_CLASS, obj);
}
@@ -86,7 +86,7 @@ _ector_renderer_cairo_gradient_radial_ector_renderer_generic_base_draw(Eo *obj,
pat = _ector_renderer_cairo_gradient_radial_prepare(obj, grd, gd, mul_col);
if (!pat) return EINA_FALSE;
- eo_do_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS, ector_renderer_draw(op, clips, mul_col));
+ eo_super_ector_renderer_draw(ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS, obj, op, clips, mul_col);
USE(obj, cairo_arc, EINA_FALSE);
USE(obj, cairo_fill, EINA_FALSE);
@@ -152,10 +152,10 @@ _ector_renderer_cairo_gradient_radial_eo_base_destructor(Eo *obj,
{
Eo *parent;
- eo_do(obj, parent = eo_parent_get());
+ eo_do(obj, parent = eo_parent_get(obj));
eo_data_xunref(parent, pd->parent, obj);
- eo_do_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS, eo_destructor());
+ eo_super_eo_destructor(ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS, obj);
}
void
@@ -164,8 +164,7 @@ _ector_renderer_cairo_gradient_radial_efl_gfx_gradient_base_stop_set(Eo *obj,
const Efl_Gfx_Gradient_Stop *colors,
unsigned int length)
{
- eo_do_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS,
- efl_gfx_gradient_stop_set(colors, length));
+ eo_super_efl_gfx_gradient_stop_set(ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS, obj, colors, length);
}
static unsigned int
@@ -175,8 +174,7 @@ _ector_renderer_cairo_gradient_radial_ector_renderer_generic_base_crc_get(Eo *ob
Ector_Renderer_Generic_Gradient_Data *gd;
unsigned int crc;
- eo_do_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS,
- crc = ector_renderer_crc_get());
+ crc = eo_super_ector_renderer_crc_get(ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS, obj);
grd = eo_data_scope_get(obj, ECTOR_RENDERER_GENERIC_GRADIENT_RADIAL_MIXIN);
gd = eo_data_scope_get(obj, ECTOR_RENDERER_GENERIC_GRADIENT_MIXIN);
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_shape.c b/src/lib/ector/cairo/ector_renderer_cairo_shape.c
index 0f9193ed5c..da4871c9d3 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_shape.c
+++ b/src/lib/ector/cairo/ector_renderer_cairo_shape.c
@@ -85,27 +85,27 @@ _ector_renderer_cairo_shape_ector_renderer_generic_base_prepare(Eo *obj, Ector_R
const Efl_Gfx_Path_Command *cmds = NULL;
const double *pts = NULL;
- eo_do_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS, ector_renderer_prepare());
+ eo_super_ector_renderer_prepare(ECTOR_RENDERER_CAIRO_SHAPE_CLASS, obj);
if (pd->shape->fill)
- eo_do(pd->shape->fill, ector_renderer_prepare());
+ eo_do(pd->shape->fill, ector_renderer_prepare(pd->shape->fill));
if (pd->shape->stroke.fill)
- eo_do(pd->shape->stroke.fill, ector_renderer_prepare());
+ eo_do(pd->shape->stroke.fill, ector_renderer_prepare(pd->shape->stroke.fill));
if (pd->shape->stroke.marker)
- eo_do(pd->shape->stroke.marker, ector_renderer_prepare());
+ eo_do(pd->shape->stroke.marker, ector_renderer_prepare(pd->shape->stroke.marker));
// shouldn't that be moved to the cairo base object
if (!pd->parent)
{
Eo *parent;
- eo_do(obj, parent = eo_parent_get());
+ eo_do(obj, parent = eo_parent_get(obj));
if (!parent) return EINA_FALSE;
pd->parent = eo_data_xref(parent, ECTOR_CAIRO_SURFACE_CLASS, obj);
if (!pd->parent) return EINA_FALSE;
}
- eo_do(obj, efl_gfx_shape_path_get(&cmds, &pts));
+ eo_do(obj, efl_gfx_shape_path_get(obj, &cmds, &pts));
if (!pd->path && cmds)
{
USE(obj, cairo_new_path, EINA_FALSE);
@@ -172,7 +172,7 @@ _ector_renderer_cairo_shape_ector_renderer_generic_base_draw(Eo *obj, Ector_Rend
USE(obj, cairo_save, EINA_FALSE);
cairo_save(pd->parent->cairo);
- eo_do_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS, ector_renderer_draw(op, clips, mul_col));
+ eo_super_ector_renderer_draw(ECTOR_RENDERER_CAIRO_SHAPE_CLASS, obj, op, clips, mul_col);
USE(obj, cairo_new_path, EINA_FALSE);
USE(obj, cairo_append_path, EINA_FALSE);
@@ -181,7 +181,7 @@ _ector_renderer_cairo_shape_ector_renderer_generic_base_draw(Eo *obj, Ector_Rend
cairo_append_path(pd->parent->cairo, pd->path);
if (pd->shape->fill)
- eo_do(pd->shape->fill, ector_renderer_cairo_base_fill(mul_col));
+ eo_do(pd->shape->fill, ector_renderer_cairo_base_fill(pd->shape->fill, mul_col));
if (pd->shape->stroke.fill || pd->shape->stroke.color.a > 0)
{
@@ -195,7 +195,7 @@ _ector_renderer_cairo_shape_ector_renderer_generic_base_draw(Eo *obj, Ector_Rend
cairo_fill_preserve(pd->parent->cairo);
if (pd->shape->stroke.fill)
- eo_do(pd->shape->stroke.fill, ector_renderer_cairo_base_fill(mul_col));
+ eo_do(pd->shape->stroke.fill, ector_renderer_cairo_base_fill(pd->shape->stroke.fill, mul_col));
else
{
r = (((pd->shape->stroke.color.r * R_VAL(&mul_col)) + 0xff) >> 8);
@@ -256,7 +256,7 @@ _ector_renderer_cairo_shape_ector_renderer_generic_base_bounds_get(Eo *obj,
Ector_Renderer_Cairo_Base_Data *bd;
// FIXME: It should be possible to actually ask cairo about that
- eo_do(obj, efl_gfx_shape_bounds_get(r));
+ eo_do(obj, efl_gfx_shape_bounds_get(obj, r));
bd = eo_data_scope_get(obj, ECTOR_RENDERER_CAIRO_BASE_CLASS);
r->x += bd->generic->origin.x;
@@ -266,12 +266,12 @@ _ector_renderer_cairo_shape_ector_renderer_generic_base_bounds_get(Eo *obj,
Eo *
_ector_renderer_cairo_shape_eo_base_constructor(Eo *obj, Ector_Renderer_Cairo_Shape_Data *pd)
{
- obj = eo_do_super_ret(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS, obj, eo_constructor());
+ obj = eo_super_eo_constructor( ECTOR_RENDERER_CAIRO_SHAPE_CLASS, obj);
pd->shape = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_SHAPE_MIXIN, obj);
pd->base = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_BASE_CLASS, obj);
eo_do(obj,
- eo_event_callback_add(EFL_GFX_PATH_CHANGED, _ector_renderer_cairo_shape_path_changed, pd));
+ eo_event_callback_add(obj, EFL_GFX_PATH_CHANGED, _ector_renderer_cairo_shape_path_changed, pd));
return obj;
}
@@ -282,15 +282,15 @@ _ector_renderer_cairo_shape_eo_base_destructor(Eo *obj, Ector_Renderer_Cairo_Sha
Eo *parent;
//FIXME, As base class destructor can't call destructor of mixin class.
// call explicit API to free shape data.
- eo_do(obj, efl_gfx_shape_reset());
+ eo_do(obj, efl_gfx_shape_reset(obj));
- eo_do(obj, parent = eo_parent_get());
+ eo_do(obj, parent = eo_parent_get(obj));
eo_data_xunref(parent, pd->parent, obj);
eo_data_xunref(obj, pd->shape, obj);
eo_data_xunref(obj, pd->base, obj);
- eo_do_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS, eo_destructor());
+ eo_super_eo_destructor(ECTOR_RENDERER_CAIRO_SHAPE_CLASS, obj);
USE(obj, cairo_path_destroy, );
if (pd->path) cairo_path_destroy(pd->path);
@@ -302,8 +302,7 @@ _ector_renderer_cairo_shape_ector_renderer_generic_base_crc_get(Eo *obj,
{
unsigned int crc;
- eo_do_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS,
- crc = ector_renderer_crc_get());
+ crc = eo_super_ector_renderer_crc_get(ECTOR_RENDERER_CAIRO_SHAPE_CLASS, obj);
crc = eina_crc((void*) &pd->shape->stroke.marker, sizeof (pd->shape->stroke.marker), crc, EINA_FALSE);
crc = eina_crc((void*) &pd->shape->stroke.scale, sizeof (pd->shape->stroke.scale) * 3, crc, EINA_FALSE); // scale, width, centered
diff --git a/src/lib/ector/ector_private.h b/src/lib/ector/ector_private.h
index 099542b631..ac013189e8 100644
--- a/src/lib/ector/ector_private.h
+++ b/src/lib/ector/ector_private.h
@@ -150,7 +150,7 @@ _renderer_crc_get(Eo *obj, unsigned int crc)
{
unsigned int id;
- eo_do(obj, id = ector_renderer_crc_get());
+ eo_do(obj, id = ector_renderer_crc_get(obj));
crc = eina_crc((void*) &id, sizeof (id), crc, EINA_FALSE);
return crc;
}
diff --git a/src/lib/ector/ector_renderer_base.c b/src/lib/ector/ector_renderer_base.c
index 4c84eba43e..40f365fbbe 100644
--- a/src/lib/ector/ector_renderer_base.c
+++ b/src/lib/ector/ector_renderer_base.c
@@ -11,7 +11,7 @@ static void
_ector_renderer_generic_base_eo_base_destructor(Eo *obj, Ector_Renderer_Generic_Base_Data *pd)
{
if (pd->m) free(pd->m);
- eo_do_super(obj, ECTOR_RENDERER_GENERIC_BASE_CLASS, eo_destructor());
+ eo_super_eo_destructor(ECTOR_RENDERER_GENERIC_BASE_CLASS, obj);
}
static void
@@ -130,7 +130,7 @@ _ector_renderer_generic_base_prepare(Eo *obj EINA_UNUSED,
Ector_Renderer_Generic_Base_Data *pd)
{
if (pd->mask)
- eo_do(pd->mask, ector_renderer_prepare());
+ eo_do(pd->mask, ector_renderer_prepare(pd->mask));
return EINA_TRUE;
}
diff --git a/src/lib/ector/software/ector_renderer_software_gradient_linear.c b/src/lib/ector/software/ector_renderer_software_gradient_linear.c
index a7ce3ece12..240fb64fb4 100644
--- a/src/lib/ector/software/ector_renderer_software_gradient_linear.c
+++ b/src/lib/ector/software/ector_renderer_software_gradient_linear.c
@@ -42,7 +42,7 @@ _ector_renderer_software_gradient_linear_ector_renderer_generic_base_prepare(Eo
{
Eo *parent;
- eo_do(obj, parent = eo_parent_get());
+ eo_do(obj, parent = eo_parent_get(obj));
if (!parent) return EINA_FALSE;
pd->surface = eo_data_xref(parent, ECTOR_SOFTWARE_SURFACE_CLASS, obj);
}
@@ -75,7 +75,7 @@ Eo *
_ector_renderer_software_gradient_linear_eo_base_constructor(Eo *obj,
Ector_Renderer_Software_Gradient_Data *pd)
{
- obj = eo_do_super_ret(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS, obj, eo_constructor());
+ obj = eo_super_eo_constructor( ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS, obj);
pd->gd = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_GRADIENT_MIXIN, obj);
pd->gld = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_GRADIENT_LINEAR_MIXIN, obj);
@@ -90,20 +90,19 @@ _ector_renderer_software_gradient_linear_eo_base_destructor(Eo *obj,
destroy_color_table(pd);
- eo_do(obj, parent = eo_parent_get());
+ eo_do(obj, parent = eo_parent_get(obj));
eo_data_xunref(parent, pd->surface, obj);
eo_data_xunref(obj, pd->gd, obj);
eo_data_xunref(obj, pd->gld, obj);
- eo_do_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS, eo_destructor());
+ eo_super_eo_destructor(ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS, obj);
}
void
_ector_renderer_software_gradient_linear_efl_gfx_gradient_base_stop_set(Eo *obj, Ector_Renderer_Software_Gradient_Data *pd, const Efl_Gfx_Gradient_Stop *colors, unsigned int length)
{
- eo_do_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS,
- efl_gfx_gradient_stop_set(colors, length));
+ eo_super_efl_gfx_gradient_stop_set(ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS, obj, colors, length);
destroy_color_table(pd);
}
@@ -113,8 +112,7 @@ _ector_renderer_software_gradient_linear_ector_renderer_generic_base_crc_get(Eo
{
unsigned int crc;
- eo_do_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS,
- crc = ector_renderer_crc_get());
+ crc = eo_super_ector_renderer_crc_get(ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS, obj);
crc = eina_crc((void*) pd->gd->s, sizeof (Efl_Gfx_Gradient_Spread), crc, EINA_FALSE);
if (pd->gd->colors_count)
diff --git a/src/lib/ector/software/ector_renderer_software_gradient_radial.c b/src/lib/ector/software/ector_renderer_software_gradient_radial.c
index 74a8dab6a1..ee761b1ef1 100644
--- a/src/lib/ector/software/ector_renderer_software_gradient_radial.c
+++ b/src/lib/ector/software/ector_renderer_software_gradient_radial.c
@@ -52,7 +52,7 @@ _ector_renderer_software_gradient_radial_ector_renderer_generic_base_prepare(Eo
{
Eo *parent;
- eo_do(obj, parent = eo_parent_get());
+ eo_do(obj, parent = eo_parent_get(obj));
if (!parent) return EINA_FALSE;
pd->surface = eo_data_xref(parent, ECTOR_SOFTWARE_SURFACE_CLASS, obj);
}
@@ -83,7 +83,7 @@ Eo *
_ector_renderer_software_gradient_radial_eo_base_constructor(Eo *obj,
Ector_Renderer_Software_Gradient_Data *pd)
{
- obj = eo_do_super_ret(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS, obj, eo_constructor());
+ obj = eo_super_eo_constructor( ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS, obj);
pd->gd = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_GRADIENT_MIXIN, obj);
pd->gld = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_GRADIENT_RADIAL_MIXIN, obj);
@@ -98,20 +98,19 @@ _ector_renderer_software_gradient_radial_eo_base_destructor(Eo *obj,
destroy_color_table(pd);
- eo_do(obj, parent = eo_parent_get());
+ eo_do(obj, parent = eo_parent_get(obj));
eo_data_xunref(parent, pd->surface, obj);
eo_data_xunref(obj, pd->gd, obj);
eo_data_xunref(obj, pd->gld, obj);
- eo_do_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS, eo_destructor());
+ eo_super_eo_destructor(ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS, obj);
}
void
_ector_renderer_software_gradient_radial_efl_gfx_gradient_base_stop_set(Eo *obj, Ector_Renderer_Software_Gradient_Data *pd, const Efl_Gfx_Gradient_Stop *colors, unsigned int length)
{
- eo_do_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS,
- efl_gfx_gradient_stop_set(colors, length));
+ eo_super_efl_gfx_gradient_stop_set(ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS, obj, colors, length);
destroy_color_table(pd);
}
@@ -121,8 +120,8 @@ _ector_renderer_software_gradient_radial_ector_renderer_generic_base_crc_get(Eo
{
unsigned int crc;
- eo_do_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS,
- crc = ector_renderer_crc_get());
+
+ crc = eo_super_ector_renderer_crc_get(ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS, obj);
crc = eina_crc((void*) pd->gd->s, sizeof (Efl_Gfx_Gradient_Spread), crc, EINA_FALSE);
if (pd->gd->colors_count)
diff --git a/src/lib/ector/software/ector_renderer_software_shape.c b/src/lib/ector/software/ector_renderer_software_shape.c
index d659c9204c..9d6a505b1c 100644
--- a/src/lib/ector/software/ector_renderer_software_shape.c
+++ b/src/lib/ector/software/ector_renderer_software_shape.c
@@ -520,7 +520,7 @@ _update_rle(Eo *obj, Ector_Renderer_Software_Shape_Data *pd)
Eina_Bool close_path;
Outline *outline, *dash_outline;
- eo_do(obj, efl_gfx_shape_path_get(&cmds, &pts));
+ eo_do(obj, efl_gfx_shape_path_get(obj, &cmds, &pts));
if (cmds && (_generate_stroke_data(pd) || _generate_shape_data(pd)))
{
outline = _outline_create();
@@ -570,17 +570,17 @@ _ector_renderer_software_shape_ector_renderer_generic_base_prepare(Eo *obj,
{
// FIXME: shouldn't that be part of the shape generic implementation ?
if (pd->shape->fill)
- eo_do(pd->shape->fill, ector_renderer_prepare());
+ eo_do(pd->shape->fill, ector_renderer_prepare(pd->shape->fill));
if (pd->shape->stroke.fill)
- eo_do(pd->shape->stroke.fill, ector_renderer_prepare());
+ eo_do(pd->shape->stroke.fill, ector_renderer_prepare(pd->shape->stroke.fill));
if (pd->shape->stroke.marker)
- eo_do(pd->shape->stroke.marker, ector_renderer_prepare());
+ eo_do(pd->shape->stroke.marker, ector_renderer_prepare(pd->shape->stroke.marker));
// shouldn't that be moved to the software base object
if (!pd->surface)
{
Eo *parent;
- eo_do(obj, parent = eo_parent_get());
+ eo_do(obj, parent = eo_parent_get(obj));
if (!parent) return EINA_FALSE;
pd->surface = eo_data_xref(parent, ECTOR_SOFTWARE_SURFACE_CLASS, obj);
if (!pd->surface) return EINA_FALSE;
@@ -609,7 +609,7 @@ _ector_renderer_software_shape_ector_renderer_generic_base_draw(Eo *obj,
if (pd->shape->fill)
{
- eo_do(pd->shape->fill, ector_renderer_software_base_fill());
+ eo_do(pd->shape->fill, ector_renderer_software_base_fill(pd->shape->fill));
ector_software_rasterizer_draw_rle_data(pd->surface->software,
x, y, mul_col, op,
pd->shape_data);
@@ -631,7 +631,7 @@ _ector_renderer_software_shape_ector_renderer_generic_base_draw(Eo *obj,
if (pd->shape->stroke.fill)
{
- eo_do(pd->shape->stroke.fill, ector_renderer_software_base_fill());
+ eo_do(pd->shape->stroke.fill, ector_renderer_software_base_fill(pd->shape->stroke.fill));
ector_software_rasterizer_draw_rle_data(pd->surface->software,
x, y, mul_col, op,
pd->outline_data);
@@ -674,7 +674,7 @@ _ector_renderer_software_shape_efl_gfx_shape_path_set(Eo *obj,
pd->shape_data = NULL;
pd->outline_data = NULL;
- eo_do_super(obj, ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS, efl_gfx_shape_path_set(op, points));
+ eo_super_efl_gfx_shape_path_set(ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS, obj, op, points);
}
@@ -697,11 +697,11 @@ _ector_renderer_software_shape_path_changed(void *data, Eo *obj EINA_UNUSED,
Eo *
_ector_renderer_software_shape_eo_base_constructor(Eo *obj, Ector_Renderer_Software_Shape_Data *pd)
{
- obj = eo_do_super_ret(obj, ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS, obj, eo_constructor());
+ obj = eo_super_eo_constructor( ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS, obj);
pd->shape = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_SHAPE_MIXIN, obj);
pd->base = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_BASE_CLASS, obj);
eo_do(obj,
- eo_event_callback_add(EFL_GFX_PATH_CHANGED, _ector_renderer_software_shape_path_changed, pd));
+ eo_event_callback_add(obj, EFL_GFX_PATH_CHANGED, _ector_renderer_software_shape_path_changed, pd));
return obj;
}
@@ -712,17 +712,17 @@ _ector_renderer_software_shape_eo_base_destructor(Eo *obj, Ector_Renderer_Softwa
Eo *parent;
//FIXME, As base class destructor can't call destructor of mixin class.
// call explicit API to free shape data.
- eo_do(obj, efl_gfx_shape_reset());
+ eo_do(obj, efl_gfx_shape_reset(obj));
if (pd->shape_data) ector_software_rasterizer_destroy_rle_data(pd->shape_data);
if (pd->outline_data) ector_software_rasterizer_destroy_rle_data(pd->outline_data);
- eo_do(obj, parent = eo_parent_get());
+ eo_do(obj, parent = eo_parent_get(obj));
eo_data_xunref(parent, pd->surface, obj);
eo_data_xunref(obj, pd->shape, obj);
eo_data_xunref(obj, pd->base, obj);
- eo_do_super(obj, ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS, eo_destructor());
+ eo_super_eo_destructor(ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS, obj);
}
@@ -732,7 +732,7 @@ _ector_renderer_software_shape_ector_renderer_generic_base_crc_get(Eo *obj,
{
unsigned int crc;
- eo_do_super(obj, ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS, crc = ector_renderer_crc_get());
+ crc = eo_super_ector_renderer_crc_get(ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS, obj);
crc = eina_crc((void*) &pd->shape->stroke.marker, sizeof (pd->shape->stroke.marker), crc, EINA_FALSE);
crc = eina_crc((void*) &pd->shape->stroke.scale, sizeof (pd->shape->stroke.scale) * 3, crc, EINA_FALSE); // scale, width, centered
diff --git a/src/lib/ector/software/ector_software_surface.c b/src/lib/ector/software/ector_software_surface.c
index 0391150701..8c3d81a005 100644
--- a/src/lib/ector/software/ector_software_surface.c
+++ b/src/lib/ector/software/ector_software_surface.c
@@ -18,14 +18,16 @@ _ector_software_surface_ector_generic_surface_renderer_factory_new(Eo *obj,
Ector_Software_Surface_Data *pd EINA_UNUSED,
const Eo_Class *type)
{
+ Eo* o = NULL;
if (type == ECTOR_RENDERER_GENERIC_SHAPE_MIXIN)
- return eo_add(ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS, obj);
+ eo_add(o, ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS, obj);
else if (type == ECTOR_RENDERER_GENERIC_GRADIENT_LINEAR_MIXIN)
- return eo_add(ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS, obj);
+ eo_add(o, ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS, obj);
else if (type == ECTOR_RENDERER_GENERIC_GRADIENT_RADIAL_MIXIN)
- return eo_add(ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS, obj);
- ERR("Couldn't find class for type: %s\n", eo_class_name_get(type));
- return NULL;
+ eo_add(o, ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS, obj);
+ else
+ ERR("Couldn't find class for type: %s\n", eo_class_name_get(type));
+ return o;
}
static void
@@ -67,7 +69,7 @@ static Eo *
_ector_software_surface_eo_base_constructor(Eo *obj,
Ector_Software_Surface_Data *pd EINA_UNUSED)
{
- obj = eo_do_super_ret(obj, ECTOR_SOFTWARE_SURFACE_CLASS, obj, eo_constructor());
+ obj = eo_super_eo_constructor( ECTOR_SOFTWARE_SURFACE_CLASS, obj);
pd->software = (Software_Rasterizer *) calloc(1, sizeof(Software_Rasterizer));
ector_software_rasterizer_init(pd->software);
return obj;
@@ -80,7 +82,7 @@ _ector_software_surface_eo_base_destructor(Eo *obj EINA_UNUSED,
ector_software_rasterizer_done(pd->software);
free(pd->software);
pd->software = NULL;
- eo_do_super(obj, ECTOR_SOFTWARE_SURFACE_CLASS, eo_destructor());
+ eo_super_eo_destructor(ECTOR_SOFTWARE_SURFACE_CLASS, obj);
}
static void
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index e2a662fb6b..ee0f9298c4 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -58,12 +58,12 @@ static void _edje_part_recalc_single(Edje *ed, Edje_Rea
eina_quaternion_scale(&quaternion, &quaternion, 1/norm); \
\
eo_do(ep->node, \
- evas_canvas3d_node_orientation_set(quaternion.x, quaternion.y, \
+ evas_canvas3d_node_orientation_set(ep->node, quaternion.x, quaternion.y, \
quaternion.z, quaternion.w));
#define SET_LOOK_AT(type) \
eo_do(ep->node, \
- evas_canvas3d_node_look_at_set(pd_##type->type.position.space, \
+ evas_canvas3d_node_look_at_set(ep->node, pd_##type->type.position.space, \
pd_##type->type.orientation.data[0], \
pd_##type->type.orientation.data[1], \
pd_##type->type.orientation.data[2], \
@@ -77,9 +77,9 @@ static void _edje_part_recalc_single(Edje *ed, Edje_Rea
Evas_Real x, y ,z; \
look_to = ed->table_parts[pd_##type->type.orientation.look_to % ed->table_parts_size]; \
eo_do(look_to->node, \
- evas_canvas3d_node_position_get(pd_##type->type.position.space, &x, &y, &z)); \
+ evas_canvas3d_node_position_get(look_to->node, pd_##type->type.position.space, &x, &y, &z)); \
eo_do(ep->node, \
- evas_canvas3d_node_look_at_set(pd_##type->type.position.space, x, y, z, \
+ evas_canvas3d_node_look_at_set(ep->node, pd_##type->type.position.space, x, y, z, \
pd_##type->type.position.space, \
pd_##type->type.orientation.data[3], \
pd_##type->type.orientation.data[4], \
@@ -87,7 +87,7 @@ static void _edje_part_recalc_single(Edje *ed, Edje_Rea
#define SET_ANGLE_AXIS(type) \
eo_do(ep->node, \
- evas_canvas3d_node_orientation_angle_axis_set(pd_##type->type.orientation.data[0], \
+ evas_canvas3d_node_orientation_angle_axis_set(ep->node, pd_##type->type.orientation.data[0], \
pd_##type->type.orientation.data[1], \
pd_##type->type.orientation.data[2], \
pd_##type->type.orientation.data[3]));
@@ -843,7 +843,7 @@ _edje_recalc_do(Edje *ed)
if (!ed->calc_only)
{
if (ed->recalc_call)
- eo_do(ed->obj, eo_event_callback_call(EDJE_OBJECT_EVENT_RECALC, NULL));
+ eo_do(ed->obj, eo_event_callback_call(ed->obj, EDJE_OBJECT_EVENT_RECALC, NULL));
}
else
evas_object_smart_need_recalculate_set(ed->obj, need_calc);
@@ -855,8 +855,8 @@ _edje_recalc_do(Edje *ed)
ed->recalc_hints = EINA_FALSE;
- eo_do(ed->obj, edje_obj_size_min_calc(&w, &h));
- eo_do(ed->obj, evas_obj_size_hint_min_set(w, h));
+ eo_do(ed->obj, edje_obj_size_min_calc(ed->obj, &w, &h));
+ eo_do(ed->obj, evas_obj_size_hint_min_set(ed->obj, w, h));
}
if (!ed->collection) return;
@@ -1436,8 +1436,8 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
if (ep->part->scale) base_s = TO_DOUBLE(sc);
eo_do(ep->object,
- evas_obj_scale_set(base_s),
- evas_obj_textblock_size_native_get(&tw, &th));
+ evas_obj_scale_set(ep->object, base_s),
+ evas_obj_textblock_size_native_get(ep->object, &tw, &th));
orig_s = base_s;
/* Now make it bigger so calculations will be more accurate
@@ -1446,8 +1446,8 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
orig_s = _edje_part_recalc_single_textblock_scale_range_adjust(chosen_desc, base_s,
orig_s * TO_INT(params->eval.w) / tw);
eo_do(ep->object,
- evas_obj_scale_set(orig_s),
- evas_obj_textblock_size_native_get(&tw, &th));
+ evas_obj_scale_set(ep->object, orig_s),
+ evas_obj_textblock_size_native_get(ep->object, &tw, &th));
}
if (chosen_desc->text.fit_x)
{
@@ -1456,8 +1456,8 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
s = _edje_part_recalc_single_textblock_scale_range_adjust(chosen_desc, base_s,
orig_s * TO_INT(params->eval.w) / tw);
eo_do(ep->object,
- evas_obj_scale_set(s),
- evas_obj_textblock_size_native_get(NULL, NULL));
+ evas_obj_scale_set(ep->object, s),
+ evas_obj_textblock_size_native_get(ep->object, NULL, NULL));
}
}
if (chosen_desc->text.fit_y)
@@ -1474,8 +1474,8 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
}
eo_do(ep->object,
- evas_obj_scale_set(s),
- evas_obj_textblock_size_native_get(NULL, NULL));
+ evas_obj_scale_set(ep->object, s),
+ evas_obj_textblock_size_native_get(ep->object, NULL, NULL));
}
}
@@ -1485,7 +1485,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
int i = 5; /* Tries before we give up. */
Evas_Coord fw, fh;
eo_do(ep->object,
- evas_obj_textblock_size_native_get(&fw, &fh));
+ evas_obj_textblock_size_native_get(ep->object, &fw, &fh));
/* If we are still too big, try reducing the size to
* 95% each try. */
@@ -1501,8 +1501,8 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
s = tmp_s;
eo_do(ep->object,
- evas_obj_scale_set(s),
- evas_obj_textblock_size_native_get(&fw, &fh));
+ evas_obj_scale_set(ep->object, s),
+ evas_obj_textblock_size_native_get(ep->object, &fw, &fh));
i--;
}
}
@@ -1535,8 +1535,8 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
if (!chosen_desc->text.min_x)
{
eo_do(ep->object,
- efl_gfx_size_set(TO_INT(params->eval.w), TO_INT(params->eval.h)),
- evas_obj_textblock_size_formatted_get(&tw, &th));
+ efl_gfx_size_set(ep->object, TO_INT(params->eval.w), TO_INT(params->eval.h)),
+ evas_obj_textblock_size_formatted_get(ep->object, &tw, &th));
}
else
evas_object_textblock_size_native_get(ep->object, &tw, &th);
@@ -1563,8 +1563,8 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
if (!chosen_desc->text.max_x)
{
eo_do(ep->object,
- efl_gfx_size_set(TO_INT(params->eval.w), TO_INT(params->eval.h)),
- evas_obj_textblock_size_formatted_get(&tw, &th));
+ efl_gfx_size_set(ep->object, TO_INT(params->eval.w), TO_INT(params->eval.h)),
+ evas_obj_textblock_size_formatted_get(ep->object, &tw, &th));
}
else
evas_object_textblock_size_native_get(ep->object, &tw, &th);
@@ -1651,7 +1651,7 @@ _edje_part_recalc_single_text(FLOAT_T sc EINA_UNUSED,
return;
// Note: No need to add padding to that, it's already in the geometry
- eo_do(ep->object, efl_gfx_size_get(&mw, &mh));
+ eo_do(ep->object, efl_gfx_size_get(ep->object, &mw, &mh));
if (chosen_desc->text.max_x)
{
@@ -2503,7 +2503,7 @@ _edje_part_recalc_single_filter(Edje *ed,
code = _edje_filter_get(ed, filter);
if (!code)
{
- eo_do(obj, efl_gfx_filter_program_set(NULL, NULL));
+ eo_do(obj, efl_gfx_filter_program_set(obj, NULL, NULL));
return;
}
@@ -2525,7 +2525,7 @@ _edje_part_recalc_single_filter(Edje *ed,
continue;
if (!data->value)
{
- efl_gfx_filter_data_set(data->name, NULL, EINA_FALSE);
+ efl_gfx_filter_data_set(obj, data->name, NULL, EINA_FALSE);
}
else if (!strncmp(data->value, "color_class('", sizeof("color_class('") - 1))
{
@@ -2555,7 +2555,7 @@ _edje_part_recalc_single_filter(Edje *ed,
(int) cc->r2, (int) cc->g2, (int) cc->b2, (int) cc->a2,
(int) cc->r3, (int) cc->g3, (int) cc->b3, (int) cc->a3);
buffer[len - 1] = 0;
- efl_gfx_filter_data_set(data->name, buffer, EINA_TRUE);
+ efl_gfx_filter_data_set(obj, data->name, buffer, EINA_TRUE);
}
else
{
@@ -2572,10 +2572,10 @@ _edje_part_recalc_single_filter(Edje *ed,
}
}
else
- efl_gfx_filter_data_set(data->name, data->value, EINA_FALSE);
+ efl_gfx_filter_data_set(obj, data->name, data->value, EINA_FALSE);
}
}
- efl_gfx_filter_program_set(code, filter->name);
+ efl_gfx_filter_program_set(obj, code, filter->name);
if (prev_sources != filter_sources)
{
/* remove sources that are not there anymore
@@ -2595,12 +2595,12 @@ _edje_part_recalc_single_filter(Edje *ed,
{
part = strchr(src1, ':');
if (!part)
- efl_gfx_filter_source_set(src1, NULL);
+ efl_gfx_filter_source_set(obj, src1, NULL);
else
{
char *name = strdup(src1);
name[part - src1] = 0;
- efl_gfx_filter_source_set(name, NULL);
+ efl_gfx_filter_source_set(obj, name, NULL);
free(name);
}
}
@@ -2619,20 +2619,20 @@ _edje_part_recalc_single_filter(Edje *ed,
else
part = src1;
rp = _edje_real_part_get(ed, part);
- efl_gfx_filter_source_set(name ? name : part, rp ? rp->object : NULL);
+ efl_gfx_filter_source_set(obj, name ? name : part, rp ? rp->object : NULL);
free(name);
}
}
/* pass edje state for transitions */
if (ep->param2)
{
- efl_gfx_filter_state_set(chosen_desc->state.name, chosen_desc->state.value,
+ efl_gfx_filter_state_set(obj, chosen_desc->state.name, chosen_desc->state.value,
ep->param2->description->state.name, ep->param2->description->state.value,
pos);
}
else
{
- efl_gfx_filter_state_set(chosen_desc->state.name, chosen_desc->state.value,
+ efl_gfx_filter_state_set(obj, chosen_desc->state.name, chosen_desc->state.value,
NULL, 0.0, pos);
}
);
@@ -2812,9 +2812,9 @@ _edje_part_recalc_single(Edje *ed,
Evas_Coord lminw = 0, lminh = 0;
eo_do(ep->object,
- evas_obj_smart_need_recalculate_set(1),
- evas_obj_smart_calculate(),
- evas_obj_size_hint_min_get(&lminw, &lminh));
+ evas_obj_smart_need_recalculate_set(ep->object, 1),
+ evas_obj_smart_calculate(ep->object),
+ evas_obj_size_hint_min_get(ep->object, &lminw, &lminh));
if (((Edje_Part_Description_Table *)chosen_desc)->table.min.h)
{
if (lminw > minw) minw = lminw;
@@ -2831,9 +2831,9 @@ _edje_part_recalc_single(Edje *ed,
Evas_Coord lminw = 0, lminh = 0;
eo_do(ep->object,
- evas_obj_smart_need_recalculate_set(1),
- evas_obj_smart_calculate(),
- evas_obj_size_hint_min_get(&lminw, &lminh));
+ evas_obj_smart_need_recalculate_set(ep->object, 1),
+ evas_obj_smart_calculate(ep->object),
+ evas_obj_size_hint_min_get(ep->object, &lminw, &lminh));
if (((Edje_Part_Description_Box *)chosen_desc)->box.min.h)
{
if (lminw > minw) minw = lminw;
@@ -2994,14 +2994,14 @@ _edje_table_recalc_apply(Edje *ed EINA_UNUSED,
Edje_Part_Description_Table *chosen_desc)
{
eo_do(ep->object,
- evas_obj_table_homogeneous_set(chosen_desc->table.homogeneous),
- evas_obj_table_align_set(TO_DOUBLE(chosen_desc->table.align.x), TO_DOUBLE(chosen_desc->table.align.y)),
- evas_obj_table_padding_set(chosen_desc->table.padding.x, chosen_desc->table.padding.y));
+ evas_obj_table_homogeneous_set(ep->object, chosen_desc->table.homogeneous),
+ evas_obj_table_align_set(ep->object, TO_DOUBLE(chosen_desc->table.align.x), TO_DOUBLE(chosen_desc->table.align.y)),
+ evas_obj_table_padding_set(ep->object, chosen_desc->table.padding.x, chosen_desc->table.padding.y));
if (evas_object_smart_need_recalculate_get(ep->object))
{
eo_do(ep->object,
- evas_obj_smart_need_recalculate_set(0),
- evas_obj_smart_calculate());
+ evas_obj_smart_need_recalculate_set(ep->object, 0),
+ evas_obj_smart_calculate(ep->object));
}
}
@@ -3064,13 +3064,13 @@ _edje_proxy_recalc_apply(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *p3, Edj
}
eo_do(ep->object,
- efl_gfx_fill_set(p3->type.common.fill.x,
+ efl_gfx_fill_set(ep->object, p3->type.common.fill.x,
p3->type.common.fill.y,
p3->type.common.fill.w,
p3->type.common.fill.h),
- efl_image_smooth_scale_set(p3->smooth),
- evas_obj_image_source_visible_set(chosen_desc->proxy.source_visible),
- evas_obj_image_source_clip_set(chosen_desc->proxy.source_clip));
+ efl_image_smooth_scale_set(ep->object, p3->smooth),
+ evas_obj_image_source_visible_set(ep->object, chosen_desc->proxy.source_visible),
+ evas_obj_image_source_clip_set(ep->object, chosen_desc->proxy.source_clip));
}
static void
@@ -3105,9 +3105,9 @@ _edje_image_recalc_apply(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *p3, Edj
}
eo_do(ep->object,
- efl_gfx_fill_set(p3->type.common.fill.x, p3->type.common.fill.y,
+ efl_gfx_fill_set(ep->object, p3->type.common.fill.x, p3->type.common.fill.y,
p3->type.common.fill.w, p3->type.common.fill.h),
- efl_image_smooth_scale_set(p3->smooth));
+ efl_image_smooth_scale_set(ep->object, p3->smooth));
if (chosen_desc->image.border.scale)
{
if (p3->type.common.spec.image.border_scale_by > FROM_DOUBLE(0.0))
@@ -4345,7 +4345,7 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
/* visibility and color have no meaning on SWALLOW and GROUP part. */
#ifdef HAVE_EPHYSICS
eo_do(ep->object,
- efl_gfx_size_set(pf->final.w, pf->final.h));
+ efl_gfx_size_set(ep->object, pf->final.w, pf->final.h));
if ((ep->part->physics_body) && (!ep->body))
{
if (_edje_physics_world_geometry_check(ed->world))
@@ -4363,7 +4363,7 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
}
else
eo_do(ep->object,
- efl_gfx_position_set(ed->x + pf->final.x, ed->y + pf->final.y));
+ efl_gfx_position_set(ep->object, ed->x + pf->final.x, ed->y + pf->final.y));
#else
eo_do(ep->object,
efl_gfx_position_set(ed->x + pf->final.x, ed->y + pf->final.y),
@@ -4373,8 +4373,8 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
if (ep->nested_smart) /* Move, Resize all nested parts */
{ /* Not really needed but will improve the bounding box evaluation done by Evas */
eo_do(ep->nested_smart,
- efl_gfx_position_set(ed->x + pf->final.x, ed->y + pf->final.y),
- efl_gfx_size_set(pf->final.w, pf->final.h));
+ efl_gfx_position_set(ep->nested_smart, ed->x + pf->final.x, ed->y + pf->final.y),
+ efl_gfx_size_set(ep->nested_smart, pf->final.w, pf->final.h));
}
if (ep->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
_edje_entry_real_part_configure(ed, ep);
@@ -4406,14 +4406,14 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
Edje_Part_Description_Camera *pd_camera;
pd_camera = (Edje_Part_Description_Camera*) ep->chosen_description;
- eo_do(ep->node, camera = evas_canvas3d_node_camera_get());
+ eo_do(ep->node, camera = evas_canvas3d_node_camera_get(ep->node));
eo_do(camera,
- evas_canvas3d_camera_projection_perspective_set(pd_camera->camera.camera.fovy, pd_camera->camera.camera.aspect,
+ evas_canvas3d_camera_projection_perspective_set(camera, pd_camera->camera.camera.fovy, pd_camera->camera.camera.aspect,
pd_camera->camera.camera.frustum_near, pd_camera->camera.camera.frustum_far));
eo_do(ep->node,
- evas_canvas3d_node_position_set(pd_camera->camera.position.point.x, pd_camera->camera.position.point.y,
+ evas_canvas3d_node_position_set(ep->node, pd_camera->camera.position.point.x, pd_camera->camera.position.point.y,
pd_camera->camera.position.point.z));
switch (pd_camera->camera.orientation.type)
{
@@ -4443,19 +4443,19 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
Edje_Part_Description_Light *pd_light;
pd_light = (Edje_Part_Description_Light*) ep->chosen_description;
- eo_do(ep->node, light_node = evas_canvas3d_node_light_get());
+ eo_do(ep->node, light_node = evas_canvas3d_node_light_get(ep->node));
eo_do(light_node,
- evas_canvas3d_light_ambient_set(pd_light->light.properties.ambient.r / 255, pd_light->light.properties.ambient.g / 255,
+ evas_canvas3d_light_ambient_set(light_node, pd_light->light.properties.ambient.r / 255, pd_light->light.properties.ambient.g / 255,
pd_light->light.properties.ambient.b / 255, pd_light->light.properties.ambient.a / 255),
- evas_canvas3d_light_diffuse_set(pd_light->light.properties.diffuse.r / 255, pd_light->light.properties.diffuse.g / 255,
+ evas_canvas3d_light_diffuse_set(light_node, pd_light->light.properties.diffuse.r / 255, pd_light->light.properties.diffuse.g / 255,
pd_light->light.properties.diffuse.b / 255, pd_light->light.properties.diffuse.a / 255),
- evas_canvas3d_light_specular_set(pd_light->light.properties.specular.r / 255, pd_light->light.properties.specular.g / 255,
+ evas_canvas3d_light_specular_set(light_node, pd_light->light.properties.specular.r / 255, pd_light->light.properties.specular.g / 255,
pd_light->light.properties.specular.b / 255, pd_light->light.properties.specular.a / 255),
- evas_canvas3d_light_directional_set(EINA_TRUE));
+ evas_canvas3d_light_directional_set(light_node, EINA_TRUE));
eo_do(ep->node,
- evas_canvas3d_node_position_set(pd_light->light.position.point.x, pd_light->light.position.point.y,
+ evas_canvas3d_node_position_set(ep->node, pd_light->light.position.point.x, pd_light->light.position.point.y,
pd_light->light.position.point.z));
switch (pd_light->light.orientation.type)
{
@@ -4489,36 +4489,36 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
const Eina_List *meshes;
const Eina_List *list;
- eo_do(ep->node, meshes = evas_canvas3d_node_mesh_list_get());
+ eo_do(ep->node, meshes = evas_canvas3d_node_mesh_list_get(ep->node));
EINA_LIST_FOREACH(meshes, list, mesh)
{
- eo_do(mesh, material = evas_canvas3d_mesh_frame_material_get(0));
- eo_do(material, texture = evas_canvas3d_material_texture_get(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE));
+ eo_do(mesh, material = evas_canvas3d_mesh_frame_material_get(mesh, 0));
+ eo_do(material, texture = evas_canvas3d_material_texture_get(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE));
pd_mesh_node = (Edje_Part_Description_Mesh_Node*) ep->chosen_description;
eo_do(material,
- evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
- evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE),
- evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE),
- evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, pd_mesh_node->mesh_node.properties.normal),
- evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT,
+ evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
+ evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE),
+ evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE),
+ evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, pd_mesh_node->mesh_node.properties.normal),
+ evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT,
pd_mesh_node->mesh_node.properties.ambient.r / 255,
pd_mesh_node->mesh_node.properties.ambient.g / 255,
pd_mesh_node->mesh_node.properties.ambient.b / 255,
pd_mesh_node->mesh_node.properties.ambient.a / 255),
- evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE,
+ evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE,
pd_mesh_node->mesh_node.properties.diffuse.r / 255,
pd_mesh_node->mesh_node.properties.diffuse.g / 255,
pd_mesh_node->mesh_node.properties.diffuse.b / 255,
pd_mesh_node->mesh_node.properties.diffuse.a / 255),
- evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR,
+ evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR,
pd_mesh_node->mesh_node.properties.specular.r / 255,
pd_mesh_node->mesh_node.properties.specular.g / 255,
pd_mesh_node->mesh_node.properties.specular.b / 255,
pd_mesh_node->mesh_node.properties.specular.a / 255),
- evas_canvas3d_material_shininess_set(pd_mesh_node->mesh_node.properties.shininess));
+ evas_canvas3d_material_shininess_set(material, pd_mesh_node->mesh_node.properties.shininess));
switch(pd_mesh_node->mesh_node.mesh.primitive)
{
@@ -4527,10 +4527,10 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
Eo *primitive = NULL;
eo_do(primitive,
- evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_CUBE));
+ evas_canvas3d_primitive_form_set(primitive, EVAS_CANVAS3D_MESH_PRIMITIVE_CUBE));
eo_do(mesh,
- evas_canvas3d_mesh_from_primitive_set(0, primitive));
+ evas_canvas3d_mesh_from_primitive_set(mesh, 0, primitive));
break;
}
case EVAS_CANVAS3D_MESH_PRIMITIVE_SPHERE:
@@ -4538,11 +4538,11 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
Eo *primitive = NULL;
eo_do(primitive,
- evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_SPHERE),
- evas_canvas3d_primitive_precision_set(20));
+ evas_canvas3d_primitive_form_set(primitive, EVAS_CANVAS3D_MESH_PRIMITIVE_SPHERE),
+ evas_canvas3d_primitive_precision_set(primitive, 20));
eo_do(mesh,
- evas_canvas3d_mesh_from_primitive_set(0, primitive));
+ evas_canvas3d_mesh_from_primitive_set(mesh, 0, primitive));
break;
}
default:
@@ -4554,7 +4554,7 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
proxy = NULL;
eo_do(material,
- texture = evas_canvas3d_material_texture_get(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE));
+ texture = evas_canvas3d_material_texture_get(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE));
//proxy = _edje_image_name_find(ed, pd_mesh_node->mesh_node.texture.id);
/*FIXME Conflict with function _edje_image_name_find (two places in edje_utils and edje_edit.c,
@@ -4563,22 +4563,22 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
if (proxy)
{
eo_do(texture,
- evas_canvas3d_texture_file_set(eina_stringshare_add(proxy), NULL),
- evas_canvas3d_texture_filter_set(pd_mesh_node->mesh_node.texture.filter1,
+ evas_canvas3d_texture_file_set(texture, eina_stringshare_add(proxy), NULL),
+ evas_canvas3d_texture_filter_set(texture, pd_mesh_node->mesh_node.texture.filter1,
pd_mesh_node->mesh_node.texture.filter2),
- evas_canvas3d_texture_wrap_set(pd_mesh_node->mesh_node.texture.wrap1,
+ evas_canvas3d_texture_wrap_set(texture, pd_mesh_node->mesh_node.texture.wrap1,
pd_mesh_node->mesh_node.texture.wrap2));
}
}
eo_do(mesh,
- evas_canvas3d_mesh_frame_material_set(0, material),
- evas_canvas3d_mesh_shade_mode_set(pd_mesh_node->mesh_node.properties.shade),
- evas_canvas3d_mesh_vertex_assembly_set(pd_mesh_node->mesh_node.mesh.assembly));
+ evas_canvas3d_mesh_frame_material_set(mesh, 0, material),
+ evas_canvas3d_mesh_shade_mode_set(mesh, pd_mesh_node->mesh_node.properties.shade),
+ evas_canvas3d_mesh_vertex_assembly_set(mesh, pd_mesh_node->mesh_node.mesh.assembly));
eo_do(ep->node,
- evas_canvas3d_node_scale_set(ep->part->scale_3d.x, ep->part->scale_3d.y,
+ evas_canvas3d_node_scale_set(ep->node, ep->part->scale_3d.x, ep->part->scale_3d.y,
ep->part->scale_3d.z),
- evas_canvas3d_node_position_set(pd_mesh_node->mesh_node.position.point.x,
+ evas_canvas3d_node_position_set(ep->node, pd_mesh_node->mesh_node.position.point.x,
pd_mesh_node->mesh_node.position.point.y,
pd_mesh_node->mesh_node.position.point.z));
switch (pd_mesh_node->mesh_node.orientation.type)
@@ -4668,9 +4668,9 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
if (ep->part->type == EDJE_PART_TYPE_GROUP)
vis = evas_object_visible_get(ed->obj);
eo_do(ep->typedata.swallow->swallowed_object,
- efl_gfx_position_set(ed->x + pf->final.x, ed->y + pf->final.y),
- efl_gfx_size_set(pf->final.w, pf->final.h),
- efl_gfx_visible_set(vis));
+ efl_gfx_position_set(ep->typedata.swallow->swallowed_object, ed->x + pf->final.x, ed->y + pf->final.y),
+ efl_gfx_size_set(ep->typedata.swallow->swallowed_object, pf->final.w, pf->final.h),
+ efl_gfx_visible_set(ep->typedata.swallow->swallowed_object, vis));
}
else evas_object_hide(ep->typedata.swallow->swallowed_object);
mo = ep->typedata.swallow->swallowed_object;
@@ -4694,8 +4694,8 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
if (map_obj)
{
eo_do(map_obj,
- evas_obj_map_set(map),
- evas_obj_map_enable_set(EINA_TRUE));
+ evas_obj_map_set(map_obj, map),
+ evas_obj_map_enable_set(map_obj, EINA_TRUE));
}
}
else
@@ -4703,8 +4703,8 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
if (ep->nested_smart) /* Cancel map of smart obj holding nested parts */
{
eo_do(ep->nested_smart,
- evas_obj_map_enable_set(EINA_FALSE),
- evas_obj_map_set(NULL));
+ evas_obj_map_enable_set(ep->nested_smart, EINA_FALSE),
+ evas_obj_map_set(ep->nested_smart, NULL));
}
else
{
@@ -4714,8 +4714,8 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
#endif
if (mo)
eo_do(mo,
- evas_obj_map_enable_set(0),
- evas_obj_map_set(NULL));
+ evas_obj_map_enable_set(mo, 0),
+ evas_obj_map_set(mo, NULL));
#ifdef HAVE_EPHYSICS
}
#endif
diff --git a/src/lib/edje/edje_callbacks.c b/src/lib/edje/edje_callbacks.c
index 39a6255d1a..7600b42625 100644
--- a/src/lib/edje/edje_callbacks.c
+++ b/src/lib/edje/edje_callbacks.c
@@ -466,28 +466,28 @@ EO_CALLBACKS_ARRAY_DEFINE(edje_focus_callbacks,
void
_edje_callbacks_add(Evas_Object *obj, Edje *ed, Edje_Real_Part *rp)
{
- eo_do(obj, eo_event_callback_array_add(edje_callbacks(), ed));
+ eo_do(obj, eo_event_callback_array_add(obj, edje_callbacks(), ed));
evas_object_data_set(obj, "real_part", rp);
}
void
_edje_callbacks_del(Evas_Object *obj, Edje *ed)
{
- eo_do(obj, eo_event_callback_array_del(edje_callbacks(), ed));
+ eo_do(obj, eo_event_callback_array_del(obj, edje_callbacks(), ed));
evas_object_data_del(obj, "real_part");
}
void
_edje_callbacks_focus_add(Evas_Object *obj, Edje *ed, Edje_Real_Part *rp)
{
- eo_do(obj, eo_event_callback_array_add(edje_focus_callbacks(), ed));
+ eo_do(obj, eo_event_callback_array_add(obj, edje_focus_callbacks(), ed));
evas_object_data_set(obj, "real_part", rp);
}
void
_edje_callbacks_focus_del(Evas_Object *obj, Edje *ed)
{
- eo_do(obj, eo_event_callback_array_del(edje_focus_callbacks(), ed));
+ eo_do(obj, eo_event_callback_array_del(obj, edje_focus_callbacks(), ed));
evas_object_data_del(obj, "real_part");
}
diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c
index 8d09e45ffe..1b64d027cb 100644
--- a/src/lib/edje/edje_edit.c
+++ b/src/lib/edje/edje_edit.c
@@ -152,7 +152,7 @@ _edje_edit_evas_object_smart_del(Eo *obj, Edje_Edit *eed)
{
_edje_edit_data_clean(eed);
- eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+ eo_super_evas_obj_smart_del(MY_CLASS, obj);
}
static void
@@ -190,7 +190,7 @@ _edje_edit_efl_file_file_set(Eo *obj, Edje_Edit *eed, const char *file, const ch
* groups).
*/
Eina_Bool int_ret = EINA_FALSE;
- eo_do_super(obj, MY_CLASS, int_ret = efl_file_set(file, group));
+ int_ret = eo_super_efl_file_set(MY_CLASS, obj, file, group);
if (!int_ret)
return ret;
@@ -231,7 +231,7 @@ EAPI Evas_Object *
edje_edit_object_add(Evas *evas)
{
Evas_Object *e;
- e = eo_add(MY_CLASS, evas);
+ eo_add(e, MY_CLASS, evas);
return e;
}
@@ -240,13 +240,13 @@ _edje_edit_eo_base_constructor(Eo *obj, Edje_Edit *eed)
{
eed->base = eo_data_ref(obj, EDJE_OBJECT_CLASS);
- return eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
+ return eo_super_eo_constructor( MY_CLASS, obj);
}
EOLIAN static void
_edje_edit_eo_base_destructor(Eo *obj, Edje_Edit *class_data EINA_UNUSED)
{
- eo_do_super(obj, MY_CLASS, eo_destructor());
+ eo_super_eo_destructor(MY_CLASS, obj);
eo_data_unref(obj, class_data);
}
diff --git a/src/lib/edje/edje_load.c b/src/lib/edje/edje_load.c
index f79072cb3a..d462bda93a 100644
--- a/src/lib/edje/edje_load.c
+++ b/src/lib/edje/edje_load.c
@@ -780,7 +780,7 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch
}
if (ep->no_render)
- eo_do(rp->object, evas_obj_no_render_set(1));
+ eo_do(rp->object, evas_obj_no_render_set(rp->object, 1));
if (st_nested && st_nested->nested_children_count) /* Add this to list of children */
{
@@ -834,8 +834,8 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch
evas_object_pointer_mode_set(rp->object, EVAS_OBJECT_POINTER_MODE_NOGRAB);
}
eo_do(rp->object,
- evas_obj_anti_alias_set(ep->anti_alias),
- evas_obj_precise_is_inside_set(ep->precise_is_inside));
+ evas_obj_anti_alias_set(rp->object, ep->anti_alias),
+ evas_obj_precise_is_inside_set(rp->object, ep->precise_is_inside));
}
if (rp->part->clip_to_id < 0)
evas_object_clip_set(rp->object, ed->base->clipper);
diff --git a/src/lib/edje/edje_multisense.c b/src/lib/edje/edje_multisense.c
index 92e36d50a0..3186a5b9de 100644
--- a/src/lib/edje/edje_multisense.c
+++ b/src/lib/edje/edje_multisense.c
@@ -202,18 +202,18 @@ _edje_multisense_internal_sound_sample_play(Edje *ed, const char *sample_name, c
eet_data->vio.tell = eet_snd_file_tell;
eet_data->offset = 0;
- in = eo_add(ECORE_AUDIO_IN_SNDFILE_CLASS, NULL,
- ecore_audio_obj_name_set(snd_id_str),
- ecore_audio_obj_in_speed_set(speed),
- ecore_audio_obj_vio_set(&eet_data->vio, eet_data, _free),
- eo_event_callback_add(ECORE_AUDIO_IN_EVENT_IN_STOPPED, _play_finished, NULL));
+ eo_add(in, ECORE_AUDIO_IN_SNDFILE_CLASS, NULL,
+ ecore_audio_obj_name_set(NULL, snd_id_str),
+ ecore_audio_obj_in_speed_set(NULL, speed),
+ ecore_audio_obj_vio_set(NULL, &eet_data->vio, eet_data, _free),
+ eo_event_callback_add(NULL, ECORE_AUDIO_IN_EVENT_IN_STOPPED, _play_finished, NULL));
if (!out)
{
#if HAVE_COREAUDIO
- out = eo_add(ECORE_AUDIO_OUT_CORE_AUDIO_CLASS, NULL);
+ eo_add(out, ECORE_AUDIO_OUT_CORE_AUDIO_CLASS, NULL);
#elif HAVE_PULSE
- out = eo_add(ECORE_AUDIO_OUT_PULSE_CLASS, NULL,
- eo_event_callback_add(ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, _out_fail, NULL));
+ eo_add(out, ECORE_AUDIO_OUT_PULSE_CLASS, NULL,
+ eo_event_callback_add(NULL, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, _out_fail, NULL));
#endif
if (out) outs++;
}
@@ -227,7 +227,7 @@ _edje_multisense_internal_sound_sample_play(Edje *ed, const char *sample_name, c
eo_del(in);
return EINA_FALSE;
}
- eo_do(out, ret = ecore_audio_obj_out_input_attach(in));
+ eo_do(out, ret = ecore_audio_obj_out_input_attach(out, in));
if (!ret)
{
ERR("Could not attach input");
@@ -274,24 +274,24 @@ _edje_multisense_internal_sound_tone_play(Edje *ed, const char *tone_name, const
tone = &ed->file->sound_dir->tones[i];
if (!strcmp(tone->name, tone_name))
{
- in = eo_add(ECORE_AUDIO_IN_TONE_CLASS, NULL);
- eo_do(in, ecore_audio_obj_name_set("tone"));
- eo_do(in, eo_key_data_set(ECORE_AUDIO_ATTR_TONE_FREQ, &tone->value));
- eo_do(in, ecore_audio_obj_in_length_set(duration));
- eo_do(in, eo_event_callback_add(ECORE_AUDIO_IN_EVENT_IN_STOPPED, _play_finished, NULL));
+ eo_add(in, ECORE_AUDIO_IN_TONE_CLASS, NULL);
+ eo_do(in, ecore_audio_obj_name_set(in, "tone"));
+ eo_do(in, eo_key_data_set(in, ECORE_AUDIO_ATTR_TONE_FREQ, &tone->value));
+ eo_do(in, ecore_audio_obj_in_length_set(in, duration));
+ eo_do(in, eo_event_callback_add(in, ECORE_AUDIO_IN_EVENT_IN_STOPPED, _play_finished, NULL));
if (!out)
{
#if HAVE_COREAUDIO
- out = eo_add(ECORE_AUDIO_OUT_CORE_AUDIO_CLASS, NULL);
+ eo_add(out, ECORE_AUDIO_OUT_CORE_AUDIO_CLASS, NULL);
#elif HAVE_PULSE
- out = eo_add(ECORE_AUDIO_OUT_PULSE_CLASS, NULL,
- eo_event_callback_add(ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, _out_fail, NULL));
+ eo_add(out, ECORE_AUDIO_OUT_PULSE_CLASS, NULL,
+ eo_event_callback_add(NULL, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, _out_fail, NULL));
#endif
if (out) outs++;
}
- eo_do(out, ret = ecore_audio_obj_out_input_attach(in));
+ eo_do(out, ret = ecore_audio_obj_out_input_attach(out, in));
if (!ret)
{
ERR("Could not attach input");
diff --git a/src/lib/edje/edje_program.c b/src/lib/edje/edje_program.c
index 0c97e210c6..46d86ed8b5 100644
--- a/src/lib/edje/edje_program.c
+++ b/src/lib/edje/edje_program.c
@@ -261,7 +261,7 @@ edje_object_signal_callback_del(Evas_Object *obj, const char *emission, const ch
{
if (!obj) return NULL;
void *ret = NULL;
- eo_do(obj, ret = edje_obj_signal_callback_del(emission, source, (Edje_Signal_Cb)func, NULL));
+ eo_do(obj, ret = edje_obj_signal_callback_del(obj, emission, source, (Edje_Signal_Cb)func, NULL));
return ret;
}
@@ -290,7 +290,7 @@ edje_object_signal_callback_del_full(Evas_Object *obj, const char *emission, con
{
if (!obj) return NULL;
void *ret = NULL;
- eo_do(obj, ret = edje_obj_signal_callback_del(emission, source, func, data));
+ eo_do(obj, ret = edje_obj_signal_callback_del(obj, emission, source, func, data));
return ret;
}
diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c
index 5bd5ce2830..f28b1f6379 100644
--- a/src/lib/edje/edje_smart.c
+++ b/src/lib/edje/edje_smart.c
@@ -20,7 +20,7 @@ edje_object_add(Evas *evas)
{
Evas_Object *e;
EINA_SAFETY_ON_NULL_RETURN_VAL(evas, NULL);
- e = eo_add(MY_CLASS, evas);
+ eo_add(e, MY_CLASS, evas);
return e;
}
@@ -30,8 +30,8 @@ _edje_object_eo_base_constructor(Eo *obj, Edje *ed)
ed->base = eo_data_ref(obj, EVAS_SMART_CLIPPED_CLASS);
ed->duration_scale = 1.0;
- 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));
_edje_lib_ref();
return obj;
@@ -40,23 +40,23 @@ _edje_object_eo_base_constructor(Eo *obj, Edje *ed)
EOLIAN static void
_edje_object_eo_base_destructor(Eo *obj, Edje *class_data)
{
- eo_do_super(obj, MY_CLASS, eo_destructor());
+ eo_super_eo_destructor(MY_CLASS, obj);
eo_data_unref(obj, class_data->base);
}
EOLIAN static void
_edje_object_eo_base_dbg_info_get(Eo *eo_obj, Edje *_pd EINA_UNUSED, Eo_Dbg_Info *root) EINA_ARG_NONNULL(3)
{
- 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, *edje_group;
- eo_do(eo_obj, efl_file_get(&file, &edje_group));
+ eo_do(eo_obj, efl_file_get(eo_obj, &file, &edje_group));
EO_DBG_INFO_APPEND(group, "File", EINA_VALUE_TYPE_STRING, file);
EO_DBG_INFO_APPEND(group, "Group", EINA_VALUE_TYPE_STRING, edje_group);
Edje_Load_Error error = EDJE_LOAD_ERROR_NONE;
- eo_do(eo_obj, error = edje_obj_load_error_get());
+ eo_do(eo_obj, error = edje_obj_load_error_get(eo_obj));
if (error != EDJE_LOAD_ERROR_NONE)
{
EO_DBG_INFO_APPEND(group, "Error", EINA_VALUE_TYPE_STRING,
@@ -81,7 +81,7 @@ _edje_object_evas_object_smart_add(Eo *obj, Edje *ed)
evas_event_freeze(tev);
- eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+ eo_super_evas_obj_smart_add(MY_CLASS, obj);
ed->is_rtl = EINA_FALSE;
ed->have_objects = EINA_TRUE;
@@ -260,7 +260,7 @@ _edje_object_evas_object_smart_show(Eo *obj, Edje *ed)
Eina_List *l;
Edje *edg;
- eo_do_super(obj, MY_CLASS, evas_obj_smart_show());
+ eo_super_evas_obj_smart_show(MY_CLASS, obj);
if (evas_object_visible_get(obj)) return;
if (_edje_lua_script_only(ed))
{
@@ -288,7 +288,7 @@ _edje_object_evas_object_smart_hide(Eo *obj, Edje *ed)
Eina_List *l;
Edje *edg;
- eo_do_super(obj, MY_CLASS, evas_obj_smart_hide());
+ eo_super_evas_obj_smart_hide(MY_CLASS, obj);
if (!evas_object_visible_get(obj)) return;
if (_edje_lua_script_only(ed))
{
@@ -372,21 +372,21 @@ edje_object_mmap_set(Edje_Object *obj, const Eina_File *file, const char *group)
{
Eina_Bool ret;
- return eo_do_ret(obj, ret, efl_file_mmap_set(file, group));
+ return eo_do_ret(obj, ret, efl_file_mmap_set(obj, file, group));
}
EAPI Eina_Bool
edje_object_file_set(Edje_Object *obj, const char *file, const char *group)
{
Eina_Bool ret = 0;
- eo_do(obj, ret = efl_file_set(file, group));
+ eo_do(obj, ret = efl_file_set(obj, file, group));
return ret;
}
EAPI void
edje_object_file_get(const Edje_Object *obj, const char **file, const char **group)
{
- eo_do((Edje_Object *)obj, efl_file_get(file, group));
+ eo_do((Edje_Object *)obj, efl_file_get(obj, file, group));
}
#include "edje_object.eo.c"
diff --git a/src/lib/edje/edje_text.c b/src/lib/edje/edje_text.c
index a49b661c9e..59b20a5d29 100644
--- a/src/lib/edje/edje_text.c
+++ b/src/lib/edje/edje_text.c
@@ -19,7 +19,7 @@ static inline void
part_get_geometry(Edje_Real_Part *rp, Evas_Coord *w, Evas_Coord *h)
{
if (!rp->part->use_alternate_font_metrics)
- eo_do(rp->object, efl_gfx_size_get(w, h));
+ eo_do(rp->object, efl_gfx_size_get(rp->object, w, h));
else
{
if (w) *w = evas_object_text_horiz_advance_get(rp->object);
@@ -132,10 +132,10 @@ _edje_text_fit_x(Edje *ed, Edje_Real_Part *ep,
if (ep->part->scale) evas_object_scale_set(ep->object, TO_DOUBLE(sc));
eo_do(ep->object,
- evas_obj_text_ellipsis_set(chosen_desc->text.min_x ? -1 : params->type.text.ellipsis),
- efl_text_properties_font_set(font, size),
- efl_text_set(text),
- efl_gfx_size_set(sw, sh));
+ evas_obj_text_ellipsis_set(ep->object, chosen_desc->text.min_x ? -1 : params->type.text.ellipsis),
+ efl_text_properties_font_set(ep->object, font, size),
+ efl_text_set(ep->object, text),
+ efl_gfx_size_set(ep->object, sw, sh));
return text;
}
@@ -323,13 +323,13 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
{
eo_do(ep->object,
- if (inlined_font) efl_text_properties_font_source_set(ed->path);
- else efl_text_properties_font_source_set(NULL);
+ if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path);
+ else efl_text_properties_font_source_set(ep->object, NULL);
- if (ep->part->scale) evas_obj_scale_set(TO_DOUBLE(sc));
+ if (ep->part->scale) evas_obj_scale_set(ep->object, TO_DOUBLE(sc));
- efl_text_properties_font_set(font, size);
- efl_text_set(text));
+ efl_text_properties_font_set(ep->object, font, size);
+ efl_text_set(ep->object, text));
part_get_geometry(ep, &tw, &th);
/* Find the wanted font size */
@@ -339,12 +339,12 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
eo_do(ep->object,
- if (inlined_font) efl_text_properties_font_source_set(ed->path);
- else efl_text_properties_font_source_set(NULL);
+ if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path);
+ else efl_text_properties_font_source_set(ep->object, NULL);
- if (ep->part->scale) evas_obj_scale_set(TO_DOUBLE(sc));
+ if (ep->part->scale) evas_obj_scale_set(ep->object, TO_DOUBLE(sc));
- efl_text_properties_font_set(font, size));
+ efl_text_properties_font_set(ep->object, font, size));
part_get_geometry(ep, &tw, &th);
}
@@ -363,13 +363,13 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
eo_do(ep->object,
- if (inlined_font) efl_text_properties_font_source_set(ed->path);
- else efl_text_properties_font_source_set(NULL);
+ if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path);
+ else efl_text_properties_font_source_set(ep->object, NULL);
- if (ep->part->scale) evas_obj_scale_set(TO_DOUBLE(sc));
+ if (ep->part->scale) evas_obj_scale_set(ep->object, TO_DOUBLE(sc));
- efl_text_properties_font_set(font, size);
- efl_text_set(text));
+ efl_text_properties_font_set(ep->object, font, size);
+ efl_text_set(ep->object, text));
part_get_geometry(ep, &tw, &th);
/* only grow the font size if we didn't already reach the max size
@@ -388,11 +388,11 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
eo_do(ep->object,
- if (inlined_font) efl_text_properties_font_source_set(ed->path);
- else efl_text_properties_font_source_set(NULL);
+ if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path);
+ else efl_text_properties_font_source_set(ep->object, NULL);
- if (ep->part->scale) evas_obj_scale_set(TO_DOUBLE(sc));
- efl_text_properties_font_set(font, size));
+ if (ep->part->scale) evas_obj_scale_set(ep->object, TO_DOUBLE(sc));
+ efl_text_properties_font_set(ep->object, font, size));
part_get_geometry(ep, &tw, &th);
if ((size > 0) && (th == 0)) break;
@@ -404,8 +404,8 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
int current;
eo_do(ep->object,
- if (ep->part->scale) evas_obj_scale_set(TO_DOUBLE(sc));
- efl_text_properties_font_set(font, 10));
+ if (ep->part->scale) evas_obj_scale_set(ep->object, TO_DOUBLE(sc));
+ efl_text_properties_font_set(ep->object, font, 10));
part_get_geometry(ep, &tw, &th);
@@ -427,8 +427,8 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
current = (top + bottom) / 2;
eo_do(ep->object,
- if (ep->part->scale) evas_obj_scale_set(TO_DOUBLE(sc));
- efl_text_properties_font_set(font, current));
+ if (ep->part->scale) evas_obj_scale_set(ep->object, TO_DOUBLE(sc));
+ efl_text_properties_font_set(ep->object, font, current));
part_get_geometry(ep, &tw, &th);
@@ -444,8 +444,8 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
current++;
eo_do(ep->object,
- if (ep->part->scale) evas_obj_scale_set(TO_DOUBLE(sc));
- efl_text_properties_font_set(font, current));
+ if (ep->part->scale) evas_obj_scale_set(ep->object, TO_DOUBLE(sc));
+ efl_text_properties_font_set(ep->object, font, current));
part_get_geometry(ep, &tw, &th);
} while (th <= sh);
@@ -466,8 +466,8 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
if (!chosen_desc->text.min_x)
{
eo_do (ep->object,
- if (inlined_font) efl_text_properties_font_source_set(ed->path);
- else efl_text_properties_font_source_set(NULL));
+ if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path);
+ else efl_text_properties_font_source_set(ep->object, NULL));
text = _edje_text_fit_x(ed, ep, params, chosen_desc,
text, font, size,
@@ -509,13 +509,13 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
arrange_text:
eo_do(ep->object,
- if (inlined_font) efl_text_properties_font_source_set(ed->path);
- else efl_text_properties_font_source_set(NULL);
+ if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path);
+ else efl_text_properties_font_source_set(ep->object, NULL);
- if (ep->part->scale) evas_obj_scale_set(TO_DOUBLE(sc));
+ if (ep->part->scale) evas_obj_scale_set(ep->object, TO_DOUBLE(sc));
- efl_text_properties_font_set(font, size);
- efl_text_set(text));
+ efl_text_properties_font_set(ep->object, font, size);
+ efl_text_set(ep->object, text));
part_get_geometry(ep, &tw, &th);
/* Handle alignment */
@@ -544,10 +544,10 @@ arrange_text:
if (!calc_only)
{
eo_do(ep->object,
- efl_gfx_position_set(ed->x + TO_INT(params->eval.x) + ep->typedata.text->offset.x,
+ efl_gfx_position_set(ep->object, ed->x + TO_INT(params->eval.x) + ep->typedata.text->offset.x,
ed->y + TO_INT(params->eval.y) + ep->typedata.text->offset.y);
- efl_gfx_visible_set(params->visible));
+ efl_gfx_visible_set(ep->object, params->visible));
}
{
@@ -608,11 +608,11 @@ arrange_text:
case EDJE_TEXT_EFFECT_OUTLINE_SHADOW:
style = EVAS_TEXT_STYLE_OUTLINE_SHADOW;
eo_do(ep->object,
- evas_obj_text_outline_color_set((params->type.text.color2.r * params->type.text.color2.a) / 255,
+ evas_obj_text_outline_color_set(ep->object, (params->type.text.color2.r * params->type.text.color2.a) / 255,
(params->type.text.color2.g * params->type.text.color2.a) / 255,
(params->type.text.color2.b * params->type.text.color2.a) / 255,
params->type.text.color2.a),
- evas_obj_text_shadow_color_set((params->type.text.color3.r * params->type.text.color3.a) / 255,
+ evas_obj_text_shadow_color_set(ep->object, (params->type.text.color3.r * params->type.text.color3.a) / 255,
(params->type.text.color3.g * params->type.text.color3.a) / 255,
(params->type.text.color3.b * params->type.text.color3.a) / 255,
params->type.text.color3.a));
@@ -621,11 +621,11 @@ arrange_text:
case EDJE_TEXT_EFFECT_OUTLINE_SOFT_SHADOW:
style = EVAS_TEXT_STYLE_OUTLINE_SOFT_SHADOW;
eo_do(ep->object,
- evas_obj_text_outline_color_set((params->type.text.color2.r * params->type.text.color2.a) / 255,
+ evas_obj_text_outline_color_set(ep->object, (params->type.text.color2.r * params->type.text.color2.a) / 255,
(params->type.text.color2.g * params->type.text.color2.a) / 255,
(params->type.text.color2.b * params->type.text.color2.a) / 255,
params->type.text.color2.a),
- evas_obj_text_shadow_color_set((params->type.text.color3.r * params->type.text.color3.a) / 255,
+ evas_obj_text_shadow_color_set(ep->object, (params->type.text.color3.r * params->type.text.color3.a) / 255,
(params->type.text.color3.g * params->type.text.color3.a) / 255,
(params->type.text.color3.b * params->type.text.color3.a) / 255,
params->type.text.color3.a));
@@ -652,11 +652,11 @@ arrange_text:
case EDJE_TEXT_EFFECT_GLOW:
style = EVAS_TEXT_STYLE_GLOW;
eo_do(ep->object,
- evas_obj_text_glow_color_set((params->type.text.color2.r * params->type.text.color2.a) / 255,
+ evas_obj_text_glow_color_set(ep->object, (params->type.text.color2.r * params->type.text.color2.a) / 255,
(params->type.text.color2.g * params->type.text.color2.a) / 255,
(params->type.text.color2.b * params->type.text.color2.a) / 255,
params->type.text.color2.a),
- evas_obj_text_glow2_color_set((params->type.text.color3.r * params->type.text.color3.a) / 255,
+ evas_obj_text_glow2_color_set(ep->object, (params->type.text.color3.r * params->type.text.color3.a) / 255,
(params->type.text.color3.g * params->type.text.color3.a) / 255,
(params->type.text.color3.b * params->type.text.color3.a) / 255,
params->type.text.color3.a));
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index 9a1b44630c..95cf686e75 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -5519,8 +5519,8 @@ _edje_real_part_swallow(Edje *ed,
evas_object_pass_events_set(obj_swallow, 1);
_edje_callbacks_focus_add(rp->typedata.swallow->swallowed_object, ed, rp);
eo_do(obj_swallow,
- evas_obj_anti_alias_set(rp->part->anti_alias),
- evas_obj_precise_is_inside_set(rp->part->precise_is_inside));
+ evas_obj_anti_alias_set(obj_swallow, rp->part->anti_alias),
+ evas_obj_precise_is_inside_set(obj_swallow, rp->part->precise_is_inside));
ed->dirty = EINA_TRUE;
ed->recalc_call = EINA_TRUE;
diff --git a/src/lib/efl/interfaces/efl_gfx_shape.c b/src/lib/efl/interfaces/efl_gfx_shape.c
index b054ca7923..114e5deae3 100644
--- a/src/lib/efl/interfaces/efl_gfx_shape.c
+++ b/src/lib/efl/interfaces/efl_gfx_shape.c
@@ -181,8 +181,8 @@ _efl_gfx_shape_path_set(Eo *obj, Efl_Gfx_Shape_Data *pd,
end:
eo_do(obj,
- eo_event_callback_call(EFL_GFX_PATH_CHANGED, NULL),
- eo_event_callback_call(EFL_GFX_CHANGED, NULL));
+ eo_event_callback_call(obj, EFL_GFX_PATH_CHANGED, NULL),
+ eo_event_callback_call(obj, EFL_GFX_CHANGED, NULL));
}
static void
@@ -294,14 +294,14 @@ static inline void
gfx_property_get(const Eo *obj, Efl_Gfx_Property *property)
{
eo_do(obj,
- property->scale = efl_gfx_shape_stroke_scale_get(),
- efl_gfx_shape_stroke_color_get(&property->r, &property->g, &property->b, &property->a),
- efl_gfx_color_get(&property->fr, &property->fg, &property->fb, &property->fa),
- property->w = efl_gfx_shape_stroke_width_get(),
- property->centered = efl_gfx_shape_stroke_location_get(),
- efl_gfx_shape_stroke_dash_get(&property->dash, &property->dash_length),
- property->c = efl_gfx_shape_stroke_cap_get(),
- property->j = efl_gfx_shape_stroke_join_get());
+ property->scale = efl_gfx_shape_stroke_scale_get(obj),
+ efl_gfx_shape_stroke_color_get(obj, &property->r, &property->g, &property->b, &property->a),
+ efl_gfx_color_get(obj, &property->fr, &property->fg, &property->fb, &property->fa),
+ property->w = efl_gfx_shape_stroke_width_get(obj),
+ property->centered = efl_gfx_shape_stroke_location_get(obj),
+ efl_gfx_shape_stroke_dash_get(obj, &property->dash, &property->dash_length),
+ property->c = efl_gfx_shape_stroke_cap_get(obj),
+ property->j = efl_gfx_shape_stroke_join_get(obj));
}
static Eina_Bool
@@ -389,23 +389,23 @@ _efl_gfx_shape_interpolate(Eo *obj, Efl_Gfx_Shape_Data *pd,
eo_do(obj,
- efl_gfx_shape_stroke_scale_set(interpolate(property_to.scale, property_from.scale, pos_map)),
- efl_gfx_shape_stroke_color_set(interpolatei(property_to.r, property_from.r, pos_map),
+ efl_gfx_shape_stroke_scale_set(obj, interpolate(property_to.scale, property_from.scale, pos_map)),
+ efl_gfx_shape_stroke_color_set(obj, interpolatei(property_to.r, property_from.r, pos_map),
interpolatei(property_to.g, property_from.g, pos_map),
interpolatei(property_to.b, property_from.b, pos_map),
interpolatei(property_to.a, property_from.a, pos_map)),
- efl_gfx_color_set(interpolatei(property_to.fr, property_from.fr, pos_map),
+ efl_gfx_color_set(obj, interpolatei(property_to.fr, property_from.fr, pos_map),
interpolatei(property_to.fg, property_from.fg, pos_map),
interpolatei(property_to.fb, property_from.fb, pos_map),
interpolatei(property_to.fa, property_from.fa, pos_map)),
- efl_gfx_shape_stroke_width_set(interpolate(property_to.w, property_from.w, pos_map)),
- efl_gfx_shape_stroke_location_set(interpolate(property_to.centered, property_from.centered, pos_map)),
- efl_gfx_shape_stroke_dash_set(dash, property_to.dash_length),
- efl_gfx_shape_stroke_cap_set(pos_map < 0.5 ? property_from.c : property_to.c),
- efl_gfx_shape_stroke_join_set(pos_map < 0.5 ? property_from.j : property_to.j),
+ efl_gfx_shape_stroke_width_set(obj, interpolate(property_to.w, property_from.w, pos_map)),
+ efl_gfx_shape_stroke_location_set(obj, interpolate(property_to.centered, property_from.centered, pos_map)),
+ efl_gfx_shape_stroke_dash_set(obj, dash, property_to.dash_length),
+ efl_gfx_shape_stroke_cap_set(obj, pos_map < 0.5 ? property_from.c : property_to.c),
+ efl_gfx_shape_stroke_join_set(obj, pos_map < 0.5 ? property_from.j : property_to.j),
- eo_event_callback_call(EFL_GFX_PATH_CHANGED, NULL),
- eo_event_callback_call(EFL_GFX_CHANGED, NULL));
+ eo_event_callback_call(obj, EFL_GFX_PATH_CHANGED, NULL),
+ eo_event_callback_call(obj, EFL_GFX_CHANGED, NULL));
return EINA_TRUE;
}
@@ -440,27 +440,27 @@ _efl_gfx_shape_dup(Eo *obj, Efl_Gfx_Shape_Data *pd, const Eo *dup_from)
if (!from) return ;
eo_do(dup_from,
- scale = efl_gfx_shape_stroke_scale_get(),
- efl_gfx_shape_stroke_color_get(&sr, &sg, &sb, &sa),
- sw = efl_gfx_shape_stroke_width_get(),
- location = efl_gfx_shape_stroke_location_get(),
- efl_gfx_shape_stroke_dash_get(&dash, &dash_length),
- cap = efl_gfx_shape_stroke_cap_get(),
- j = efl_gfx_shape_stroke_join_get());
+ scale = efl_gfx_shape_stroke_scale_get(dup_from),
+ efl_gfx_shape_stroke_color_get(dup_from, &sr, &sg, &sb, &sa),
+ sw = efl_gfx_shape_stroke_width_get(dup_from),
+ location = efl_gfx_shape_stroke_location_get(dup_from),
+ efl_gfx_shape_stroke_dash_get(dup_from, &dash, &dash_length),
+ cap = efl_gfx_shape_stroke_cap_get(dup_from),
+ j = efl_gfx_shape_stroke_join_get(dup_from));
eo_do(obj,
- efl_gfx_shape_stroke_scale_set(scale),
- efl_gfx_shape_stroke_color_set(sr, sg, sb, sa),
- efl_gfx_shape_stroke_width_set(sw),
- efl_gfx_shape_stroke_location_set(location),
- efl_gfx_shape_stroke_dash_set(dash, dash_length),
- efl_gfx_shape_stroke_cap_set(cap),
- efl_gfx_shape_stroke_join_set(j));
+ efl_gfx_shape_stroke_scale_set(obj, scale),
+ efl_gfx_shape_stroke_color_set(obj, sr, sg, sb, sa),
+ efl_gfx_shape_stroke_width_set(obj, sw),
+ efl_gfx_shape_stroke_location_set(obj, location),
+ efl_gfx_shape_stroke_dash_set(obj, dash, dash_length),
+ efl_gfx_shape_stroke_cap_set(obj, cap),
+ efl_gfx_shape_stroke_join_set(obj, j));
_efl_gfx_shape_path_set(obj, pd, from->commands, from->points);
eo_do(obj,
- eo_event_callback_call(EFL_GFX_PATH_CHANGED, NULL),
- eo_event_callback_call(EFL_GFX_CHANGED, NULL));
+ eo_event_callback_call(obj, EFL_GFX_PATH_CHANGED, NULL),
+ eo_event_callback_call(obj, EFL_GFX_CHANGED, NULL));
}
static void
@@ -480,8 +480,8 @@ _efl_gfx_shape_reset(Eo *obj, Efl_Gfx_Shape_Data *pd)
pd->current_ctrl.y = 0;
eo_do(obj,
- eo_event_callback_call(EFL_GFX_PATH_CHANGED, NULL),
- eo_event_callback_call(EFL_GFX_CHANGED, NULL));
+ eo_event_callback_call(obj, EFL_GFX_PATH_CHANGED, NULL),
+ eo_event_callback_call(obj, EFL_GFX_CHANGED, NULL));
}
static void
@@ -501,8 +501,8 @@ _efl_gfx_shape_append_move_to(Eo *obj, Efl_Gfx_Shape_Data *pd,
pd->current.y = y;
eo_do(obj,
- eo_event_callback_call(EFL_GFX_PATH_CHANGED, NULL),
- eo_event_callback_call(EFL_GFX_CHANGED, NULL));
+ eo_event_callback_call(obj, EFL_GFX_PATH_CHANGED, NULL),
+ eo_event_callback_call(obj, EFL_GFX_CHANGED, NULL));
}
static void
@@ -522,8 +522,8 @@ _efl_gfx_shape_append_line_to(Eo *obj, Efl_Gfx_Shape_Data *pd,
pd->current.y = y;
eo_do(obj,
- eo_event_callback_call(EFL_GFX_PATH_CHANGED, NULL),
- eo_event_callback_call(EFL_GFX_CHANGED, NULL));
+ eo_event_callback_call(obj, EFL_GFX_PATH_CHANGED, NULL),
+ eo_event_callback_call(obj, EFL_GFX_CHANGED, NULL));
}
static void
@@ -551,8 +551,8 @@ _efl_gfx_shape_append_cubic_to(Eo *obj, Efl_Gfx_Shape_Data *pd,
pd->current_ctrl.y = ctrl_y1;
eo_do(obj,
- eo_event_callback_call(EFL_GFX_PATH_CHANGED, NULL),
- eo_event_callback_call(EFL_GFX_CHANGED, NULL));
+ eo_event_callback_call(obj, EFL_GFX_PATH_CHANGED, NULL),
+ eo_event_callback_call(obj, EFL_GFX_CHANGED, NULL));
}
static void
@@ -821,8 +821,8 @@ _efl_gfx_shape_append_close(Eo *obj, Efl_Gfx_Shape_Data *pd)
pd, &offset_point);
eo_do(obj,
- eo_event_callback_call(EFL_GFX_PATH_CHANGED, NULL),
- eo_event_callback_call(EFL_GFX_CHANGED, NULL));
+ eo_event_callback_call(obj, EFL_GFX_PATH_CHANGED, NULL),
+ eo_event_callback_call(obj, EFL_GFX_CHANGED, NULL));
}
static void
diff --git a/src/lib/eio/eio_model.c b/src/lib/eio/eio_model.c
index 5ff288ea0b..0aded48ff3 100644
--- a/src/lib/eio/eio_model.c
+++ b/src/lib/eio/eio_model.c
@@ -51,7 +51,7 @@ _load_set(Eio_Model_Data *priv, Efl_Model_Load_Status status)
if (priv->load.status != load.status)
{
priv->load.status = load.status;
- eo_do(priv->obj, eo_event_callback_call(EFL_MODEL_BASE_EVENT_LOAD_STATUS, &load));
+ eo_do(priv->obj, eo_event_callback_call(priv->obj, EFL_MODEL_BASE_EVENT_LOAD_STATUS, &load));
}
}
@@ -75,7 +75,7 @@ _eio_stat_done_cb(void *data, Eio_File *handler EINA_UNUSED, const Eina_Stat *st
eina_value_set(priv->properties_value[EIO_MODEL_PROP_SIZE], eio_file_size(stat));
evt.changed_properties = priv->properties_name;
- eo_do(priv->obj, eo_event_callback_call(EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, &evt));
+ eo_do(priv->obj, eo_event_callback_call(priv->obj, EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, &evt));
_load_set(priv, EFL_MODEL_LOAD_STATUS_LOADED_PROPERTIES);
@@ -112,7 +112,7 @@ _eio_move_done_cb(void *data, Eio_File *handler EINA_UNUSED)
eina_array_push(properties, _eio_model_prop_names[EIO_MODEL_PROP_FILENAME]);
evt.changed_properties = properties;
- eo_do(priv->obj, eo_event_callback_call(EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, &evt));
+ eo_do(priv->obj, eo_event_callback_call(priv->obj, EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, &evt));
eina_array_free(properties);
}
@@ -147,16 +147,16 @@ _efl_model_evt_added_ecore_cb(void *data EINA_UNUSED, int type EINA_UNUSED, void
Efl_Model_Children_Event cevt;
Eina_Value path;
- cevt.child = eo_add_ref(EIO_MODEL_CLASS, priv->obj, eio_model_path_set(evt->filename));
+ eo_add_ref(cevt.child, EIO_MODEL_CLASS, priv->obj, eio_model_path_set(NULL, evt->filename));
priv->children_list = eina_list_append(priv->children_list, cevt.child);
cevt.index = eina_list_count(priv->children_list);
eina_value_setup(&path, EINA_VALUE_TYPE_STRING);
eina_value_set(&path, evt->filename);
- eo_do(cevt.child, eio_model_children_filter_set(priv->filter_cb, priv->filter_userdata));
+ eo_do(cevt.child, eio_model_children_filter_set(cevt.child, priv->filter_cb, priv->filter_userdata));
eina_value_flush(&path);
- eo_do(priv->obj, eo_event_callback_call(EFL_MODEL_BASE_EVENT_CHILD_ADDED, &cevt));
+ eo_do(priv->obj, eo_event_callback_call(priv->obj, EFL_MODEL_BASE_EVENT_CHILD_ADDED, &cevt));
return EINA_TRUE;
}
@@ -185,7 +185,7 @@ _efl_model_evt_deleted_ecore_cb(void *data EINA_UNUSED, int type EINA_UNUSED, vo
cevt.index = i;
cevt.child = cur->data;
- eo_do(priv->obj, eo_event_callback_call(EFL_MODEL_BASE_EVENT_CHILD_REMOVED, &cevt));
+ eo_do(priv->obj, eo_event_callback_call(priv->obj, EFL_MODEL_BASE_EVENT_CHILD_REMOVED, &cevt));
priv->children_list = eina_list_remove_list(priv->children_list, cur);
eo_unref(cevt.child);
@@ -407,10 +407,10 @@ _eio_main_children_load_cb(void *data, Eio_File *handler EINA_UNUSED, const Eina
Eio_Model_Data *priv = data;
EINA_SAFETY_ON_NULL_RETURN(priv);
- child = eo_add(MY_CLASS, NULL, eio_model_path_set(info->path));
+ eo_add(child, MY_CLASS, NULL, eio_model_path_set(NULL, info->path));
eina_spinlock_take(&priv->filter_lock);
if (priv->filter_cb)
- eo_do(child, eio_model_children_filter_set(priv->filter_cb, priv->filter_userdata));
+ eo_do(child, eio_model_children_filter_set(child, priv->filter_cb, priv->filter_userdata));
eina_spinlock_release(&priv->filter_lock);
priv->children_list = eina_list_append(priv->children_list, child);
@@ -426,7 +426,7 @@ _eio_done_children_load_cb(void *data, Eio_File *handler EINA_UNUSED)
count = eina_list_count(priv->children_list);
_load_set(priv, EFL_MODEL_LOAD_STATUS_LOADED_CHILDREN);
- eo_do(priv->obj, eo_event_callback_call(EFL_MODEL_BASE_EVENT_CHILDREN_COUNT_CHANGED, &count));
+ eo_do(priv->obj, eo_event_callback_call(priv->obj, EFL_MODEL_BASE_EVENT_CHILDREN_COUNT_CHANGED, &count));
}
static void
@@ -523,7 +523,9 @@ _eio_model_children_filter_set(Eo *obj EINA_UNUSED, Eio_Model_Data *priv, Eio_Fi
static Eo *
_eio_model_efl_model_base_child_add(Eo *obj EINA_UNUSED, Eio_Model_Data *priv EINA_UNUSED)
{
- return eo_add(EIO_MODEL_CLASS, obj);
+ Eo* o;
+ eo_add(o, EIO_MODEL_CLASS, obj);
+ return o;
}
static void
@@ -626,7 +628,7 @@ _eio_model_efl_model_base_children_slice_get(Eo *obj EINA_UNUSED, Eio_Model_Data
static Eo *
_eio_model_eo_base_constructor(Eo *obj, Eio_Model_Data *priv)
{
- obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
+ obj = eo_super_eo_constructor( MY_CLASS, obj);
unsigned int i;
priv->obj = obj;
@@ -684,7 +686,7 @@ _eio_model_eo_base_destructor(Eo *obj , Eio_Model_Data *priv)
eo_unref(child);
free(priv->path);
- eo_do_super(obj, MY_CLASS, eo_destructor());
+ eo_super_eo_destructor(MY_CLASS, obj);
}
#include "eio_model.eo.c"
diff --git a/src/lib/emotion/emotion_smart.c b/src/lib/emotion/emotion_smart.c
index ea1130e3fd..acc13ff905 100644
--- a/src/lib/emotion/emotion_smart.c
+++ b/src/lib/emotion/emotion_smart.c
@@ -236,15 +236,15 @@ EAPI Evas_Object *
emotion_object_add(Evas *evas)
{
Evas_Object *e;
- e = eo_add(MY_CLASS, evas);
+ eo_add(e, MY_CLASS, evas);
return e;
}
EOLIAN static Eo *
_emotion_object_eo_base_constructor(Eo *obj, Emotion_Object_Data *pd EINA_UNUSED)
{
- obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
- eo_do(obj, evas_obj_type_set(E_OBJ_NAME));
+ obj = eo_super_eo_constructor( MY_CLASS, obj);
+ eo_do(obj, evas_obj_type_set(obj, E_OBJ_NAME));
return obj;
}
@@ -350,7 +350,7 @@ EAPI Eina_Bool
emotion_object_file_set(Evas_Object *obj, const char *file)
{
Eina_Bool ret;
- return eo_do_ret(obj, ret, efl_file_set(file, NULL));
+ return eo_do_ret(obj, ret, efl_file_set(obj, file, NULL));
}
EOLIAN static Eina_Bool
@@ -413,7 +413,7 @@ EAPI const char *
emotion_object_file_get(const Evas_Object *obj)
{
const char *file = NULL;
- eo_do(obj, efl_file_get(&file, NULL));
+ eo_do(obj, efl_file_get(obj, &file, NULL));
return file;
}
@@ -624,7 +624,7 @@ emotion_object_keep_aspect_get(const Evas_Object *obj)
EAPI void
emotion_object_play_set(Evas_Object *obj, Eina_Bool play)
{
- eo_do(obj, efl_player_play_set(play));
+ eo_do(obj, efl_player_play_set(obj, play));
}
EOLIAN static void
@@ -649,7 +649,7 @@ EAPI Eina_Bool
emotion_object_play_get(const Evas_Object *obj)
{
Eina_Bool ret;
- return eo_do_ret(obj, ret, efl_player_play_get());
+ return eo_do_ret(obj, ret, efl_player_play_get(obj));
}
EOLIAN static Eina_Bool
@@ -662,7 +662,7 @@ _emotion_object_efl_player_play_get(Eo *obj EINA_UNUSED, Emotion_Object_Data *sd
EAPI void
emotion_object_position_set(Evas_Object *obj, double sec)
{
- eo_do(obj, efl_player_position_set(sec));
+ eo_do(obj, efl_player_position_set(obj, sec));
}
EOLIAN static void
@@ -688,7 +688,7 @@ EAPI double
emotion_object_position_get(const Evas_Object *obj)
{
double ret;
- return eo_do_ret(obj, ret, efl_player_position_get());
+ return eo_do_ret(obj, ret, efl_player_position_get(obj));
}
EOLIAN static double
@@ -713,7 +713,7 @@ EAPI Eina_Bool
emotion_object_seekable_get(const Evas_Object *obj)
{
Eina_Bool ret;
- return eo_do_ret(obj, ret, efl_player_seekable_get());
+ return eo_do_ret(obj, ret, efl_player_seekable_get(obj));
}
EAPI Eina_Bool
@@ -740,7 +740,7 @@ EAPI double
emotion_object_play_length_get(const Evas_Object *obj)
{
double ret;
- return eo_do_ret(obj, ret, efl_player_length_get());
+ return eo_do_ret(obj, ret, efl_player_length_get(obj));
}
EAPI void
@@ -749,7 +749,7 @@ emotion_object_size_get(const Evas_Object *obj, int *iw, int *ih)
if (iw) *iw = 0;
if (ih) *ih = 0;
- eo_do(obj, efl_image_load_size_get(iw, ih));
+ eo_do(obj, efl_image_load_size_get(obj, iw, ih));
}
EOLIAN static void
@@ -762,7 +762,7 @@ _emotion_object_efl_image_load_size_get(Eo *obj EINA_UNUSED, Emotion_Object_Data
EAPI void
emotion_object_smooth_scale_set(Evas_Object *obj, Eina_Bool smooth)
{
- eo_do(obj, efl_image_smooth_scale_set(smooth));
+ eo_do(obj, efl_image_smooth_scale_set(obj, smooth));
}
EOLIAN static void
@@ -775,7 +775,7 @@ EAPI Eina_Bool
emotion_object_smooth_scale_get(const Evas_Object *obj)
{
Eina_Bool ret;
- return eo_do_ret(obj, ret, efl_image_smooth_scale_get());
+ return eo_do_ret(obj, ret, efl_image_smooth_scale_get(obj));
}
EOLIAN static Eina_Bool
@@ -788,7 +788,7 @@ EAPI double
emotion_object_ratio_get(const Evas_Object *obj)
{
double ret;
- return eo_do_ret(obj, ret, efl_image_ratio_get());
+ return eo_do_ret(obj, ret, efl_image_ratio_get(obj));
}
EOLIAN static double
@@ -814,7 +814,7 @@ emotion_object_event_simple_send(Evas_Object *obj, Emotion_Event ev)
EAPI void
emotion_object_audio_volume_set(Evas_Object *obj, double vol)
{
- eo_do(obj, efl_player_audio_volume_set(vol));
+ eo_do(obj, efl_player_audio_volume_set(obj, vol));
}
EOLIAN static void
@@ -829,7 +829,7 @@ EAPI double
emotion_object_audio_volume_get(const Evas_Object *obj)
{
double ret;
- return eo_do_ret(obj, ret, efl_player_audio_volume_get());
+ return eo_do_ret(obj, ret, efl_player_audio_volume_get(obj));
}
EOLIAN static double
@@ -842,7 +842,7 @@ _emotion_object_efl_player_audio_volume_get(Eo *obj EINA_UNUSED, Emotion_Object_
EAPI void
emotion_object_audio_mute_set(Evas_Object *obj, Eina_Bool mute)
{
- eo_do(obj, efl_player_audio_mute_set(mute));
+ eo_do(obj, efl_player_audio_mute_set(obj, mute));
}
EOLIAN static void
@@ -857,7 +857,7 @@ EAPI Eina_Bool
emotion_object_audio_mute_get(const Evas_Object *obj)
{
Eina_Bool ret;
- return eo_do_ret(obj, ret, efl_player_audio_mute_get());
+ return eo_do_ret(obj, ret, efl_player_audio_mute_get(obj));
}
EOLIAN static Eina_Bool
@@ -1148,7 +1148,7 @@ EAPI double
emotion_object_progress_status_get(const Evas_Object *obj)
{
double ret;
- return eo_do_ret(obj, ret, efl_player_progress_get());
+ return eo_do_ret(obj, ret, efl_player_progress_get(obj));
}
EOLIAN static double
@@ -1319,7 +1319,7 @@ _eio_load_xattr_done(void *data, Eio_File *handler, double xattr_double)
emotion_object_position_set(evas_object_smart_parent_get(sd->obj), xattr_double);
eo_do(evas_object_smart_parent_get(sd->obj),
- eo_event_callback_call(EMOTION_OBJECT_EVENT_POSITION_LOAD_SUCCEED, NULL));
+ eo_event_callback_call(evas_object_smart_parent_get(sd->obj), EMOTION_OBJECT_EVENT_POSITION_LOAD_SUCCEED, NULL));
_eio_load_xattr_cleanup(sd, handler);
}
@@ -1329,7 +1329,7 @@ _eio_load_xattr_error(void *data, Eio_File *handler, int err EINA_UNUSED)
Emotion_Object_Data *sd = data;
eo_do(evas_object_smart_parent_get(sd->obj),
- eo_event_callback_call(EMOTION_OBJECT_EVENT_POSITION_LOAD_FAILED, NULL));
+ eo_event_callback_call(evas_object_smart_parent_get(sd->obj), EMOTION_OBJECT_EVENT_POSITION_LOAD_FAILED, NULL));
_eio_load_xattr_cleanup(sd, handler);
}
#endif
@@ -1390,7 +1390,7 @@ _eio_save_xattr_done(void *data, Eio_File *handler)
{
Emotion_Object_Data *sd = data;
- eo_do(sd->obj, eo_event_callback_call(EMOTION_OBJECT_EVENT_POSITION_SAVE_SUCCEED, NULL));
+ eo_do(sd->obj, eo_event_callback_call(sd->obj, EMOTION_OBJECT_EVENT_POSITION_SAVE_SUCCEED, NULL));
_eio_save_xattr_cleanup(sd, handler);
}
@@ -1399,7 +1399,7 @@ _eio_save_xattr_error(void *data, Eio_File *handler, int err EINA_UNUSED)
{
Emotion_Object_Data *sd = data;
- eo_do(sd->obj, eo_event_callback_call(EMOTION_OBJECT_EVENT_POSITION_SAVE_FAILED, NULL));
+ eo_do(sd->obj, eo_event_callback_call(sd->obj, EMOTION_OBJECT_EVENT_POSITION_SAVE_FAILED, NULL));
_eio_save_xattr_cleanup(sd, handler);
}
#endif
@@ -1493,7 +1493,7 @@ _emotion_frame_anim(void *data)
_emotion_video_pos_update(obj,
emotion_engine_instance_pos_get(sd->engine_instance),
emotion_engine_instance_len_get(sd->engine_instance));
- eo_do(obj, eo_event_callback_call(EMOTION_OBJECT_EVENT_FRAME_DECODE, NULL));
+ eo_do(obj, eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_FRAME_DECODE, NULL));
return EINA_FALSE;
}
@@ -1518,9 +1518,9 @@ _emotion_video_pos_update(Evas_Object *obj, double pos, double len)
sd->pos = pos;
sd->len = len;
if (npos) eo_do(obj,
- eo_event_callback_call(EMOTION_OBJECT_EVENT_POSITION_UPDATE, NULL));
+ eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_POSITION_UPDATE, NULL));
if (nlen) eo_do(obj,
- eo_event_callback_call(EMOTION_OBJECT_EVENT_LENGTH_CHANGE, NULL));
+ eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_LENGTH_CHANGE, NULL));
}
EAPI void
@@ -1549,7 +1549,7 @@ _emotion_frame_resize(Evas_Object *obj, int w, int h, double ratio)
if (changed)
{
evas_object_size_hint_request_set(obj, w, h);
- eo_do(obj, eo_event_callback_call(EMOTION_OBJECT_EVENT_FRAME_RESIZE, NULL));
+ eo_do(obj, eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_FRAME_RESIZE, NULL));
evas_object_geometry_get(obj, NULL, NULL, &w, &h);
_emotion_object_aspect_border_apply(obj, sd, w, h);
}
@@ -1573,7 +1573,7 @@ _emotion_decode_stop(Evas_Object *obj)
if (sd->play)
{
sd->play = 0;
- eo_do(obj, eo_event_callback_call(EMOTION_OBJECT_EVENT_DECODE_STOP, NULL));
+ eo_do(obj, eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_DECODE_STOP, NULL));
}
}
@@ -1589,26 +1589,26 @@ _emotion_open_done(Evas_Object *obj)
emotion_object_position_set(obj, sd->remember_jump);
if (sd->remember_play != sd->play)
emotion_object_play_set(obj, sd->remember_play);
- eo_do(obj, eo_event_callback_call(EMOTION_OBJECT_EVENT_OPEN_DONE, NULL));
+ eo_do(obj, eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_OPEN_DONE, NULL));
}
EAPI void
_emotion_playback_started(Evas_Object *obj)
{
- eo_do(obj, eo_event_callback_call(EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, NULL));
+ eo_do(obj, eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, NULL));
}
EAPI void
_emotion_playback_finished(Evas_Object *obj)
{
- eo_do(obj, eo_event_callback_call(EMOTION_OBJECT_EVENT_PLAYBACK_FINISHED, NULL));
+ eo_do(obj, eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_PLAYBACK_FINISHED, NULL));
}
EAPI void
_emotion_audio_level_change(Evas_Object *obj)
{
- eo_do(obj, eo_event_callback_call(EMOTION_OBJECT_EVENT_AUDIO_LEVEL_CHANGE, NULL));
+ eo_do(obj, eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_AUDIO_LEVEL_CHANGE, NULL));
}
EAPI void
@@ -1617,7 +1617,7 @@ _emotion_channels_change(Evas_Object *obj)
Emotion_Object_Data *sd;
E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
- eo_do(obj, eo_event_callback_call(EMOTION_OBJECT_EVENT_CHANNELS_CHANGE, NULL));
+ eo_do(obj, eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_CHANNELS_CHANGE, NULL));
}
EAPI void
@@ -1627,7 +1627,7 @@ _emotion_title_set(Evas_Object *obj, char *title)
E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
eina_stringshare_replace(&sd->title, title);
- eo_do(obj, eo_event_callback_call(EMOTION_OBJECT_EVENT_TITLE_CHANGE, NULL));
+ eo_do(obj, eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_TITLE_CHANGE, NULL));
}
@@ -1639,7 +1639,7 @@ _emotion_progress_set(Evas_Object *obj, char *info, double st)
E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
eina_stringshare_replace(&sd->progress.info, info);
sd->progress.stat = st;
- eo_do(obj, eo_event_callback_call(EMOTION_OBJECT_EVENT_PROGRESS_CHANGE, NULL));
+ eo_do(obj, eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_PROGRESS_CHANGE, NULL));
}
EAPI void
@@ -1650,7 +1650,7 @@ _emotion_file_ref_set(Evas_Object *obj, const char *file, int num)
E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
eina_stringshare_replace(&sd->ref.file, file);
sd->ref.num = num;
- eo_do(obj, eo_event_callback_call(EMOTION_OBJECT_EVENT_REF_CHANGE, NULL));
+ eo_do(obj, eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_REF_CHANGE, NULL));
}
EAPI void
@@ -1660,7 +1660,7 @@ _emotion_spu_button_num_set(Evas_Object *obj, int num)
E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
sd->spu.button_num = num;
- eo_do(obj, eo_event_callback_call(EMOTION_OBJECT_EVENT_BUTTON_NUM_CHANGE, NULL));
+ eo_do(obj, eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_BUTTON_NUM_CHANGE, NULL));
}
EAPI void
@@ -1670,7 +1670,7 @@ _emotion_spu_button_set(Evas_Object *obj, int button)
E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
sd->spu.button = button;
- eo_do(obj, eo_event_callback_call(EMOTION_OBJECT_EVENT_BUTTON_CHANGE, NULL));
+ eo_do(obj, eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_BUTTON_CHANGE, NULL));
}
EAPI void
diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h
index 19aba96024..f099f1ee5e 100644
--- a/src/lib/eo/Eo.h
+++ b/src/lib/eo/Eo.h
@@ -112,6 +112,102 @@ typedef struct _Eo_Opaque Eo;
*/
typedef Eo Eo_Class;
+#define HAVE_EO_ID
+typedef uintptr_t Eo_Id;
+typedef struct _Eo_Class _Eo_Class;
+
+typedef void (*eo_op_func_type)(Eo *, void *class_data, va_list *list);
+typedef struct op_type_funcs
+{
+ eo_op_func_type func;
+ const _Eo_Class *src;
+} op_type_funcs;
+
+
+struct _Eo_Header
+{
+#ifndef HAVE_EO_ID
+ EINA_MAGIC
+#endif
+ Eo_Id id;
+};
+typedef struct _Eo_Header Eo_Header;
+
+struct _Eo_Object
+{
+ Eo_Header header;
+ const _Eo_Class *klass;
+#ifdef EO_DEBUG
+ Eina_Inlist *xrefs;
+ Eina_Inlist *data_xrefs;
+#endif
+
+ Eina_List *composite_objects;
+
+ int refcount;
+ int datarefcount;
+
+ Eina_Bool condtor_done:1;
+ Eina_Bool finalized:1;
+
+ Eina_Bool composite:1;
+ Eina_Bool del_triggered:1;
+ Eina_Bool destructed:1;
+ Eina_Bool manual_free:1;
+ ///struct _Eo_Context context;
+};
+typedef struct _Eo_Class_Description Eo_Class_Description;
+typedef struct Eo_Extension_Data_Offset Eo_Extension_Data_Offset;
+typedef struct _Dich_Chain1 Dich_Chain1;
+struct _Eo_Class
+{
+ Eo_Header header;
+
+ const _Eo_Class *parent;
+ const Eo_Class_Description *desc;
+ Dich_Chain1 *chain; /**< The size is chain size */
+
+ const _Eo_Class **extensions;
+
+ Eo_Extension_Data_Offset *extn_data_off;
+
+ const _Eo_Class **mro;
+
+ /* cached object for faster allocation */
+ struct {
+ Eina_Trash *trash;
+ Eina_Spinlock trash_lock;
+ unsigned int trash_count;
+ } objects;
+
+ /* cached iterator for faster allocation cycle */
+ struct {
+ Eina_Trash *trash;
+ Eina_Spinlock trash_lock;
+ unsigned int trash_count;
+ } iterators;
+
+ unsigned int obj_size; /**< size of an object of this class */
+ unsigned int chain_size;
+ unsigned int base_id;
+ unsigned int data_offset; /* < Offset of the data within object data. */
+
+ Eina_Bool constructed : 1;
+ /* [extensions*] + NULL */
+ /* [mro*] + NULL */
+ /* [extensions data offset] + NULL */
+};
+
+ __attribute__ ((visibility("default"))) struct _Eo_Object *_eo_obj_pointer_get(const Eo_Id obj_id);
+ EAPI _Eo_Class * _eo_class_pointer_get(const Eo_Class *klass_id);
+
+struct _Eo_Id_Resolve_Cache
+{
+ int flags;
+ Eo* eoid;
+ struct _Eo_Object* object;
+};
+
/**
* @var _eo_class_creation_lock
* This variable is used for locking purposes in the class_get function
@@ -447,8 +543,15 @@ typedef void (*Eo_Hook_Call)(const Eo_Class *klass_id, const Eo *obj, const char
EAPI extern Eo_Hook_Call eo_hook_call_pre;
EAPI extern Eo_Hook_Call eo_hook_call_post;
+typedef struct op_type_funcs op_type_funcs;
+typedef struct _Eo_Class _Eo_Class;
+typedef struct _Eo_Object _Eo_Object;
+
+EAPI const op_type_funcs *_dich_func_get(const _Eo_Class *klass, Eo_Op op);
+EAPI void *_eo_data_scope_get(const _Eo_Object *obj, const _Eo_Class *klass);
+
// to pass the internal function call to EO_FUNC_BODY (as Func parameter)
-#define EO_FUNC_CALL(...) __VA_ARGS__
+#define EO_FUNC_CALL(...) , __VA_ARGS__
#define EO_HOOK_CALL_PREPARE(Hook, FuncName) \
if (Hook) \
@@ -464,6 +567,89 @@ EAPI extern Eo_Hook_Call eo_hook_call_post;
# define EO_FUNC_COMMON_OP_FUNC(Name) ((const void *) #Name)
#endif
+#define EO_FUNC_VOID_API_DEFINE(Name, Args, ...) \
+ EOAPI void Name(Eo const* ___object, ##__VA_ARGS__); \
+ EOAPI void _eo_impl_##Name(_Eo_Class const* ___klass, Eo* ___oid, _Eo_Object const* ___object, ##__VA_ARGS__) \
+ { \
+ typedef Eo_Base * (*_Eo_func)(Eo*, void *obj_data, ##__VA_ARGS__); \
+ static Eo_Op ___op = EO_NOOP; \
+ if (EINA_UNLIKELY(___op == EO_NOOP)) \
+ { \
+ fprintf(stderr, "%s %s:%d\n", __func__, __FILE__, __LINE__); fflush(stderr); \
+ ___op = _eo_api_op_id_get(EO_FUNC_COMMON_OP_FUNC(Name)); \
+ fprintf(stderr, "%s %s:%d\n", __func__, __FILE__, __LINE__); fflush(stderr); \
+ if (___op == EO_NOOP) return 0; \
+ } \
+ fprintf(stderr, "%s %s:%d\n", __func__, __FILE__, __LINE__); fflush(stderr); \
+ const op_type_funcs *___func = _dich_func_get(___klass, ___op); \
+ fprintf(stderr, "%s %s:%d\n", __func__, __FILE__, __LINE__); fflush(stderr); \
+ fprintf(stderr, "___func %p\n", ___func); fflush(stderr); \
+ fprintf(stderr, "___func->func %p\n", ___func->func);fflush(stderr); \
+ fprintf(stderr, "___func->src %p\n", ___func->src);fflush(stderr); \
+ _Eo_func ___func_ = (_Eo_func) ___func->func; \
+ void* ___data = _eo_data_scope_get(___object, ___func->src); \
+ ___func_((Eo*)___oid, ___data Args); \
+ } \
+ EOAPI void Name(Eo const* ___object, ##__VA_ARGS__) \
+ { \
+ _Eo_Object* ___obj = (_Eo_Object*)_eo_obj_pointer_get((Eo_Id)___object); \
+ if(___obj) { \
+ _eo_impl_##Name(___obj->klass, ___object, ___obj Args); \
+ } \
+ } \
+ EOAPI void eo_super_##Name(Eo_Class const* ___klass, Eo const* ___object, ##__VA_ARGS__) \
+ { \
+ _Eo_Object* ___obj = (_Eo_Object*)_eo_obj_pointer_get((Eo_Id)___object); \
+ if(___obj) { \
+ _Eo_Class* ___kls = (_Eo_Class*)_eo_class_pointer_get((Eo_Id)___klass); \
+ if(___kls) \
+ return _eo_impl_##Name(___kls, ___object, ___obj Args); \
+ } \
+ } \
+
+#define EO_FUNC_API_DEFINE(Name, R, DefRet, Args, ...) \
+ EOAPI R Name(Eo const* ___object, ##__VA_ARGS__); \
+ EOAPI R _eo_impl_##Name(_Eo_Class const* ___klass, Eo* ___oid, _Eo_Object const* ___object, ##__VA_ARGS__) \
+ { \
+ typedef Eo_Base * (*_Eo_func)(Eo*, void *obj_data, ##__VA_ARGS__); \
+ static Eo_Op ___op = EO_NOOP; \
+ if (EINA_UNLIKELY(___op == EO_NOOP)) \
+ { \
+ fprintf(stderr, "%s %s:%d\n", __func__, __FILE__, __LINE__); fflush(stderr); \
+ ___op = _eo_api_op_id_get(EO_FUNC_COMMON_OP_FUNC(Name)); \
+ fprintf(stderr, "%s %s:%d\n", __func__, __FILE__, __LINE__); fflush(stderr); \
+ if (___op == EO_NOOP) return 0; \
+ } \
+ fprintf(stderr, "%s %s:%d\n", __func__, __FILE__, __LINE__); fflush(stderr); \
+ const op_type_funcs *___func = _dich_func_get(___klass, ___op); \
+ fprintf(stderr, "%s %s:%d\n", __func__, __FILE__, __LINE__); fflush(stderr); \
+ fprintf(stderr, "___func %p\n", ___func); fflush(stderr); \
+ fprintf(stderr, "___func->func %p\n", ___func->func);fflush(stderr); \
+ fprintf(stderr, "___func->src %p\n", ___func->src);fflush(stderr); \
+ _Eo_func ___func_ = (_Eo_func) ___func->func; \
+ void* ___data = _eo_data_scope_get(___object, ___func->src); \
+ R _ret; \
+ _ret = ___func_((Eo*)___oid, ___data Args); \
+ return _ret; \
+ } \
+ EOAPI R Name(Eo const* ___object, ##__VA_ARGS__) \
+ { \
+ _Eo_Object* ___obj = (_Eo_Object*)_eo_obj_pointer_get((Eo_Id)___object); \
+ if(___obj) { \
+ return _eo_impl_##Name(___obj->klass, ___object, ___obj Args); \
+ } \
+ } \
+ EOAPI R eo_super_##Name(Eo_Class const* ___klass, Eo const* ___object, ##__VA_ARGS__) \
+ { \
+ _Eo_Object* ___obj = (_Eo_Object*)_eo_obj_pointer_get((Eo_Id)___object); \
+ if(___obj) { \
+ _Eo_Class* ___kls = (_Eo_Class*)_eo_class_pointer_get((Eo_Id)___klass); \
+ if(___kls) \
+ return _eo_impl_##Name(___kls, ___object, ___obj Args); \
+ } \
+ } \
+
+
// cache OP id, get real fct and object data then do the call
#define EO_FUNC_COMMON_OP(Name, DefRet) \
Eo_Op_Call_Data ___call; \
@@ -543,13 +729,13 @@ EAPI Eo_Op _eo_api_op_id_get(const void *api_func);
EAPI Eina_Bool _eo_call_resolve(const char *func_name, const Eo_Op op, Eo_Op_Call_Data *call, const char *file, int line);
// start of eo_do barrier, gets the object pointer and ref it, put it on the stask
- EAPI Eina_Bool _eo_do_start(const Eo *obj, const Eo_Class *cur_klass, Eina_Bool is_super, void *eo_stack);
+EAPI Eo* _eo_do_start(const Eo *obj, const Eo_Class *cur_klass, Eina_Bool is_super, void *eo_stack);
// end of the eo_do barrier, unref the obj, move the stack pointer
EAPI void _eo_do_end(void *eo_stack);
// end of the eo_add. Calls finalize among others
-EAPI Eo * _eo_add_end(void *eo_stack);
+EAPI Eo * _eo_add_end(Eo* obj_id, void *eo_stack, int x);
// XXX: We cheat and make it const to indicate to the compiler that the value never changes
EAPI EINA_CONST void *_eo_stack_get(void);
@@ -558,35 +744,48 @@ EAPI EINA_CONST void *_eo_stack_get(void);
#define _eo_do_common(eoid, clsid, is_super, ...) \
do { \
+ fprintf(stderr, "do super %s %s:%d\n", __func__, __FILE__, __LINE__); fflush(stderr); \
_eo_do_start(eoid, clsid, is_super, _eo_stack_get()); \
+ fprintf(stderr, "do super %s %s:%d\n", __func__, __FILE__, __LINE__); fflush(stderr); \
__VA_ARGS__; \
+ fprintf(stderr, "do super %s %s:%d\n", __func__, __FILE__, __LINE__); fflush(stderr); \
_eo_do_end(_eo_stack_get()); \
+ fprintf(stderr, "do super %s %s:%d\n", __func__, __FILE__, __LINE__); fflush(stderr); \
} while (0)
#define _eo_do_common_ret(eoid, clsid, is_super, ret_tmp, func) \
( \
+ fprintf(stderr, "do super %s %s:%d\n", __func__, __FILE__, __LINE__), fflush(stderr), \
_eo_do_start(eoid, clsid, is_super, _eo_stack_get()), \
+ fprintf(stderr, "do super %s %s:%d\n", __func__, __FILE__, __LINE__), fflush(stderr), \
ret_tmp = func, \
+ fprintf(stderr, "do super %s %s:%d\n", __func__, __FILE__, __LINE__), fflush(stderr), \
_eo_do_end(_eo_stack_get()), \
+ fprintf(stderr, "do super %s %s:%d\n", __func__, __FILE__, __LINE__), fflush(stderr), \
ret_tmp \
)
-#define eo_do(eoid, ...) _eo_do_common(eoid, NULL, EINA_FALSE, __VA_ARGS__)
+//#define eo_do(eoid, ...) _eo_do_common(eoid, NULL, EINA_FALSE, __VA_ARGS__)
-#define eo_do_super(eoid, clsid, func) _eo_do_common(eoid, clsid, EINA_TRUE, func)
+#define eo_do(eoid, ...) do { __VA_ARGS__; } while(0)
-#define eo_do_ret(eoid, ret_tmp, func) _eo_do_common_ret(eoid, NULL, EINA_FALSE, ret_tmp, func)
+ //#define eo_do_super(eoid, clsid, func) _eo_do_common(eoid, clsid, EINA_TRUE, func)
-#define eo_do_super_ret(eoid, clsid, ret_tmp, func) _eo_do_common_ret(eoid, clsid, EINA_TRUE, ret_tmp, func)
+ //#define eo_do_ret(eoid, ret_tmp, func) _eo_do_common_ret(eoid, NULL, EINA_FALSE, ret_tmp, func)
-#define eo_do_part(eoid, part_func, ...) \
+#define eo_do_ret(eoid, ret_tmp, func) \
+ (ret_tmp = (func))
+
+ //#define eo_do_super_ret(eoid, clsid, ret_tmp, func) _eo_do_common_ret(eoid, clsid, EINA_TRUE, ret_tmp, func)
+ /*
+#define eo_do_part(eoid, part_func, ...) \
do { \
Eo *__eo_part = eoid; \
eo_do(eoid, __eo_part = part_func); \
eo_do(__eo_part, __VA_ARGS__); \
} while (0)
-
+ */
/*****************************************************************************/
/**
@@ -597,15 +796,28 @@ EAPI EINA_CONST void *_eo_stack_get(void);
* @see eo_class_name_get()
*/
EAPI const Eo_Class *eo_class_get(const Eo *obj);
-
-#define _eo_add_common(klass, parent, is_ref, ...) \
- ( \
- _eo_do_start(_eo_add_internal_start(__FILE__, __LINE__, klass, parent, is_ref), \
- klass, EINA_FALSE, _eo_stack_get()) \
- , ##__VA_ARGS__, \
- (Eo *) _eo_add_end(_eo_stack_get()) \
- )
-
+ /*
+ #define _eo_add_common(klass, parent, is_ref, ...) \
+ ( \
+ (Eo *) _eo_add_end \
+ ( \
+ _eo_do_start(_eo_add_internal_start(__FILE__, __LINE__, klass, parent, is_ref), \
+ klass, EINA_FALSE, _eo_stack_get()) \
+ , _eo_stack_get() \
+ , (0, ##__VA_ARGS__ , 0)))
+ */
+#define _eo_add_common(obj, klass, parent, is_ref, ...) \
+ do { \
+ obj = _eo_add_internal_start(__FILE__, __LINE__, klass, parent, is_ref); \
+ fprintf(stderr, "eo1: %p\n", obj); fflush(stderr); \
+ obj = _eo_do_start(obj, klass, EINA_FALSE, _eo_stack_get()); \
+ fprintf(stderr, "eo2: %p\n", obj); fflush(stderr); \
+ {__VA_ARGS__;} \
+ fprintf(stderr, "eo3: %p\n", obj); fflush(stderr); \
+ obj = _eo_add_end(obj, _eo_stack_get(), 0); \
+ fprintf(stderr, "eo4: %p\n", obj); fflush(stderr); \
+ } while(0)
+
/**
* @def eo_add
* @brief Create a new object and call its constructor(If it exits).
@@ -625,7 +837,7 @@ EAPI const Eo_Class *eo_class_get(const Eo *obj);
* @param ... The ops to run.
* @return An handle to the new object on success, NULL otherwise.
*/
-#define eo_add(klass, parent, ...) _eo_add_common(klass, parent, EINA_FALSE, ##__VA_ARGS__)
+#define eo_add(obj, klass, parent, ...) _eo_add_common(obj, klass, parent, EINA_FALSE, ##__VA_ARGS__)
/**
* @def eo_add_ref
@@ -642,9 +854,11 @@ EAPI const Eo_Class *eo_class_get(const Eo *obj);
* @param ... The ops to run.
* @return An handle to the new object on success, NULL otherwise.
*/
-#define eo_add_ref(klass, parent, ...) _eo_add_common(klass, parent, EINA_TRUE, ##__VA_ARGS__)
+#define eo_add_ref(obj, klass, parent, ...) _eo_add_common(obj, klass, parent, EINA_TRUE, ##__VA_ARGS__)
EAPI Eo * _eo_add_internal_start(const char *file, int line, const Eo_Class *klass_id, Eo *parent, Eina_Bool ref);
+struct _Eo_Call_Stack;
+EAPI Eo * _eo_add_internal_end(Eo *eo_id, struct _Eo_Call_Stack *stack);
/**
* @brief Get a pointer to the data of an object for a specific class.
@@ -902,7 +1116,7 @@ typedef void (*eo_key_data_free_func)(void *);
*/
#define eo_weak_unref(wref) \
do { \
- if (*wref) eo_do(*wref, eo_wref_del(wref)); \
+ if (*wref) eo_do(*wref, eo_wref_del(*wref, wref)); \
} while (0)
/**
@@ -993,8 +1207,8 @@ EAPI const Eo_Event_Description *eo_base_legacy_only_event_description_get(const
*
* @see eo_event_callback_priority_add()
*/
-#define eo_event_callback_add(desc, cb, data) \
- eo_event_callback_priority_add(desc, \
+#define eo_event_callback_add(obj, desc, cb, data) \
+ eo_event_callback_priority_add(obj, desc, \
EO_CALLBACK_PRIORITY_DEFAULT, cb, data)
/**
@@ -1007,8 +1221,8 @@ EAPI const Eo_Event_Description *eo_base_legacy_only_event_description_get(const
*
* @see eo_event_callback_array_priority_add()
*/
-#define eo_event_callback_array_add(array, data) \
- eo_event_callback_array_priority_add(array, \
+#define eo_event_callback_array_add(obj, array, data) \
+ eo_event_callback_array_priority_add(obj, array, \
EO_CALLBACK_PRIORITY_DEFAULT, data)
/**
diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c
index ee72b742e6..8f543518de 100644
--- a/src/lib/eo/eo.c
+++ b/src/lib/eo/eo.c
@@ -19,7 +19,7 @@
/* Used inside the class_get functions of classes, see #EO_DEFINE_CLASS */
EAPI Eina_Spinlock _eo_class_creation_lock;
-int _eo_log_dom = -1;
+__attribute__ ((visibility("default"))) int _eo_log_dom = -1;
static _Eo_Class **_eo_classes;
static Eo_Id _eo_classes_last_id;
@@ -32,7 +32,7 @@ static size_t _eo_sz = 0;
static size_t _eo_class_sz = 0;
static void _eo_condtor_reset(_Eo_Object *obj);
-static inline void *_eo_data_scope_get(const _Eo_Object *obj, const _Eo_Class *klass);
+/* static inline void *_eo_data_scope_get(const _Eo_Object *obj, const _Eo_Class *klass); */
static inline void *_eo_data_xref_internal(const char *file, int line, _Eo_Object *obj, const _Eo_Class *klass, const _Eo_Object *ref_obj);
static inline void _eo_data_xunref_internal(_Eo_Object *obj, void *data, const _Eo_Object *ref_obj);
@@ -90,7 +90,7 @@ _dich_copy_all(_Eo_Class *dst, const _Eo_Class *src)
}
}
-static inline const op_type_funcs *
+EAPI const op_type_funcs *
_dich_func_get(const _Eo_Class *klass, Eo_Op op)
{
size_t idx1 = DICH_CHAIN1(op);
@@ -186,7 +186,7 @@ _eo_is_a_class(const Eo *eo_id)
return !!(oid & MASK_CLASS_TAG);
}
-static inline _Eo_Class *
+EAPI _Eo_Class *
_eo_class_pointer_get(const Eo_Class *klass_id)
{
#ifdef HAVE_EO_ID
@@ -473,10 +473,9 @@ _eo_do_internal(const Eo *eo_id, const Eo_Class *cur_klass_id,
return EINA_TRUE;
}
-EAPI Eina_Bool
+EAPI Eo*
_eo_do_start(const Eo *eo_id, const Eo_Class *cur_klass_id, Eina_Bool is_super, void *eo_stack)
{
- Eina_Bool ret = EINA_TRUE;
Eo_Stack_Frame *fptr;
Eo_Call_Stack *stack = eo_stack;
@@ -492,12 +491,12 @@ _eo_do_start(const Eo *eo_id, const Eo_Class *cur_klass_id, Eina_Bool is_super,
fptr->o.obj = NULL;
fptr->cur_klass = NULL;
- ret = EINA_FALSE;
+ return NULL;
}
stack->frame_ptr++;
- return ret;
+ return eo_id;
}
EAPI void
@@ -832,20 +831,20 @@ _eo_add_internal_start(const char *file, int line, const Eo_Class *klass_id, Eo
_eo_ref(obj);
- eo_do(eo_id, eo_parent_set(parent_id));
+ eo_do(eo_id, eo_parent_set(eo_id, parent_id));
/* If there's a parent. Ref. Eo_add should return an object with either a
* parent ref, or with the lack of, just a ref. */
{
Eo *parent_tmp;
- if (ref && eo_do_ret(eo_id, parent_tmp, eo_parent_get()))
+ if (ref && eo_do_ret(eo_id, parent_tmp, eo_parent_get(eo_id)))
{
_eo_ref(obj);
}
}
/* eo_id can change here. Freeing is done on the resolved object. */
- eo_do(eo_id, eo_id = eo_constructor());
+ eo_do(eo_id, eo_id = eo_constructor(eo_id));
if (!eo_id)
{
ERR("Object of class '%s' - Error while constructing object",
@@ -858,7 +857,7 @@ _eo_add_internal_start(const char *file, int line, const Eo_Class *klass_id, Eo
return eo_id;
}
-static Eo *
+EAPI Eo *
_eo_add_internal_end(Eo *eo_id, Eo_Call_Stack *stack)
{
Eo_Stack_Frame *fptr;
@@ -909,11 +908,20 @@ cleanup:
}
EAPI Eo *
-_eo_add_end(void *eo_stack)
-{
- Eo *ret = eo_finalize();
- ret = _eo_add_internal_end(ret, eo_stack);
- _eo_do_end(eo_stack);
+_eo_add_end(Eo* obj_id, void *eo_stack, int x)
+{
+ Eo* ret = NULL;
+ if(obj_id)
+ {
+ fprintf(stderr, "%s %s:%d\n", __func__, __FILE__, __LINE__); fflush(stderr);
+ ret = eo_finalize(obj_id);
+ fprintf(stderr, "%s %s:%d\n", __func__, __FILE__, __LINE__); fflush(stderr);
+ ret = _eo_add_internal_end(ret, eo_stack);
+ fprintf(stderr, "%s %s:%d\n", __func__, __FILE__, __LINE__); fflush(stderr);
+ _eo_do_end(eo_stack);
+ }
+ fprintf(stderr, "%s %s:%d\n", __func__, __FILE__, __LINE__); fflush(stderr);
+ fprintf(stderr, "%s %s:%d\n", __func__, __FILE__, __LINE__); fflush(stderr);
return ret;
}
@@ -1190,6 +1198,7 @@ eo_class_new(const Eo_Class_Description *desc, const Eo_Class *parent_id, ...)
/* Build class extensions list */
{
DBG("Started building extensions list for class '%s'", desc->name);
+ fprintf(stderr, "Started building extensions list for class '%s'\n", desc->name); fflush(stderr);
extn_list = NULL;
const _Eo_Class *extn = NULL;
const Eo_Id *extn_id = NULL;
@@ -1220,6 +1229,7 @@ eo_class_new(const Eo_Class_Description *desc, const Eo_Class *parent_id, ...)
extn_sz = sizeof(_Eo_Class *) * (eina_list_count(extn_list) + 1);
DBG("Finished building extensions list for class '%s'", desc->name);
+ fprintf(stderr, "Finished building extensions list for class '%s'\n", desc->name); fflush(stderr);
}
/* Prepare mro list */
@@ -1244,6 +1254,7 @@ eo_class_new(const Eo_Class_Description *desc, const Eo_Class *parent_id, ...)
const _Eo_Class *kls_itr;
DBG("Started building Mixins list for class '%s'", desc->name);
+ fprintf(stderr, "Started building Mixins list for class '%s'\n", desc->name); fflush(stderr);
mixins = NULL;
EINA_LIST_FOREACH(mro, itr, kls_itr)
@@ -1258,6 +1269,7 @@ eo_class_new(const Eo_Class_Description *desc, const Eo_Class *parent_id, ...)
mixins_sz += sizeof(Eo_Extension_Data_Offset);
DBG("Finished building Mixins list for class '%s'", desc->name);
+ fprintf(stderr, "Finished building Mixins list for class '%s'\n", desc->name); fflush(stderr);
}
klass = calloc(1, _eo_class_sz + extn_sz + mro_sz + mixins_sz);
@@ -1297,6 +1309,7 @@ eo_class_new(const Eo_Class_Description *desc, const Eo_Class *parent_id, ...)
*(extn_itr++) = extn;
DBG("Added '%s' extension", extn->desc->name);
+ fprintf(stderr, "Added '%s' extension\n", extn->desc->name); fflush(stderr);
}
*(extn_itr) = NULL;
}
@@ -1310,6 +1323,7 @@ eo_class_new(const Eo_Class_Description *desc, const Eo_Class *parent_id, ...)
*(mro_itr++) = kls_itr;
DBG("Added '%s' to MRO", kls_itr->desc->name);
+ fprintf(stderr, "Added '%s' to MRO\n", kls_itr->desc->name); fflush(stderr);
}
*(mro_itr) = NULL;
}
@@ -1331,6 +1345,7 @@ eo_class_new(const Eo_Class_Description *desc, const Eo_Class *parent_id, ...)
extn_data_itr++;
DBG("Added '%s' to Data Offset info", kls_itr->desc->name);
+ fprintf(stderr, "Added '%s' to Data Offset info\n", kls_itr->desc->name);
}
extn_data_itr->klass = 0;
extn_data_itr->offset = 0;
@@ -1410,6 +1425,7 @@ eo_class_new(const Eo_Class_Description *desc, const Eo_Class *parent_id, ...)
_eo_class_constructor(klass);
DBG("Finished building class '%s'", klass->desc->name);
+ fprintf(stderr, "Finished building class '%s'\n", klass->desc->name); fflush(stderr);
return _eo_class_id_get(klass);
}
@@ -1499,13 +1515,18 @@ EAPI void
eo_del(const Eo *obj)
{
Eo *parent_tmp;
- if (eo_do_ret(obj, parent_tmp, eo_parent_get()))
+ fprintf(stderr, "%s %s:%d\n", __func__, __FILE__, __LINE__); fflush(stderr);
+ if (eo_do_ret(obj, parent_tmp, eo_parent_get(obj)))
{
- eo_do(obj, eo_parent_set(NULL));
+ fprintf(stderr, "%s %s:%d\n", __func__, __FILE__, __LINE__); fflush(stderr);
+ eo_do(obj, eo_parent_set(obj, NULL));
+ fprintf(stderr, "%s %s:%d\n", __func__, __FILE__, __LINE__); fflush(stderr);
}
else
{
+ fprintf(stderr, "%s %s:%d\n", __func__, __FILE__, __LINE__); fflush(stderr);
eo_unref(obj);
+ fprintf(stderr, "%s %s:%d\n", __func__, __FILE__, __LINE__); fflush(stderr);
}
}
@@ -1541,7 +1562,7 @@ _eo_data_scope_safe_get(const _Eo_Object *obj, const _Eo_Class *klass)
return NULL;
}
-static inline void *
+EAPI void *
_eo_data_scope_get(const _Eo_Object *obj, const _Eo_Class *klass)
{
if (EINA_LIKELY(klass->desc->type != EO_CLASS_TYPE_MIXIN))
@@ -1871,3 +1892,44 @@ eo_manual_free(Eo *obj_id)
return EINA_TRUE;
}
+__attribute__ ((visibility("default"))) _Eo_Object *
+_eo_obj_pointer_get(const Eo_Id obj_id)
+{
+#ifdef HAVE_EO_ID
+ _Eo_Id_Entry *entry;
+ Generation_Counter generation;
+ Table_Index mid_table_id, table_id, entry_id;
+
+ // NULL objects will just be sensibly ignored. not worth complaining
+ // every single time.
+ if (!obj_id)
+ {
+ DBG("obj_id is NULL. Possibly unintended access?");
+ return NULL;
+ }
+ else if (!(obj_id & MASK_OBJ_TAG))
+ {
+ DBG("obj_id is not a valid object id.");
+ return NULL;
+ }
+
+ EO_DECOMPOSE_ID(obj_id, mid_table_id, table_id, entry_id, generation);
+
+ /* Check the validity of the entry */
+ if (_eo_ids_tables[mid_table_id] && TABLE_FROM_IDS)
+ {
+ entry = &(TABLE_FROM_IDS->entries[entry_id]);
+ if (entry && entry->active && (entry->generation == generation))
+ return entry->ptr;
+ }
+
+ ERR("obj_id %p is not pointing to a valid object. Maybe it has already been freed.",
+ (void *)obj_id);
+
+ return NULL;
+#else
+ return (_Eo_Object *) obj_id;
+#endif
+
+}
+
diff --git a/src/lib/eo/eo_base_class.c b/src/lib/eo/eo_base_class.c
index f99ca37289..e763300945 100644
--- a/src/lib/eo/eo_base_class.c
+++ b/src/lib/eo/eo_base_class.c
@@ -66,7 +66,7 @@ _eo_base_key_data_set(Eo *obj, Eo_Base_Data *pd,
if (!key) return;
- eo_do(obj, eo_key_data_del(key); );
+ eo_do(obj, eo_key_data_del(obj, key); );
node = malloc(sizeof(Eo_Generic_Data_Node));
if (!node) return;
@@ -103,9 +103,9 @@ _eo_base_parent_set(Eo *obj, Eo_Base_Data *pd, Eo *parent_id)
if (pd->parent == parent_id)
return;
- if (eo_do_ret(obj, tmp, eo_composite_part_is()) && pd->parent)
+ if (eo_do_ret(obj, tmp, eo_composite_part_is(obj)) && pd->parent)
{
- eo_do(pd->parent, eo_composite_detach(obj));
+ eo_do(pd->parent, eo_composite_detach(pd->parent, obj));
}
if (pd->parent)
@@ -574,7 +574,7 @@ _eo_base_event_callback_priority_add(Eo *obj, Eo_Base_Data *pd,
{
const Eo_Callback_Array_Item arr[] = { {desc, func}, {NULL, NULL}};
- eo_do(obj, eo_event_callback_call(EO_EV_CALLBACK_ADD, (void *)arr));
+ eo_do(obj, eo_event_callback_call(obj, EO_EV_CALLBACK_ADD, (void *)arr));
}
}
@@ -596,7 +596,7 @@ _eo_base_event_callback_del(Eo *obj, Eo_Base_Data *pd,
cb->delete_me = EINA_TRUE;
pd->deletions_waiting = EINA_TRUE;
_eo_callbacks_clear(pd);
- eo_do(obj, eo_event_callback_call(EO_EV_CALLBACK_DEL, (void *)arr); );
+ eo_do(obj, eo_event_callback_call(obj, EO_EV_CALLBACK_DEL, (void *)arr); );
return;
}
}
@@ -621,7 +621,7 @@ _eo_base_event_callback_array_priority_add(Eo *obj, Eo_Base_Data *pd,
_eo_callbacks_sorted_insert(pd, cb);
{
- eo_do(obj, eo_event_callback_call(EO_EV_CALLBACK_ADD, (void *)array); );
+ eo_do(obj, eo_event_callback_call(obj, EO_EV_CALLBACK_ADD, (void *)array); );
}
}
@@ -641,7 +641,7 @@ _eo_base_event_callback_array_del(Eo *obj, Eo_Base_Data *pd,
pd->deletions_waiting = EINA_TRUE;
_eo_callbacks_clear(pd);
- eo_do(obj, eo_event_callback_call(EO_EV_CALLBACK_DEL, (void *)array); );
+ eo_do(obj, eo_event_callback_call(obj, EO_EV_CALLBACK_DEL, (void *)array); );
return;
}
}
@@ -729,7 +729,7 @@ _eo_event_forwarder_callback(void *data, Eo *obj, const Eo_Event_Description *de
Eo *new_obj = (Eo *) data;
Eina_Bool ret = EINA_FALSE;
- eo_do(new_obj, ret = eo_event_callback_call(desc, (void *)event_info); );
+ eo_do(new_obj, ret = eo_event_callback_call(new_obj, desc, (void *)event_info); );
return ret;
}
@@ -743,7 +743,7 @@ _eo_base_event_callback_forwarder_add(Eo *obj, Eo_Base_Data *pd EINA_UNUSED,
/* FIXME: Add it EO_MAGIC_RETURN(new_obj, EO_EINA_MAGIC); */
- eo_do(obj, eo_event_callback_add(desc, _eo_event_forwarder_callback, new_obj); );
+ eo_do(obj, eo_event_callback_add(obj, desc, _eo_event_forwarder_callback, new_obj); );
}
EOLIAN static void
@@ -754,7 +754,7 @@ _eo_base_event_callback_forwarder_del(Eo *obj, Eo_Base_Data *pd EINA_UNUSED,
/* FIXME: Add it EO_MAGIC_RETURN(new_obj, EO_EINA_MAGIC); */
- eo_do(obj, eo_event_callback_del(desc, _eo_event_forwarder_callback, new_obj); );
+ eo_do(obj, eo_event_callback_del(obj, desc, _eo_event_forwarder_callback, new_obj); );
}
EOLIAN static void
@@ -829,7 +829,7 @@ _eo_base_composite_attach(Eo *parent_id, Eo_Base_Data *pd EINA_UNUSED, Eo *comp_
comp_obj->composite = EINA_TRUE;
parent->composite_objects = eina_list_prepend(parent->composite_objects, comp_obj_id);
- eo_do(comp_obj_id, eo_parent_set(parent_id));
+ eo_do(comp_obj_id, eo_parent_set(comp_obj_id, parent_id));
return EINA_TRUE;
}
@@ -845,7 +845,7 @@ _eo_base_composite_detach(Eo *parent_id, Eo_Base_Data *pd EINA_UNUSED, Eo *comp_
comp_obj->composite = EINA_FALSE;
parent->composite_objects = eina_list_remove(parent->composite_objects, comp_obj_id);
- eo_do(comp_obj_id, eo_parent_set(NULL));
+ eo_do(comp_obj_id, eo_parent_set(comp_obj_id, NULL));
return EINA_TRUE;
}
@@ -981,14 +981,14 @@ _eo_base_destructor(Eo *obj, Eo_Base_Data *pd)
while (pd->children)
{
child = eina_list_data_get(pd->children);
- eo_do(child, eo_parent_set(NULL));
+ eo_do(child, eo_parent_set(child, NULL));
}
if (pd->parent)
{
ERR("Object '%p' still has a parent at the time of destruction.", obj);
eo_ref(obj);
- eo_do(obj, eo_parent_set(NULL));
+ eo_do(obj, eo_parent_set(obj, NULL));
}
_eo_generic_data_del_all(pd);
diff --git a/src/lib/eo/eo_private.h b/src/lib/eo/eo_private.h
index 135966daf6..ea78f04527 100644
--- a/src/lib/eo/eo_private.h
+++ b/src/lib/eo/eo_private.h
@@ -32,7 +32,7 @@
} while (0)
-extern int _eo_log_dom;
+__attribute__ ((visibility("default"))) extern int _eo_log_dom;
#ifdef CRI
#undef CRI
@@ -65,7 +65,7 @@ typedef struct _Eo_Object _Eo_Object;
typedef struct _Eo_Header Eo_Header;
/* Retrieves the pointer to the object from the id */
-static inline _Eo_Object *_eo_obj_pointer_get(const Eo_Id obj_id);
+//EAPI _Eo_Object *_eo_obj_pointer_get(const Eo_Id obj_id);
/* Allocates an entry for the given object */
static inline Eo_Id _eo_id_allocate(const _Eo_Object *obj);
@@ -78,97 +78,60 @@ static inline void _eo_free_ids_tables(void);
void _eo_condtor_done(Eo *obj);
-struct _Eo_Header
-{
-#ifndef HAVE_EO_ID
- EINA_MAGIC
-#endif
- Eo_Id id;
-};
-
-struct _Eo_Object
-{
- Eo_Header header;
- const _Eo_Class *klass;
-#ifdef EO_DEBUG
- Eina_Inlist *xrefs;
- Eina_Inlist *data_xrefs;
-#endif
-
- Eina_List *composite_objects;
-
- int refcount;
- int datarefcount;
-
- Eina_Bool condtor_done:1;
- Eina_Bool finalized:1;
-
- Eina_Bool composite:1;
- Eina_Bool del_triggered:1;
- Eina_Bool destructed:1;
- Eina_Bool manual_free:1;
-};
-
/* FIXME: Change the type to something generic that makes sense for eo */
typedef void (*eo_op_func_type)(Eo *, void *class_data, va_list *list);
typedef struct _Dich_Chain1 Dich_Chain1;
-typedef struct
-{
- eo_op_func_type func;
- const _Eo_Class *src;
-} op_type_funcs;
-
struct _Dich_Chain1
{
op_type_funcs *funcs;
};
-typedef struct
+typedef struct Eo_Extension_Data_Offset
{
const _Eo_Class *klass;
size_t offset;
} Eo_Extension_Data_Offset;
-struct _Eo_Class
-{
- Eo_Header header;
+struct _Eo_Class;
+// {
+// Eo_Header header;
- const _Eo_Class *parent;
- const Eo_Class_Description *desc;
- Dich_Chain1 *chain; /**< The size is chain size */
+// const _Eo_Class *parent;
+// const Eo_Class_Description *desc;
+// Dich_Chain1 *chain; /**< The size is chain size */
- const _Eo_Class **extensions;
+// const _Eo_Class **extensions;
- Eo_Extension_Data_Offset *extn_data_off;
+// Eo_Extension_Data_Offset *extn_data_off;
- const _Eo_Class **mro;
+// const _Eo_Class **mro;
- /* cached object for faster allocation */
- struct {
- Eina_Trash *trash;
- Eina_Spinlock trash_lock;
- unsigned int trash_count;
- } objects;
+// /* cached object for faster allocation */
+// struct {
+// Eina_Trash *trash;
+// Eina_Spinlock trash_lock;
+// unsigned int trash_count;
+// } objects;
- /* cached iterator for faster allocation cycle */
- struct {
- Eina_Trash *trash;
- Eina_Spinlock trash_lock;
- unsigned int trash_count;
- } iterators;
+// /* cached iterator for faster allocation cycle */
+// struct {
+// Eina_Trash *trash;
+// Eina_Spinlock trash_lock;
+// unsigned int trash_count;
+// } iterators;
- unsigned int obj_size; /**< size of an object of this class */
- unsigned int chain_size;
- unsigned int base_id;
- unsigned int data_offset; /* < Offset of the data within object data. */
+// unsigned int obj_size; /**< size of an object of this class */
+// unsigned int chain_size;
+// unsigned int base_id;
+// unsigned int data_offset; /* < Offset of the data within object data. */
- Eina_Bool constructed : 1;
- /* [extensions*] + NULL */
- /* [mro*] + NULL */
- /* [extensions data offset] + NULL */
-};
+// Eina_Bool constructed : 1;
+// /* [extensions*] + NULL */
+// /* [mro*] + NULL */
+// /* [extensions data offset] + NULL */
+// };
typedef struct
{
@@ -214,11 +177,11 @@ _eo_del_internal(const char *file, int line, _Eo_Object *obj)
const _Eo_Class *klass = obj->klass;
- eo_do(_eo_id_get(obj), eo_event_callback_call(EO_EV_DEL, NULL));
+ eo_do(_eo_id_get(obj), eo_event_callback_call(_eo_id_get(obj), EO_EV_DEL, NULL));
_eo_condtor_reset(obj);
- eo_do(_eo_id_get(obj), eo_destructor());
+ eo_do(_eo_id_get(obj), eo_destructor(_eo_id_get(obj)));
if (!obj->condtor_done)
{
@@ -232,7 +195,7 @@ _eo_del_internal(const char *file, int line, _Eo_Object *obj)
Eo *emb_obj;
EINA_LIST_FOREACH_SAFE(obj->composite_objects, itr, itr_n, emb_obj)
{
- eo_do(_eo_id_get(obj), eo_composite_detach(emb_obj));
+ eo_do(_eo_id_get(obj), eo_composite_detach(_eo_id_get(obj), emb_obj));
}
}
diff --git a/src/lib/eo/eo_ptr_indirection.c b/src/lib/eo/eo_ptr_indirection.c
index ee559014f3..e5a9238f4b 100644
--- a/src/lib/eo/eo_ptr_indirection.c
+++ b/src/lib/eo/eo_ptr_indirection.c
@@ -5,7 +5,7 @@
#include "eo_ptr_indirection.h"
/* Tables handling pointers indirection */
-_Eo_Ids_Table **_eo_ids_tables[MAX_MID_TABLE_ID] = { NULL };
+__attribute__ ((visibility("default"))) _Eo_Ids_Table **_eo_ids_tables[MAX_MID_TABLE_ID] = { NULL };
/* Current table used for following allocations */
_Eo_Ids_Table *_current_table = NULL;
diff --git a/src/lib/eo/eo_ptr_indirection.x b/src/lib/eo/eo_ptr_indirection.x
index 2faae7529e..b9138bcaf5 100644
--- a/src/lib/eo/eo_ptr_indirection.x
+++ b/src/lib/eo/eo_ptr_indirection.x
@@ -227,7 +227,7 @@ typedef struct
} _Eo_Ids_Table;
/* Tables handling pointers indirection */
-extern _Eo_Ids_Table **_eo_ids_tables[MAX_MID_TABLE_ID];
+__attribute__ ((visibility("default"))) extern _Eo_Ids_Table **_eo_ids_tables[MAX_MID_TABLE_ID];
/* Current table used for following allocations */
extern _Eo_Ids_Table *_current_table;
@@ -259,45 +259,6 @@ extern Generation_Counter _eo_generation_counter;
/* Macro used for readability */
#define TABLE_FROM_IDS _eo_ids_tables[mid_table_id][table_id]
-static inline _Eo_Object *
-_eo_obj_pointer_get(const Eo_Id obj_id)
-{
-#ifdef HAVE_EO_ID
- _Eo_Id_Entry *entry;
- Generation_Counter generation;
- Table_Index mid_table_id, table_id, entry_id;
-
- // NULL objects will just be sensibly ignored. not worth complaining
- // every single time.
- if (!obj_id)
- {
- DBG("obj_id is NULL. Possibly unintended access?");
- return NULL;
- }
- else if (!(obj_id & MASK_OBJ_TAG))
- {
- DBG("obj_id is not a valid object id.");
- return NULL;
- }
-
- EO_DECOMPOSE_ID(obj_id, mid_table_id, table_id, entry_id, generation);
-
- /* Check the validity of the entry */
- if (_eo_ids_tables[mid_table_id] && TABLE_FROM_IDS)
- {
- entry = &(TABLE_FROM_IDS->entries[entry_id]);
- if (entry && entry->active && (entry->generation == generation))
- return entry->ptr;
- }
-
- ERR("obj_id %p is not pointing to a valid object. Maybe it has already been freed.",
- (void *)obj_id);
-
- return NULL;
-#else
- return (_Eo_Object *) obj_id;
-#endif
-}
static inline _Eo_Id_Entry *
_get_available_entry(_Eo_Ids_Table *table)
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));