summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavi Artigas <xavierartigas@yahoo.es>2018-04-04 13:38:34 +0200
committerCedric Bail <cedric@osg.samsung.com>2018-04-24 09:03:30 -0700
commita217d4b45576b4065f1ce0384efa9061a556f10a (patch)
treef6e65f19c6b13cb418854f358067ac2d38822880
parenta26fbbbc66f15c359fe8b27dcb034b812d735193 (diff)
Efl.Canvas.Vg.Object (from Efl.Canvas.Vg)
Also, Efl.Canvas.Vg.* (from Efl.Canvas.VG.*) Ref https://phab.enlightenment.org/T6847 Reviewed-by: Cedric Bail <cedric@osg.samsung.com>
-rw-r--r--src/Makefile_Efl_Mono.am2
-rw-r--r--src/Makefile_Evas.am4
-rw-r--r--src/lib/edje/edje_calc.c6
-rw-r--r--src/lib/evas/Evas_Eo.h4
-rw-r--r--src/lib/evas/Evas_Legacy.h2
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg_container.eo6
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg_gradient.eo2
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg_gradient_linear.eo2
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg_gradient_radial.eo2
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg_node.eo4
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg_object.c (renamed from src/lib/evas/canvas/efl_canvas_vg.c)62
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg_object.eo (renamed from src/lib/evas/canvas/efl_canvas_vg.eo)4
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg_shape.eo8
-rw-r--r--src/lib/evas/canvas/evas_main.c2
-rw-r--r--src/lib/evas/canvas/evas_vg_container.c22
-rw-r--r--src/lib/evas/canvas/evas_vg_gradient.c14
-rw-r--r--src/lib/evas/canvas/evas_vg_gradient_linear.c34
-rw-r--r--src/lib/evas/canvas/evas_vg_gradient_radial.c38
-rw-r--r--src/lib/evas/canvas/evas_vg_node.c98
-rw-r--r--src/lib/evas/canvas/evas_vg_private.h30
-rw-r--r--src/lib/evas/canvas/evas_vg_shape.c70
21 files changed, 208 insertions, 208 deletions
diff --git a/src/Makefile_Efl_Mono.am b/src/Makefile_Efl_Mono.am
index 01f6a12..28a1dad 100644
--- a/src/Makefile_Efl_Mono.am
+++ b/src/Makefile_Efl_Mono.am
@@ -118,7 +118,7 @@ lib/evas/canvas/evas_canvas3d_object.eo.cs \
118lib/evas/canvas/evas_canvas3d_primitive.eo.cs \ 118lib/evas/canvas/evas_canvas3d_primitive.eo.cs \
119lib/evas/canvas/evas_canvas3d_scene.eo.cs \ 119lib/evas/canvas/evas_canvas3d_scene.eo.cs \
120lib/evas/canvas/evas_canvas3d_texture.eo.cs \ 120lib/evas/canvas/evas_canvas3d_texture.eo.cs \
121lib/evas/canvas/efl_canvas_vg.eo.cs \ 121lib/evas/canvas/efl_canvas_vg_object.eo.cs \
122lib/evas/canvas/efl_vg.eo.cs \ 122lib/evas/canvas/efl_vg.eo.cs \
123lib/evas/canvas/efl_vg_container.eo.cs \ 123lib/evas/canvas/efl_vg_container.eo.cs \
124lib/evas/canvas/efl_vg_gradient.eo.cs \ 124lib/evas/canvas/efl_vg_gradient.eo.cs \
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 497adf1..229917e 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -19,7 +19,7 @@ evas_canvas_eolian_pub_files = \
19 lib/evas/canvas/evas_canvas3d_node.eo\ 19 lib/evas/canvas/evas_canvas3d_node.eo\
20 lib/evas/canvas/evas_canvas3d_scene.eo\ 20 lib/evas/canvas/evas_canvas3d_scene.eo\
21 lib/evas/canvas/evas_canvas3d_object.eo \ 21 lib/evas/canvas/evas_canvas3d_object.eo \
22 lib/evas/canvas/efl_canvas_vg.eo \ 22 lib/evas/canvas/efl_canvas_vg_object.eo \
23 lib/evas/canvas/efl_canvas_vg_node.eo \ 23 lib/evas/canvas/efl_canvas_vg_node.eo \
24 lib/evas/canvas/efl_canvas_vg_container.eo \ 24 lib/evas/canvas/efl_canvas_vg_container.eo \
25 lib/evas/canvas/efl_canvas_vg_shape.eo \ 25 lib/evas/canvas/efl_canvas_vg_shape.eo \
@@ -377,7 +377,7 @@ lib/evas/common3d/primitives/primitive_common.c
377 377
378# Evas_VG 378# Evas_VG
379lib_evas_libevas_la_SOURCES += \ 379lib_evas_libevas_la_SOURCES += \
380lib/evas/canvas/efl_canvas_vg.c \ 380lib/evas/canvas/efl_canvas_vg_object.c \
381lib/evas/canvas/evas_vg_node.c \ 381lib/evas/canvas/evas_vg_node.c \
382lib/evas/canvas/evas_vg_container.c \ 382lib/evas/canvas/evas_vg_container.c \
383lib/evas/canvas/evas_vg_gradient.c \ 383lib/evas/canvas/evas_vg_gradient.c \
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index 4a9dde7..5e63913 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -3190,11 +3190,11 @@ _edje_svg_recalc_apply(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *p3 EINA_U
3190 snprintf(dest_key, sizeof(dest_key), "edje/vectors/%i", new_svg); 3190 snprintf(dest_key, sizeof(dest_key), "edje/vectors/%i", new_svg);
3191 3191
3192 efl_file_set(ep->object, ed->file->path, src_key); 3192 efl_file_set(ep->object, ed->file->path, src_key);
3193 src_root = efl_canvas_vg_root_node_get(ep->object); 3193 src_root = efl_canvas_vg_object_root_node_get(ep->object);
3194 efl_ref(src_root); 3194 efl_ref(src_root);
3195 3195
3196 efl_file_set(ep->object, ed->file->path, dest_key); 3196 efl_file_set(ep->object, ed->file->path, dest_key);
3197 dest_root = efl_canvas_vg_root_node_get(ep->object); 3197 dest_root = efl_canvas_vg_object_root_node_get(ep->object);
3198 efl_ref(dest_root); 3198 efl_ref(dest_root);
3199 3199
3200 root = efl_duplicate(src_root); 3200 root = efl_duplicate(src_root);
@@ -3203,7 +3203,7 @@ _edje_svg_recalc_apply(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *p3 EINA_U
3203 { 3203 {
3204 ERR("Can't interpolate check the svg file"); 3204 ERR("Can't interpolate check the svg file");
3205 } 3205 }
3206 efl_canvas_vg_root_node_set(ep->object, root); 3206 efl_canvas_vg_object_root_node_set(ep->object, root);
3207 efl_unref(src_root); 3207 efl_unref(src_root);
3208 efl_unref(dest_root); 3208 efl_unref(dest_root);
3209 } 3209 }
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index cb4e069..6334236 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -7,7 +7,7 @@
7#ifndef _EFL_CANVAS_VG_NODE_EO_CLASS_TYPE 7#ifndef _EFL_CANVAS_VG_NODE_EO_CLASS_TYPE
8#define _EFL_CANVAS_VG_NODE_EO_CLASS_TYPE 8#define _EFL_CANVAS_VG_NODE_EO_CLASS_TYPE
9 9
10typedef Eo Efl_Canvas_VG_Node; 10typedef Eo Efl_Canvas_Vg_Node;
11 11
12#endif 12#endif
13 13
@@ -434,7 +434,7 @@ typedef void (Evas_Canvas3D_Surface_Func)(Evas_Real *out_x,
434 * 434 *
435 * @{ 435 * @{
436 */ 436 */
437#include "canvas/efl_canvas_vg.eo.h" 437#include "canvas/efl_canvas_vg_object.eo.h"
438/** 438/**
439 * @} 439 * @}
440 */ 440 */
diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h
index ffff908..53185d1 100644
--- a/src/lib/evas/Evas_Legacy.h
+++ b/src/lib/evas/Evas_Legacy.h
@@ -3605,7 +3605,7 @@ EAPI Evas_Object *evas_object_rectangle_add(Evas *e) EINA_WARN_UNUSED_RESULT EIN
3605EAPI Evas_Object *evas_object_vg_add(Evas *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_MALLOC; 3605EAPI Evas_Object *evas_object_vg_add(Evas *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_MALLOC;
3606 3606
3607#include "canvas/efl_canvas_vg_node.eo.legacy.h" 3607#include "canvas/efl_canvas_vg_node.eo.legacy.h"
3608#include "canvas/efl_canvas_vg.eo.legacy.h" 3608#include "canvas/efl_canvas_vg_object.eo.legacy.h"
3609#include "canvas/efl_canvas_vg_container.eo.legacy.h" 3609#include "canvas/efl_canvas_vg_container.eo.legacy.h"
3610/** 3610/**
3611 * Creates a new vector shape object \. 3611 * Creates a new vector shape object \.
diff --git a/src/lib/evas/canvas/efl_canvas_vg_container.eo b/src/lib/evas/canvas/efl_canvas_vg_container.eo
index 289ea4b..f89d584 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_container.eo
+++ b/src/lib/evas/canvas/efl_canvas_vg_container.eo
@@ -1,4 +1,4 @@
1class Efl.Canvas.VG.Container (Efl.Canvas.VG.Node) 1class Efl.Canvas.Vg.Container (Efl.Canvas.Vg.Node)
2{ 2{
3 [[Efl vector graphics container class]] 3 [[Efl vector graphics container class]]
4 legacy_prefix: evas_vg_container; 4 legacy_prefix: evas_vg_container;
@@ -8,11 +8,11 @@ class Efl.Canvas.VG.Container (Efl.Canvas.VG.Node)
8 params { 8 params {
9 @in name: string; [[Child node name]] 9 @in name: string; [[Child node name]]
10 } 10 }
11 return: Efl.Canvas.VG.Node; [[Child object]] 11 return: Efl.Canvas.Vg.Node; [[Child object]]
12 } 12 }
13 children_get { 13 children_get {
14 [[Get all children of container]] 14 [[Get all children of container]]
15 return: iterator<Efl.Canvas.VG.Node> @owned @warn_unused; [[Iterator to children]] 15 return: iterator<Efl.Canvas.Vg.Node> @owned @warn_unused; [[Iterator to children]]
16 } 16 }
17 } 17 }
18 implements { 18 implements {
diff --git a/src/lib/evas/canvas/efl_canvas_vg_gradient.eo b/src/lib/evas/canvas/efl_canvas_vg_gradient.eo
index cd48aef..944b5f2 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_gradient.eo
+++ b/src/lib/evas/canvas/efl_canvas_vg_gradient.eo
@@ -1,4 +1,4 @@
1abstract Efl.Canvas.VG.Gradient (Efl.Canvas.VG.Node, Efl.Gfx.Gradient) 1abstract Efl.Canvas.Vg.Gradient (Efl.Canvas.Vg.Node, Efl.Gfx.Gradient)
2{ 2{
3 [[Efl vectopr graphics gradient abstract class]] 3 [[Efl vectopr graphics gradient abstract class]]
4 legacy_prefix: evas_vg_gradient; 4 legacy_prefix: evas_vg_gradient;
diff --git a/src/lib/evas/canvas/efl_canvas_vg_gradient_linear.eo b/src/lib/evas/canvas/efl_canvas_vg_gradient_linear.eo
index c505027..97b60e7 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_gradient_linear.eo
+++ b/src/lib/evas/canvas/efl_canvas_vg_gradient_linear.eo
@@ -1,4 +1,4 @@
1class Efl.Canvas.VG.Gradient.Linear (Efl.Canvas.VG.Gradient, Efl.Gfx.Gradient.Linear) 1class Efl.Canvas.Vg.Gradient_Linear (Efl.Canvas.Vg.Gradient, Efl.Gfx.Gradient.Linear)
2{ 2{
3 [[Efl vector graphics gradient linear class]] 3 [[Efl vector graphics gradient linear class]]
4 legacy_prefix: evas_vg_gradient_linear; 4 legacy_prefix: evas_vg_gradient_linear;
diff --git a/src/lib/evas/canvas/efl_canvas_vg_gradient_radial.eo b/src/lib/evas/canvas/efl_canvas_vg_gradient_radial.eo
index 27fbe64..0e7af1a 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_gradient_radial.eo
+++ b/src/lib/evas/canvas/efl_canvas_vg_gradient_radial.eo
@@ -1,4 +1,4 @@
1class Efl.Canvas.VG.Gradient.Radial (Efl.Canvas.VG.Gradient, Efl.Gfx.Gradient.Radial) 1class Efl.Canvas.Vg.Gradient_Radial (Efl.Canvas.Vg.Gradient, Efl.Gfx.Gradient.Radial)
2{ 2{
3 [[Efl vector graphics gradient radial class]] 3 [[Efl vector graphics gradient radial class]]
4 legacy_prefix: evas_vg_gradient_radial; 4 legacy_prefix: evas_vg_gradient_radial;
diff --git a/src/lib/evas/canvas/efl_canvas_vg_node.eo b/src/lib/evas/canvas/efl_canvas_vg_node.eo
index a273afa..300aaeb 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_node.eo
+++ b/src/lib/evas/canvas/efl_canvas_vg_node.eo
@@ -1,6 +1,6 @@
1import eina_types; 1import eina_types;
2 2
3abstract Efl.Canvas.VG.Node (Efl.Object, Efl.Gfx, Efl.Gfx.Color, Efl.Gfx.Stack, Efl.Duplicate, Efl.Gfx.Path) 3abstract Efl.Canvas.Vg.Node (Efl.Object, Efl.Gfx, Efl.Gfx.Color, Efl.Gfx.Stack, Efl.Duplicate, Efl.Gfx.Path)
4{ 4{
5 [[Efl vector graphics abstract class]] 5 [[Efl vector graphics abstract class]]
6 eo_prefix: efl_canvas_vg_node; 6 eo_prefix: efl_canvas_vg_node;
@@ -48,7 +48,7 @@ abstract Efl.Canvas.VG.Node (Efl.Object, Efl.Gfx, Efl.Gfx.Color, Efl.Gfx.Stack,
48 get { 48 get {
49 } 49 }
50 values { 50 values {
51 m: Efl.Canvas.VG.Node; [[Object mask]] 51 m: Efl.Canvas.Vg.Node; [[Object mask]]
52 } 52 }
53 } 53 }
54/* quality { 54/* quality {
diff --git a/src/lib/evas/canvas/efl_canvas_vg.c b/src/lib/evas/canvas/efl_canvas_vg_object.c
index 6662c53..a01f98a 100644
--- a/src/lib/evas/canvas/efl_canvas_vg.c
+++ b/src/lib/evas/canvas/efl_canvas_vg_object.c
@@ -5,7 +5,7 @@
5 5
6#include "evas_vg_private.h" 6#include "evas_vg_private.h"
7 7
8#define MY_CLASS EFL_CANVAS_VG_CLASS 8#define MY_CLASS EFL_CANVAS_VG_OBJECT_CLASS
9 9
10/* private magic number for rectangle objects */ 10/* private magic number for rectangle objects */
11static const char o_type[] = "vectors"; 11static const char o_type[] = "vectors";
@@ -65,7 +65,7 @@ static void
65_evas_vg_tree_changed(void *data, const Efl_Event *event EINA_UNUSED) 65_evas_vg_tree_changed(void *data, const Efl_Event *event EINA_UNUSED)
66{ 66{
67 Evas_Object_Protected_Data *obj = data; 67 Evas_Object_Protected_Data *obj = data;
68 Efl_Canvas_Vg_Data *pd = efl_data_scope_get(obj->object, MY_CLASS); 68 Efl_Canvas_Vg_Object_Data *pd = efl_data_scope_get(obj->object, MY_CLASS);
69 69
70 if (pd->changed) return; 70 if (pd->changed) return;
71 71
@@ -75,7 +75,7 @@ _evas_vg_tree_changed(void *data, const Efl_Event *event EINA_UNUSED)
75} 75}
76 76
77static void 77static void
78_update_vgtree_viewport(Eo *obj, Efl_Canvas_Vg_Data *pd) 78_update_vgtree_viewport(Eo *obj, Efl_Canvas_Vg_Object_Data *pd)
79{ 79{
80 double vb_w, vb_h, vp_w, vp_h, scale_w, scale_h, scale; 80 double vb_w, vb_h, vp_w, vp_h, scale_w, scale_h, scale;
81 Eina_Size2D sz = efl_gfx_size_get(obj); 81 Eina_Size2D sz = efl_gfx_size_get(obj);
@@ -113,7 +113,7 @@ _update_vgtree_viewport(Eo *obj, Efl_Canvas_Vg_Data *pd)
113static void 113static void
114_evas_vg_resize(void *data, const Efl_Event *ev) 114_evas_vg_resize(void *data, const Efl_Event *ev)
115{ 115{
116 Efl_Canvas_Vg_Data *pd = data; 116 Efl_Canvas_Vg_Object_Data *pd = data;
117 117
118 if (eina_rectangle_is_empty(&pd->viewbox.rect)) 118 if (eina_rectangle_is_empty(&pd->viewbox.rect))
119 return; 119 return;
@@ -132,7 +132,7 @@ evas_object_vg_add(Evas *e)
132} 132}
133 133
134EOLIAN static Efl_VG * 134EOLIAN static Efl_VG *
135_efl_canvas_vg_root_node_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Data *pd) 135_efl_canvas_vg_object_root_node_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Object_Data *pd)
136{ 136{
137 Efl_VG *root = NULL; 137 Efl_VG *root = NULL;
138 138
@@ -145,7 +145,7 @@ _efl_canvas_vg_root_node_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Data *pd)
145} 145}
146 146
147EOLIAN static void 147EOLIAN static void
148_efl_canvas_vg_root_node_set(Eo *obj, Efl_Canvas_Vg_Data *pd, Efl_VG *root_node) 148_efl_canvas_vg_object_root_node_set(Eo *obj, Efl_Canvas_Vg_Object_Data *pd, Efl_VG *root_node)
149{ 149{
150 // if the same root is already set 150 // if the same root is already set
151 if (pd->user_entry && pd->user_entry->root == root_node) 151 if (pd->user_entry && pd->user_entry->root == root_node)
@@ -188,19 +188,19 @@ _efl_canvas_vg_root_node_set(Eo *obj, Efl_Canvas_Vg_Data *pd, Efl_VG *root_node)
188} 188}
189 189
190EOLIAN static void 190EOLIAN static void
191_efl_canvas_vg_fill_mode_set(Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Data *pd, Efl_Canvas_Vg_Fill_Mode fill_mode) 191_efl_canvas_vg_object_fill_mode_set(Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Object_Data *pd, Efl_Canvas_Vg_Fill_Mode fill_mode)
192{ 192{
193 pd->fill_mode = fill_mode; 193 pd->fill_mode = fill_mode;
194} 194}
195 195
196EOLIAN static Efl_Canvas_Vg_Fill_Mode 196EOLIAN static Efl_Canvas_Vg_Fill_Mode
197_efl_canvas_vg_fill_mode_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Data *pd) 197_efl_canvas_vg_object_fill_mode_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Object_Data *pd)
198{ 198{
199 return pd->fill_mode; 199 return pd->fill_mode;
200} 200}
201 201
202EOLIAN static void 202EOLIAN static void
203_efl_canvas_vg_viewbox_set(Eo *obj, Efl_Canvas_Vg_Data *pd, Eina_Rect viewbox) 203_efl_canvas_vg_object_viewbox_set(Eo *obj, Efl_Canvas_Vg_Object_Data *pd, Eina_Rect viewbox)
204{ 204{
205 // viewbox should be a valid rectangle 205 // viewbox should be a valid rectangle
206 if (eina_rectangle_is_empty(&viewbox.rect)) 206 if (eina_rectangle_is_empty(&viewbox.rect))
@@ -227,13 +227,13 @@ _efl_canvas_vg_viewbox_set(Eo *obj, Efl_Canvas_Vg_Data *pd, Eina_Rect viewbox)
227} 227}
228 228
229EOLIAN static Eina_Rect 229EOLIAN static Eina_Rect
230_efl_canvas_vg_viewbox_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Data *pd) 230_efl_canvas_vg_object_viewbox_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Object_Data *pd)
231{ 231{
232 return pd->viewbox; 232 return pd->viewbox;
233} 233}
234 234
235EOLIAN static void 235EOLIAN static void
236_efl_canvas_vg_viewbox_align_set(Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Data *pd, double align_x, double align_y) 236_efl_canvas_vg_object_viewbox_align_set(Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Object_Data *pd, double align_x, double align_y)
237{ 237{
238 align_x = align_x < 0 ? 0 : align_x; 238 align_x = align_x < 0 ? 0 : align_x;
239 align_x = align_x > 1 ? 1 : align_x; 239 align_x = align_x > 1 ? 1 : align_x;
@@ -246,7 +246,7 @@ _efl_canvas_vg_viewbox_align_set(Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Data *pd, do
246} 246}
247 247
248EOLIAN static void 248EOLIAN static void
249_efl_canvas_vg_viewbox_align_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Data *pd, double *align_x, double *align_y) 249_efl_canvas_vg_object_viewbox_align_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Object_Data *pd, double *align_x, double *align_y)
250{ 250{
251 if (align_x) *align_x = pd->align_x; 251 if (align_x) *align_x = pd->align_x;
252 if (align_y) *align_y = pd->align_y; 252 if (align_y) *align_y = pd->align_y;
@@ -255,7 +255,7 @@ _efl_canvas_vg_viewbox_align_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Data *
255// file set and save api implementation 255// file set and save api implementation
256 256
257EOLIAN static Eina_Bool 257EOLIAN static Eina_Bool
258_efl_canvas_vg_efl_file_file_set(Eo *obj, Efl_Canvas_Vg_Data *pd, const char *file, const char *key) 258_efl_canvas_vg_object_efl_file_file_set(Eo *obj, Efl_Canvas_Vg_Object_Data *pd, const char *file, const char *key)
259{ 259{
260 Evas_Cache_Vg_Entry *old_entry; 260 Evas_Cache_Vg_Entry *old_entry;
261 int w, h; 261 int w, h;
@@ -273,7 +273,7 @@ _efl_canvas_vg_efl_file_file_set(Eo *obj, Efl_Canvas_Vg_Data *pd, const char *fi
273} 273}
274 274
275EOLIAN static void 275EOLIAN static void
276_efl_canvas_vg_efl_file_file_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Data *pd, const char **file, const char **key) 276_efl_canvas_vg_object_efl_file_file_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Object_Data *pd, const char **file, const char **key)
277{ 277{
278 if (pd->vg_entry) 278 if (pd->vg_entry)
279 { 279 {
@@ -283,7 +283,7 @@ _efl_canvas_vg_efl_file_file_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Data *
283} 283}
284 284
285EOLIAN static Eina_Bool 285EOLIAN static Eina_Bool
286_efl_canvas_vg_efl_file_save(const Eo *obj, Efl_Canvas_Vg_Data *pd, const char *file, const char *key, const char *flags) 286_efl_canvas_vg_object_efl_file_save(const Eo *obj, Efl_Canvas_Vg_Object_Data *pd, const char *file, const char *key, const char *flags)
287{ 287{
288 Vg_File_Data tmp = {}; 288 Vg_File_Data tmp = {};
289 Vg_File_Data *info = &tmp; 289 Vg_File_Data *info = &tmp;
@@ -306,7 +306,7 @@ _efl_canvas_vg_efl_file_save(const Eo *obj, Efl_Canvas_Vg_Data *pd, const char *
306static void 306static void
307_cleanup_reference(void *data, const Efl_Event *event EINA_UNUSED) 307_cleanup_reference(void *data, const Efl_Event *event EINA_UNUSED)
308{ 308{
309 Efl_Canvas_Vg_Data *pd = data; 309 Efl_Canvas_Vg_Object_Data *pd = data;
310 Eo *renderer; 310 Eo *renderer;
311 311
312 /* unref all renderer and may also destroy them async */ 312 /* unref all renderer and may also destroy them async */
@@ -315,7 +315,7 @@ _cleanup_reference(void *data, const Efl_Event *event EINA_UNUSED)
315} 315}
316 316
317EOLIAN static void 317EOLIAN static void
318_efl_canvas_vg_efl_object_destructor(Eo *eo_obj, Efl_Canvas_Vg_Data *pd) 318_efl_canvas_vg_object_efl_object_destructor(Eo *eo_obj, Efl_Canvas_Vg_Object_Data *pd)
319{ 319{
320 Evas *e = evas_object_evas_get(eo_obj); 320 Evas *e = evas_object_evas_get(eo_obj);
321 321
@@ -327,7 +327,7 @@ _efl_canvas_vg_efl_object_destructor(Eo *eo_obj, Efl_Canvas_Vg_Data *pd)
327} 327}
328 328
329EOLIAN static Eo * 329EOLIAN static Eo *
330_efl_canvas_vg_efl_object_constructor(Eo *eo_obj, Efl_Canvas_Vg_Data *pd) 330_efl_canvas_vg_object_efl_object_constructor(Eo *eo_obj, Efl_Canvas_Vg_Object_Data *pd)
331{ 331{
332 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 332 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
333 333
@@ -349,7 +349,7 @@ _efl_canvas_vg_efl_object_constructor(Eo *eo_obj, Efl_Canvas_Vg_Data *pd)
349} 349}
350 350
351static Efl_Object * 351static Efl_Object *
352_efl_canvas_vg_efl_object_finalize(Eo *obj, Efl_Canvas_Vg_Data *pd) 352_efl_canvas_vg_object_efl_object_finalize(Eo *obj, Efl_Canvas_Vg_Object_Data *pd)
353{ 353{
354 Evas *e = evas_object_evas_get(obj); 354 Evas *e = evas_object_evas_get(obj);
355 355
@@ -361,13 +361,13 @@ _efl_canvas_vg_efl_object_finalize(Eo *obj, Efl_Canvas_Vg_Data *pd)
361} 361}
362 362
363static void 363static void
364_evas_vg_render(Evas_Object_Protected_Data *obj, Efl_Canvas_Vg_Data *vd, 364_evas_vg_render(Evas_Object_Protected_Data *obj, Efl_Canvas_Vg_Object_Data *vd,
365 void *engine, void *output, void *context, void *surface, Efl_VG *n, 365 void *engine, void *output, void *context, void *surface, Efl_VG *n,
366 Eina_Array *clips, Eina_Bool do_async) 366 Eina_Array *clips, Eina_Bool do_async)
367{ 367{
368 if (efl_isa(n, EFL_CANVAS_VG_CONTAINER_CLASS)) 368 if (efl_isa(n, EFL_CANVAS_VG_CONTAINER_CLASS))
369 { 369 {
370 Efl_Canvas_VG_Container_Data *vc; 370 Efl_Canvas_Vg_Container_Data *vc;
371 Efl_VG *child; 371 Efl_VG *child;
372 Eina_List *l; 372 Eina_List *l;
373 373
@@ -380,7 +380,7 @@ _evas_vg_render(Evas_Object_Protected_Data *obj, Efl_Canvas_Vg_Data *vd,
380 } 380 }
381 else 381 else
382 { 382 {
383 Efl_Canvas_VG_Node_Data *nd; 383 Efl_Canvas_Vg_Node_Data *nd;
384 384
385 nd = efl_data_scope_get(n, EFL_CANVAS_VG_NODE_CLASS); 385 nd = efl_data_scope_get(n, EFL_CANVAS_VG_NODE_CLASS);
386 386
@@ -394,7 +394,7 @@ _evas_vg_render(Evas_Object_Protected_Data *obj, Efl_Canvas_Vg_Data *vd,
394// renders a vg_tree to an offscreen buffer 394// renders a vg_tree to an offscreen buffer
395// and push it to the cache. 395// and push it to the cache.
396static void * 396static void *
397_render_to_buffer(Evas_Object_Protected_Data *obj, Efl_Canvas_Vg_Data *vd, 397_render_to_buffer(Evas_Object_Protected_Data *obj, Efl_Canvas_Vg_Object_Data *vd,
398 void *engine, void *surface, 398 void *engine, void *surface,
399 Efl_VG *root, int w, int h, void *key, 399 Efl_VG *root, int w, int h, void *key,
400 void *buffer, Eina_Bool do_async) 400 void *buffer, Eina_Bool do_async)
@@ -473,7 +473,7 @@ _render_buffer_to_screen(Evas_Object_Protected_Data *obj,
473 473
474static void 474static void
475_cache_vg_entry_render(Evas_Object_Protected_Data *obj, 475_cache_vg_entry_render(Evas_Object_Protected_Data *obj,
476 Efl_Canvas_Vg_Data *vd, 476 Efl_Canvas_Vg_Object_Data *vd,
477 void *engine, void *output, void *context, void *surface, 477 void *engine, void *output, void *context, void *surface,
478 int x, int y, int w, int h, Eina_Bool do_async) 478 int x, int y, int w, int h, Eina_Bool do_async)
479{ 479{
@@ -521,7 +521,7 @@ _cache_vg_entry_render(Evas_Object_Protected_Data *obj,
521 521
522static void 522static void
523_user_vg_entry_render(Evas_Object_Protected_Data *obj, 523_user_vg_entry_render(Evas_Object_Protected_Data *obj,
524 Efl_Canvas_Vg_Data *vd, 524 Efl_Canvas_Vg_Object_Data *vd,
525 void *engine, void *output, void *context, void *surface, 525 void *engine, void *output, void *context, void *surface,
526 int x, int y, int w, int h, Eina_Bool do_async) 526 int x, int y, int w, int h, Eina_Bool do_async)
527{ 527{
@@ -578,7 +578,7 @@ _efl_canvas_vg_render(Evas_Object *eo_obj EINA_UNUSED,
578 void *engine, void *output, void *context, void *surface, 578 void *engine, void *output, void *context, void *surface,
579 int x, int y, Eina_Bool do_async) 579 int x, int y, Eina_Bool do_async)
580{ 580{
581 Efl_Canvas_Vg_Data *vd = type_private_data; 581 Efl_Canvas_Vg_Object_Data *vd = type_private_data;
582 582
583 /* render object to surface with context, and offxet by x,y */ 583 /* render object to surface with context, and offxet by x,y */
584 obj->layer->evas->engine.func->context_color_set(engine, 584 obj->layer->evas->engine.func->context_color_set(engine,
@@ -619,7 +619,7 @@ _efl_canvas_vg_render_pre(Evas_Object *eo_obj,
619 Evas_Object_Protected_Data *obj, 619 Evas_Object_Protected_Data *obj,
620 void *type_private_data) 620 void *type_private_data)
621{ 621{
622 Efl_Canvas_Vg_Data *vd = type_private_data; 622 Efl_Canvas_Vg_Object_Data *vd = type_private_data;
623 int is_v, was_v; 623 int is_v, was_v;
624 Ector_Surface *s; 624 Ector_Surface *s;
625 625
@@ -752,7 +752,7 @@ _efl_canvas_vg_render_post(Evas_Object *eo_obj EINA_UNUSED,
752static unsigned int 752static unsigned int
753_efl_canvas_vg_id_get(Evas_Object *eo_obj) 753_efl_canvas_vg_id_get(Evas_Object *eo_obj)
754{ 754{
755 Efl_Canvas_Vg_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 755 Efl_Canvas_Vg_Object_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
756 if (!o) return 0; 756 if (!o) return 0;
757 return MAGIC_OBJ_VG; 757 return MAGIC_OBJ_VG;
758} 758}
@@ -760,7 +760,7 @@ _efl_canvas_vg_id_get(Evas_Object *eo_obj)
760static unsigned int 760static unsigned int
761_efl_canvas_vg_visual_id_get(Evas_Object *eo_obj) 761_efl_canvas_vg_visual_id_get(Evas_Object *eo_obj)
762{ 762{
763 Efl_Canvas_Vg_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 763 Efl_Canvas_Vg_Object_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
764 if (!o) return 0; 764 if (!o) return 0;
765 return MAGIC_OBJ_SHAPE; 765 return MAGIC_OBJ_SHAPE;
766} 766}
@@ -768,7 +768,7 @@ _efl_canvas_vg_visual_id_get(Evas_Object *eo_obj)
768static void * 768static void *
769_efl_canvas_vg_engine_data_get(Evas_Object *eo_obj) 769_efl_canvas_vg_engine_data_get(Evas_Object *eo_obj)
770{ 770{
771 Efl_Canvas_Vg_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 771 Efl_Canvas_Vg_Object_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
772 return o->engine_data; 772 return o->engine_data;
773} 773}
774 774
@@ -788,4 +788,4 @@ _efl_canvas_vg_was_opaque(Evas_Object *eo_obj EINA_UNUSED,
788 return 0; 788 return 0;
789} 789}
790 790
791#include "efl_canvas_vg.eo.c" 791#include "efl_canvas_vg_object.eo.c"
diff --git a/src/lib/evas/canvas/efl_canvas_vg.eo b/src/lib/evas/canvas/efl_canvas_vg_object.eo
index 0aceaf2..971c977 100644
--- a/src/lib/evas/canvas/efl_canvas_vg.eo
+++ b/src/lib/evas/canvas/efl_canvas_vg_object.eo
@@ -21,7 +21,7 @@ enum Efl.Canvas.Vg.Fill_Mode
21 dimension of the viewport.]] 21 dimension of the viewport.]]
22} 22}
23 23
24class Efl.Canvas.Vg (Efl.Canvas.Object, Efl.File) 24class Efl.Canvas.Vg.Object (Efl.Canvas.Object, Efl.File)
25{ 25{
26 [[Efl vector graphics class]] 26 [[Efl vector graphics class]]
27 legacy_prefix: evas_object_vg; 27 legacy_prefix: evas_object_vg;
@@ -65,7 +65,7 @@ class Efl.Canvas.Vg (Efl.Canvas.Object, Efl.File)
65 It takes the ownership of the root node. ]] 65 It takes the ownership of the root node. ]]
66 } 66 }
67 values { 67 values {
68 root: Efl.Canvas.VG.Node; [[Root node of the VG canvas.]] 68 root: Efl.Canvas.Vg.Node; [[Root node of the VG canvas.]]
69 } 69 }
70 } 70 }
71 } 71 }
diff --git a/src/lib/evas/canvas/efl_canvas_vg_shape.eo b/src/lib/evas/canvas/efl_canvas_vg_shape.eo
index 322fca0..2706d0f 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_shape.eo
+++ b/src/lib/evas/canvas/efl_canvas_vg_shape.eo
@@ -1,4 +1,4 @@
1class Efl.Canvas.VG.Shape (Efl.Canvas.VG.Node, Efl.Gfx.Shape) 1class Efl.Canvas.Vg.Shape (Efl.Canvas.Vg.Node, Efl.Gfx.Shape)
2{ 2{
3 [[Efl vector graphics shape class]] 3 [[Efl vector graphics shape class]]
4 legacy_prefix: evas_vg_shape; 4 legacy_prefix: evas_vg_shape;
@@ -10,7 +10,7 @@ class Efl.Canvas.VG.Shape (Efl.Canvas.VG.Node, Efl.Gfx.Shape)
10 get { 10 get {
11 } 11 }
12 values { 12 values {
13 f: Efl.Canvas.VG.Node; [[Fill object]] 13 f: Efl.Canvas.Vg.Node; [[Fill object]]
14 } 14 }
15 } 15 }
16 @property stroke_fill { 16 @property stroke_fill {
@@ -20,7 +20,7 @@ class Efl.Canvas.VG.Shape (Efl.Canvas.VG.Node, Efl.Gfx.Shape)
20 get { 20 get {
21 } 21 }
22 values { 22 values {
23 f: Efl.Canvas.VG.Node; [[Stroke fill object]] 23 f: Efl.Canvas.Vg.Node; [[Stroke fill object]]
24 } 24 }
25 } 25 }
26 @property stroke_marker { 26 @property stroke_marker {
@@ -30,7 +30,7 @@ class Efl.Canvas.VG.Shape (Efl.Canvas.VG.Node, Efl.Gfx.Shape)
30 get { 30 get {
31 } 31 }
32 values { 32 values {
33 m: Efl.Canvas.VG.Node; [[Stroke marker object]] 33 m: Efl.Canvas.Vg.Node; [[Stroke marker object]]
34 } 34 }
35 } 35 }
36 } 36 }
diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c
index 7b658aa..8157abc 100644
--- a/src/lib/evas/canvas/evas_main.c
+++ b/src/lib/evas/canvas/evas_main.c
@@ -964,7 +964,7 @@ _image_data_regenerate(Evas_Object *eo_obj)
964 CHECK(EFL_CANVAS_IMAGE_INTERNAL_CLASS, Evas_Image_Data, _image_image_data_regenerate(eo_obj, obj, data)) 964 CHECK(EFL_CANVAS_IMAGE_INTERNAL_CLASS, Evas_Image_Data, _image_image_data_regenerate(eo_obj, obj, data))
965 else CHECK(EFL_CANVAS_IMAGE_CLASS, Evas_Image_Data, _image_image_data_regenerate(eo_obj, obj, data)) 965 else CHECK(EFL_CANVAS_IMAGE_CLASS, Evas_Image_Data, _image_image_data_regenerate(eo_obj, obj, data))
966 else CHECK(EFL_CANVAS_SCENE3D_CLASS, Evas_Image_Data, _image_image_data_regenerate(eo_obj, obj, data)) 966 else CHECK(EFL_CANVAS_SCENE3D_CLASS, Evas_Image_Data, _image_image_data_regenerate(eo_obj, obj, data))
967 //else CHECK(EFL_CANVAS_VG_CLASS, Efl_Canvas_Vg_Data,) 967 //else CHECK(EFL_CANVAS_VG_OBJECT_CLASS, Efl_Canvas_Vg_Object_Data,)
968 //else CHECK(EFL_CANVAS_POLYGON_CLASS, Efl_Canvas_Polygon_Data,) 968 //else CHECK(EFL_CANVAS_POLYGON_CLASS, Efl_Canvas_Polygon_Data,)
969 //else CHECK(EVAS_CANVAS3D_TEXTURE_CLASS, Evas_Canvas3D_Texture_Data, 969 //else CHECK(EVAS_CANVAS3D_TEXTURE_CLASS, Evas_Canvas3D_Texture_Data,
970} 970}
diff --git a/src/lib/evas/canvas/evas_vg_container.c b/src/lib/evas/canvas/evas_vg_container.c
index deb89ca..7b2a9cb 100644
--- a/src/lib/evas/canvas/evas_vg_container.c
+++ b/src/lib/evas/canvas/evas_vg_container.c
@@ -10,12 +10,12 @@ _efl_canvas_vg_container_render_pre(Eo *obj EINA_UNUSED,
10 Eina_Matrix3 *parent, 10 Eina_Matrix3 *parent,
11 Ector_Surface *s, 11 Ector_Surface *s,
12 void *data, 12 void *data,
13 Efl_Canvas_VG_Node_Data *nd) 13 Efl_Canvas_Vg_Node_Data *nd)
14{ 14{
15 Efl_Canvas_VG_Container_Data *pd = data; 15 Efl_Canvas_Vg_Container_Data *pd = data;
16 Eina_List *l; 16 Eina_List *l;
17 Eo *child; 17 Eo *child;
18 Efl_Canvas_VG_Node_Data *child_nd; 18 Efl_Canvas_Vg_Node_Data *child_nd;
19 Efl_Gfx_Change_Flag flag; 19 Efl_Gfx_Change_Flag flag;
20 20
21 if (nd->flags == EFL_GFX_CHANGE_FLAG_NONE) return ; 21 if (nd->flags == EFL_GFX_CHANGE_FLAG_NONE) return ;
@@ -38,9 +38,9 @@ _efl_canvas_vg_container_render_pre(Eo *obj EINA_UNUSED,
38 38
39static Eo * 39static Eo *
40_efl_canvas_vg_container_efl_object_constructor(Eo *obj, 40_efl_canvas_vg_container_efl_object_constructor(Eo *obj,
41 Efl_Canvas_VG_Container_Data *pd) 41 Efl_Canvas_Vg_Container_Data *pd)
42{ 42{
43 Efl_Canvas_VG_Node_Data *nd; 43 Efl_Canvas_Vg_Node_Data *nd;
44 44
45 pd->names = eina_hash_stringshared_new(NULL); 45 pd->names = eina_hash_stringshared_new(NULL);
46 46
@@ -56,7 +56,7 @@ _efl_canvas_vg_container_efl_object_constructor(Eo *obj,
56 56
57static void 57static void
58_efl_canvas_vg_container_efl_object_destructor(Eo *obj, 58_efl_canvas_vg_container_efl_object_destructor(Eo *obj,
59 Efl_Canvas_VG_Container_Data *pd EINA_UNUSED) 59 Efl_Canvas_Vg_Container_Data *pd EINA_UNUSED)
60{ 60{
61 efl_destructor(efl_super(obj, MY_CLASS)); 61 efl_destructor(efl_super(obj, MY_CLASS));
62 62
@@ -66,7 +66,7 @@ _efl_canvas_vg_container_efl_object_destructor(Eo *obj,
66 66
67static void 67static void
68_efl_canvas_vg_container_efl_gfx_path_bounds_get(const Eo *obj EINA_UNUSED, 68_efl_canvas_vg_container_efl_gfx_path_bounds_get(const Eo *obj EINA_UNUSED,
69 Efl_Canvas_VG_Container_Data *pd, 69 Efl_Canvas_Vg_Container_Data *pd,
70 Eina_Rect *r) 70 Eina_Rect *r)
71{ 71{
72 Eina_Rect s; 72 Eina_Rect s;
@@ -92,7 +92,7 @@ _efl_canvas_vg_container_efl_gfx_path_bounds_get(const Eo *obj EINA_UNUSED,
92} 92}
93 93
94static Efl_VG * 94static Efl_VG *
95_efl_canvas_vg_container_child_get(Eo *obj EINA_UNUSED, Efl_Canvas_VG_Container_Data *pd, const char *name) 95_efl_canvas_vg_container_child_get(Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Container_Data *pd, const char *name)
96{ 96{
97 const char *tmp = eina_stringshare_add(name); 97 const char *tmp = eina_stringshare_add(name);
98 Efl_VG *r; 98 Efl_VG *r;
@@ -104,14 +104,14 @@ _efl_canvas_vg_container_child_get(Eo *obj EINA_UNUSED, Efl_Canvas_VG_Container_
104} 104}
105 105
106static Eina_Iterator * 106static Eina_Iterator *
107_efl_canvas_vg_container_children_get(Eo *obj EINA_UNUSED, Efl_Canvas_VG_Container_Data *pd) 107_efl_canvas_vg_container_children_get(Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Container_Data *pd)
108{ 108{
109 return eina_list_iterator_new(pd->children); 109 return eina_list_iterator_new(pd->children);
110} 110}
111 111
112static Eina_Bool 112static Eina_Bool
113_efl_canvas_vg_container_efl_gfx_path_interpolate(Eo *obj, 113_efl_canvas_vg_container_efl_gfx_path_interpolate(Eo *obj,
114 Efl_Canvas_VG_Container_Data *pd, 114 Efl_Canvas_Vg_Container_Data *pd,
115 const Efl_VG *from, const Efl_VG *to, 115 const Efl_VG *from, const Efl_VG *to,
116 double pos_map) 116 double pos_map)
117{ 117{
@@ -152,7 +152,7 @@ _efl_canvas_vg_container_efl_gfx_path_interpolate(Eo *obj,
152} 152}
153 153
154EOLIAN static Efl_VG * 154EOLIAN static Efl_VG *
155_efl_canvas_vg_container_efl_duplicate_duplicate(const Eo *obj, Efl_Canvas_VG_Container_Data *pd) 155_efl_canvas_vg_container_efl_duplicate_duplicate(const Eo *obj, Efl_Canvas_Vg_Container_Data *pd)
156{ 156{
157 Eina_List *l; 157 Eina_List *l;
158 Efl_VG *child; 158 Efl_VG *child;
diff --git a/src/lib/evas/canvas/evas_vg_gradient.c b/src/lib/evas/canvas/evas_vg_gradient.c
index 9a458b1..b55f3c3 100644
--- a/src/lib/evas/canvas/evas_vg_gradient.c
+++ b/src/lib/evas/canvas/evas_vg_gradient.c
@@ -9,7 +9,7 @@
9 9
10static void 10static void
11_efl_canvas_vg_gradient_efl_gfx_gradient_stop_set(Eo *obj EINA_UNUSED, 11_efl_canvas_vg_gradient_efl_gfx_gradient_stop_set(Eo *obj EINA_UNUSED,
12 Efl_Canvas_VG_Gradient_Data *pd, 12 Efl_Canvas_Vg_Gradient_Data *pd,
13 const Efl_Gfx_Gradient_Stop *colors, 13 const Efl_Gfx_Gradient_Stop *colors,
14 unsigned int length) 14 unsigned int length)
15{ 15{
@@ -28,7 +28,7 @@ _efl_canvas_vg_gradient_efl_gfx_gradient_stop_set(Eo *obj EINA_UNUSED,
28 28
29static void 29static void
30_efl_canvas_vg_gradient_efl_gfx_gradient_stop_get(const Eo *obj EINA_UNUSED, 30_efl_canvas_vg_gradient_efl_gfx_gradient_stop_get(const Eo *obj EINA_UNUSED,
31 Efl_Canvas_VG_Gradient_Data *pd, 31 Efl_Canvas_Vg_Gradient_Data *pd,
32 const Efl_Gfx_Gradient_Stop **colors, 32 const Efl_Gfx_Gradient_Stop **colors,
33 unsigned int *length) 33 unsigned int *length)
34{ 34{
@@ -38,7 +38,7 @@ _efl_canvas_vg_gradient_efl_gfx_gradient_stop_get(const Eo *obj EINA_UNUSED,
38 38
39static void 39static void
40_efl_canvas_vg_gradient_efl_gfx_gradient_spread_set(Eo *obj EINA_UNUSED, 40_efl_canvas_vg_gradient_efl_gfx_gradient_spread_set(Eo *obj EINA_UNUSED,
41 Efl_Canvas_VG_Gradient_Data *pd, 41 Efl_Canvas_Vg_Gradient_Data *pd,
42 Efl_Gfx_Gradient_Spread s) 42 Efl_Gfx_Gradient_Spread s)
43{ 43{
44 pd->s = s; 44 pd->s = s;
@@ -48,18 +48,18 @@ _efl_canvas_vg_gradient_efl_gfx_gradient_spread_set(Eo *obj EINA_UNUSED,
48 48
49static Efl_Gfx_Gradient_Spread 49static Efl_Gfx_Gradient_Spread
50_efl_canvas_vg_gradient_efl_gfx_gradient_spread_get(const Eo *obj EINA_UNUSED, 50_efl_canvas_vg_gradient_efl_gfx_gradient_spread_get(const Eo *obj EINA_UNUSED,
51 Efl_Canvas_VG_Gradient_Data *pd) 51 Efl_Canvas_Vg_Gradient_Data *pd)
52{ 52{
53 return pd->s; 53 return pd->s;
54} 54}
55 55
56static Eina_Bool 56static Eina_Bool
57_efl_canvas_vg_gradient_efl_gfx_path_interpolate(Eo *obj, 57_efl_canvas_vg_gradient_efl_gfx_path_interpolate(Eo *obj,
58 Efl_Canvas_VG_Gradient_Data *pd, 58 Efl_Canvas_Vg_Gradient_Data *pd,
59 const Efl_VG *from, const Efl_VG *to, 59 const Efl_VG *from, const Efl_VG *to,
60 double pos_map) 60 double pos_map)
61{ 61{
62 Efl_Canvas_VG_Gradient_Data *fromd, *tod; 62 Efl_Canvas_Vg_Gradient_Data *fromd, *tod;
63 Efl_Gfx_Gradient_Stop *colors; 63 Efl_Gfx_Gradient_Stop *colors;
64 unsigned int i; 64 unsigned int i;
65 double from_map; 65 double from_map;
@@ -97,7 +97,7 @@ _efl_canvas_vg_gradient_efl_gfx_path_interpolate(Eo *obj,
97} 97}
98 98
99EOLIAN static Efl_VG * 99EOLIAN static Efl_VG *
100_efl_canvas_vg_gradient_efl_duplicate_duplicate(const Eo *obj, Efl_Canvas_VG_Gradient_Data *pd) 100_efl_canvas_vg_gradient_efl_duplicate_duplicate(const Eo *obj, Efl_Canvas_Vg_Gradient_Data *pd)
101 101
102{ 102{
103 Efl_VG *cn = NULL; 103 Efl_VG *cn = NULL;
diff --git a/src/lib/evas/canvas/evas_vg_gradient_linear.c b/src/lib/evas/canvas/evas_vg_gradient_linear.c
index c02ada1..c7a1263 100644
--- a/src/lib/evas/canvas/evas_vg_gradient_linear.c
+++ b/src/lib/evas/canvas/evas_vg_gradient_linear.c
@@ -7,8 +7,8 @@
7 7
8#define MY_CLASS EFL_CANVAS_VG_GRADIENT_LINEAR_CLASS 8#define MY_CLASS EFL_CANVAS_VG_GRADIENT_LINEAR_CLASS
9 9
10typedef struct _Efl_Canvas_VG_Gradient_Linear_Data Efl_Canvas_VG_Gradient_Linear_Data; 10typedef struct _Efl_Canvas_Vg_Gradient_Linear_Data Efl_Canvas_Vg_Gradient_Linear_Data;
11struct _Efl_Canvas_VG_Gradient_Linear_Data 11struct _Efl_Canvas_Vg_Gradient_Linear_Data
12{ 12{
13 struct { 13 struct {
14 double x, y; 14 double x, y;
@@ -17,7 +17,7 @@ struct _Efl_Canvas_VG_Gradient_Linear_Data
17 17
18static void 18static void
19_efl_canvas_vg_gradient_linear_efl_gfx_gradient_linear_start_set(Eo *obj EINA_UNUSED, 19_efl_canvas_vg_gradient_linear_efl_gfx_gradient_linear_start_set(Eo *obj EINA_UNUSED,
20 Efl_Canvas_VG_Gradient_Linear_Data *pd, 20 Efl_Canvas_Vg_Gradient_Linear_Data *pd,
21 double x, double y) 21 double x, double y)
22{ 22{
23 pd->start.x = x; 23 pd->start.x = x;
@@ -28,7 +28,7 @@ _efl_canvas_vg_gradient_linear_efl_gfx_gradient_linear_start_set(Eo *obj EINA_UN
28 28
29static void 29static void
30_efl_canvas_vg_gradient_linear_efl_gfx_gradient_linear_start_get(const Eo *obj EINA_UNUSED, 30_efl_canvas_vg_gradient_linear_efl_gfx_gradient_linear_start_get(const Eo *obj EINA_UNUSED,
31 Efl_Canvas_VG_Gradient_Linear_Data *pd, 31 Efl_Canvas_Vg_Gradient_Linear_Data *pd,
32 double *x, double *y) 32 double *x, double *y)
33{ 33{
34 if (x) *x = pd->start.x; 34 if (x) *x = pd->start.x;
@@ -37,7 +37,7 @@ _efl_canvas_vg_gradient_linear_efl_gfx_gradient_linear_start_get(const Eo *obj E
37 37
38static void 38static void
39_efl_canvas_vg_gradient_linear_efl_gfx_gradient_linear_end_set(Eo *obj EINA_UNUSED, 39_efl_canvas_vg_gradient_linear_efl_gfx_gradient_linear_end_set(Eo *obj EINA_UNUSED,
40 Efl_Canvas_VG_Gradient_Linear_Data *pd, 40 Efl_Canvas_Vg_Gradient_Linear_Data *pd,
41 double x, double y) 41 double x, double y)
42{ 42{
43 pd->end.x = x; 43 pd->end.x = x;
@@ -48,7 +48,7 @@ _efl_canvas_vg_gradient_linear_efl_gfx_gradient_linear_end_set(Eo *obj EINA_UNUS
48 48
49static void 49static void
50_efl_canvas_vg_gradient_linear_efl_gfx_gradient_linear_end_get(const Eo *obj EINA_UNUSED, 50_efl_canvas_vg_gradient_linear_efl_gfx_gradient_linear_end_get(const Eo *obj EINA_UNUSED,
51 Efl_Canvas_VG_Gradient_Linear_Data *pd, 51 Efl_Canvas_Vg_Gradient_Linear_Data *pd,
52 double *x, double *y) 52 double *x, double *y)
53{ 53{
54 if (x) *x = pd->end.x; 54 if (x) *x = pd->end.x;
@@ -60,10 +60,10 @@ _efl_canvas_vg_gradient_linear_render_pre(Eo *obj,
60 Eina_Matrix3 *parent, 60 Eina_Matrix3 *parent,
61 Ector_Surface *s, 61 Ector_Surface *s,
62 void *data, 62 void *data,
63 Efl_Canvas_VG_Node_Data *nd) 63 Efl_Canvas_Vg_Node_Data *nd)
64{ 64{
65 Efl_Canvas_VG_Gradient_Linear_Data *pd = data; 65 Efl_Canvas_Vg_Gradient_Linear_Data *pd = data;
66 Efl_Canvas_VG_Gradient_Data *gd; 66 Efl_Canvas_Vg_Gradient_Data *gd;
67 67
68 if (nd->flags == EFL_GFX_CHANGE_FLAG_NONE) return ; 68 if (nd->flags == EFL_GFX_CHANGE_FLAG_NONE) return ;
69 69
@@ -92,9 +92,9 @@ _efl_canvas_vg_gradient_linear_render_pre(Eo *obj,
92 92
93static Eo * 93static Eo *
94_efl_canvas_vg_gradient_linear_efl_object_constructor(Eo *obj, 94_efl_canvas_vg_gradient_linear_efl_object_constructor(Eo *obj,
95 Efl_Canvas_VG_Gradient_Linear_Data *pd) 95 Efl_Canvas_Vg_Gradient_Linear_Data *pd)
96{ 96{
97 Efl_Canvas_VG_Node_Data *nd; 97 Efl_Canvas_Vg_Node_Data *nd;
98 98
99 obj = efl_constructor(efl_super(obj, MY_CLASS)); 99 obj = efl_constructor(efl_super(obj, MY_CLASS));
100 100
@@ -106,15 +106,15 @@ _efl_canvas_vg_gradient_linear_efl_object_constructor(Eo *obj,
106} 106}
107 107
108static void 108static void
109_efl_canvas_vg_gradient_linear_efl_object_destructor(Eo *obj, Efl_Canvas_VG_Gradient_Linear_Data *pd EINA_UNUSED) 109_efl_canvas_vg_gradient_linear_efl_object_destructor(Eo *obj, Efl_Canvas_Vg_Gradient_Linear_Data *pd EINA_UNUSED)
110{ 110{
111 efl_destructor(efl_super(obj, MY_CLASS)); 111 efl_destructor(efl_super(obj, MY_CLASS));
112} 112}
113 113
114static void 114static void
115_efl_canvas_vg_gradient_linear_efl_gfx_path_bounds_get(const Eo *obj, Efl_Canvas_VG_Gradient_Linear_Data *pd, Eina_Rect *r) 115_efl_canvas_vg_gradient_linear_efl_gfx_path_bounds_get(const Eo *obj, Efl_Canvas_Vg_Gradient_Linear_Data *pd, Eina_Rect *r)
116{ 116{
117 Efl_Canvas_VG_Node_Data *nd; 117 Efl_Canvas_Vg_Node_Data *nd;
118 118
119 nd = efl_data_scope_get(obj, EFL_CANVAS_VG_NODE_CLASS); 119 nd = efl_data_scope_get(obj, EFL_CANVAS_VG_NODE_CLASS);
120 EINA_RECTANGLE_SET(r, 120 EINA_RECTANGLE_SET(r,
@@ -124,11 +124,11 @@ _efl_canvas_vg_gradient_linear_efl_gfx_path_bounds_get(const Eo *obj, Efl_Canvas
124 124
125static Eina_Bool 125static Eina_Bool
126_efl_canvas_vg_gradient_linear_efl_gfx_path_interpolate(Eo *obj, 126_efl_canvas_vg_gradient_linear_efl_gfx_path_interpolate(Eo *obj,
127 Efl_Canvas_VG_Gradient_Linear_Data *pd, 127 Efl_Canvas_Vg_Gradient_Linear_Data *pd,
128 const Efl_VG *from, const Efl_VG *to, 128 const Efl_VG *from, const Efl_VG *to,
129 double pos_map) 129 double pos_map)
130{ 130{
131 Efl_Canvas_VG_Gradient_Linear_Data *fromd, *tod; 131 Efl_Canvas_Vg_Gradient_Linear_Data *fromd, *tod;
132 double from_map; 132 double from_map;
133 Eina_Bool r; 133 Eina_Bool r;
134 134
@@ -154,7 +154,7 @@ _efl_canvas_vg_gradient_linear_efl_gfx_path_interpolate(Eo *obj,
154} 154}
155 155
156EOLIAN static Efl_VG * 156EOLIAN static Efl_VG *
157_efl_canvas_vg_gradient_linear_efl_duplicate_duplicate(const Eo *obj, Efl_Canvas_VG_Gradient_Linear_Data *pd) 157_efl_canvas_vg_gradient_linear_efl_duplicate_duplicate(const Eo *obj, Efl_Canvas_Vg_Gradient_Linear_Data *pd)
158{ 158{
159 Efl_VG *cn = NULL; 159 Efl_VG *cn = NULL;
160 160
diff --git a/src/lib/evas/canvas/evas_vg_gradient_radial.c b/src/lib/evas/canvas/evas_vg_gradient_radial.c
index 5565fc8..573c17a 100644
--- a/src/lib/evas/canvas/evas_vg_gradient_radial.c
+++ b/src/lib/evas/canvas/evas_vg_gradient_radial.c
@@ -5,8 +5,8 @@
5 5
6#define MY_CLASS EFL_CANVAS_VG_GRADIENT_RADIAL_CLASS 6#define MY_CLASS EFL_CANVAS_VG_GRADIENT_RADIAL_CLASS
7 7
8typedef struct _Efl_Canvas_VG_Gradient_Radial_Data Efl_Canvas_VG_Gradient_Radial_Data; 8typedef struct _Efl_Canvas_Vg_Gradient_Radial_Data Efl_Canvas_Vg_Gradient_Radial_Data;
9struct _Efl_Canvas_VG_Gradient_Radial_Data 9struct _Efl_Canvas_Vg_Gradient_Radial_Data
10{ 10{
11 struct { 11 struct {
12 double x, y; 12 double x, y;
@@ -16,7 +16,7 @@ struct _Efl_Canvas_VG_Gradient_Radial_Data
16 16
17static void 17static void
18_efl_canvas_vg_gradient_radial_efl_gfx_gradient_radial_center_set(Eo *obj EINA_UNUSED, 18_efl_canvas_vg_gradient_radial_efl_gfx_gradient_radial_center_set(Eo *obj EINA_UNUSED,
19 Efl_Canvas_VG_Gradient_Radial_Data *pd, 19 Efl_Canvas_Vg_Gradient_Radial_Data *pd,
20 double x, double y) 20 double x, double y)
21{ 21{
22 pd->center.x = x; 22 pd->center.x = x;
@@ -27,7 +27,7 @@ _efl_canvas_vg_gradient_radial_efl_gfx_gradient_radial_center_set(Eo *obj EINA_U
27 27
28static void 28static void
29_efl_canvas_vg_gradient_radial_efl_gfx_gradient_radial_center_get(const Eo *obj EINA_UNUSED, 29_efl_canvas_vg_gradient_radial_efl_gfx_gradient_radial_center_get(const Eo *obj EINA_UNUSED,
30 Efl_Canvas_VG_Gradient_Radial_Data *pd, 30 Efl_Canvas_Vg_Gradient_Radial_Data *pd,
31 double *x, double *y) 31 double *x, double *y)
32{ 32{
33 if (x) *x = pd->center.x; 33 if (x) *x = pd->center.x;
@@ -36,7 +36,7 @@ _efl_canvas_vg_gradient_radial_efl_gfx_gradient_radial_center_get(const Eo *obj
36 36
37static void 37static void
38_efl_canvas_vg_gradient_radial_efl_gfx_gradient_radial_radius_set(Eo *obj EINA_UNUSED, 38_efl_canvas_vg_gradient_radial_efl_gfx_gradient_radial_radius_set(Eo *obj EINA_UNUSED,
39 Efl_Canvas_VG_Gradient_Radial_Data *pd, 39 Efl_Canvas_Vg_Gradient_Radial_Data *pd,
40 double r) 40 double r)
41{ 41{
42 pd->radius = r; 42 pd->radius = r;
@@ -46,14 +46,14 @@ _efl_canvas_vg_gradient_radial_efl_gfx_gradient_radial_radius_set(Eo *obj EINA_U
46 46
47static double 47static double
48_efl_canvas_vg_gradient_radial_efl_gfx_gradient_radial_radius_get(const Eo *obj EINA_UNUSED, 48_efl_canvas_vg_gradient_radial_efl_gfx_gradient_radial_radius_get(const Eo *obj EINA_UNUSED,
49 Efl_Canvas_VG_Gradient_Radial_Data *pd) 49 Efl_Canvas_Vg_Gradient_Radial_Data *pd)
50{ 50{
51 return pd->radius; 51 return pd->radius;
52} 52}
53 53
54static void 54static void
55_efl_canvas_vg_gradient_radial_efl_gfx_gradient_radial_focal_set(Eo *obj EINA_UNUSED, 55_efl_canvas_vg_gradient_radial_efl_gfx_gradient_radial_focal_set(Eo *obj EINA_UNUSED,
56 Efl_Canvas_VG_Gradient_Radial_Data *pd, 56 Efl_Canvas_Vg_Gradient_Radial_Data *pd,
57 double x, double y) 57 double x, double y)
58{ 58{
59 pd->focal.x = x; 59 pd->focal.x = x;
@@ -64,7 +64,7 @@ _efl_canvas_vg_gradient_radial_efl_gfx_gradient_radial_focal_set(Eo *obj EINA_UN
64 64
65static void 65static void
66_efl_canvas_vg_gradient_radial_efl_gfx_gradient_radial_focal_get(const Eo *obj EINA_UNUSED, 66_efl_canvas_vg_gradient_radial_efl_gfx_gradient_radial_focal_get(const Eo *obj EINA_UNUSED,
67 Efl_Canvas_VG_Gradient_Radial_Data *pd, 67 Efl_Canvas_Vg_Gradient_Radial_Data *pd,
68 double *x, double *y) 68 double *x, double *y)
69{ 69{
70 if (x) *x = pd->focal.x; 70 if (x) *x = pd->focal.x;
@@ -76,10 +76,10 @@ _efl_canvas_vg_gradient_radial_render_pre(Eo *obj,
76 Eina_Matrix3 *parent, 76 Eina_Matrix3 *parent,
77 Ector_Surface *s, 77 Ector_Surface *s,
78 void *data, 78 void *data,
79 Efl_Canvas_VG_Node_Data *nd) 79 Efl_Canvas_Vg_Node_Data *nd)
80{ 80{
81 Efl_Canvas_VG_Gradient_Radial_Data *pd = data; 81 Efl_Canvas_Vg_Gradient_Radial_Data *pd = data;
82 Efl_Canvas_VG_Gradient_Data *gd; 82 Efl_Canvas_Vg_Gradient_Data *gd;
83 83
84 if (nd->flags == EFL_GFX_CHANGE_FLAG_NONE) return ; 84 if (nd->flags == EFL_GFX_CHANGE_FLAG_NONE) return ;
85 85
@@ -108,9 +108,9 @@ _efl_canvas_vg_gradient_radial_render_pre(Eo *obj,
108} 108}
109 109
110static Eo * 110static Eo *
111_efl_canvas_vg_gradient_radial_efl_object_constructor(Eo *obj, Efl_Canvas_VG_Gradient_Radial_Data *pd) 111_efl_canvas_vg_gradient_radial_efl_object_constructor(Eo *obj, Efl_Canvas_Vg_Gradient_Radial_Data *pd)
112{ 112{
113 Efl_Canvas_VG_Node_Data *nd; 113 Efl_Canvas_Vg_Node_Data *nd;
114 114
115 obj = efl_constructor(efl_super(obj, MY_CLASS)); 115 obj = efl_constructor(efl_super(obj, MY_CLASS));
116 116
@@ -123,15 +123,15 @@ _efl_canvas_vg_gradient_radial_efl_object_constructor(Eo *obj, Efl_Canvas_VG_Gra
123 123
124static void 124static void
125_efl_canvas_vg_gradient_radial_efl_object_destructor(Eo *obj, 125_efl_canvas_vg_gradient_radial_efl_object_destructor(Eo *obj,
126 Efl_Canvas_VG_Gradient_Radial_Data *pd EINA_UNUSED) 126 Efl_Canvas_Vg_Gradient_Radial_Data *pd EINA_UNUSED)
127{ 127{
128 efl_destructor(efl_super(obj, MY_CLASS)); 128 efl_destructor(efl_super(obj, MY_CLASS));
129} 129}
130 130
131static void 131static void
132_efl_canvas_vg_gradient_radial_efl_gfx_path_bounds_get(const Eo *obj, Efl_Canvas_VG_Gradient_Radial_Data *pd, Eina_Rect *r) 132_efl_canvas_vg_gradient_radial_efl_gfx_path_bounds_get(const Eo *obj, Efl_Canvas_Vg_Gradient_Radial_Data *pd, Eina_Rect *r)
133{ 133{
134 Efl_Canvas_VG_Node_Data *nd; 134 Efl_Canvas_Vg_Node_Data *nd;
135 135
136 nd = efl_data_scope_get(obj, EFL_CANVAS_VG_NODE_CLASS); 136 nd = efl_data_scope_get(obj, EFL_CANVAS_VG_NODE_CLASS);
137 EINA_RECTANGLE_SET(r, 137 EINA_RECTANGLE_SET(r,
@@ -142,11 +142,11 @@ _efl_canvas_vg_gradient_radial_efl_gfx_path_bounds_get(const Eo *obj, Efl_Canvas
142 142
143static Eina_Bool 143static Eina_Bool
144_efl_canvas_vg_gradient_radial_efl_gfx_path_interpolate(Eo *obj, 144_efl_canvas_vg_gradient_radial_efl_gfx_path_interpolate(Eo *obj,
145 Efl_Canvas_VG_Gradient_Radial_Data *pd, 145 Efl_Canvas_Vg_Gradient_Radial_Data *pd,
146 const Efl_VG *from, const Efl_VG *to, 146 const Efl_VG *from, const Efl_VG *to,
147 double pos_map) 147 double pos_map)
148{ 148{
149 Efl_Canvas_VG_Gradient_Radial_Data *fromd, *tod; 149 Efl_Canvas_Vg_Gradient_Radial_Data *fromd, *tod;
150 double from_map; 150 double from_map;
151 Eina_Bool r; 151 Eina_Bool r;
152 152
@@ -174,7 +174,7 @@ _efl_canvas_vg_gradient_radial_efl_gfx_path_interpolate(Eo *obj,
174 174
175 175
176EOLIAN static Efl_VG * 176EOLIAN static Efl_VG *
177_efl_canvas_vg_gradient_radial_efl_duplicate_duplicate(const Eo *obj, Efl_Canvas_VG_Gradient_Radial_Data *pd) 177_efl_canvas_vg_gradient_radial_efl_duplicate_duplicate(const Eo *obj, Efl_Canvas_Vg_Gradient_Radial_Data *pd)
178 178
179{ 179{
180 Efl_VG *cn = NULL; 180 Efl_VG *cn = NULL;
diff --git a/src/lib/evas/canvas/evas_vg_node.c b/src/lib/evas/canvas/evas_vg_node.c
index 76e91df..36c2f5d 100644
--- a/src/lib/evas/canvas/evas_vg_node.c
+++ b/src/lib/evas/canvas/evas_vg_node.c
@@ -8,7 +8,7 @@
8 8
9#define MY_CLASS EFL_CANVAS_VG_NODE_CLASS 9#define MY_CLASS EFL_CANVAS_VG_NODE_CLASS
10 10
11static const Efl_Canvas_VG_Interpolation interpolation_identity = { 11static const Efl_Canvas_Vg_Interpolation interpolation_identity = {
12 { 0, 0, 0, 1 }, 12 { 0, 0, 0, 1 },
13 { 0, 0, 0, 1 }, 13 { 0, 0, 0, 1 },
14 { 0, 0, 0 }, 14 { 0, 0, 0 },
@@ -19,7 +19,7 @@ static const Efl_Canvas_VG_Interpolation interpolation_identity = {
19static void 19static void
20_efl_canvas_vg_node_property_changed(void *data, const Efl_Event *event EINA_UNUSED) 20_efl_canvas_vg_node_property_changed(void *data, const Efl_Event *event EINA_UNUSED)
21{ 21{
22 Efl_Canvas_VG_Node_Data *pd = data; 22 Efl_Canvas_Vg_Node_Data *pd = data;
23 Eo *parent; 23 Eo *parent;
24 24
25 if (!pd->flags) pd->flags = EFL_GFX_CHANGE_FLAG_ALL; 25 if (!pd->flags) pd->flags = EFL_GFX_CHANGE_FLAG_ALL;
@@ -30,7 +30,7 @@ _efl_canvas_vg_node_property_changed(void *data, const Efl_Event *event EINA_UNU
30 30
31static void 31static void
32_efl_canvas_vg_node_transformation_set(Eo *obj, 32_efl_canvas_vg_node_transformation_set(Eo *obj,
33 Efl_Canvas_VG_Node_Data *pd, 33 Efl_Canvas_Vg_Node_Data *pd,
34 const Eina_Matrix3 *m) 34 const Eina_Matrix3 *m)
35{ 35{
36 if (pd->intp) 36 if (pd->intp)
@@ -59,14 +59,14 @@ _efl_canvas_vg_node_transformation_set(Eo *obj,
59} 59}
60 60
61const Eina_Matrix3 * 61const Eina_Matrix3 *
62_efl_canvas_vg_node_transformation_get(const Eo *obj EINA_UNUSED, Efl_Canvas_VG_Node_Data *pd) 62_efl_canvas_vg_node_transformation_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Node_Data *pd)
63{ 63{
64 return pd->m; 64 return pd->m;
65} 65}
66 66
67static void 67static void
68_efl_canvas_vg_node_origin_set(Eo *obj, 68_efl_canvas_vg_node_origin_set(Eo *obj,
69 Efl_Canvas_VG_Node_Data *pd, 69 Efl_Canvas_Vg_Node_Data *pd,
70 double x, double y) 70 double x, double y)
71{ 71{
72 pd->x = x; 72 pd->x = x;
@@ -77,7 +77,7 @@ _efl_canvas_vg_node_origin_set(Eo *obj,
77 77
78static void 78static void
79_efl_canvas_vg_node_origin_get(const Eo *obj EINA_UNUSED, 79_efl_canvas_vg_node_origin_get(const Eo *obj EINA_UNUSED,
80 Efl_Canvas_VG_Node_Data *pd, 80 Efl_Canvas_Vg_Node_Data *pd,
81 double *x, double *y) 81 double *x, double *y)
82{ 82{
83 if (x) *x = pd->x; 83 if (x) *x = pd->x;
@@ -85,7 +85,7 @@ _efl_canvas_vg_node_origin_get(const Eo *obj EINA_UNUSED,
85} 85}
86 86
87static void 87static void
88_efl_canvas_vg_node_efl_gfx_position_set(Eo *obj EINA_UNUSED, Efl_Canvas_VG_Node_Data *pd, Eina_Position2D pos) 88_efl_canvas_vg_node_efl_gfx_position_set(Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Node_Data *pd, Eina_Position2D pos)
89{ 89{
90 pd->x = (double) pos.x; 90 pd->x = (double) pos.x;
91 pd->y = (double) pos.y; 91 pd->y = (double) pos.y;
@@ -94,7 +94,7 @@ _efl_canvas_vg_node_efl_gfx_position_set(Eo *obj EINA_UNUSED, Efl_Canvas_VG_Node
94} 94}
95 95
96static Eina_Position2D 96static Eina_Position2D
97_efl_canvas_vg_node_efl_gfx_position_get(const Eo *obj EINA_UNUSED, Efl_Canvas_VG_Node_Data *pd) 97_efl_canvas_vg_node_efl_gfx_position_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Node_Data *pd)
98{ 98{
99 // NOTE: This casts double to int! 99 // NOTE: This casts double to int!
100 return EINA_POSITION2D(pd->x, pd->y); 100 return EINA_POSITION2D(pd->x, pd->y);
@@ -102,7 +102,7 @@ _efl_canvas_vg_node_efl_gfx_position_get(const Eo *obj EINA_UNUSED, Efl_Canvas_V
102 102
103static void 103static void
104_efl_canvas_vg_node_efl_gfx_visible_set(Eo *obj EINA_UNUSED, 104_efl_canvas_vg_node_efl_gfx_visible_set(Eo *obj EINA_UNUSED,
105 Efl_Canvas_VG_Node_Data *pd, Eina_Bool v) 105 Efl_Canvas_Vg_Node_Data *pd, Eina_Bool v)
106{ 106{
107 pd->visibility = v; 107 pd->visibility = v;
108 108
@@ -112,14 +112,14 @@ _efl_canvas_vg_node_efl_gfx_visible_set(Eo *obj EINA_UNUSED,
112 112
113static Eina_Bool 113static Eina_Bool
114_efl_canvas_vg_node_efl_gfx_visible_get(const Eo *obj EINA_UNUSED, 114_efl_canvas_vg_node_efl_gfx_visible_get(const Eo *obj EINA_UNUSED,
115 Efl_Canvas_VG_Node_Data *pd) 115 Efl_Canvas_Vg_Node_Data *pd)
116{ 116{
117 return pd->visibility; 117 return pd->visibility;
118} 118}
119 119
120static void 120static void
121_efl_canvas_vg_node_efl_gfx_color_color_set(Eo *obj EINA_UNUSED, 121_efl_canvas_vg_node_efl_gfx_color_color_set(Eo *obj EINA_UNUSED,
122 Efl_Canvas_VG_Node_Data *pd, 122 Efl_Canvas_Vg_Node_Data *pd,
123 int r, int g, int b, int a) 123 int r, int g, int b, int a)
124{ 124{
125 if (r > 255) r = 255; 125 if (r > 255) r = 255;
@@ -156,7 +156,7 @@ _efl_canvas_vg_node_efl_gfx_color_color_set(Eo *obj EINA_UNUSED,
156 156
157static void 157static void
158_efl_canvas_vg_node_efl_gfx_color_color_get(const Eo *obj EINA_UNUSED, 158_efl_canvas_vg_node_efl_gfx_color_color_get(const Eo *obj EINA_UNUSED,
159 Efl_Canvas_VG_Node_Data *pd, 159 Efl_Canvas_Vg_Node_Data *pd,
160 int *r, int *g, int *b, int *a) 160 int *r, int *g, int *b, int *a)
161{ 161{
162 if (r) *r = pd->r; 162 if (r) *r = pd->r;
@@ -167,7 +167,7 @@ _efl_canvas_vg_node_efl_gfx_color_color_get(const Eo *obj EINA_UNUSED,
167 167
168static void 168static void
169_efl_canvas_vg_node_mask_set(Eo *obj EINA_UNUSED, 169_efl_canvas_vg_node_mask_set(Eo *obj EINA_UNUSED,
170 Efl_Canvas_VG_Node_Data *pd, 170 Efl_Canvas_Vg_Node_Data *pd,
171 Efl_VG *r) 171 Efl_VG *r)
172{ 172{
173 Efl_VG *tmp = pd->mask; 173 Efl_VG *tmp = pd->mask;
@@ -179,13 +179,13 @@ _efl_canvas_vg_node_mask_set(Eo *obj EINA_UNUSED,
179} 179}
180 180
181static Efl_VG* 181static Efl_VG*
182_efl_canvas_vg_node_mask_get(const Eo *obj EINA_UNUSED, Efl_Canvas_VG_Node_Data *pd) 182_efl_canvas_vg_node_mask_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Node_Data *pd)
183{ 183{
184 return pd->mask; 184 return pd->mask;
185} 185}
186 186
187static Eina_Size2D 187static Eina_Size2D
188_efl_canvas_vg_node_efl_gfx_size_get(const Eo *obj, Efl_Canvas_VG_Node_Data *pd EINA_UNUSED) 188_efl_canvas_vg_node_efl_gfx_size_get(const Eo *obj, Efl_Canvas_Vg_Node_Data *pd EINA_UNUSED)
189{ 189{
190 Eina_Rect r; 190 Eina_Rect r;
191 191
@@ -194,7 +194,7 @@ _efl_canvas_vg_node_efl_gfx_size_get(const Eo *obj, Efl_Canvas_VG_Node_Data *pd
194} 194}
195 195
196EOLIAN static Eina_Rect 196EOLIAN static Eina_Rect
197_efl_canvas_vg_node_efl_gfx_geometry_get(const Eo *obj, Efl_Canvas_VG_Node_Data *pd EINA_UNUSED) 197_efl_canvas_vg_node_efl_gfx_geometry_get(const Eo *obj, Efl_Canvas_Vg_Node_Data *pd EINA_UNUSED)
198{ 198{
199 Eina_Rect r; 199 Eina_Rect r;
200 r.pos = efl_gfx_position_get(obj); 200 r.pos = efl_gfx_position_get(obj);
@@ -206,7 +206,7 @@ _efl_canvas_vg_node_efl_gfx_geometry_get(const Eo *obj, Efl_Canvas_VG_Node_Data
206static Eina_Bool 206static Eina_Bool
207_efl_canvas_vg_node_parent_checked_get(Eo *obj, 207_efl_canvas_vg_node_parent_checked_get(Eo *obj,
208 Eo **parent, 208 Eo **parent,
209 Efl_Canvas_VG_Container_Data **cd) 209 Efl_Canvas_Vg_Container_Data **cd)
210{ 210{
211 *cd = NULL; 211 *cd = NULL;
212 *parent = efl_parent_get(obj); 212 *parent = efl_parent_get(obj);
@@ -220,7 +220,7 @@ _efl_canvas_vg_node_parent_checked_get(Eo *obj,
220 goto on_error; 220 goto on_error;
221 } 221 }
222 } 222 }
223 else if (efl_isa(*parent, EFL_CANVAS_VG_CLASS)) 223 else if (efl_isa(*parent, EFL_CANVAS_VG_OBJECT_CLASS))
224 { 224 {
225 *cd = NULL; 225 *cd = NULL;
226 *parent = NULL; 226 *parent = NULL;
@@ -241,9 +241,9 @@ _efl_canvas_vg_node_parent_checked_get(Eo *obj,
241 241
242static Eo * 242static Eo *
243_efl_canvas_vg_node_efl_object_constructor(Eo *obj, 243_efl_canvas_vg_node_efl_object_constructor(Eo *obj,
244 Efl_Canvas_VG_Node_Data *pd) 244 Efl_Canvas_Vg_Node_Data *pd)
245{ 245{
246 Efl_Canvas_VG_Container_Data *cd = NULL; 246 Efl_Canvas_Vg_Container_Data *cd = NULL;
247 Eo *parent; 247 Eo *parent;
248 248
249 obj = efl_constructor(efl_super(obj, MY_CLASS)); 249 obj = efl_constructor(efl_super(obj, MY_CLASS));
@@ -261,7 +261,7 @@ _efl_canvas_vg_node_efl_object_constructor(Eo *obj,
261} 261}
262 262
263static void 263static void
264_efl_canvas_vg_node_efl_object_invalidate(Eo *obj, Efl_Canvas_VG_Node_Data *pd) 264_efl_canvas_vg_node_efl_object_invalidate(Eo *obj, Efl_Canvas_Vg_Node_Data *pd)
265{ 265{
266 if (pd->renderer) 266 if (pd->renderer)
267 { 267 {
@@ -273,7 +273,7 @@ _efl_canvas_vg_node_efl_object_invalidate(Eo *obj, Efl_Canvas_VG_Node_Data *pd)
273} 273}
274 274
275static void 275static void
276_efl_canvas_vg_node_efl_object_destructor(Eo *obj, Efl_Canvas_VG_Node_Data *pd) 276_efl_canvas_vg_node_efl_object_destructor(Eo *obj, Efl_Canvas_Vg_Node_Data *pd)
277{ 277{
278 if (pd->m) 278 if (pd->m)
279 { 279 {
@@ -290,7 +290,7 @@ _efl_canvas_vg_node_efl_object_destructor(Eo *obj, Efl_Canvas_VG_Node_Data *pd)
290} 290}
291 291
292static void 292static void
293_efl_canvas_vg_node_name_insert(Eo *obj, Efl_Canvas_VG_Container_Data *cd) 293_efl_canvas_vg_node_name_insert(Eo *obj, Efl_Canvas_Vg_Container_Data *cd)
294{ 294{
295 Eo *set; 295 Eo *set;
296 const char *name = efl_name_get(efl_super(obj, MY_CLASS)); 296 const char *name = efl_name_get(efl_super(obj, MY_CLASS));
@@ -311,9 +311,9 @@ _efl_canvas_vg_node_name_insert(Eo *obj, Efl_Canvas_VG_Container_Data *cd)
311} 311}
312 312
313static void 313static void
314_efl_canvas_vg_node_efl_object_name_set(Eo *obj, Efl_Canvas_VG_Node_Data *pd EINA_UNUSED, const char *name) 314_efl_canvas_vg_node_efl_object_name_set(Eo *obj, Efl_Canvas_Vg_Node_Data *pd EINA_UNUSED, const char *name)
315{ 315{
316 Efl_Canvas_VG_Container_Data *cd = NULL; 316 Efl_Canvas_Vg_Container_Data *cd = NULL;
317 Eo *parent = NULL; 317 Eo *parent = NULL;
318 const char *pname = efl_name_get(obj); 318 const char *pname = efl_name_get(obj);
319 319
@@ -329,11 +329,11 @@ _efl_canvas_vg_node_efl_object_name_set(Eo *obj, Efl_Canvas_VG_Node_Data *pd EIN
329 329
330static void 330static void
331_efl_canvas_vg_node_efl_object_parent_set(Eo *obj, 331_efl_canvas_vg_node_efl_object_parent_set(Eo *obj,
332 Efl_Canvas_VG_Node_Data *pd EINA_UNUSED, 332 Efl_Canvas_Vg_Node_Data *pd EINA_UNUSED,
333 Eo *parent) 333 Eo *parent)
334{ 334{
335 Efl_Canvas_VG_Container_Data *cd = NULL; 335 Efl_Canvas_Vg_Container_Data *cd = NULL;
336 Efl_Canvas_VG_Container_Data *old_cd = NULL; 336 Efl_Canvas_Vg_Container_Data *old_cd = NULL;
337 Eo *old_parent = NULL; 337 Eo *old_parent = NULL;
338 Eina_Bool parent_container = EINA_TRUE; 338 Eina_Bool parent_container = EINA_TRUE;
339 339
@@ -346,7 +346,7 @@ _efl_canvas_vg_node_efl_object_parent_set(Eo *obj,
346 goto on_error; 346 goto on_error;
347 } 347 }
348 } 348 }
349 else if (efl_isa(parent, EFL_CANVAS_VG_CLASS)) 349 else if (efl_isa(parent, EFL_CANVAS_VG_OBJECT_CLASS))
350 { 350 {
351 parent_container = EINA_FALSE; 351 parent_container = EINA_FALSE;
352 } 352 }
@@ -389,9 +389,9 @@ _efl_canvas_vg_node_efl_object_parent_set(Eo *obj,
389} 389}
390 390
391static void 391static void
392_efl_canvas_vg_node_efl_gfx_stack_raise(Eo *obj, Efl_Canvas_VG_Node_Data *pd EINA_UNUSED) 392_efl_canvas_vg_node_efl_gfx_stack_raise(Eo *obj, Efl_Canvas_Vg_Node_Data *pd EINA_UNUSED)
393{ 393{
394 Efl_Canvas_VG_Container_Data *cd; 394 Efl_Canvas_Vg_Container_Data *cd;
395 Eina_List *lookup, *next; 395 Eina_List *lookup, *next;
396 Eo *parent; 396 Eo *parent;
397 397
@@ -418,10 +418,10 @@ _efl_canvas_vg_node_efl_gfx_stack_raise(Eo *obj, Efl_Canvas_VG_Node_Data *pd EIN
418 418
419static void 419static void
420_efl_canvas_vg_node_efl_gfx_stack_stack_above(Eo *obj, 420_efl_canvas_vg_node_efl_gfx_stack_stack_above(Eo *obj,
421 Efl_Canvas_VG_Node_Data *pd EINA_UNUSED, 421 Efl_Canvas_Vg_Node_Data *pd EINA_UNUSED,
422 Efl_Gfx_Stack *above) 422 Efl_Gfx_Stack *above)
423{ 423{
424 Efl_Canvas_VG_Container_Data *cd; 424 Efl_Canvas_Vg_Container_Data *cd;
425 Eina_List *lookup, *ref; 425 Eina_List *lookup, *ref;
426 Eo *parent; 426 Eo *parent;
427 427
@@ -448,10 +448,10 @@ _efl_canvas_vg_node_efl_gfx_stack_stack_above(Eo *obj,
448 448
449static void 449static void
450_efl_canvas_vg_node_efl_gfx_stack_stack_below(Eo *obj, 450_efl_canvas_vg_node_efl_gfx_stack_stack_below(Eo *obj,
451 Efl_Canvas_VG_Node_Data *pd EINA_UNUSED, 451 Efl_Canvas_Vg_Node_Data *pd EINA_UNUSED,
452 Efl_Gfx_Stack *below) 452 Efl_Gfx_Stack *below)
453{ 453{
454 Efl_Canvas_VG_Container_Data *cd; 454 Efl_Canvas_Vg_Container_Data *cd;
455 Eina_List *lookup, *ref; 455 Eina_List *lookup, *ref;
456 Eo *parent; 456 Eo *parent;
457 457
@@ -477,9 +477,9 @@ _efl_canvas_vg_node_efl_gfx_stack_stack_below(Eo *obj,
477} 477}
478 478
479static void 479static void
480_efl_canvas_vg_node_efl_gfx_stack_lower(Eo *obj, Efl_Canvas_VG_Node_Data *pd EINA_UNUSED) 480_efl_canvas_vg_node_efl_gfx_stack_lower(Eo *obj, Efl_Canvas_Vg_Node_Data *pd EINA_UNUSED)
481{ 481{
482 Efl_Canvas_VG_Container_Data *cd; 482 Efl_Canvas_Vg_Container_Data *cd;
483 Eina_List *lookup, *prev; 483 Eina_List *lookup, *prev;
484 Eo *parent; 484 Eo *parent;
485 485
@@ -527,7 +527,7 @@ _efl_canvas_vg_node_walk_down_at(const Eo *root, Eina_Array *a, Eina_Rectangle *
527 527
528 if (efl_isa(root, EFL_CANVAS_VG_CONTAINER_CLASS)) 528 if (efl_isa(root, EFL_CANVAS_VG_CONTAINER_CLASS))
529 { 529 {
530 Efl_Canvas_VG_Container_Data *cd; 530 Efl_Canvas_Vg_Container_Data *cd;
531 Eina_List *l; 531 Eina_List *l;
532 Eo *child; 532 Eo *child;
533 533
@@ -549,7 +549,7 @@ _efl_canvas_vg_node_object_at(const Eo *obj, Eina_Array *a, Eina_Rectangle *r)
549} 549}
550 550
551static Efl_Gfx_Stack * 551static Efl_Gfx_Stack *
552_efl_canvas_vg_node_efl_gfx_stack_below_get(const Eo *obj, Efl_Canvas_VG_Node_Data *pd EINA_UNUSED) 552_efl_canvas_vg_node_efl_gfx_stack_below_get(const Eo *obj, Efl_Canvas_Vg_Node_Data *pd EINA_UNUSED)
553{ 553{
554 Eina_Rect r; 554 Eina_Rect r;
555 Eina_Array a; 555 Eina_Array a;
@@ -579,7 +579,7 @@ _efl_canvas_vg_node_efl_gfx_stack_below_get(const Eo *obj, Efl_Canvas_VG_Node_Da
579} 579}
580 580
581static Efl_Gfx_Stack * 581static Efl_Gfx_Stack *
582_efl_canvas_vg_node_efl_gfx_stack_above_get(const Eo *obj, Efl_Canvas_VG_Node_Data *pd EINA_UNUSED) 582_efl_canvas_vg_node_efl_gfx_stack_above_get(const Eo *obj, Efl_Canvas_Vg_Node_Data *pd EINA_UNUSED)
583{ 583{
584 Eina_Rect r; 584 Eina_Rect r;
585 Eina_Array a; 585 Eina_Array a;
@@ -607,15 +607,15 @@ _efl_canvas_vg_node_efl_gfx_stack_above_get(const Eo *obj, Efl_Canvas_VG_Node_Da
607 return above; 607 return above;
608} 608}
609 609
610static Efl_Canvas_VG_Interpolation * 610static Efl_Canvas_Vg_Interpolation *
611_efl_canvas_vg_node_interpolation_get(Efl_Canvas_VG_Node_Data *pd) 611_efl_canvas_vg_node_interpolation_get(Efl_Canvas_Vg_Node_Data *pd)
612{ 612{
613 Eina_Matrix4 m; 613 Eina_Matrix4 m;
614 614
615 if (!pd->m) return NULL; 615 if (!pd->m) return NULL;
616 if (pd->intp) return pd->intp; 616 if (pd->intp) return pd->intp;
617 617
618 pd->intp = calloc(1, sizeof (Efl_Canvas_VG_Interpolation)); 618 pd->intp = calloc(1, sizeof (Efl_Canvas_Vg_Interpolation));
619 if (!pd->intp) return NULL; 619 if (!pd->intp) return NULL;
620 620
621 eina_matrix3_matrix4_to(&m, pd->m); 621 eina_matrix3_matrix4_to(&m, pd->m);
@@ -646,10 +646,10 @@ _efl_canvas_vg_node_interpolate_point(Eina_Point_3D *d,
646 646
647static Eina_Bool 647static Eina_Bool
648_efl_canvas_vg_node_efl_gfx_path_interpolate(Eo *obj, 648_efl_canvas_vg_node_efl_gfx_path_interpolate(Eo *obj,
649 Efl_Canvas_VG_Node_Data *pd, const Efl_VG *from, const Efl_VG *to, 649 Efl_Canvas_Vg_Node_Data *pd, const Efl_VG *from, const Efl_VG *to,
650 double pos_map) 650 double pos_map)
651{ 651{
652 Efl_Canvas_VG_Node_Data *fromd, *tod; 652 Efl_Canvas_Vg_Node_Data *fromd, *tod;
653 double from_map; 653 double from_map;
654 Eina_Bool r = EINA_TRUE; 654 Eina_Bool r = EINA_TRUE;
655 655
@@ -665,8 +665,8 @@ _efl_canvas_vg_node_efl_gfx_path_interpolate(Eo *obj,
665 if (!pd->m) pd->m = malloc(sizeof (Eina_Matrix3)); 665 if (!pd->m) pd->m = malloc(sizeof (Eina_Matrix3));
666 if (pd->m) 666 if (pd->m)
667 { 667 {
668 const Efl_Canvas_VG_Interpolation *fi, *ti; 668 const Efl_Canvas_Vg_Interpolation *fi, *ti;
669 Efl_Canvas_VG_Interpolation result; 669 Efl_Canvas_Vg_Interpolation result;
670 Eina_Matrix4 m; 670 Eina_Matrix4 m;
671 671
672 fi = _efl_canvas_vg_node_interpolation_get(fromd); 672 fi = _efl_canvas_vg_node_interpolation_get(fromd);
@@ -724,10 +724,10 @@ _efl_canvas_vg_node_efl_gfx_path_interpolate(Eo *obj,
724} 724}
725 725
726EOLIAN static Efl_VG * 726EOLIAN static Efl_VG *
727_efl_canvas_vg_node_efl_duplicate_duplicate(const Eo *obj, Efl_Canvas_VG_Node_Data *pd) 727_efl_canvas_vg_node_efl_duplicate_duplicate(const Eo *obj, Efl_Canvas_Vg_Node_Data *pd)
728{ 728{
729 Efl_VG *cn; 729 Efl_VG *cn;
730 Efl_Canvas_VG_Node_Data *cd; 730 Efl_Canvas_Vg_Node_Data *cd;
731 731
732 cn = efl_add(efl_class_get(obj), NULL); 732 cn = efl_add(efl_class_get(obj), NULL);
733 cd = efl_data_scope_get(cn, MY_CLASS); 733 cd = efl_data_scope_get(cn, MY_CLASS);
diff --git a/src/lib/evas/canvas/evas_vg_private.h b/src/lib/evas/canvas/evas_vg_private.h
index ecf025b..4ff8b2b 100644
--- a/src/lib/evas/canvas/evas_vg_private.h
+++ b/src/lib/evas/canvas/evas_vg_private.h
@@ -3,13 +3,13 @@
3 3
4#include <Ector.h> 4#include <Ector.h>
5 5
6typedef struct _Efl_Canvas_VG_Node_Data Efl_Canvas_VG_Node_Data; 6typedef struct _Efl_Canvas_Vg_Node_Data Efl_Canvas_Vg_Node_Data;
7typedef struct _Efl_Canvas_VG_Container_Data Efl_Canvas_VG_Container_Data; 7typedef struct _Efl_Canvas_Vg_Container_Data Efl_Canvas_Vg_Container_Data;
8typedef struct _Efl_Canvas_VG_Gradient_Data Efl_Canvas_VG_Gradient_Data; 8typedef struct _Efl_Canvas_Vg_Gradient_Data Efl_Canvas_Vg_Gradient_Data;
9typedef struct _Efl_Canvas_VG_Interpolation Efl_Canvas_VG_Interpolation; 9typedef struct _Efl_Canvas_Vg_Interpolation Efl_Canvas_Vg_Interpolation;
10 10
11 11
12typedef struct _Efl_Canvas_Vg_Data Efl_Canvas_Vg_Data; 12typedef struct _Efl_Canvas_Vg_Object_Data Efl_Canvas_Vg_Object_Data;
13 13
14typedef struct _Evas_Cache_Vg_Entry Evas_Cache_Vg_Entry; 14typedef struct _Evas_Cache_Vg_Entry Evas_Cache_Vg_Entry;
15typedef struct _Evas_Cache_Vg Evas_Cache_Vg; 15typedef struct _Evas_Cache_Vg Evas_Cache_Vg;
@@ -39,7 +39,7 @@ typedef struct _User_Vg_Entry
39 Efl_VG *root; 39 Efl_VG *root;
40}User_Vg_Entry; // holds the vg tree info set by the user 40}User_Vg_Entry; // holds the vg tree info set by the user
41 41
42struct _Efl_Canvas_Vg_Data 42struct _Efl_Canvas_Vg_Object_Data
43{ 43{
44 void *engine_data; 44 void *engine_data;
45 Efl_VG *root; 45 Efl_VG *root;
@@ -54,15 +54,15 @@ struct _Efl_Canvas_Vg_Data
54 Eina_Bool changed; 54 Eina_Bool changed;
55}; 55};
56 56
57struct _Efl_Canvas_VG_Node_Data 57struct _Efl_Canvas_Vg_Node_Data
58{ 58{
59 Eina_Matrix3 *m; 59 Eina_Matrix3 *m;
60 Efl_Canvas_VG_Interpolation *intp; 60 Efl_Canvas_Vg_Interpolation *intp;
61 61
62 Efl_Canvas_VG_Node *mask; 62 Efl_Canvas_Vg_Node *mask;
63 Ector_Renderer *renderer; 63 Ector_Renderer *renderer;
64 64
65 void (*render_pre)(Eo *obj, Eina_Matrix3 *parent, Ector_Surface *s, void *data, Efl_Canvas_VG_Node_Data *nd); 65 void (*render_pre)(Eo *obj, Eina_Matrix3 *parent, Ector_Surface *s, void *data, Efl_Canvas_Vg_Node_Data *nd);
66 void *data; 66 void *data;
67 67
68 double x, y; 68 double x, y;
@@ -73,14 +73,14 @@ struct _Efl_Canvas_VG_Node_Data
73 Eina_Bool changed : 1; 73 Eina_Bool changed : 1;
74}; 74};
75 75
76struct _Efl_Canvas_VG_Container_Data 76struct _Efl_Canvas_Vg_Container_Data
77{ 77{
78 Eina_List *children; 78 Eina_List *children;
79 79
80 Eina_Hash *names; 80 Eina_Hash *names;
81}; 81};
82 82
83struct _Efl_Canvas_VG_Gradient_Data 83struct _Efl_Canvas_Vg_Gradient_Data
84{ 84{
85 // FIXME: Later on we should deduplicate it somehow (Using Ector ?). 85 // FIXME: Later on we should deduplicate it somehow (Using Ector ?).
86 Efl_Gfx_Gradient_Stop *colors; 86 Efl_Gfx_Gradient_Stop *colors;
@@ -89,7 +89,7 @@ struct _Efl_Canvas_VG_Gradient_Data
89 Efl_Gfx_Gradient_Spread s; 89 Efl_Gfx_Gradient_Spread s;
90}; 90};
91 91
92struct _Efl_Canvas_VG_Interpolation 92struct _Efl_Canvas_Vg_Interpolation
93{ 93{
94 Eina_Quaternion rotation; 94 Eina_Quaternion rotation;
95 Eina_Quaternion perspective; 95 Eina_Quaternion perspective;
@@ -108,10 +108,10 @@ Vg_File_Data * evas_cache_vg_file_info(const char *file, const char
108 108
109Eina_Bool evas_vg_save_to_file(Vg_File_Data *evg_data, const char *file, const char *key, const char *flags); 109Eina_Bool evas_vg_save_to_file(Vg_File_Data *evg_data, const char *file, const char *key, const char *flags);
110 110
111static inline Efl_Canvas_VG_Node_Data * 111static inline Efl_Canvas_Vg_Node_Data *
112_evas_vg_render_pre(Efl_VG *child, Ector_Surface *s, Eina_Matrix3 *m) 112_evas_vg_render_pre(Efl_VG *child, Ector_Surface *s, Eina_Matrix3 *m)
113{ 113{
114 Efl_Canvas_VG_Node_Data *child_nd = NULL; 114 Efl_Canvas_Vg_Node_Data *child_nd = NULL;
115 115
116 // FIXME: Prevent infinite loop 116 // FIXME: Prevent infinite loop
117 if (child) 117 if (child)
diff --git a/src/lib/evas/canvas/evas_vg_shape.c b/src/lib/evas/canvas/evas_vg_shape.c
index e150e19..7c1ef88 100644
--- a/src/lib/evas/canvas/evas_vg_shape.c
+++ b/src/lib/evas/canvas/evas_vg_shape.c
@@ -5,14 +5,14 @@
5 5
6#define MY_CLASS EFL_CANVAS_VG_SHAPE_CLASS 6#define MY_CLASS EFL_CANVAS_VG_SHAPE_CLASS
7 7
8typedef struct _Efl_Canvas_VG_Shape_Data Efl_Canvas_VG_Shape_Data; 8typedef struct _Efl_Canvas_Vg_Shape_Data Efl_Canvas_Vg_Shape_Data;
9struct _Efl_Canvas_VG_Shape_Data 9struct _Efl_Canvas_Vg_Shape_Data
10{ 10{
11 Efl_Canvas_VG_Node *fill; 11 Efl_Canvas_Vg_Node *fill;
12 12
13 struct { 13 struct {
14 Efl_Canvas_VG_Node *fill; 14 Efl_Canvas_Vg_Node *fill;
15 Efl_Canvas_VG_Node *marker; 15 Efl_Canvas_Vg_Node *marker;
16 } stroke; 16 } stroke;
17}; 17};
18 18
@@ -20,10 +20,10 @@ struct _Efl_Canvas_VG_Shape_Data
20 20
21static void 21static void
22_efl_canvas_vg_shape_fill_set(Eo *obj EINA_UNUSED, 22_efl_canvas_vg_shape_fill_set(Eo *obj EINA_UNUSED,
23 Efl_Canvas_VG_Shape_Data *pd, 23 Efl_Canvas_Vg_Shape_Data *pd,
24 Efl_Canvas_VG_Node *f) 24 Efl_Canvas_Vg_Node *f)
25{ 25{
26 Efl_Canvas_VG_Node *tmp = pd->fill; 26 Efl_Canvas_Vg_Node *tmp = pd->fill;
27 27
28 pd->fill = efl_ref(f); 28 pd->fill = efl_ref(f);
29 efl_unref(tmp); 29 efl_unref(tmp);
@@ -31,18 +31,18 @@ _efl_canvas_vg_shape_fill_set(Eo *obj EINA_UNUSED,
31 _efl_canvas_vg_node_changed(obj); 31 _efl_canvas_vg_node_changed(obj);
32} 32}
33 33
34static Efl_Canvas_VG_Node * 34static Efl_Canvas_Vg_Node *
35_efl_canvas_vg_shape_fill_get(const Eo *obj EINA_UNUSED, Efl_Canvas_VG_Shape_Data *pd) 35_efl_canvas_vg_shape_fill_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Shape_Data *pd)
36{ 36{
37 return pd->fill; 37 return pd->fill;
38} 38}
39 39
40static void 40static void
41_efl_canvas_vg_shape_stroke_fill_set(Eo *obj EINA_UNUSED, 41_efl_canvas_vg_shape_stroke_fill_set(Eo *obj EINA_UNUSED,
42 Efl_Canvas_VG_Shape_Data *pd, 42 Efl_Canvas_Vg_Shape_Data *pd,
43 Efl_Canvas_VG_Node *f) 43 Efl_Canvas_Vg_Node *f)
44{ 44{
45 Efl_Canvas_VG_Node *tmp = pd->fill; 45 Efl_Canvas_Vg_Node *tmp = pd->fill;
46 46
47 pd->stroke.fill = efl_ref(f); 47 pd->stroke.fill = efl_ref(f);
48 efl_unref(tmp); 48 efl_unref(tmp);
@@ -50,19 +50,19 @@ _efl_canvas_vg_shape_stroke_fill_set(Eo *obj EINA_UNUSED,
50 _efl_canvas_vg_node_changed(obj); 50 _efl_canvas_vg_node_changed(obj);
51} 51}
52 52
53static Efl_Canvas_VG_Node * 53static Efl_Canvas_Vg_Node *
54_efl_canvas_vg_shape_stroke_fill_get(const Eo *obj EINA_UNUSED, 54_efl_canvas_vg_shape_stroke_fill_get(const Eo *obj EINA_UNUSED,
55 Efl_Canvas_VG_Shape_Data *pd) 55 Efl_Canvas_Vg_Shape_Data *pd)
56{ 56{
57 return pd->stroke.fill; 57 return pd->stroke.fill;
58} 58}
59 59
60static void 60static void
61_efl_canvas_vg_shape_stroke_marker_set(Eo *obj EINA_UNUSED, 61_efl_canvas_vg_shape_stroke_marker_set(Eo *obj EINA_UNUSED,
62 Efl_Canvas_VG_Shape_Data *pd, 62 Efl_Canvas_Vg_Shape_Data *pd,
63 Efl_Canvas_VG_Shape *m) 63 Efl_Canvas_Vg_Shape *m)
64{ 64{
65 Efl_Canvas_VG_Node *tmp = pd->stroke.marker; 65 Efl_Canvas_Vg_Node *tmp = pd->stroke.marker;
66 66
67 pd->stroke.marker = efl_ref(m); 67 pd->stroke.marker = efl_ref(m);
68 efl_unref(tmp); 68 efl_unref(tmp);
@@ -70,9 +70,9 @@ _efl_canvas_vg_shape_stroke_marker_set(Eo *obj EINA_UNUSED,
70 _efl_canvas_vg_node_changed(obj); 70 _efl_canvas_vg_node_changed(obj);
71} 71}
72 72
73static Efl_Canvas_VG_Shape * 73static Efl_Canvas_Vg_Shape *
74_efl_canvas_vg_shape_stroke_marker_get(const Eo *obj EINA_UNUSED, 74_efl_canvas_vg_shape_stroke_marker_get(const Eo *obj EINA_UNUSED,
75 Efl_Canvas_VG_Shape_Data *pd) 75 Efl_Canvas_Vg_Shape_Data *pd)
76{ 76{
77 return pd->stroke.marker; 77 return pd->stroke.marker;
78} 78}
@@ -82,10 +82,10 @@ _efl_canvas_vg_shape_render_pre(Eo *obj EINA_UNUSED,
82 Eina_Matrix3 *parent, 82 Eina_Matrix3 *parent,
83 Ector_Surface *s, 83 Ector_Surface *s,
84 void *data, 84 void *data,
85 Efl_Canvas_VG_Node_Data *nd) 85 Efl_Canvas_Vg_Node_Data *nd)
86{ 86{
87 Efl_Canvas_VG_Shape_Data *pd = data; 87 Efl_Canvas_Vg_Shape_Data *pd = data;
88 Efl_Canvas_VG_Node_Data *fill, *stroke_fill, *stroke_marker, *mask; 88 Efl_Canvas_Vg_Node_Data *fill, *stroke_fill, *stroke_marker, *mask;
89 89
90 if (nd->flags == EFL_GFX_CHANGE_FLAG_NONE) return ; 90 if (nd->flags == EFL_GFX_CHANGE_FLAG_NONE) return ;
91 91
@@ -118,9 +118,9 @@ _efl_canvas_vg_shape_render_pre(Eo *obj EINA_UNUSED,
118} 118}
119 119
120static Eo * 120static Eo *
121_efl_canvas_vg_shape_efl_object_constructor(Eo *obj, Efl_Canvas_VG_Shape_Data *pd) 121_efl_canvas_vg_shape_efl_object_constructor(Eo *obj, Efl_Canvas_Vg_Shape_Data *pd)
122{ 122{
123 Efl_Canvas_VG_Node_Data *nd; 123 Efl_Canvas_Vg_Node_Data *nd;
124 124
125 obj = efl_constructor(efl_super(obj, MY_CLASS)); 125 obj = efl_constructor(efl_super(obj, MY_CLASS));
126 126
@@ -137,7 +137,7 @@ _efl_canvas_vg_shape_efl_object_constructor(Eo *obj, Efl_Canvas_VG_Shape_Data *p
137} 137}
138 138
139static void 139static void
140_efl_canvas_vg_shape_efl_object_destructor(Eo *obj, Efl_Canvas_VG_Shape_Data *pd EINA_UNUSED) 140_efl_canvas_vg_shape_efl_object_destructor(Eo *obj, Efl_Canvas_Vg_Shape_Data *pd EINA_UNUSED)
141{ 141{
142 efl_gfx_path_reset(obj); 142 efl_gfx_path_reset(obj);
143 efl_destructor(efl_super(obj, MY_CLASS)); 143 efl_destructor(efl_super(obj, MY_CLASS));
@@ -145,11 +145,11 @@ _efl_canvas_vg_shape_efl_object_destructor(Eo *obj, Efl_Canvas_VG_Shape_Data *pd
145 145
146static Eina_Bool 146static Eina_Bool
147_efl_canvas_vg_shape_efl_gfx_path_interpolate(Eo *obj, 147_efl_canvas_vg_shape_efl_gfx_path_interpolate(Eo *obj,
148 Efl_Canvas_VG_Shape_Data *pd, 148 Efl_Canvas_Vg_Shape_Data *pd,
149 const Efl_Canvas_VG_Node *from, const Efl_Canvas_VG_Node *to, 149 const Efl_Canvas_Vg_Node *from, const Efl_Canvas_Vg_Node *to,
150 double pos_map) 150 double pos_map)
151{ 151{
152 Efl_Canvas_VG_Shape_Data *fromd, *tod; 152 Efl_Canvas_Vg_Shape_Data *fromd, *tod;
153 Eina_Bool r; 153 Eina_Bool r;
154 154
155 fromd = efl_data_scope_get(from, EFL_CANVAS_VG_SHAPE_CLASS); 155 fromd = efl_data_scope_get(from, EFL_CANVAS_VG_SHAPE_CLASS);
@@ -174,11 +174,11 @@ _efl_canvas_vg_shape_efl_gfx_path_interpolate(Eo *obj,
174} 174}
175 175
176 176
177EOLIAN static Efl_Canvas_VG_Node * 177EOLIAN static Efl_Canvas_Vg_Node *
178_efl_canvas_vg_shape_efl_duplicate_duplicate(const Eo *obj, Efl_Canvas_VG_Shape_Data *pd) 178_efl_canvas_vg_shape_efl_duplicate_duplicate(const Eo *obj, Efl_Canvas_Vg_Shape_Data *pd)
179{ 179{
180 Efl_Canvas_VG_Node *cn = NULL; 180 Efl_Canvas_Vg_Node *cn = NULL;
181 Efl_Canvas_VG_Shape_Data *cd = NULL; 181 Efl_Canvas_Vg_Shape_Data *cd = NULL;
182 182
183 cn = efl_duplicate(efl_super(obj, MY_CLASS)); 183 cn = efl_duplicate(efl_super(obj, MY_CLASS));
184 cd = efl_data_scope_get(cn, MY_CLASS); 184 cd = efl_data_scope_get(cn, MY_CLASS);
@@ -403,8 +403,8 @@ evas_vg_shape_equal_commands(Eo *obj, const Eo *with)
403 return efl_gfx_path_equal_commands(obj, with); 403 return efl_gfx_path_equal_commands(obj, with);
404} 404}
405 405
406EAPI Efl_Canvas_VG_Node* 406EAPI Efl_Canvas_Vg_Node*
407evas_vg_shape_add(Efl_Canvas_VG_Node *parent) 407evas_vg_shape_add(Efl_Canvas_Vg_Node *parent)
408{ 408{
409 return efl_add(EFL_CANVAS_VG_SHAPE_CLASS, parent); 409 return efl_add(EFL_CANVAS_VG_SHAPE_CLASS, parent);
410} 410}