From 880dd63a0c884642a0f87aa3a08338a7b244e37a Mon Sep 17 00:00:00 2001 From: subhransu mohanty Date: Tue, 24 Oct 2017 15:19:52 +0900 Subject: [PATCH] evas/vg: renamed the evas_vg class to efl_canvas_vg Reviewers: jpeg Subscribers: jenkins, cedric Differential Revision: https://phab.enlightenment.org/D5357 --- src/Makefile_Evas.am | 4 +- src/lib/evas/Evas_Eo.h | 2 +- .../{evas_object_vg.c => efl_canvas_vg.c} | 86 +++++++++---------- .../canvas/{evas_vg.eo => efl_canvas_vg.eo} | 2 +- src/lib/evas/canvas/evas_main.c | 4 +- src/lib/evas/canvas/evas_vg_node.c | 2 +- src/lib/evas/canvas/evas_vg_private.h | 4 +- 7 files changed, 52 insertions(+), 52 deletions(-) rename src/lib/evas/canvas/{evas_object_vg.c => efl_canvas_vg.c} (84%) rename src/lib/evas/canvas/{evas_vg.eo => efl_canvas_vg.eo} (92%) diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am index 6e2e155af1..8789e95071 100644 --- a/src/Makefile_Evas.am +++ b/src/Makefile_Evas.am @@ -19,7 +19,7 @@ evas_canvas_eolian_pub_files = \ lib/evas/canvas/evas_canvas3d_node.eo\ lib/evas/canvas/evas_canvas3d_scene.eo\ lib/evas/canvas/evas_canvas3d_object.eo \ - lib/evas/canvas/evas_vg.eo \ + lib/evas/canvas/efl_canvas_vg.eo \ lib/evas/canvas/efl_vg.eo \ lib/evas/canvas/efl_vg_container.eo \ lib/evas/canvas/efl_vg_shape.eo \ @@ -390,7 +390,7 @@ lib/evas/common3d/primitives/primitive_common.c # Evas_VG lib_evas_libevas_la_SOURCES += \ -lib/evas/canvas/evas_object_vg.c \ +lib/evas/canvas/efl_canvas_vg.c \ lib/evas/canvas/evas_vg_node.c \ lib/evas/canvas/evas_vg_container.c \ lib/evas/canvas/evas_vg_gradient.c \ diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h index 030a18fc63..dbd65e1555 100644 --- a/src/lib/evas/Evas_Eo.h +++ b/src/lib/evas/Evas_Eo.h @@ -305,7 +305,7 @@ typedef void (Evas_Canvas3D_Surface_Func)(Evas_Real *out_x, * * @{ */ -#include "canvas/evas_vg.eo.h" +#include "canvas/efl_canvas_vg.eo.h" /** * @} */ diff --git a/src/lib/evas/canvas/evas_object_vg.c b/src/lib/evas/canvas/efl_canvas_vg.c similarity index 84% rename from src/lib/evas/canvas/evas_object_vg.c rename to src/lib/evas/canvas/efl_canvas_vg.c index 386dcb85c9..55ad5d3b8d 100644 --- a/src/lib/evas/canvas/evas_object_vg.c +++ b/src/lib/evas/canvas/efl_canvas_vg.c @@ -3,7 +3,7 @@ #include "evas_vg_private.h" -#define MY_CLASS EVAS_VG_CLASS +#define MY_CLASS EFL_CANVAS_VG_CLASS /* private magic number for rectangle objects */ static const char o_type[] = "vectors"; @@ -11,24 +11,24 @@ static const char o_type[] = "vectors"; const char *o_vg_type = o_type; -static void evas_object_vg_render(Evas_Object *eo_obj, +static void _efl_canvas_vg_render(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, void *type_private_data, void *engine, void *output, void *context, void *surface, int x, int y, Eina_Bool do_async); -static void evas_object_vg_render_pre(Evas_Object *eo_obj, +static void _efl_canvas_vg_render_pre(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, void *type_private_data); -static void evas_object_vg_render_post(Evas_Object *eo_obj, +static void _efl_canvas_vg_render_post(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, void *type_private_data); -static unsigned int evas_object_vg_id_get(Evas_Object *eo_obj); -static unsigned int evas_object_vg_visual_id_get(Evas_Object *eo_obj); -static void *evas_object_vg_engine_data_get(Evas_Object *eo_obj); -static int evas_object_vg_is_opaque(Evas_Object *eo_obj, +static unsigned int _efl_canvas_vg_id_get(Evas_Object *eo_obj); +static unsigned int _efl_canvas_vg_visual_id_get(Evas_Object *eo_obj); +static void *_efl_canvas_vg_engine_data_get(Evas_Object *eo_obj); +static int _efl_canvas_vg_is_opaque(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, void *type_private_data); -static int evas_object_vg_was_opaque(Evas_Object *eo_obj, +static int _efl_canvas_vg_was_opaque(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, void *type_private_data); @@ -36,19 +36,19 @@ static const Evas_Object_Func object_func = { /* methods (compulsory) */ NULL, - evas_object_vg_render, - evas_object_vg_render_pre, - evas_object_vg_render_post, - evas_object_vg_id_get, - evas_object_vg_visual_id_get, - evas_object_vg_engine_data_get, + _efl_canvas_vg_render, + _efl_canvas_vg_render_pre, + _efl_canvas_vg_render_post, + _efl_canvas_vg_id_get, + _efl_canvas_vg_visual_id_get, + _efl_canvas_vg_engine_data_get, /* these are optional. NULL = nothing */ NULL, NULL, NULL, NULL, - evas_object_vg_is_opaque, - evas_object_vg_was_opaque, + _efl_canvas_vg_is_opaque, + _efl_canvas_vg_was_opaque, NULL, NULL, NULL, @@ -64,7 +64,7 @@ static void _evas_vg_tree_changed(void *data, const Efl_Event *event EINA_UNUSED) { Evas_Object_Protected_Data *obj = data; - Evas_VG_Data *pd = efl_data_scope_get(obj->object, MY_CLASS); + Efl_Canvas_Vg_Data *pd = efl_data_scope_get(obj->object, MY_CLASS); if (pd->changed) return; @@ -85,13 +85,13 @@ evas_object_vg_add(Evas *e) } Efl_VG * -_evas_vg_root_node_get(Eo *obj EINA_UNUSED, Evas_VG_Data *pd) +_efl_canvas_vg_root_node_get(Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Data *pd) { return pd->vg_tree; } void -_evas_vg_root_node_set(Eo *obj EINA_UNUSED, Evas_VG_Data *pd, Efl_VG *root_node) +_efl_canvas_vg_root_node_set(Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Data *pd, Efl_VG *root_node) { // if the same root is already set if (pd->vg_tree == root_node) @@ -118,7 +118,7 @@ _evas_vg_root_node_set(Eo *obj EINA_UNUSED, Evas_VG_Data *pd, Efl_VG *root_node) static void _cleanup_reference(void *data, const Efl_Event *event EINA_UNUSED) { - Evas_VG_Data *pd = data; + Efl_Canvas_Vg_Data *pd = data; Eo *renderer; /* unref all renderer and may also destroy them async */ @@ -127,7 +127,7 @@ _cleanup_reference(void *data, const Efl_Event *event EINA_UNUSED) } void -_evas_vg_efl_object_destructor(Eo *eo_obj, Evas_VG_Data *pd) +_efl_canvas_vg_efl_object_destructor(Eo *eo_obj, Efl_Canvas_Vg_Data *pd) { Evas_Object_Protected_Data *obj; Evas *e = evas_object_evas_get(eo_obj); @@ -144,7 +144,7 @@ _evas_vg_efl_object_destructor(Eo *eo_obj, Evas_VG_Data *pd) } Eo * -_evas_vg_efl_object_constructor(Eo *eo_obj, Evas_VG_Data *pd) +_efl_canvas_vg_efl_object_constructor(Eo *eo_obj, Efl_Canvas_Vg_Data *pd) { Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); @@ -166,7 +166,7 @@ _evas_vg_efl_object_constructor(Eo *eo_obj, Evas_VG_Data *pd) } static Efl_Object * -_evas_vg_efl_object_finalize(Eo *obj, Evas_VG_Data *pd) +_efl_canvas_vg_efl_object_finalize(Eo *obj, Efl_Canvas_Vg_Data *pd) { Evas *e = evas_object_evas_get(obj); @@ -178,7 +178,7 @@ _evas_vg_efl_object_finalize(Eo *obj, Evas_VG_Data *pd) } static void -_evas_vg_render(Evas_Object_Protected_Data *obj, Evas_VG_Data *vd, +_evas_vg_render(Evas_Object_Protected_Data *obj, Efl_Canvas_Vg_Data *vd, void *engine, void *output, void *context, void *surface, Efl_VG *n, Eina_Array *clips, Eina_Bool do_async) { @@ -209,13 +209,13 @@ _evas_vg_render(Evas_Object_Protected_Data *obj, Evas_VG_Data *vd, } static void -evas_object_vg_render(Evas_Object *eo_obj EINA_UNUSED, +_efl_canvas_vg_render(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, void *type_private_data, void *engine, void *output, void *context, void *surface, int x, int y, Eina_Bool do_async) { - Evas_VG_Data *vd = type_private_data; + Efl_Canvas_Vg_Data *vd = type_private_data; Ector_Surface *ector = evas_ector_get(obj->layer->evas); obj->layer->evas->engine.func->ector_output_set(engine, surface, output); @@ -255,11 +255,11 @@ evas_object_vg_render(Evas_Object *eo_obj EINA_UNUSED, } static void -evas_object_vg_render_pre(Evas_Object *eo_obj, +_efl_canvas_vg_render_pre(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, void *type_private_data) { - Evas_VG_Data *vd = type_private_data; + Efl_Canvas_Vg_Data *vd = type_private_data; int is_v, was_v; Ector_Surface *s; @@ -376,7 +376,7 @@ evas_object_vg_render_pre(Evas_Object *eo_obj, } static void -evas_object_vg_render_post(Evas_Object *eo_obj EINA_UNUSED, +_efl_canvas_vg_render_post(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, void *type_private_data EINA_UNUSED) { @@ -390,30 +390,30 @@ evas_object_vg_render_post(Evas_Object *eo_obj EINA_UNUSED, } static unsigned int -evas_object_vg_id_get(Evas_Object *eo_obj) +_efl_canvas_vg_id_get(Evas_Object *eo_obj) { - Evas_VG_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); + Efl_Canvas_Vg_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); if (!o) return 0; return MAGIC_OBJ_VG; } static unsigned int -evas_object_vg_visual_id_get(Evas_Object *eo_obj) +_efl_canvas_vg_visual_id_get(Evas_Object *eo_obj) { - Evas_VG_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); + Efl_Canvas_Vg_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); if (!o) return 0; return MAGIC_OBJ_SHAPE; } static void * -evas_object_vg_engine_data_get(Evas_Object *eo_obj) +_efl_canvas_vg_engine_data_get(Evas_Object *eo_obj) { - Evas_VG_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); + Efl_Canvas_Vg_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); return o->engine_data; } static int -evas_object_vg_is_opaque(Evas_Object *eo_obj EINA_UNUSED, +_efl_canvas_vg_is_opaque(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj EINA_UNUSED, void *type_private_data EINA_UNUSED) { @@ -421,7 +421,7 @@ evas_object_vg_is_opaque(Evas_Object *eo_obj EINA_UNUSED, } static int -evas_object_vg_was_opaque(Evas_Object *eo_obj EINA_UNUSED, +_efl_canvas_vg_was_opaque(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj EINA_UNUSED, void *type_private_data EINA_UNUSED) { @@ -429,28 +429,28 @@ evas_object_vg_was_opaque(Evas_Object *eo_obj EINA_UNUSED, } EOLIAN static Eina_Size2D -_evas_vg_efl_gfx_view_view_size_get(Eo *obj EINA_UNUSED, Evas_VG_Data *pd) +_efl_canvas_vg_efl_gfx_view_view_size_get(Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Data *pd) { return EINA_SIZE2D(pd->width, pd->height); } EOLIAN static void -_evas_vg_efl_gfx_view_view_size_set(Eo *obj EINA_UNUSED, Evas_VG_Data *pd, Eina_Size2D sz) +_efl_canvas_vg_efl_gfx_view_view_size_set(Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Data *pd, Eina_Size2D sz) { pd->width = sz.w; pd->height = sz.h; } void -_evas_vg_efl_gfx_fill_fill_set(Eo *obj EINA_UNUSED, Evas_VG_Data *pd, Eina_Rect fill) +_efl_canvas_vg_efl_gfx_fill_fill_set(Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Data *pd, Eina_Rect fill) { pd->fill = fill; } Eina_Rect -_evas_vg_efl_gfx_fill_fill_get(Eo *obj EINA_UNUSED, Evas_VG_Data *pd) +_efl_canvas_vg_efl_gfx_fill_fill_get(Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Data *pd) { return pd->fill; } -#include "evas_vg.eo.c" +#include "efl_canvas_vg.eo.c" diff --git a/src/lib/evas/canvas/evas_vg.eo b/src/lib/evas/canvas/efl_canvas_vg.eo similarity index 92% rename from src/lib/evas/canvas/evas_vg.eo rename to src/lib/evas/canvas/efl_canvas_vg.eo index 4eac040637..3f4becd056 100644 --- a/src/lib/evas/canvas/evas_vg.eo +++ b/src/lib/evas/canvas/efl_canvas_vg.eo @@ -1,4 +1,4 @@ -class Evas.VG (Efl.Canvas.Object, Efl.Gfx.Fill, Efl.Gfx.View) +class Efl.Canvas.Vg (Efl.Canvas.Object, Efl.Gfx.Fill, Efl.Gfx.View) { [[Efl vector graphics class]] legacy_prefix: evas_object_vg; diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c index d519f2ee49..bcc2334ace 100644 --- a/src/lib/evas/canvas/evas_main.c +++ b/src/lib/evas/canvas/evas_main.c @@ -891,7 +891,7 @@ _image_data_unset(Evas_Object_Protected_Data *obj, Eina_List **list) } CHECK(EFL_CANVAS_IMAGE_INTERNAL_CLASS, Evas_Image_Data, ENFN->image_free(ENC, data->engine_data)) - else CHECK(EVAS_VG_CLASS, Evas_VG_Data, + else CHECK(EFL_CANVAS_VG_CLASS, Efl_Canvas_Vg_Data, obj->layer->evas->engine.func->ector_free(data->engine_data)) else CHECK(EFL_CANVAS_POLYGON_CLASS, Efl_Canvas_Polygon_Data, data->engine_data = @@ -957,7 +957,7 @@ _image_data_regenerate(Evas_Object *eo_obj) CHECK(EFL_CANVAS_IMAGE_INTERNAL_CLASS, Evas_Image_Data, _image_image_data_regenerate(eo_obj, obj, data)) else CHECK(EFL_CANVAS_IMAGE_CLASS, Evas_Image_Data, _image_image_data_regenerate(eo_obj, obj, data)) else CHECK(EFL_CANVAS_SCENE3D_CLASS, Evas_Image_Data, _image_image_data_regenerate(eo_obj, obj, data)) - //else CHECK(EVAS_VG_CLASS, Evas_VG_Data,) + //else CHECK(EFL_CANVAS_VG_CLASS, Efl_Canvas_Vg_Data,) //else CHECK(EFL_CANVAS_POLYGON_CLASS, Efl_Canvas_Polygon_Data,) //else CHECK(EVAS_CANVAS3D_TEXTURE_CLASS, Evas_Canvas3D_Texture_Data, } diff --git a/src/lib/evas/canvas/evas_vg_node.c b/src/lib/evas/canvas/evas_vg_node.c index 116f9f49ef..04f576eb16 100644 --- a/src/lib/evas/canvas/evas_vg_node.c +++ b/src/lib/evas/canvas/evas_vg_node.c @@ -220,7 +220,7 @@ _efl_vg_parent_checked_get(Eo *obj, goto on_error; } } - else if (efl_isa(*parent, EVAS_VG_CLASS)) + else if (efl_isa(*parent, EFL_CANVAS_VG_CLASS)) { goto on_error; } diff --git a/src/lib/evas/canvas/evas_vg_private.h b/src/lib/evas/canvas/evas_vg_private.h index 47003def5b..f45ba0a3ac 100644 --- a/src/lib/evas/canvas/evas_vg_private.h +++ b/src/lib/evas/canvas/evas_vg_private.h @@ -8,9 +8,9 @@ typedef struct _Efl_VG_Container_Data Efl_VG_Container_Data; typedef struct _Efl_VG_Gradient_Data Efl_VG_Gradient_Data; typedef struct _Efl_VG_Interpolation Efl_VG_Interpolation; -typedef struct _Evas_VG_Data Evas_VG_Data; +typedef struct _Efl_Canvas_Vg_Data Efl_Canvas_Vg_Data; -struct _Evas_VG_Data +struct _Efl_Canvas_Vg_Data { void *engine_data; Efl_VG *root;