summaryrefslogtreecommitdiff
path: root/src/lib/evas
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2015-04-03 16:30:59 +0200
committerCedric BAIL <cedric@osg.samsung.com>2015-04-03 16:30:59 +0200
commiteb2bd9a8d8ff79bb30a1888969bb5960e8fed066 (patch)
tree441470b05dc400cb8f76c806909ef67f6c2de13a /src/lib/evas
parentdd1cae7329c933d48c488a99d297706d29d4521a (diff)
evas: move Evas.VG_* to Efl.VG.*
This also introduce legacy API for all of them.
Diffstat (limited to 'src/lib/evas')
-rw-r--r--src/lib/evas/Evas_Common.h5
-rw-r--r--src/lib/evas/Evas_Eo.h19
-rw-r--r--src/lib/evas/Evas_Legacy.h78
-rw-r--r--src/lib/evas/canvas/efl_vg_base.eo (renamed from src/lib/evas/canvas/evas_vg_node.eo)8
-rw-r--r--src/lib/evas/canvas/efl_vg_container.eo9
-rw-r--r--src/lib/evas/canvas/efl_vg_gradient.eo (renamed from src/lib/evas/canvas/evas_vg_gradient.eo)5
-rw-r--r--src/lib/evas/canvas/efl_vg_gradient_linear.eo (renamed from src/lib/evas/canvas/evas_vg_gradient_linear.eo)5
-rw-r--r--src/lib/evas/canvas/efl_vg_gradient_radial.eo (renamed from src/lib/evas/canvas/evas_vg_gradient_radial.eo)5
-rw-r--r--src/lib/evas/canvas/efl_vg_image.eo (renamed from src/lib/evas/canvas/evas_vg_image.eo)5
-rw-r--r--src/lib/evas/canvas/efl_vg_root_node.eo8
-rw-r--r--src/lib/evas/canvas/efl_vg_shape.eo (renamed from src/lib/evas/canvas/evas_vg_shape.eo)13
-rw-r--r--src/lib/evas/canvas/evas_object_vg.c22
-rw-r--r--src/lib/evas/canvas/evas_vg.eo2
-rw-r--r--src/lib/evas/canvas/evas_vg_container.c42
-rw-r--r--src/lib/evas/canvas/evas_vg_container.eo9
-rw-r--r--src/lib/evas/canvas/evas_vg_gradient.c58
-rw-r--r--src/lib/evas/canvas/evas_vg_gradient_linear.c90
-rw-r--r--src/lib/evas/canvas/evas_vg_gradient_radial.c110
-rw-r--r--src/lib/evas/canvas/evas_vg_image.c34
-rw-r--r--src/lib/evas/canvas/evas_vg_loader_svg.c4
-rw-r--r--src/lib/evas/canvas/evas_vg_node.c278
-rw-r--r--src/lib/evas/canvas/evas_vg_private.h28
-rw-r--r--src/lib/evas/canvas/evas_vg_root_node.c40
-rw-r--r--src/lib/evas/canvas/evas_vg_root_node.eo8
-rw-r--r--src/lib/evas/canvas/evas_vg_shape.c412
25 files changed, 862 insertions, 435 deletions
diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h
index 3a9633f..5055561 100644
--- a/src/lib/evas/Evas_Common.h
+++ b/src/lib/evas/Evas_Common.h
@@ -312,6 +312,11 @@ typedef Eo Evas_Object;
312/* This define is used in H files generated by Eolian */ 312/* This define is used in H files generated by Eolian */
313#define _EVAS_OBJECT_EO_CLASS_TYPE 313#define _EVAS_OBJECT_EO_CLASS_TYPE
314 314
315/**
316 * Type of abstract VG node
317 */
318typedef Eo Efl_VG;
319
315typedef void Evas_Performance; /**< An Evas Performance handle */ 320typedef void Evas_Performance; /**< An Evas Performance handle */
316typedef struct _Evas_Modifier Evas_Modifier; /**< An opaque type containing information on which modifier keys are registered in an Evas canvas */ 321typedef struct _Evas_Modifier Evas_Modifier; /**< An opaque type containing information on which modifier keys are registered in an Evas canvas */
317typedef struct _Evas_Lock Evas_Lock; /**< An opaque type containing information on which lock keys are registered in an Evas canvas */ 322typedef struct _Evas_Lock Evas_Lock; /**< An opaque type containing information on which lock keys are registered in an Evas canvas */
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index 0209677..49e1da2 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -846,11 +846,6 @@ typedef enum _Evas_3D_Material_Attrib
846#include "canvas/evas_3d_object.eo.h" 846#include "canvas/evas_3d_object.eo.h"
847 847
848/** 848/**
849 * Type of abstract VG node
850 */
851typedef Eo Evas_VG_Node;
852
853/**
854 * @ingroup Evas_Object_VG 849 * @ingroup Evas_Object_VG
855 * 850 *
856 * @{ 851 * @{
@@ -860,10 +855,10 @@ typedef Eo Evas_VG_Node;
860 * @} 855 * @}
861 */ 856 */
862 857
863#include "canvas/evas_vg_node.eo.h" 858#include "canvas/efl_vg_base.eo.h"
864#include "canvas/evas_vg_container.eo.h" 859#include "canvas/efl_vg_container.eo.h"
865#include "canvas/evas_vg_shape.eo.h" 860#include "canvas/efl_vg_shape.eo.h"
866#include "canvas/evas_vg_gradient.eo.h" 861#include "canvas/efl_vg_gradient.eo.h"
867#include "canvas/evas_vg_gradient_linear.eo.h" 862#include "canvas/efl_vg_gradient_linear.eo.h"
868#include "canvas/evas_vg_gradient_radial.eo.h" 863#include "canvas/efl_vg_gradient_radial.eo.h"
869#include "canvas/evas_vg_image.eo.h" 864#include "canvas/efl_vg_image.eo.h"
diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h
index 8f53493..01d6706 100644
--- a/src/lib/evas/Evas_Legacy.h
+++ b/src/lib/evas/Evas_Legacy.h
@@ -1710,13 +1710,79 @@ EAPI Evas_Object *evas_object_rectangle_add(Evas *e) EINA_WARN_UNUSED_RESULT EIN
1710 */ 1710 */
1711EAPI Evas_Object *evas_object_vg_add(Evas *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_MALLOC; 1711EAPI Evas_Object *evas_object_vg_add(Evas *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_MALLOC;
1712 1712
1713#include "canvas/evas_vg_node.eo.legacy.h"
1714#include "canvas/evas_vg.eo.legacy.h" 1713#include "canvas/evas_vg.eo.legacy.h"
1715#include "canvas/evas_vg_shape.eo.legacy.h" 1714
1716#include "canvas/evas_vg_gradient.eo.legacy.h" 1715EAPI Eina_Bool evas_vg_node_visible_get(Eo *obj);
1717#include "canvas/evas_vg_gradient_linear.eo.legacy.h" 1716EAPI void evas_vg_node_visible_set(Eo *obj, Eina_Bool v);
1718#include "canvas/evas_vg_gradient_radial.eo.legacy.h" 1717EAPI void evas_vg_node_color_get(Eo *obj, int *r, int *g, int *b, int *a);
1719#include "canvas/evas_vg_image.eo.legacy.h" 1718EAPI void evas_vg_node_color_set(Eo *obj, int r, int g, int b, int a);
1719EAPI void evas_vg_node_geometry_get(Eo *obj, int *x, int *y, int *w, int *h);
1720EAPI void evas_vg_node_geometry_set(Eo *obj, int x, int y, int w, int h);
1721EAPI void evas_vg_node_stack_below(Eo *obj, Eo *below);
1722EAPI void evas_vg_node_stack_above(Eo *obj, Eo *above);
1723EAPI void evas_vg_node_raise(Eo *obj);
1724EAPI void evas_vg_node_lower(Eo *obj);
1725
1726#include "canvas/efl_vg_base.eo.legacy.h"
1727
1728EAPI double evas_vg_shape_stroke_scale_get(Eo *obj);
1729EAPI void evas_vg_shape_stroke_scale_set(Eo *obj, double s);
1730EAPI void evas_vg_shape_stroke_color_get(Eo *obj, int *r, int *g, int *b, int *a);
1731EAPI void evas_vg_shape_stroke_color_set(Eo *obj, int r, int g, int b, int a);
1732EAPI double evas_vg_shape_stroke_width_get(Eo *obj);
1733EAPI void evas_vg_shape_stroke_width_set(Eo *obj, double w);
1734EAPI double evas_vg_shape_stroke_location_get(Eo *obj);
1735EAPI void evas_vg_shape_stroke_location_set(Eo *obj, double centered);
1736EAPI void evas_vg_shape_stroke_dash_get(Eo *obj, const Efl_Gfx_Dash **dash, unsigned int *length);
1737EAPI void evas_vg_shape_stroke_dash_set(Eo *obj, const Efl_Gfx_Dash *dash, unsigned int length);
1738EAPI Efl_Gfx_Cap evas_vg_shape_stroke_cap_get(Eo *obj);
1739EAPI void evas_vg_shape_stroke_cap_set(Eo *obj, Efl_Gfx_Cap c);
1740EAPI Efl_Gfx_Join evas_vg_shape_stroke_join_get(Eo *obj);
1741EAPI void evas_vg_shape_stroke_join_set(Eo *obj, Efl_Gfx_Join j);
1742EAPI void evas_vg_shape_shape_path_set(Eo *obj, const Efl_Gfx_Path_Command *op, const double *points);
1743EAPI void evas_vg_shape_shape_path_get(Eo *obj, const Efl_Gfx_Path_Command **op, const double **points);
1744EAPI void evas_vg_shape_shape_path_length_get(Eo *obj, unsigned int *commands, unsigned int *points);
1745EAPI void evas_vg_shape_shape_current_get(Eo *obj, double *x, double *y);
1746EAPI void evas_vg_shape_shape_current_ctrl_get(Eo *obj, double *x, double *y);
1747EAPI void evas_vg_shape_shape_dup(Eo *obj, Eo *dup_from);
1748EAPI void evas_vg_shape_shape_reset(Eo *obj);
1749EAPI void evas_vg_shape_shape_append_move_to(Eo *obj, double x, double y);
1750EAPI void evas_vg_shape_shape_append_line_to(Eo *obj, double x, double y);
1751EAPI void evas_vg_shape_shape_append_quadratic_to(Eo *obj, double x, double y, double ctrl_x, double ctrl_y);
1752EAPI void evas_vg_shape_shape_append_squadratic_to(Eo *obj, double x, double y);
1753EAPI 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);
1754EAPI void evas_vg_shape_shape_append_scubic_to(Eo *obj, double x, double y, double ctrl_x, double ctrl_y);
1755EAPI 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);
1756EAPI void evas_vg_shape_shape_append_close(Eo *obj);
1757EAPI void evas_vg_shape_shape_append_circle(Eo *obj, double x, double y, double radius);
1758EAPI void evas_vg_shape_shape_append_svg_path(Eo *obj, const char *svg_path_data);
1759EAPI Eina_Bool evas_vg_shape_shape_interpolate(Eo *obj, const Eo *from, const Eo *to, double pos_map);
1760EAPI Eina_Bool evas_vg_shape_shape_equal_commands(Eo *obj, const Eo *with);
1761
1762#include "canvas/efl_vg_shape.eo.legacy.h"
1763
1764EAPI void evas_vg_gradient_stop_set(Eo *obj, const Efl_Gfx_Gradient_Stop *colors, unsigned int length);
1765EAPI void evas_vg_gradient_stop_get(Eo *obj, const Efl_Gfx_Gradient_Stop **colors, unsigned int *length);
1766EAPI void evas_vg_gradient_spread_set(Eo *obj, Efl_Gfx_Gradient_Spread s);
1767EAPI Efl_Gfx_Gradient_Spread evas_vg_gradient_spread_get(Eo *obj);
1768
1769#include "canvas/efl_vg_gradient.eo.legacy.h"
1770
1771EAPI void evas_vg_gradient_linear_start_set(Eo *obj, double x, double y);
1772EAPI void evas_vg_gradient_linear_start_get(Eo *obj, double *x, double *y);
1773EAPI void evas_vg_gradient_linear_end_set(Eo *obj, double x, double y);
1774EAPI void evas_vg_gradient_linear_end_get(Eo *obj, double *x, double *y);
1775
1776#include "canvas/efl_vg_gradient_linear.eo.legacy.h"
1777
1778EAPI void evas_vg_gradient_radial_center_set(Eo *obj, double x, double y);
1779EAPI void evas_vg_gradient_radial_center_get(Eo *obj, double *x, double *y);
1780EAPI void evas_vg_gradient_radial_radius_set(Eo *obj, double r);
1781EAPI double evas_vg_gradient_radial_radius_get(Eo *obj);
1782EAPI void evas_vg_gradient_radial_focal_set(Eo *obj, double x, double y);
1783EAPI void evas_vg_gradient_radial_focal_get(Eo *obj, double *x, double *y);
1784
1785#include "canvas/efl_vg_gradient_radial.eo.legacy.h"
1720 1786
1721/** 1787/**
1722 * @} 1788 * @}
diff --git a/src/lib/evas/canvas/evas_vg_node.eo b/src/lib/evas/canvas/efl_vg_base.eo
index 83c7014..2b8d9e7 100644
--- a/src/lib/evas/canvas/evas_vg_node.eo
+++ b/src/lib/evas/canvas/efl_vg_base.eo
@@ -1,7 +1,7 @@
1abstract Evas.VG_Node (Eo.Base, Efl.Gfx.Base, Efl.Gfx.Stack) 1abstract Efl.VG.Base (Eo.Base, Efl.Gfx.Base, Efl.Gfx.Stack)
2{ 2{
3 eo_prefix: evas_vg_node; 3 eo_prefix: efl_vg;
4 legacy_prefix: null; 4 legacy_prefix: evas_vg_node;
5 properties { 5 properties {
6 transformation { 6 transformation {
7 set { 7 set {
@@ -45,7 +45,7 @@ abstract Evas.VG_Node (Eo.Base, Efl.Gfx.Base, Efl.Gfx.Stack)
45 get { 45 get {
46 } 46 }
47 values { 47 values {
48 Evas_VG_Node *m; 48 Efl_VG *m;
49 } 49 }
50 } 50 }
51/* quality { 51/* quality {
diff --git a/src/lib/evas/canvas/efl_vg_container.eo b/src/lib/evas/canvas/efl_vg_container.eo
new file mode 100644
index 0000000..4d8a085
--- /dev/null
+++ b/src/lib/evas/canvas/efl_vg_container.eo
@@ -0,0 +1,9 @@
1class Efl.VG.Container (Efl.VG.Base)
2{
3 legacy_prefix: evas_vg_container;
4 implements {
5 Eo.Base.constructor;
6 Eo.Base.destructor;
7 Efl.VG.Base.bound_get;
8 }
9}
diff --git a/src/lib/evas/canvas/evas_vg_gradient.eo b/src/lib/evas/canvas/efl_vg_gradient.eo
index 29f1de2..de78039 100644
--- a/src/lib/evas/canvas/evas_vg_gradient.eo
+++ b/src/lib/evas/canvas/efl_vg_gradient.eo
@@ -1,7 +1,6 @@
1abstract Evas.VG_Gradient (Evas.VG_Node, Efl.Gfx.Gradient.Base) 1abstract Efl.VG.Gradient (Efl.VG.Base, Efl.Gfx.Gradient.Base)
2{ 2{
3 eo_prefix: evas_vg_gradient; 3 legacy_prefix: evas_vg_gradient;
4 legacy_prefix: null;
5 implements { 4 implements {
6 Efl.Gfx.Gradient.Base.stop.set; 5 Efl.Gfx.Gradient.Base.stop.set;
7 Efl.Gfx.Gradient.Base.stop.get; 6 Efl.Gfx.Gradient.Base.stop.get;
diff --git a/src/lib/evas/canvas/evas_vg_gradient_linear.eo b/src/lib/evas/canvas/efl_vg_gradient_linear.eo
index 95a773a..bc9c664 100644
--- a/src/lib/evas/canvas/evas_vg_gradient_linear.eo
+++ b/src/lib/evas/canvas/efl_vg_gradient_linear.eo
@@ -1,7 +1,6 @@
1class Evas.VG_Gradient_Linear (Evas.VG_Gradient, Efl.Gfx.Gradient.Linear) 1class Efl.VG.Gradient_Linear (Efl.VG.Gradient, Efl.Gfx.Gradient.Linear)
2{ 2{
3 eo_prefix: evas_vg_gradient_linear; 3 legacy_prefix: evas_vg_gradient_linear;
4 legacy_prefix: null;
5 implements { 4 implements {
6 Efl.Gfx.Gradient.Linear.start.set; 5 Efl.Gfx.Gradient.Linear.start.set;
7 Efl.Gfx.Gradient.Linear.start.get; 6 Efl.Gfx.Gradient.Linear.start.get;
diff --git a/src/lib/evas/canvas/evas_vg_gradient_radial.eo b/src/lib/evas/canvas/efl_vg_gradient_radial.eo
index bab5282..0d60589 100644
--- a/src/lib/evas/canvas/evas_vg_gradient_radial.eo
+++ b/src/lib/evas/canvas/efl_vg_gradient_radial.eo
@@ -1,7 +1,6 @@
1class Evas.VG_Gradient_Radial (Evas.VG_Gradient, Efl.Gfx.Gradient.Radial) 1class Efl.VG.Gradient_Radial (Efl.VG.Gradient, Efl.Gfx.Gradient.Radial)
2{ 2{
3 eo_prefix: evas_vg_gradient_radial; 3 legacy_prefix: evas_vg_gradient_radial;
4 legacy_prefix: null;
5 implements { 4 implements {
6 Efl.Gfx.Gradient.Radial.center.set; 5 Efl.Gfx.Gradient.Radial.center.set;
7 Efl.Gfx.Gradient.Radial.center.get; 6 Efl.Gfx.Gradient.Radial.center.get;
diff --git a/src/lib/evas/canvas/evas_vg_image.eo b/src/lib/evas/canvas/efl_vg_image.eo
index ff9ab8e..62d7451 100644
--- a/src/lib/evas/canvas/evas_vg_image.eo
+++ b/src/lib/evas/canvas/efl_vg_image.eo
@@ -1,7 +1,6 @@
1class Evas.VG_Image (Evas.VG_Node, Efl.File) 1class Efl.VG.Image (Efl.VG.Base, Efl.File)
2{ 2{
3 eo_prefix: evas_vg_image; 3 legacy_prefix: evas_vg_image;
4 legacy_prefix: null;
5 properties { 4 properties {
6 position { 5 position {
7 set { 6 set {
diff --git a/src/lib/evas/canvas/efl_vg_root_node.eo b/src/lib/evas/canvas/efl_vg_root_node.eo
new file mode 100644
index 0000000..685bf7e
--- /dev/null
+++ b/src/lib/evas/canvas/efl_vg_root_node.eo
@@ -0,0 +1,8 @@
1class Efl.VG.Root_Node (Efl.VG.Container)
2{
3 legacy_prefix: evas_vg_root_node;
4 implements {
5 Eo.Base.parent.set;
6 Eo.Base.constructor;
7 }
8}
diff --git a/src/lib/evas/canvas/evas_vg_shape.eo b/src/lib/evas/canvas/efl_vg_shape.eo
index 9127241..ab6468c 100644
--- a/src/lib/evas/canvas/evas_vg_shape.eo
+++ b/src/lib/evas/canvas/efl_vg_shape.eo
@@ -1,7 +1,6 @@
1class Evas.VG_Shape (Evas.VG_Node, Efl.Gfx.Shape) 1class Efl.VG.Shape (Efl.VG.Base, Efl.Gfx.Shape)
2{ 2{
3 eo_prefix: evas_vg_shape; 3 legacy_prefix: evas_vg_shape;
4 legacy_prefix: null;
5 properties { 4 properties {
6 fill { 5 fill {
7 set { 6 set {
@@ -9,7 +8,7 @@ class Evas.VG_Shape (Evas.VG_Node, Efl.Gfx.Shape)
9 get { 8 get {
10 } 9 }
11 values { 10 values {
12 Evas_VG_Node *f; 11 Efl_VG *f;
13 } 12 }
14 } 13 }
15 stroke_fill { 14 stroke_fill {
@@ -18,7 +17,7 @@ class Evas.VG_Shape (Evas.VG_Node, Efl.Gfx.Shape)
18 get { 17 get {
19 } 18 }
20 values { 19 values {
21 Evas_VG_Node *f; 20 Efl_VG *f;
22 } 21 }
23 } 22 }
24 stroke_marker { 23 stroke_marker {
@@ -27,7 +26,7 @@ class Evas.VG_Shape (Evas.VG_Node, Efl.Gfx.Shape)
27 get { 26 get {
28 } 27 }
29 values { 28 values {
30 Evas_VG_Node *m; 29 Efl_VG *m;
31 } 30 }
32 } 31 }
33 } 32 }
@@ -41,7 +40,7 @@ class Evas.VG_Shape (Evas.VG_Node, Efl.Gfx.Shape)
41 Efl.Gfx.Shape.stroke_join; 40 Efl.Gfx.Shape.stroke_join;
42 Efl.Gfx.Base.color_part.set; 41 Efl.Gfx.Base.color_part.set;
43 Efl.Gfx.Base.color_part.get; 42 Efl.Gfx.Base.color_part.get;
44 Evas.VG_Node.bound_get; 43 Efl.VG.Base.bound_get;
45 Eo.Base.constructor; 44 Eo.Base.constructor;
46 Eo.Base.destructor; 45 Eo.Base.destructor;
47 } 46 }
diff --git a/src/lib/evas/canvas/evas_object_vg.c b/src/lib/evas/canvas/evas_object_vg.c
index 6f41d50..2336d9b 100644
--- a/src/lib/evas/canvas/evas_object_vg.c
+++ b/src/lib/evas/canvas/evas_object_vg.c
@@ -2,7 +2,7 @@
2#include "evas_private.h" 2#include "evas_private.h"
3 3
4#include "evas_vg_private.h" 4#include "evas_vg_private.h"
5#include "evas_vg_root_node.eo.h" 5#include "efl_vg_root_node.eo.h"
6 6
7#define MY_CLASS EVAS_VG_CLASS 7#define MY_CLASS EVAS_VG_CLASS
8 8
@@ -16,8 +16,8 @@ typedef struct _Evas_VG_Data Evas_VG_Data;
16 16
17struct _Evas_VG_Data 17struct _Evas_VG_Data
18{ 18{
19 void *engine_data; 19 void *engine_data;
20 Evas_VG_Node *root; 20 Efl_VG *root;
21 21
22 /* Opening an SVG file (could actually be inside an eet section */ 22 /* Opening an SVG file (could actually be inside an eet section */
23 Eina_File *f; 23 Eina_File *f;
@@ -89,7 +89,7 @@ evas_object_vg_add(Evas *e)
89 return eo_obj; 89 return eo_obj;
90} 90}
91 91
92Evas_VG_Node * 92Efl_VG *
93_evas_vg_root_node_get(Eo *obj EINA_UNUSED, Evas_VG_Data *pd) 93_evas_vg_root_node_get(Eo *obj EINA_UNUSED, Evas_VG_Data *pd)
94{ 94{
95 return pd->root; 95 return pd->root;
@@ -116,7 +116,7 @@ _evas_vg_eo_base_constructor(Eo *eo_obj, Evas_VG_Data *pd)
116 obj->type = o_type; 116 obj->type = o_type;
117 117
118 /* root node */ 118 /* root node */
119 pd->root = eo_add(EVAS_VG_ROOT_NODE_CLASS, eo_obj); 119 pd->root = eo_add(EFL_VG_ROOT_NODE_CLASS, eo_obj);
120 eo_ref(pd->root); 120 eo_ref(pd->root);
121 121
122 eo_do(eo_obj, parent = eo_parent_get()); 122 eo_do(eo_obj, parent = eo_parent_get());
@@ -125,14 +125,14 @@ _evas_vg_eo_base_constructor(Eo *eo_obj, Evas_VG_Data *pd)
125 125
126static void 126static void
127_evas_vg_render(Evas_Object_Protected_Data *obj, 127_evas_vg_render(Evas_Object_Protected_Data *obj,
128 void *output, void *context, void *surface, Evas_VG_Node *n, 128 void *output, void *context, void *surface, Efl_VG *n,
129 Eina_Array *clips, int x, int y, Eina_Bool do_async) 129 Eina_Array *clips, int x, int y, Eina_Bool do_async)
130{ 130{
131 Evas_VG_Container_Data *vd = eo_data_scope_get(n, EVAS_VG_CONTAINER_CLASS); 131 Efl_VG_Container_Data *vd = eo_data_scope_get(n, EFL_VG_CONTAINER_CLASS);
132 132
133 if (eo_isa(n, EVAS_VG_CONTAINER_CLASS)) 133 if (eo_isa(n, EFL_VG_CONTAINER_CLASS))
134 { 134 {
135 Evas_VG_Node *child; 135 Efl_VG *child;
136 Eina_List *l; 136 Eina_List *l;
137 137
138 EINA_LIST_FOREACH(vd->children, l, child) 138 EINA_LIST_FOREACH(vd->children, l, child)
@@ -142,9 +142,9 @@ _evas_vg_render(Evas_Object_Protected_Data *obj,
142 } 142 }
143 else 143 else
144 { 144 {
145 Evas_VG_Node_Data *nd; 145 Efl_VG_Base_Data *nd;
146 146
147 nd = eo_data_scope_get(n, EVAS_VG_NODE_CLASS); 147 nd = eo_data_scope_get(n, EFL_VG_BASE_CLASS);
148 148
149 obj->layer->evas->engine.func->ector_renderer_draw(output, context, surface, nd->renderer, clips, x, y, do_async); 149 obj->layer->evas->engine.func->ector_renderer_draw(output, context, surface, nd->renderer, clips, x, y, do_async);
150 } 150 }
diff --git a/src/lib/evas/canvas/evas_vg.eo b/src/lib/evas/canvas/evas_vg.eo
index 3caf177..8247f46 100644
--- a/src/lib/evas/canvas/evas_vg.eo
+++ b/src/lib/evas/canvas/evas_vg.eo
@@ -15,7 +15,7 @@ class Evas.VG (Evas.Object, Efl.File, Efl.Gfx.Fill, Efl.Gfx.View)
15 */ 15 */
16 } 16 }
17 values { 17 values {
18 Evas_VG_Node *container; /*@ Root node of the VG canvas */ 18 Efl_VG *container; /*@ Root node of the VG canvas */
19 } 19 }
20 } 20 }
21 } 21 }
diff --git a/src/lib/evas/canvas/evas_vg_container.c b/src/lib/evas/canvas/evas_vg_container.c
index 3b368f0..fdf8124 100644
--- a/src/lib/evas/canvas/evas_vg_container.c
+++ b/src/lib/evas/canvas/evas_vg_container.c
@@ -3,52 +3,52 @@
3 3
4#include "evas_vg_private.h" 4#include "evas_vg_private.h"
5 5
6#define MY_CLASS EVAS_VG_CONTAINER_CLASS 6#define MY_CLASS EFL_VG_CONTAINER_CLASS
7 7
8static void 8static void
9_evas_vg_container_render_pre(Eo *obj EINA_UNUSED, 9_efl_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 Evas_VG_Node_Data *nd) 13 Efl_VG_Base_Data *nd)
14{ 14{
15 Evas_VG_Container_Data *pd = data; 15 Efl_VG_Container_Data *pd = data;
16 Eina_List *l; 16 Eina_List *l;
17 Eo *child; 17 Eo *child;
18 18
19 if (!nd->changed) return ; 19 if (!nd->changed) return ;
20 nd->changed = EINA_FALSE; 20 nd->changed = EINA_FALSE;
21 21
22 EVAS_VG_COMPUTE_MATRIX(current, parent, nd); 22 EFL_VG_COMPUTE_MATRIX(current, parent, nd);
23 23
24 EINA_LIST_FOREACH(pd->children, l, child) 24 EINA_LIST_FOREACH(pd->children, l, child)
25 _evas_vg_render_pre(child, s, current); 25 _evas_vg_render_pre(child, s, current);
26} 26}
27 27
28static void 28static void
29_evas_vg_container_eo_base_constructor(Eo *obj, 29_efl_vg_container_eo_base_constructor(Eo *obj,
30 Evas_VG_Container_Data *pd) 30 Efl_VG_Container_Data *pd)
31{ 31{
32 Evas_VG_Node_Data *nd; 32 Efl_VG_Base_Data *nd;
33 33
34 eo_do_super(obj, MY_CLASS, eo_constructor()); 34 eo_do_super(obj, MY_CLASS, eo_constructor());
35 35
36 nd = eo_data_scope_get(obj, EVAS_VG_NODE_CLASS); 36 nd = eo_data_scope_get(obj, EFL_VG_BASE_CLASS);
37 nd->render_pre = _evas_vg_container_render_pre; 37 nd->render_pre = _efl_vg_container_render_pre;
38 nd->data = pd; 38 nd->data = pd;
39} 39}
40 40
41static void 41static void
42_evas_vg_container_eo_base_destructor(Eo *obj, 42_efl_vg_container_eo_base_destructor(Eo *obj,
43 Evas_VG_Container_Data *pd EINA_UNUSED) 43 Efl_VG_Container_Data *pd EINA_UNUSED)
44{ 44{
45 eo_do_super(obj, MY_CLASS, eo_destructor()); 45 eo_do_super(obj, MY_CLASS, eo_destructor());
46} 46}
47 47
48static Eina_Bool 48static Eina_Bool
49_evas_vg_container_evas_vg_node_bound_get(Eo *obj EINA_UNUSED, 49_efl_vg_container_efl_vg_base_bound_get(Eo *obj EINA_UNUSED,
50 Evas_VG_Container_Data *pd, 50 Efl_VG_Container_Data *pd,
51 Eina_Rectangle *r) 51 Eina_Rectangle *r)
52{ 52{
53 Eina_Rectangle s; 53 Eina_Rectangle s;
54 Eina_Bool first = EINA_TRUE; 54 Eina_Bool first = EINA_TRUE;
@@ -63,12 +63,12 @@ _evas_vg_container_evas_vg_node_bound_get(Eo *obj EINA_UNUSED,
63 { 63 {
64 if (first) 64 if (first)
65 { 65 {
66 eo_do(child, evas_vg_node_bound_get(r)); 66 eo_do(child, efl_vg_bound_get(r));
67 first = EINA_FALSE; 67 first = EINA_FALSE;
68 } 68 }
69 else 69 else
70 { 70 {
71 eo_do(child, evas_vg_node_bound_get(&s)); 71 eo_do(child, efl_vg_bound_get(&s));
72 eina_rectangle_union(r, &s); 72 eina_rectangle_union(r, &s);
73 } 73 }
74 } 74 }
@@ -77,4 +77,4 @@ _evas_vg_container_evas_vg_node_bound_get(Eo *obj EINA_UNUSED,
77} 77}
78 78
79 79
80#include "evas_vg_container.eo.c" 80#include "efl_vg_container.eo.c"
diff --git a/src/lib/evas/canvas/evas_vg_container.eo b/src/lib/evas/canvas/evas_vg_container.eo
deleted file mode 100644
index 0af3b00..0000000
--- a/src/lib/evas/canvas/evas_vg_container.eo
+++ /dev/null
@@ -1,9 +0,0 @@
1class Evas.VG_Container (Evas.VG_Node)
2{
3 eo_prefix: evas_vg_container;
4 implements {
5 Eo.Base.constructor;
6 Eo.Base.destructor;
7 Evas.VG_Node.bound_get;
8 }
9}
diff --git a/src/lib/evas/canvas/evas_vg_gradient.c b/src/lib/evas/canvas/evas_vg_gradient.c
index 4df0b25..245b6fe 100644
--- a/src/lib/evas/canvas/evas_vg_gradient.c
+++ b/src/lib/evas/canvas/evas_vg_gradient.c
@@ -6,10 +6,10 @@
6#include <strings.h> 6#include <strings.h>
7 7
8static void 8static void
9_evas_vg_gradient_efl_gfx_gradient_base_stop_set(Eo *obj EINA_UNUSED, 9_efl_vg_gradient_efl_gfx_gradient_base_stop_set(Eo *obj EINA_UNUSED,
10 Evas_VG_Gradient_Data *pd, 10 Efl_VG_Gradient_Data *pd,
11 const Efl_Gfx_Gradient_Stop *colors, 11 const Efl_Gfx_Gradient_Stop *colors,
12 unsigned int length) 12 unsigned int length)
13{ 13{
14 pd->colors = realloc(pd->colors, length * sizeof(Efl_Gfx_Gradient_Stop)); 14 pd->colors = realloc(pd->colors, length * sizeof(Efl_Gfx_Gradient_Stop));
15 if (!pd->colors) 15 if (!pd->colors)
@@ -21,34 +21,60 @@ _evas_vg_gradient_efl_gfx_gradient_base_stop_set(Eo *obj EINA_UNUSED,
21 memcpy(pd->colors, colors, length * sizeof(Efl_Gfx_Gradient_Stop)); 21 memcpy(pd->colors, colors, length * sizeof(Efl_Gfx_Gradient_Stop));
22 pd->colors_count = length; 22 pd->colors_count = length;
23 23
24 _evas_vg_node_changed(obj); 24 _efl_vg_base_changed(obj);
25} 25}
26 26
27static void 27static void
28_evas_vg_gradient_efl_gfx_gradient_base_stop_get(Eo *obj EINA_UNUSED, 28_efl_vg_gradient_efl_gfx_gradient_base_stop_get(Eo *obj EINA_UNUSED,
29 Evas_VG_Gradient_Data *pd, 29 Efl_VG_Gradient_Data *pd,
30 const Efl_Gfx_Gradient_Stop **colors, 30 const Efl_Gfx_Gradient_Stop **colors,
31 unsigned int *length) 31 unsigned int *length)
32{ 32{
33 if (colors) *colors = pd->colors; 33 if (colors) *colors = pd->colors;
34 if (length) *length = pd->colors_count; 34 if (length) *length = pd->colors_count;
35} 35}
36 36
37static void 37static void
38_evas_vg_gradient_efl_gfx_gradient_base_spread_set(Eo *obj EINA_UNUSED, 38_efl_vg_gradient_efl_gfx_gradient_base_spread_set(Eo *obj EINA_UNUSED,
39 Evas_VG_Gradient_Data *pd, 39 Efl_VG_Gradient_Data *pd,
40 Efl_Gfx_Gradient_Spread s) 40 Efl_Gfx_Gradient_Spread s)
41{ 41{
42 pd->s = s; 42 pd->s = s;
43 43
44 _evas_vg_node_changed(obj); 44 _efl_vg_base_changed(obj);
45} 45}
46 46
47static Efl_Gfx_Gradient_Spread 47static Efl_Gfx_Gradient_Spread
48_evas_vg_gradient_efl_gfx_gradient_base_spread_get(Eo *obj EINA_UNUSED, 48_efl_vg_gradient_efl_gfx_gradient_base_spread_get(Eo *obj EINA_UNUSED,
49 Evas_VG_Gradient_Data *pd) 49 Efl_VG_Gradient_Data *pd)
50{ 50{
51 return pd->s; 51 return pd->s;
52} 52}
53 53
54#include "evas_vg_gradient.eo.c" 54EAPI void
55evas_vg_gradient_stop_set(Eo *obj, const Efl_Gfx_Gradient_Stop *colors, unsigned int length)
56{
57 eo_do(obj, efl_gfx_gradient_stop_set(colors, length));
58}
59
60EAPI void
61evas_vg_gradient_stop_get(Eo *obj, const Efl_Gfx_Gradient_Stop **colors, unsigned int *length)
62{
63 eo_do(obj, efl_gfx_gradient_stop_get(colors, length));
64}
65
66EAPI void
67evas_vg_gradient_spread_set(Eo *obj, Efl_Gfx_Gradient_Spread s)
68{
69 eo_do(obj, efl_gfx_gradient_spread_set(s));
70}
71
72EAPI Efl_Gfx_Gradient_Spread
73evas_vg_gradient_spread_get(Eo *obj)
74{
75 Efl_Gfx_Gradient_Spread ret;
76
77 return eo_do_ret(obj, ret, efl_gfx_gradient_spread_get());
78}
79
80#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 c1d8ffc..d29038c 100644
--- a/src/lib/evas/canvas/evas_vg_gradient_linear.c
+++ b/src/lib/evas/canvas/evas_vg_gradient_linear.c
@@ -5,10 +5,10 @@
5 5
6#include <strings.h> 6#include <strings.h>
7 7
8#define MY_CLASS EVAS_VG_GRADIENT_LINEAR_CLASS 8#define MY_CLASS EFL_VG_GRADIENT_LINEAR_CLASS
9 9
10typedef struct _Evas_VG_Gradient_Linear_Data Evas_VG_Gradient_Linear_Data; 10typedef struct _Efl_VG_Gradient_Linear_Data Efl_VG_Gradient_Linear_Data;
11struct _Evas_VG_Gradient_Linear_Data 11struct _Efl_VG_Gradient_Linear_Data
12{ 12{
13 struct { 13 struct {
14 double x, y; 14 double x, y;
@@ -16,60 +16,60 @@ struct _Evas_VG_Gradient_Linear_Data
16}; 16};
17 17
18static void 18static void
19_evas_vg_gradient_linear_efl_gfx_gradient_linear_start_set(Eo *obj EINA_UNUSED, 19_efl_vg_gradient_linear_efl_gfx_gradient_linear_start_set(Eo *obj EINA_UNUSED,
20 Evas_VG_Gradient_Linear_Data *pd, 20 Efl_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;
24 pd->start.y = y; 24 pd->start.y = y;
25 25
26 _evas_vg_node_changed(obj); 26 _efl_vg_base_changed(obj);
27} 27}
28 28
29static void 29static void
30_evas_vg_gradient_linear_efl_gfx_gradient_linear_start_get(Eo *obj EINA_UNUSED, 30_efl_vg_gradient_linear_efl_gfx_gradient_linear_start_get(Eo *obj EINA_UNUSED,
31 Evas_VG_Gradient_Linear_Data *pd, 31 Efl_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;
35 if (y) *y = pd->start.y; 35 if (y) *y = pd->start.y;
36} 36}
37 37
38static void 38static void
39_evas_vg_gradient_linear_efl_gfx_gradient_linear_end_set(Eo *obj EINA_UNUSED, 39_efl_vg_gradient_linear_efl_gfx_gradient_linear_end_set(Eo *obj EINA_UNUSED,
40 Evas_VG_Gradient_Linear_Data *pd, 40 Efl_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;
44 pd->end.y = y; 44 pd->end.y = y;
45 45
46 _evas_vg_node_changed(obj); 46 _efl_vg_base_changed(obj);
47} 47}
48 48
49static void 49static void
50_evas_vg_gradient_linear_efl_gfx_gradient_linear_end_get(Eo *obj EINA_UNUSED, 50_efl_vg_gradient_linear_efl_gfx_gradient_linear_end_get(Eo *obj EINA_UNUSED,
51 Evas_VG_Gradient_Linear_Data *pd, 51 Efl_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;
55 if (y) *y = pd->end.y; 55 if (y) *y = pd->end.y;
56} 56}
57 57
58static void 58static void
59_evas_vg_gradient_linear_render_pre(Eo *obj, 59_efl_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 Evas_VG_Node_Data *nd) 63 Efl_VG_Base_Data *nd)
64{ 64{
65 Evas_VG_Gradient_Linear_Data *pd = data; 65 Efl_VG_Gradient_Linear_Data *pd = data;
66 Evas_VG_Gradient_Data *gd; 66 Efl_VG_Gradient_Data *gd;
67 67
68 if (!nd->changed) return ; 68 if (!nd->changed) return ;
69 nd->changed = EINA_FALSE; 69 nd->changed = EINA_FALSE;
70 70
71 gd = eo_data_scope_get(obj, EVAS_VG_GRADIENT_CLASS); 71 gd = eo_data_scope_get(obj, EFL_VG_GRADIENT_CLASS);
72 EVAS_VG_COMPUTE_MATRIX(current, parent, nd); 72 EFL_VG_COMPUTE_MATRIX(current, parent, nd);
73 73
74 if (!nd->renderer) 74 if (!nd->renderer)
75 { 75 {
@@ -89,22 +89,46 @@ _evas_vg_gradient_linear_render_pre(Eo *obj,
89} 89}
90 90
91static void 91static void
92_evas_vg_gradient_linear_eo_base_constructor(Eo *obj, 92_efl_vg_gradient_linear_eo_base_constructor(Eo *obj,
93 Evas_VG_Gradient_Linear_Data *pd) 93 Efl_VG_Gradient_Linear_Data *pd)
94{ 94{
95 Evas_VG_Node_Data *nd; 95 Efl_VG_Base_Data *nd;
96 96
97 eo_do_super(obj, MY_CLASS, eo_constructor()); 97 eo_do_super(obj, MY_CLASS, eo_constructor());
98 98
99 nd = eo_data_scope_get(obj, EVAS_VG_NODE_CLASS); 99 nd = eo_data_scope_get(obj, EFL_VG_BASE_CLASS);
100 nd->render_pre = _evas_vg_gradient_linear_render_pre; 100 nd->render_pre = _efl_vg_gradient_linear_render_pre;
101 nd->data = pd; 101 nd->data = pd;
102} 102}
103 103
104void 104void
105_evas_vg_gradient_linear_eo_base_destructor(Eo *obj, Evas_VG_Gradient_Linear_Data *pd EINA_UNUSED) 105_efl_vg_gradient_linear_eo_base_destructor(Eo *obj, Efl_VG_Gradient_Linear_Data *pd EINA_UNUSED)
106{ 106{
107 eo_do_super(obj, MY_CLASS, eo_destructor()); 107 eo_do_super(obj, MY_CLASS, eo_destructor());
108} 108}
109 109
110#include "evas_vg_gradient_linear.eo.c" 110EAPI void
111evas_vg_gradient_linear_start_set(Eo *obj, double x, double y)
112{
113 eo_do(obj, efl_gfx_gradient_linear_start_set(x, y));
114}
115
116EAPI void
117evas_vg_gradient_linear_start_get(Eo *obj, double *x, double *y)
118{
119 eo_do(obj, efl_gfx_gradient_linear_start_get(x, y));
120}
121
122EAPI void
123evas_vg_gradient_linear_end_set(Eo *obj, double x, double y)
124{
125 eo_do(obj, efl_gfx_gradient_linear_end_set(x, y));
126}
127
128EAPI void
129evas_vg_gradient_linear_end_get(Eo *obj, double *x, double *y)
130{
131 eo_do(obj, efl_gfx_gradient_linear_end_get(x, y));
132}
133
134#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 ead0a49..b0743e5 100644
--- a/src/lib/evas/canvas/evas_vg_gradient_radial.c
+++ b/src/lib/evas/canvas/evas_vg_gradient_radial.c
@@ -3,10 +3,10 @@
3 3
4#include "evas_vg_private.h" 4#include "evas_vg_private.h"
5 5
6#define MY_CLASS EVAS_VG_GRADIENT_RADIAL_CLASS 6#define MY_CLASS EFL_VG_GRADIENT_RADIAL_CLASS
7 7
8typedef struct _Evas_VG_Gradient_Radial_Data Evas_VG_Gradient_Radial_Data; 8typedef struct _Efl_VG_Gradient_Radial_Data Efl_VG_Gradient_Radial_Data;
9struct _Evas_VG_Gradient_Radial_Data 9struct _Efl_VG_Gradient_Radial_Data
10{ 10{
11 struct { 11 struct {
12 double x, y; 12 double x, y;
@@ -15,77 +15,77 @@ struct _Evas_VG_Gradient_Radial_Data
15}; 15};
16 16
17static void 17static void
18_evas_vg_gradient_radial_efl_gfx_gradient_radial_center_set(Eo *obj EINA_UNUSED, 18_efl_vg_gradient_radial_efl_gfx_gradient_radial_center_set(Eo *obj EINA_UNUSED,
19 Evas_VG_Gradient_Radial_Data *pd, 19 Efl_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;
23 pd->center.y = y; 23 pd->center.y = y;
24 24
25 _evas_vg_node_changed(obj); 25 _efl_vg_base_changed(obj);
26} 26}
27 27
28static void 28static void
29_evas_vg_gradient_radial_efl_gfx_gradient_radial_center_get(Eo *obj EINA_UNUSED, 29_efl_vg_gradient_radial_efl_gfx_gradient_radial_center_get(Eo *obj EINA_UNUSED,
30 Evas_VG_Gradient_Radial_Data *pd, 30 Efl_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;
34 if (y) *y = pd->center.y; 34 if (y) *y = pd->center.y;
35} 35}
36 36
37static void 37static void
38_evas_vg_gradient_radial_efl_gfx_gradient_radial_radius_set(Eo *obj EINA_UNUSED, 38_efl_vg_gradient_radial_efl_gfx_gradient_radial_radius_set(Eo *obj EINA_UNUSED,
39 Evas_VG_Gradient_Radial_Data *pd, 39 Efl_VG_Gradient_Radial_Data *pd,
40 double r) 40 double r)
41{ 41{
42 pd->radius = r; 42 pd->radius = r;
43 43
44 _evas_vg_node_changed(obj); 44 _efl_vg_base_changed(obj);
45} 45}
46 46
47static double 47static double
48_evas_vg_gradient_radial_efl_gfx_gradient_radial_radius_get(Eo *obj EINA_UNUSED, 48_efl_vg_gradient_radial_efl_gfx_gradient_radial_radius_get(Eo *obj EINA_UNUSED,
49 Evas_VG_Gradient_Radial_Data *pd) 49 Efl_VG_Gradient_Radial_Data *pd)
50{ 50{
51 return pd->radius; 51 return pd->radius;
52} 52}
53 53
54static void 54static void
55_evas_vg_gradient_radial_efl_gfx_gradient_radial_focal_set(Eo *obj EINA_UNUSED, 55_efl_vg_gradient_radial_efl_gfx_gradient_radial_focal_set(Eo *obj EINA_UNUSED,
56 Evas_VG_Gradient_Radial_Data *pd, 56 Efl_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;
60 pd->focal.y = y; 60 pd->focal.y = y;
61 61
62 _evas_vg_node_changed(obj); 62 _efl_vg_base_changed(obj);
63} 63}
64 64
65static void 65static void
66_evas_vg_gradient_radial_efl_gfx_gradient_radial_focal_get(Eo *obj EINA_UNUSED, 66_efl_vg_gradient_radial_efl_gfx_gradient_radial_focal_get(Eo *obj EINA_UNUSED,
67 Evas_VG_Gradient_Radial_Data *pd, 67 Efl_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;
71 if (y) *y = pd->focal.y; 71 if (y) *y = pd->focal.y;
72} 72}
73 73
74static void 74static void
75_evas_vg_gradient_radial_render_pre(Eo *obj, 75_efl_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 Evas_VG_Node_Data *nd) 79 Efl_VG_Base_Data *nd)
80{ 80{
81 Evas_VG_Gradient_Radial_Data *pd = data; 81 Efl_VG_Gradient_Radial_Data *pd = data;
82 Evas_VG_Gradient_Data *gd; 82 Efl_VG_Gradient_Data *gd;
83 83
84 if (!nd->changed) return ; 84 if (!nd->changed) return ;
85 nd->changed = EINA_FALSE; 85 nd->changed = EINA_FALSE;
86 86
87 gd = eo_data_scope_get(obj, EVAS_VG_GRADIENT_CLASS); 87 gd = eo_data_scope_get(obj, EFL_VG_GRADIENT_CLASS);
88 EVAS_VG_COMPUTE_MATRIX(current, parent, nd); 88 EFL_VG_COMPUTE_MATRIX(current, parent, nd);
89 89
90 if (!nd->renderer) 90 if (!nd->renderer)
91 { 91 {
@@ -106,22 +106,60 @@ _evas_vg_gradient_radial_render_pre(Eo *obj,
106} 106}
107 107
108static void 108static void
109_evas_vg_gradient_radial_eo_base_constructor(Eo *obj, Evas_VG_Gradient_Radial_Data *pd) 109_efl_vg_gradient_radial_eo_base_constructor(Eo *obj, Efl_VG_Gradient_Radial_Data *pd)
110{ 110{
111 Evas_VG_Node_Data *nd; 111 Efl_VG_Base_Data *nd;
112 112
113 eo_do_super(obj, MY_CLASS, eo_constructor()); 113 eo_do_super(obj, MY_CLASS, eo_constructor());
114 114
115 nd = eo_data_scope_get(obj, EVAS_VG_NODE_CLASS); 115 nd = eo_data_scope_get(obj, EFL_VG_BASE_CLASS);
116 nd->render_pre = _evas_vg_gradient_radial_render_pre; 116 nd->render_pre = _efl_vg_gradient_radial_render_pre;
117 nd->data = pd; 117 nd->data = pd;
118} 118}
119 119
120static void 120static void
121_evas_vg_gradient_radial_eo_base_destructor(Eo *obj, 121_efl_vg_gradient_radial_eo_base_destructor(Eo *obj,
122 Evas_VG_Gradient_Radial_Data *pd EINA_UNUSED) 122 Efl_VG_Gradient_Radial_Data *pd EINA_UNUSED)
123{ 123{
124 eo_do_super(obj, MY_CLASS, eo_destructor()); 124 eo_do_super(obj, MY_CLASS, eo_destructor());
125} 125}
126 126
127#include "evas_vg_gradient_radial.eo.c" 127EAPI void
128evas_vg_gradient_radial_center_set(Eo *obj, double x, double y)
129{
130 eo_do(obj, efl_gfx_gradient_radial_center_set(x, y));
131}
132
133EAPI void
134evas_vg_gradient_radial_center_get(Eo *obj, double *x, double *y)
135{
136 eo_do(obj, efl_gfx_gradient_radial_center_get(x, y));
137}
138
139EAPI void
140evas_vg_gradient_radial_radius_set(Eo *obj, double r)
141{
142 eo_do(obj, efl_gfx_gradient_radial_radius_set(r));
143}
144
145EAPI double
146evas_vg_gradient_radial_radius_get(Eo *obj)
147{
148 double ret;
149
150 return eo_do_ret(obj, ret, efl_gfx_gradient_radial_radius_get());
151}
152
153EAPI void
154evas_vg_gradient_radial_focal_set(Eo *obj, double x, double y)
155{
156 eo_do(obj, efl_gfx_gradient_radial_focal_set(x, y));
157}
158
159EAPI void
160evas_vg_gradient_radial_focal_get(Eo *obj, double *x, double *y)
161{
162 eo_do(obj, efl_gfx_gradient_radial_focal_get(x, y));
163}
164
165#include "efl_vg_gradient_radial.eo.c"
diff --git a/src/lib/evas/canvas/evas_vg_image.c b/src/lib/evas/canvas/evas_vg_image.c
index 523c1fc..1bb0b1b 100644
--- a/src/lib/evas/canvas/evas_vg_image.c
+++ b/src/lib/evas/canvas/evas_vg_image.c
@@ -5,8 +5,8 @@
5 5
6#include "evas_vg_private.h" 6#include "evas_vg_private.h"
7 7
8typedef struct _Evas_VG_Image_Data Evas_VG_Image_Data; 8typedef struct _Efl_VG_Image_Data Efl_VG_Image_Data;
9struct _Evas_VG_Image_Data 9struct _Efl_VG_Image_Data
10{ 10{
11 // FIXME: only manipulate Eina_File internally. 11 // FIXME: only manipulate Eina_File internally.
12 Eina_File *f; 12 Eina_File *f;
@@ -17,33 +17,33 @@ struct _Evas_VG_Image_Data
17}; 17};
18 18
19static void 19static void
20_evas_vg_image_position_set(Eo *obj, Evas_VG_Image_Data *pd, int x, int y) 20_efl_vg_image_position_set(Eo *obj, Efl_VG_Image_Data *pd, int x, int y)
21{ 21{
22 pd->x = x; 22 pd->x = x;
23 pd->y = y; 23 pd->y = y;
24 24
25 _evas_vg_node_changed(obj); 25 _efl_vg_base_changed(obj);
26} 26}
27 27
28static void 28static void
29_evas_vg_image_position_get(Eo *obj, Evas_VG_Image_Data *pd, int *x, int *y) 29_efl_vg_image_position_get(Eo *obj, Efl_VG_Image_Data *pd, int *x, int *y)
30{ 30{
31 if (x) *x = pd->x; 31 if (x) *x = pd->x;
32 if (y) *y = pd->y; 32 if (y) *y = pd->y;
33} 33}
34 34
35static void 35static void
36_evas_vg_image_size_set(Eo *obj, Evas_VG_Image_Data *pd, 36_efl_vg_image_size_set(Eo *obj, Efl_VG_Image_Data *pd,
37 unsigned int w, unsigned int h) 37 unsigned int w, unsigned int h)
38{ 38{
39 pd->w = w; 39 pd->w = w;
40 pd->h = h; 40 pd->h = h;
41 41
42 _evas_vg_node_changed(obj); 42 _efl_vg_base_changed(obj);
43} 43}
44 44
45static void 45static void
46_evas_vg_image_size_get(Eo *obj, Evas_VG_Image_Data *pd, 46_efl_vg_image_size_get(Eo *obj, Efl_VG_Image_Data *pd,
47 unsigned int *w, unsigned int *h) 47 unsigned int *w, unsigned int *h)
48{ 48{
49 if (w) *w = pd->w; 49 if (w) *w = pd->w;
@@ -51,7 +51,7 @@ _evas_vg_image_size_get(Eo *obj, Evas_VG_Image_Data *pd,
51} 51}
52 52
53static Eina_Bool 53static Eina_Bool
54_evas_vg_image_efl_file_mmap_set(Eo *obj EINA_UNUSED, Evas_VG_Image_Data *pd, 54_efl_vg_image_efl_file_mmap_set(Eo *obj EINA_UNUSED, Efl_VG_Image_Data *pd,
55 const Eina_File *f, const char *key) 55 const Eina_File *f, const char *key)
56{ 56{
57 Eina_File *tmp = pd->f; 57 Eina_File *tmp = pd->f;
@@ -60,13 +60,13 @@ _evas_vg_image_efl_file_mmap_set(Eo *obj EINA_UNUSED, Evas_VG_Image_Data *pd,
60 eina_file_close(tmp); 60 eina_file_close(tmp);
61 eina_stringshare_replace(&pd->key, key); 61 eina_stringshare_replace(&pd->key, key);
62 62
63 _evas_vg_node_changed(obj); 63 _efl_vg_base_changed(obj);
64 64
65 return EINA_TRUE; 65 return EINA_TRUE;
66} 66}
67 67
68static void 68static void
69_evas_vg_image_efl_file_mmap_get(Eo *obj EINA_UNUSED, Evas_VG_Image_Data *pd, 69_efl_vg_image_efl_file_mmap_get(Eo *obj EINA_UNUSED, Efl_VG_Image_Data *pd,
70 const Eina_File **f, const char **key) 70 const Eina_File **f, const char **key)
71{ 71{
72 if (f) *f = pd->f; 72 if (f) *f = pd->f;
@@ -74,21 +74,21 @@ _evas_vg_image_efl_file_mmap_get(Eo *obj EINA_UNUSED, Evas_VG_Image_Data *pd,
74} 74}
75 75
76static Eina_Bool 76static Eina_Bool
77_evas_vg_image_efl_file_file_set(Eo *obj, Evas_VG_Image_Data *pd, 77_efl_vg_image_efl_file_file_set(Eo *obj, Efl_VG_Image_Data *pd,
78 const char *file, const char *key) 78 const char *file, const char *key)
79{ 79{
80 Eina_File *tmp; 80 Eina_File *tmp;
81 Eina_Bool r; 81 Eina_Bool r;
82 82
83 tmp = eina_file_open(file, EINA_FALSE); 83 tmp = eina_file_open(file, EINA_FALSE);
84 r = _evas_vg_image_efl_file_mmap_set(obj, pd, tmp, key); 84 r = _efl_vg_image_efl_file_mmap_set(obj, pd, tmp, key);
85 eina_file_close(tmp); 85 eina_file_close(tmp);
86 86
87 return r; 87 return r;
88} 88}
89 89
90static void 90static void
91_evas_vg_image_efl_file_file_get(Eo *obj EINA_UNUSED, Evas_VG_Image_Data *pd, 91_efl_vg_image_efl_file_file_get(Eo *obj EINA_UNUSED, Efl_VG_Image_Data *pd,
92 const char **file, const char **key) 92 const char **file, const char **key)
93{ 93{
94 if (file) *file = eina_file_filename_get(pd->f); 94 if (file) *file = eina_file_filename_get(pd->f);
@@ -96,15 +96,15 @@ _evas_vg_image_efl_file_file_get(Eo *obj EINA_UNUSED, Evas_VG_Image_Data *pd,
96} 96}
97 97
98static void 98static void
99_evas_vg_image_eo_base_constructor(Eo *obj, Evas_VG_Image_Data *pd) 99_efl_vg_image_eo_base_constructor(Eo *obj, Efl_VG_Image_Data *pd)
100{ 100{
101 eo_error_set(obj); 101 eo_error_set(obj);
102} 102}
103 103
104static void 104static void
105_evas_vg_image_eo_base_destructor(Eo *obj, Evas_VG_Image_Data *pd) 105_efl_vg_image_eo_base_destructor(Eo *obj, Efl_VG_Image_Data *pd)
106{ 106{
107 eo_error_set(obj); 107 eo_error_set(obj);
108} 108}
109 109
110#include "evas_vg_image.eo.c" 110#include "efl_vg_image.eo.c"
diff --git a/src/lib/evas/canvas/evas_vg_loader_svg.c b/src/lib/evas/canvas/evas_vg_loader_svg.c
index d173b2a..bf726d5 100644
--- a/src/lib/evas/canvas/evas_vg_loader_svg.c
+++ b/src/lib/evas/canvas/evas_vg_loader_svg.c
@@ -116,7 +116,7 @@ _tag_linearGradient_handler(Evas_SVG_Loader *loader,
116 _attrs_id_parser, &id); 116 _attrs_id_parser, &id);
117 117
118 if (!id) return EINA_FALSE; 118 if (!id) return EINA_FALSE;
119 node = eo_add(EVAS_VG_GRADIENT_LINEAR_CLASS, NULL); 119 node = eo_add(EFL_VG_GRADIENT_LINEAR_CLASS, NULL);
120 if (!node) return EINA_FALSE; 120 if (!node) return EINA_FALSE;
121 121
122 eina_hash_direct_add(loader->definition, id, node); 122 eina_hash_direct_add(loader->definition, id, node);
@@ -481,7 +481,7 @@ _tag_g_handler(Evas_SVG_Loader *loader,
481 481
482 parent = eina_array_data_get(loader->stack, eina_array_count(loader->stack) - 1); 482 parent = eina_array_data_get(loader->stack, eina_array_count(loader->stack) - 1);
483 483
484 node = eo_add(EVAS_VG_CONTAINER_CLASS, parent); 484 node = eo_add(EFL_VG_CONTAINER_CLASS, parent);
485 eina_array_push(loader->stack, node); 485 eina_array_push(loader->stack, node);
486 486
487 return EINA_TRUE; 487 return EINA_TRUE;
diff --git a/src/lib/evas/canvas/evas_vg_node.c b/src/lib/evas/canvas/evas_vg_node.c
index 76bec25..c368634 100644
--- a/src/lib/evas/canvas/evas_vg_node.c
+++ b/src/lib/evas/canvas/evas_vg_node.c
@@ -6,12 +6,12 @@
6#include <string.h> 6#include <string.h>
7#include <math.h> 7#include <math.h>
8 8
9#define MY_CLASS EVAS_VG_NODE_CLASS 9#define MY_CLASS EFL_VG_BASE_CLASS
10 10
11static Eina_Bool 11static Eina_Bool
12_evas_vg_node_property_changed(void *data, Eo *obj, const Eo_Event_Description *desc, void *event_info) 12_efl_vg_base_property_changed(void *data, Eo *obj, const Eo_Event_Description *desc, void *event_info)
13{ 13{
14 Evas_VG_Node_Data *pd = data; 14 Efl_VG_Base_Data *pd = data;
15 Eo *parent; 15 Eo *parent;
16 16
17 if (pd->changed) return EINA_TRUE; 17 if (pd->changed) return EINA_TRUE;
@@ -23,9 +23,9 @@ _evas_vg_node_property_changed(void *data, Eo *obj, const Eo_Event_Description *
23} 23}
24 24
25void 25void
26_evas_vg_node_transformation_set(Eo *obj, 26_efl_vg_base_transformation_set(Eo *obj,
27 Evas_VG_Node_Data *pd, 27 Efl_VG_Base_Data *pd,
28 const Eina_Matrix3 *m) 28 const Eina_Matrix3 *m)
29{ 29{
30 if (!pd->m) 30 if (!pd->m)
31 { 31 {
@@ -34,100 +34,100 @@ _evas_vg_node_transformation_set(Eo *obj,
34 } 34 }
35 memcpy(pd->m, m, sizeof (Eina_Matrix3)); 35 memcpy(pd->m, m, sizeof (Eina_Matrix3));
36 36
37 _evas_vg_node_changed(obj); 37 _efl_vg_base_changed(obj);
38} 38}
39 39
40const Eina_Matrix3 * 40const Eina_Matrix3 *
41_evas_vg_node_transformation_get(Eo *obj EINA_UNUSED, Evas_VG_Node_Data *pd) 41_efl_vg_base_transformation_get(Eo *obj EINA_UNUSED, Efl_VG_Base_Data *pd)
42{ 42{
43 return pd->m; 43 return pd->m;
44} 44}
45 45
46void 46void
47_evas_vg_node_origin_set(Eo *obj, 47_efl_vg_base_origin_set(Eo *obj,
48 Evas_VG_Node_Data *pd, 48 Efl_VG_Base_Data *pd,
49 double x, double y) 49 double x, double y)
50{ 50{
51 pd->x = x; 51 pd->x = x;
52 pd->y = y; 52 pd->y = y;
53 53
54 _evas_vg_node_changed(obj); 54 _efl_vg_base_changed(obj);
55} 55}
56 56
57void 57void
58_evas_vg_node_origin_get(Eo *obj EINA_UNUSED, 58_efl_vg_base_origin_get(Eo *obj EINA_UNUSED,
59 Evas_VG_Node_Data *pd, 59 Efl_VG_Base_Data *pd,
60 double *x, double *y) 60 double *x, double *y)
61{ 61{
62 if (x) *x = pd->x; 62 if (x) *x = pd->x;
63 if (y) *y = pd->y; 63 if (y) *y = pd->y;
64} 64}
65 65
66void 66void
67_evas_vg_node_efl_gfx_base_position_set(Eo *obj EINA_UNUSED, 67_efl_vg_base_efl_gfx_base_position_set(Eo *obj EINA_UNUSED,
68 Evas_VG_Node_Data *pd, 68 Efl_VG_Base_Data *pd,
69 int x, int y) 69 int x, int y)
70{ 70{
71 pd->x = lrint(x); 71 pd->x = lrint(x);
72 pd->y = lrint(y); 72 pd->y = lrint(y);
73 73
74 _evas_vg_node_changed(obj); 74 _efl_vg_base_changed(obj);
75} 75}
76 76
77void 77void
78_evas_vg_node_efl_gfx_base_position_get(Eo *obj EINA_UNUSED, 78_efl_vg_base_efl_gfx_base_position_get(Eo *obj EINA_UNUSED,
79 Evas_VG_Node_Data *pd, 79 Efl_VG_Base_Data *pd,
80 int *x, int *y) 80 int *x, int *y)
81{ 81{
82 if (x) *x = pd->x; 82 if (x) *x = pd->x;
83 if (y) *y = pd->y; 83 if (y) *y = pd->y;
84} 84}
85 85
86void 86void
87_evas_vg_node_efl_gfx_base_visible_set(Eo *obj EINA_UNUSED, 87_efl_vg_base_efl_gfx_base_visible_set(Eo *obj EINA_UNUSED,
88 Evas_VG_Node_Data *pd, Eina_Bool v) 88 Efl_VG_Base_Data *pd, Eina_Bool v)
89{ 89{
90 pd->visibility = v; 90 pd->visibility = v;
91 91
92 _evas_vg_node_changed(obj); 92 _efl_vg_base_changed(obj);
93} 93}
94 94
95 95
96Eina_Bool 96Eina_Bool
97_evas_vg_node_efl_gfx_base_visible_get(Eo *obj EINA_UNUSED, 97_efl_vg_base_efl_gfx_base_visible_get(Eo *obj EINA_UNUSED,
98 Evas_VG_Node_Data *pd) 98 Efl_VG_Base_Data *pd)
99{ 99{
100 return pd->visibility; 100 return pd->visibility;
101} 101}
102 102
103void 103void
104_evas_vg_node_efl_gfx_base_color_set(Eo *obj EINA_UNUSED, 104_efl_vg_base_efl_gfx_base_color_set(Eo *obj EINA_UNUSED,
105 Evas_VG_Node_Data *pd, 105 Efl_VG_Base_Data *pd,
106 int r, int g, int b, int a) 106 int r, int g, int b, int a)
107{ 107{
108 pd->r = r; 108 pd->r = r;
109 pd->g = g; 109 pd->g = g;
110 pd->b = b; 110 pd->b = b;
111 pd->a = a; 111 pd->a = a;
112 112
113 _evas_vg_node_changed(obj); 113 _efl_vg_base_changed(obj);
114} 114}
115 115
116Eina_Bool 116Eina_Bool
117_evas_vg_node_efl_gfx_base_color_part_set(Eo *obj, Evas_VG_Node_Data *pd, 117_efl_vg_base_efl_gfx_base_color_part_set(Eo *obj, Efl_VG_Base_Data *pd,
118 const char *part, 118 const char *part,
119 int r, int g, int b, int a) 119 int r, int g, int b, int a)
120{ 120{
121 if (part) return EINA_FALSE; 121 if (part) return EINA_FALSE;
122 122
123 _evas_vg_node_efl_gfx_base_color_set(obj, pd, r, g, b, a); 123 _efl_vg_base_efl_gfx_base_color_set(obj, pd, r, g, b, a);
124 return EINA_TRUE; 124 return EINA_TRUE;
125} 125}
126 126
127void 127void
128_evas_vg_node_efl_gfx_base_color_get(Eo *obj EINA_UNUSED, 128_efl_vg_base_efl_gfx_base_color_get(Eo *obj EINA_UNUSED,
129 Evas_VG_Node_Data *pd, 129 Efl_VG_Base_Data *pd,
130 int *r, int *g, int *b, int *a) 130 int *r, int *g, int *b, int *a)
131{ 131{
132 if (r) *r = pd->r; 132 if (r) *r = pd->r;
133 if (g) *g = pd->g; 133 if (g) *g = pd->g;
@@ -136,62 +136,62 @@ _evas_vg_node_efl_gfx_base_color_get(Eo *obj EINA_UNUSED,
136} 136}
137 137
138Eina_Bool 138Eina_Bool
139_evas_vg_node_efl_gfx_base_color_part_get(Eo *obj, Evas_VG_Node_Data *pd, 139_efl_vg_base_efl_gfx_base_color_part_get(Eo *obj, Efl_VG_Base_Data *pd,
140 const char *part, 140 const char *part,
141 int *r, int *g, int *b, int *a) 141 int *r, int *g, int *b, int *a)
142{ 142{
143 if (part) return EINA_FALSE; 143 if (part) return EINA_FALSE;
144 144
145 _evas_vg_node_efl_gfx_base_color_get(obj, pd, r, g, b, a); 145 _efl_vg_base_efl_gfx_base_color_get(obj, pd, r, g, b, a);
146 return EINA_TRUE; 146 return EINA_TRUE;
147} 147}
148 148
149void 149void
150_evas_vg_node_mask_set(Eo *obj EINA_UNUSED, 150_efl_vg_base_mask_set(Eo *obj EINA_UNUSED,
151 Evas_VG_Node_Data *pd, 151 Efl_VG_Base_Data *pd,
152 Evas_VG_Node *r) 152 Efl_VG_Base *r)
153{ 153{
154 Evas_VG_Node *tmp = pd->mask; 154 Efl_VG_Base *tmp = pd->mask;
155 155
156 pd->mask = eo_ref(r); 156 pd->mask = eo_ref(r);
157 eo_unref(tmp); 157 eo_unref(tmp);
158 158
159 _evas_vg_node_changed(obj); 159 _efl_vg_base_changed(obj);
160} 160}
161 161
162Evas_VG_Node* 162Efl_VG_Base*
163_evas_vg_node_mask_get(Eo *obj EINA_UNUSED, Evas_VG_Node_Data *pd) 163_efl_vg_base_mask_get(Eo *obj EINA_UNUSED, Efl_VG_Base_Data *pd)
164{ 164{
165 return pd->mask; 165 return pd->mask;
166} 166}
167 167
168void 168void
169_evas_vg_node_efl_gfx_base_size_get(Eo *obj, 169_efl_vg_base_efl_gfx_base_size_get(Eo *obj,
170 Evas_VG_Node_Data *pd EINA_UNUSED, 170 Efl_VG_Base_Data *pd EINA_UNUSED,
171 int *w, int *h) 171 int *w, int *h)
172{ 172{
173 Eina_Rectangle bound = { 0, 0, 0, 0 }; 173 Eina_Rectangle bound = { 0, 0, 0, 0 };
174 174
175 eo_do(obj, evas_vg_node_bound_get(&bound)); 175 eo_do(obj, efl_vg_bound_get(&bound));
176 if (w) *w = bound.w; 176 if (w) *w = bound.w;
177 if (h) *h = bound.h; 177 if (h) *h = bound.h;
178} 178}
179 179
180// Parent should be a container otherwise dismissing the stacking operation 180// Parent should be a container otherwise dismissing the stacking operation
181static Eina_Bool 181static Eina_Bool
182_evas_vg_node_parent_checked_get(Eo *obj, 182_efl_vg_base_parent_checked_get(Eo *obj,
183 Eo **parent, 183 Eo **parent,
184 Evas_VG_Container_Data **cd) 184 Efl_VG_Container_Data **cd)
185{ 185{
186 *cd = NULL; 186 *cd = NULL;
187 eo_do(obj, *parent = eo_parent_get()); 187 eo_do(obj, *parent = eo_parent_get());
188 188
189 if (eo_isa(*parent, EVAS_VG_CONTAINER_CLASS)) 189 if (eo_isa(*parent, EFL_VG_CONTAINER_CLASS))
190 { 190 {
191 *cd = eo_data_scope_get(*parent, EVAS_VG_CONTAINER_CLASS); 191 *cd = eo_data_scope_get(*parent, EFL_VG_CONTAINER_CLASS);
192 if (!*cd) 192 if (!*cd)
193 { 193 {
194 ERR("Can't get EVAS_VG_CONTAINER_CLASS data."); 194 ERR("Can't get EFL_VG_CONTAINER_CLASS data.");
195 goto on_error; 195 goto on_error;
196 } 196 }
197 } 197 }
@@ -210,36 +210,36 @@ _evas_vg_node_parent_checked_get(Eo *obj,
210} 210}
211 211
212void 212void
213_evas_vg_node_eo_base_constructor(Eo *obj, 213_efl_vg_base_eo_base_constructor(Eo *obj,
214 Evas_VG_Node_Data *pd) 214 Efl_VG_Base_Data *pd)
215{ 215{
216 Evas_VG_Container_Data *cd = NULL; 216 Efl_VG_Container_Data *cd = NULL;
217 Eo *parent; 217 Eo *parent;
218 218
219 eo_do_super(obj, MY_CLASS, eo_constructor()); 219 eo_do_super(obj, MY_CLASS, eo_constructor());
220 220
221 if (!_evas_vg_node_parent_checked_get(obj, &parent, &cd)) 221 if (!_efl_vg_base_parent_checked_get(obj, &parent, &cd))
222 eo_error_set(obj); 222 eo_error_set(obj);
223 223
224 eo_do(obj, eo_event_callback_add(EFL_GFX_CHANGED, _evas_vg_node_property_changed, pd)); 224 eo_do(obj, eo_event_callback_add(EFL_GFX_CHANGED, _efl_vg_base_property_changed, pd));
225 pd->changed = EINA_TRUE; 225 pd->changed = EINA_TRUE;
226} 226}
227 227
228void 228void
229_evas_vg_node_eo_base_parent_set(Eo *obj, 229_efl_vg_base_eo_base_parent_set(Eo *obj,
230 Evas_VG_Node_Data *pd EINA_UNUSED, 230 Efl_VG_Base_Data *pd EINA_UNUSED,
231 Eo *parent) 231 Eo *parent)
232{ 232{
233 Evas_VG_Container_Data *cd = NULL; 233 Efl_VG_Container_Data *cd = NULL;
234 Evas_VG_Container_Data *old_cd = NULL; 234 Efl_VG_Container_Data *old_cd = NULL;
235 Eo *old_parent; 235 Eo *old_parent;
236 236
237 if (eo_isa(parent, EVAS_VG_CONTAINER_CLASS)) 237 if (eo_isa(parent, EFL_VG_CONTAINER_CLASS))
238 { 238 {
239 cd = eo_data_scope_get(parent, EVAS_VG_CONTAINER_CLASS); 239 cd = eo_data_scope_get(parent, EFL_VG_CONTAINER_CLASS);
240 if (!cd) 240 if (!cd)
241 { 241 {
242 ERR("Can't get EVAS_VG_CONTAINER_CLASS data from %p.", parent); 242 ERR("Can't get EFL_VG_CONTAINER_CLASS data from %p.", parent);
243 goto on_error; 243 goto on_error;
244 } 244 }
245 } 245 }
@@ -249,7 +249,7 @@ _evas_vg_node_eo_base_parent_set(Eo *obj,
249 goto on_error; 249 goto on_error;
250 } 250 }
251 251
252 if (!_evas_vg_node_parent_checked_get(obj, &old_parent, &old_cd)) 252 if (!_efl_vg_base_parent_checked_get(obj, &old_parent, &old_cd))
253 goto on_error; 253 goto on_error;
254 254
255 // FIXME: this may become slow with to much object 255 // FIXME: this may become slow with to much object
@@ -260,9 +260,9 @@ _evas_vg_node_eo_base_parent_set(Eo *obj,
260 if (cd) 260 if (cd)
261 cd->children = eina_list_append(cd->children, obj); 261 cd->children = eina_list_append(cd->children, obj);
262 262
263 _evas_vg_node_changed(old_parent); 263 _efl_vg_base_changed(old_parent);
264 _evas_vg_node_changed(obj); 264 _efl_vg_base_changed(obj);
265 _evas_vg_node_changed(parent); 265 _efl_vg_base_changed(parent);
266 266
267 return ; 267 return ;
268 268
@@ -272,15 +272,15 @@ _evas_vg_node_eo_base_parent_set(Eo *obj,
272} 272}
273 273
274void 274void
275_evas_vg_node_efl_gfx_stack_raise(Eo *obj, Evas_VG_Node_Data *pd EINA_UNUSED) 275_efl_vg_base_efl_gfx_stack_raise(Eo *obj, Efl_VG_Base_Data *pd EINA_UNUSED)
276{ 276{
277 Evas_VG_Container_Data *cd; 277 Efl_VG_Container_Data *cd;
278 Eina_List *lookup, *next; 278 Eina_List *lookup, *next;
279 Eo *parent; 279 Eo *parent;
280 280
281 eo_do(obj, parent = eo_parent_get()); 281 eo_do(obj, parent = eo_parent_get());
282 if (!eo_isa(parent, EVAS_VG_CONTAINER_CLASS)) goto on_error; 282 if (!eo_isa(parent, EFL_VG_CONTAINER_CLASS)) goto on_error;
283 cd = eo_data_scope_get(parent, EVAS_VG_CONTAINER_CLASS); 283 cd = eo_data_scope_get(parent, EFL_VG_CONTAINER_CLASS);
284 284
285 // FIXME: this could become slow with to much object 285 // FIXME: this could become slow with to much object
286 lookup = eina_list_data_find_list(cd->children, obj); 286 lookup = eina_list_data_find_list(cd->children, obj);
@@ -292,7 +292,7 @@ _evas_vg_node_efl_gfx_stack_raise(Eo *obj, Evas_VG_Node_Data *pd EINA_UNUSED)
292 cd->children = eina_list_remove_list(cd->children, lookup); 292 cd->children = eina_list_remove_list(cd->children, lookup);
293 cd->children = eina_list_append_relative_list(cd->children, obj, next); 293 cd->children = eina_list_append_relative_list(cd->children, obj, next);
294 294
295 _evas_vg_node_changed(parent); 295 _efl_vg_base_changed(parent);
296 return ; 296 return ;
297 297
298 on_error: 298 on_error:
@@ -300,17 +300,17 @@ _evas_vg_node_efl_gfx_stack_raise(Eo *obj, Evas_VG_Node_Data *pd EINA_UNUSED)
300} 300}
301 301
302void 302void
303_evas_vg_node_efl_gfx_stack_stack_above(Eo *obj, 303_efl_vg_base_efl_gfx_stack_stack_above(Eo *obj,
304 Evas_VG_Node_Data *pd EINA_UNUSED, 304 Efl_VG_Base_Data *pd EINA_UNUSED,
305 Efl_Gfx_Stack *above) 305 Efl_Gfx_Stack *above)
306{ 306{
307 Evas_VG_Container_Data *cd; 307 Efl_VG_Container_Data *cd;
308 Eina_List *lookup, *ref; 308 Eina_List *lookup, *ref;
309 Eo *parent; 309 Eo *parent;
310 310
311 eo_do(obj, parent = eo_parent_get()); 311 eo_do(obj, parent = eo_parent_get());
312 if (!eo_isa(parent, EVAS_VG_CONTAINER_CLASS)) goto on_error; 312 if (!eo_isa(parent, EFL_VG_CONTAINER_CLASS)) goto on_error;
313 cd = eo_data_scope_get(parent, EVAS_VG_CONTAINER_CLASS); 313 cd = eo_data_scope_get(parent, EFL_VG_CONTAINER_CLASS);
314 314
315 // FIXME: this could become slow with to much object 315 // FIXME: this could become slow with to much object
316 lookup = eina_list_data_find_list(cd->children, obj); 316 lookup = eina_list_data_find_list(cd->children, obj);
@@ -322,7 +322,7 @@ _evas_vg_node_efl_gfx_stack_stack_above(Eo *obj,
322 cd->children = eina_list_remove_list(cd->children, lookup); 322 cd->children = eina_list_remove_list(cd->children, lookup);
323 cd->children = eina_list_append_relative_list(cd->children, obj, ref); 323 cd->children = eina_list_append_relative_list(cd->children, obj, ref);
324 324
325 _evas_vg_node_changed(parent); 325 _efl_vg_base_changed(parent);
326 return ; 326 return ;
327 327
328 on_error: 328 on_error:
@@ -330,17 +330,17 @@ _evas_vg_node_efl_gfx_stack_stack_above(Eo *obj,
330} 330}
331 331
332void 332void
333_evas_vg_node_efl_gfx_stack_stack_below(Eo *obj, 333_efl_vg_base_efl_gfx_stack_stack_below(Eo *obj,
334 Evas_VG_Node_Data *pd EINA_UNUSED, 334 Efl_VG_Base_Data *pd EINA_UNUSED,
335 Efl_Gfx_Stack *below) 335 Efl_Gfx_Stack *below)
336{ 336{
337 Evas_VG_Container_Data *cd; 337 Efl_VG_Container_Data *cd;
338 Eina_List *lookup, *ref; 338 Eina_List *lookup, *ref;
339 Eo *parent; 339 Eo *parent;
340 340
341 eo_do(obj, parent = eo_parent_get()); 341 eo_do(obj, parent = eo_parent_get());
342 if (!eo_isa(parent, EVAS_VG_CONTAINER_CLASS)) goto on_error; 342 if (!eo_isa(parent, EFL_VG_CONTAINER_CLASS)) goto on_error;
343 cd = eo_data_scope_get(parent, EVAS_VG_CONTAINER_CLASS); 343 cd = eo_data_scope_get(parent, EFL_VG_CONTAINER_CLASS);
344 344
345 // FIXME: this could become slow with to much object 345 // FIXME: this could become slow with to much object
346 lookup = eina_list_data_find_list(cd->children, obj); 346 lookup = eina_list_data_find_list(cd->children, obj);
@@ -352,7 +352,7 @@ _evas_vg_node_efl_gfx_stack_stack_below(Eo *obj,
352 cd->children = eina_list_remove_list(cd->children, lookup); 352 cd->children = eina_list_remove_list(cd->children, lookup);
353 cd->children = eina_list_prepend_relative_list(cd->children, obj, ref); 353 cd->children = eina_list_prepend_relative_list(cd->children, obj, ref);
354 354
355 _evas_vg_node_changed(parent); 355 _efl_vg_base_changed(parent);
356 return ; 356 return ;
357 357
358 on_error: 358 on_error:
@@ -360,15 +360,15 @@ _evas_vg_node_efl_gfx_stack_stack_below(Eo *obj,
360} 360}
361 361
362void 362void
363_evas_vg_node_efl_gfx_stack_lower(Eo *obj, Evas_VG_Node_Data *pd EINA_UNUSED) 363_efl_vg_base_efl_gfx_stack_lower(Eo *obj, Efl_VG_Base_Data *pd EINA_UNUSED)
364{ 364{
365 Evas_VG_Container_Data *cd; 365 Efl_VG_Container_Data *cd;
366 Eina_List *lookup, *prev; 366 Eina_List *lookup, *prev;
367 Eo *parent; 367 Eo *parent;
368 368
369 eo_do(obj, parent = eo_parent_get()); 369 eo_do(obj, parent = eo_parent_get());
370 if (!eo_isa(parent, EVAS_VG_CONTAINER_CLASS)) goto on_error; 370 if (!eo_isa(parent, EFL_VG_CONTAINER_CLASS)) goto on_error;
371 cd = eo_data_scope_get(parent, EVAS_VG_CONTAINER_CLASS); 371 cd = eo_data_scope_get(parent, EFL_VG_CONTAINER_CLASS);
372 372
373 // FIXME: this could become slow with to much object 373 // FIXME: this could become slow with to much object
374 lookup = eina_list_data_find_list(cd->children, obj); 374 lookup = eina_list_data_find_list(cd->children, obj);
@@ -380,7 +380,7 @@ _evas_vg_node_efl_gfx_stack_lower(Eo *obj, Evas_VG_Node_Data *pd EINA_UNUSED)
380 cd->children = eina_list_remove_list(cd->children, lookup); 380 cd->children = eina_list_remove_list(cd->children, lookup);
381 cd->children = eina_list_prepend_relative_list(cd->children, obj, prev); 381 cd->children = eina_list_prepend_relative_list(cd->children, obj, prev);
382 382
383 _evas_vg_node_changed(parent); 383 _efl_vg_base_changed(parent);
384 return ; 384 return ;
385 385
386 on_error: 386 on_error:
@@ -388,25 +388,91 @@ _evas_vg_node_efl_gfx_stack_lower(Eo *obj, Evas_VG_Node_Data *pd EINA_UNUSED)
388} 388}
389 389
390Efl_Gfx_Stack * 390Efl_Gfx_Stack *
391_evas_vg_node_efl_gfx_stack_below_get(Eo *obj, Evas_VG_Node_Data *pd) 391_efl_vg_base_efl_gfx_stack_below_get(Eo *obj, Efl_VG_Base_Data *pd)
392{ 392{
393 // FIXME: need to implement bound_get 393 // FIXME: need to implement bound_get
394 return NULL; 394 return NULL;
395} 395}
396 396
397Efl_Gfx_Stack * 397Efl_Gfx_Stack *
398_evas_vg_node_efl_gfx_stack_above_get(Eo *obj, Evas_VG_Node_Data *pd) 398_efl_vg_base_efl_gfx_stack_above_get(Eo *obj, Efl_VG_Base_Data *pd)
399{ 399{
400 // FIXME: need to implement bound_get 400 // FIXME: need to implement bound_get
401 return NULL; 401 return NULL;
402} 402}
403 403
404Eina_Bool 404Eina_Bool
405_evas_vg_node_original_bound_get(Eo *obj, 405_efl_vg_base_original_bound_get(Eo *obj,
406 Evas_VG_Node_Data *pd, 406 Efl_VG_Base_Data *pd,
407 Eina_Rectangle *r) 407 Eina_Rectangle *r)
408{ 408{
409 return EINA_FALSE; 409 return EINA_FALSE;
410} 410}
411 411
412#include "evas_vg_node.eo.c" 412EAPI Eina_Bool
413evas_vg_node_visible_get(Eo *obj)
414{
415 Eina_Bool ret;
416
417 return eo_do_ret(obj, ret, efl_gfx_visible_get());
418}
419
420EAPI void
421evas_vg_node_visible_set(Eo *obj, Eina_Bool v)
422{
423 eo_do(obj, efl_gfx_visible_set(v));
424}
425
426EAPI void
427evas_vg_node_color_get(Eo *obj, int *r, int *g, int *b, int *a)
428{
429 eo_do(obj, efl_gfx_color_get(r, g, b, a));
430}
431
432EAPI void
433evas_vg_node_color_set(Eo *obj, int r, int g, int b, int a)
434{
435 eo_do(obj, efl_gfx_color_set(r, g, b, a));
436}
437
438EAPI void
439evas_vg_node_geometry_get(Eo *obj, int *x, int *y, int *w, int *h)
440{
441 eo_do(obj,
442 efl_gfx_position_get(x, y),
443 efl_gfx_size_get(w, h));
444}
445
446EAPI void
447evas_vg_node_geometry_set(Eo *obj, int x, int y, int w, int h)
448{
449 eo_do(obj,
450 efl_gfx_position_set(x, y),
451 efl_gfx_size_set(w, h));
452}
453
454EAPI void
455evas_vg_node_stack_below(Eo *obj, Eo *below)
456{
457 eo_do(obj, efl_gfx_stack_below(below));
458}
459
460EAPI void
461evas_vg_node_stack_above(Eo *obj, Eo *above)
462{
463 eo_do(obj, efl_gfx_stack_above(above));
464}
465
466EAPI void
467evas_vg_node_raise(Eo *obj)
468{
469 eo_do(obj, efl_gfx_stack_raise());
470}
471
472EAPI void
473evas_vg_node_lower(Eo *obj)
474{
475 eo_do(obj, efl_gfx_stack_lower());
476}
477
478#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 1c7d516..8db3396 100644
--- a/src/lib/evas/canvas/evas_vg_private.h
+++ b/src/lib/evas/canvas/evas_vg_private.h
@@ -3,17 +3,17 @@
3 3
4#include <Ector.h> 4#include <Ector.h>
5 5
6typedef struct _Evas_VG_Node_Data Evas_VG_Node_Data; 6typedef struct _Efl_VG_Base_Data Efl_VG_Base_Data;
7typedef struct _Evas_VG_Container_Data Evas_VG_Container_Data; 7typedef struct _Efl_VG_Container_Data Efl_VG_Container_Data;
8typedef struct _Evas_VG_Gradient_Data Evas_VG_Gradient_Data; 8typedef struct _Efl_VG_Gradient_Data Efl_VG_Gradient_Data;
9 9
10struct _Evas_VG_Node_Data 10struct _Efl_VG_Base_Data
11{ 11{
12 Eina_Matrix3 *m; 12 Eina_Matrix3 *m;
13 Evas_VG_Node *mask; 13 Efl_VG *mask;
14 Ector_Renderer *renderer; 14 Ector_Renderer *renderer;
15 15
16 void (*render_pre)(Eo *obj, Eina_Matrix3 *parent, Ector_Surface *s, void *data, Evas_VG_Node_Data *nd); 16 void (*render_pre)(Eo *obj, Eina_Matrix3 *parent, Ector_Surface *s, void *data, Efl_VG_Base_Data *nd);
17 void *data; 17 void *data;
18 18
19 double x, y; 19 double x, y;
@@ -23,12 +23,12 @@ struct _Evas_VG_Node_Data
23 Eina_Bool changed : 1; 23 Eina_Bool changed : 1;
24}; 24};
25 25
26struct _Evas_VG_Container_Data 26struct _Efl_VG_Container_Data
27{ 27{
28 Eina_List *children; 28 Eina_List *children;
29}; 29};
30 30
31struct _Evas_VG_Gradient_Data 31struct _Efl_VG_Gradient_Data
32{ 32{
33 // FIXME: Later on we should deduplicate it somehow (Using Ector ?). 33 // FIXME: Later on we should deduplicate it somehow (Using Ector ?).
34 Efl_Gfx_Gradient_Stop *colors; 34 Efl_Gfx_Gradient_Stop *colors;
@@ -37,14 +37,14 @@ struct _Evas_VG_Gradient_Data
37 Efl_Gfx_Gradient_Spread s; 37 Efl_Gfx_Gradient_Spread s;
38}; 38};
39 39
40static inline Evas_VG_Node_Data * 40static inline Efl_VG_Base_Data *
41_evas_vg_render_pre(Evas_VG_Node *child, Ector_Surface *s, Eina_Matrix3 *m) 41_evas_vg_render_pre(Efl_VG *child, Ector_Surface *s, Eina_Matrix3 *m)
42{ 42{
43 Evas_VG_Node_Data *child_nd = NULL; 43 Efl_VG_Base_Data *child_nd = NULL;
44 44
45 // FIXME: Prevent infinite loop 45 // FIXME: Prevent infinite loop
46 if (child) 46 if (child)
47 child_nd = eo_data_scope_get(child, EVAS_VG_NODE_CLASS); 47 child_nd = eo_data_scope_get(child, EFL_VG_BASE_CLASS);
48 if (child_nd) 48 if (child_nd)
49 child_nd->render_pre(child, m, s, child_nd->data, child_nd); 49 child_nd->render_pre(child, m, s, child_nd->data, child_nd);
50 50
@@ -52,12 +52,12 @@ _evas_vg_render_pre(Evas_VG_Node *child, Ector_Surface *s, Eina_Matrix3 *m)
52} 52}
53 53
54static inline void 54static inline void
55_evas_vg_node_changed(Eo *obj) 55_efl_vg_base_changed(Eo *obj)
56{ 56{
57 eo_do(obj, eo_event_callback_call(EFL_GFX_CHANGED, NULL)); 57 eo_do(obj, eo_event_callback_call(EFL_GFX_CHANGED, NULL));
58} 58}
59 59
60#define EVAS_VG_COMPUTE_MATRIX(Current, Parent, Nd) \ 60#define EFL_VG_COMPUTE_MATRIX(Current, Parent, Nd) \
61 Eina_Matrix3 *Current = Nd->m; \ 61 Eina_Matrix3 *Current = Nd->m; \
62 Eina_Matrix3 _matrix_tmp; \ 62 Eina_Matrix3 _matrix_tmp; \
63 \ 63 \
diff --git a/src/lib/evas/canvas/evas_vg_root_node.c b/src/lib/evas/canvas/evas_vg_root_node.c
index d6f2c51..75a304d 100644
--- a/src/lib/evas/canvas/evas_vg_root_node.c
+++ b/src/lib/evas/canvas/evas_vg_root_node.c
@@ -2,14 +2,14 @@
2#include "evas_private.h" 2#include "evas_private.h"
3 3
4#include "evas_vg_private.h" 4#include "evas_vg_private.h"
5#include "evas_vg_root_node.eo.h" 5#include "efl_vg_root_node.eo.h"
6 6
7#include <string.h> 7#include <string.h>
8 8
9#define MY_CLASS EVAS_VG_ROOT_NODE_CLASS 9#define MY_CLASS EFL_VG_ROOT_NODE_CLASS
10 10
11typedef struct _Evas_VG_Root_Node_Data Evas_VG_Root_Node_Data; 11typedef struct _Efl_VG_Root_Node_Data Efl_VG_Root_Node_Data;
12struct _Evas_VG_Root_Node_Data 12struct _Efl_VG_Root_Node_Data
13{ 13{
14 Evas_Object *parent; 14 Evas_Object *parent;
15 Evas_Object_Protected_Data *data; 15 Evas_Object_Protected_Data *data;
@@ -20,16 +20,16 @@ _evas_vg_root_node_render_pre(Eo *obj EINA_UNUSED,
20 Eina_Matrix3 *parent, 20 Eina_Matrix3 *parent,
21 Ector_Surface *s, 21 Ector_Surface *s,
22 void *data, 22 void *data,
23 Evas_VG_Node_Data *nd) 23 Efl_VG_Base_Data *nd)
24{ 24{
25 Evas_VG_Container_Data *pd = data; 25 Efl_VG_Container_Data *pd = data;
26 Eina_List *l; 26 Eina_List *l;
27 Eo *child; 27 Eo *child;
28 28
29 if (!nd->changed) return ; 29 if (!nd->changed) return ;
30 nd->changed = EINA_FALSE; 30 nd->changed = EINA_FALSE;
31 31
32 EVAS_VG_COMPUTE_MATRIX(current, parent, nd); 32 EFL_VG_COMPUTE_MATRIX(current, parent, nd);
33 33
34 EINA_LIST_FOREACH(pd->children, l, child) 34 EINA_LIST_FOREACH(pd->children, l, child)
35 _evas_vg_render_pre(child, s, current); 35 _evas_vg_render_pre(child, s, current);
@@ -40,19 +40,19 @@ _evas_vg_root_node_changed(void *data, Eo *obj EINA_UNUSED,
40 const Eo_Event_Description *desc EINA_UNUSED, 40 const Eo_Event_Description *desc EINA_UNUSED,
41 void *event_info EINA_UNUSED) 41 void *event_info EINA_UNUSED)
42{ 42{
43 Evas_VG_Root_Node_Data *pd = data; 43 Efl_VG_Root_Node_Data *pd = data;
44 44
45 if (pd->parent) evas_object_change(pd->parent, pd->data); 45 if (pd->parent) evas_object_change(pd->parent, pd->data);
46 return EINA_TRUE; 46 return EINA_TRUE;
47} 47}
48 48
49void 49void
50_evas_vg_root_node_eo_base_parent_set(Eo *obj, 50_efl_vg_root_node_eo_base_parent_set(Eo *obj,
51 Evas_VG_Root_Node_Data *pd, 51 Efl_VG_Root_Node_Data *pd,
52 Eo *parent) 52 Eo *parent)
53{ 53{
54 // Nice little hack, jump over parent parent_set in Evas_VG_Root 54 // Nice little hack, jump over parent parent_set in Efl_VG_Root
55 eo_do_super(obj, EVAS_VG_NODE_CLASS, eo_parent_set(parent)); 55 eo_do_super(obj, EFL_VG_BASE_CLASS, eo_parent_set(parent));
56 if (parent && !eo_isa(parent, EVAS_VG_CLASS)) 56 if (parent && !eo_isa(parent, EVAS_VG_CLASS))
57 { 57 {
58 eo_error_set(obj); 58 eo_error_set(obj);
@@ -65,11 +65,11 @@ _evas_vg_root_node_eo_base_parent_set(Eo *obj,
65} 65}
66 66
67void 67void
68_evas_vg_root_node_eo_base_constructor(Eo *obj, 68_efl_vg_root_node_eo_base_constructor(Eo *obj,
69 Evas_VG_Root_Node_Data *pd) 69 Efl_VG_Root_Node_Data *pd)
70{ 70{
71 Evas_VG_Container_Data *cd; 71 Efl_VG_Container_Data *cd;
72 Evas_VG_Node_Data *nd; 72 Efl_VG_Base_Data *nd;
73 Eo *parent; 73 Eo *parent;
74 74
75 // Nice little hack, jump over parent constructor in Efl_VG_Root 75 // Nice little hack, jump over parent constructor in Efl_VG_Root
@@ -78,14 +78,14 @@ _evas_vg_root_node_eo_base_constructor(Eo *obj,
78 if (!eo_isa(parent, EVAS_VG_CLASS)) 78 if (!eo_isa(parent, EVAS_VG_CLASS))
79 eo_error_set(obj); 79 eo_error_set(obj);
80 80
81 cd = eo_data_scope_get(obj, EVAS_VG_CONTAINER_CLASS); 81 cd = eo_data_scope_get(obj, EFL_VG_CONTAINER_CLASS);
82 cd->children = NULL; 82 cd->children = NULL;
83 83
84 nd = eo_data_scope_get(obj, EVAS_VG_NODE_CLASS); 84 nd = eo_data_scope_get(obj, EFL_VG_BASE_CLASS);
85 nd->render_pre = _evas_vg_root_node_render_pre; 85 nd->render_pre = _evas_vg_root_node_render_pre;
86 nd->data = cd; 86 nd->data = cd;
87 87
88 eo_do(obj, eo_event_callback_add(EFL_GFX_CHANGED, _evas_vg_root_node_changed, pd)); 88 eo_do(obj, eo_event_callback_add(EFL_GFX_CHANGED, _evas_vg_root_node_changed, pd));
89} 89}
90 90
91#include "evas_vg_root_node.eo.c" 91#include "efl_vg_root_node.eo.c"
diff --git a/src/lib/evas/canvas/evas_vg_root_node.eo b/src/lib/evas/canvas/evas_vg_root_node.eo
deleted file mode 100644
index 9489c73..0000000
--- a/src/lib/evas/canvas/evas_vg_root_node.eo
+++ /dev/null
@@ -1,8 +0,0 @@
1class Evas.VG_Root_Node (Evas.VG_Container)
2{
3 eo_prefix: evas_vg_root_node;
4 implements {
5 Eo.Base.parent.set;
6 Eo.Base.constructor;
7 }
8}
diff --git a/src/lib/evas/canvas/evas_vg_shape.c b/src/lib/evas/canvas/evas_vg_shape.c
index 2a577b8..fd63594 100644
--- a/src/lib/evas/canvas/evas_vg_shape.c
+++ b/src/lib/evas/canvas/evas_vg_shape.c
@@ -3,17 +3,17 @@
3 3
4#include "evas_vg_private.h" 4#include "evas_vg_private.h"
5 5
6#define MY_CLASS EVAS_VG_SHAPE_CLASS 6#define MY_CLASS EFL_VG_SHAPE_CLASS
7 7
8typedef struct _Evas_VG_Shape_Data Evas_VG_Shape_Data; 8typedef struct _Efl_VG_Shape_Data Efl_VG_Shape_Data;
9struct _Evas_VG_Shape_Data 9struct _Efl_VG_Shape_Data
10{ 10{
11 Evas_VG_Node *fill; 11 Efl_VG *fill;
12 12
13 struct { 13 struct {
14 Efl_Gfx_Dash *dash; 14 Efl_Gfx_Dash *dash;
15 Evas_VG_Node *fill; 15 Efl_VG *fill;
16 Evas_VG_Node *marker; 16 Efl_VG *marker;
17 17
18 double scale; 18 double scale;
19 double width; 19 double width;
@@ -29,72 +29,72 @@ struct _Evas_VG_Shape_Data
29}; 29};
30 30
31static Eina_Bool 31static Eina_Bool
32_evas_vg_shape_evas_vg_node_bound_get(Eo *obj, 32_efl_vg_shape_efl_vg_base_bound_get(Eo *obj,
33 Evas_VG_Shape_Data *pd, 33 Efl_VG_Shape_Data *pd,
34 Eina_Rectangle *r) 34 Eina_Rectangle *r)
35{ 35{
36 return EINA_FALSE; 36 return EINA_FALSE;
37} 37}
38 38
39static void 39static void
40_evas_vg_shape_fill_set(Eo *obj EINA_UNUSED, 40_efl_vg_shape_fill_set(Eo *obj EINA_UNUSED,
41 Evas_VG_Shape_Data *pd, 41 Efl_VG_Shape_Data *pd,
42 Evas_VG_Node *f) 42 Efl_VG *f)
43{ 43{
44 Evas_VG_Node *tmp = pd->fill; 44 Efl_VG *tmp = pd->fill;
45 45
46 pd->fill = eo_ref(f); 46 pd->fill = eo_ref(f);
47 eo_unref(tmp); 47 eo_unref(tmp);
48 48
49 _evas_vg_node_changed(obj); 49 _efl_vg_base_changed(obj);
50} 50}
51 51
52static Evas_VG_Node * 52static Efl_VG *
53_evas_vg_shape_fill_get(Eo *obj EINA_UNUSED, Evas_VG_Shape_Data *pd) 53_efl_vg_shape_fill_get(Eo *obj EINA_UNUSED, Efl_VG_Shape_Data *pd)
54{ 54{
55 return pd->fill; 55 return pd->fill;
56} 56}
57 57
58static void 58static void
59_evas_vg_shape_efl_gfx_shape_stroke_scale_set(Eo *obj EINA_UNUSED, 59_efl_vg_shape_efl_gfx_shape_stroke_scale_set(Eo *obj EINA_UNUSED,
60 Evas_VG_Shape_Data *pd, 60 Efl_VG_Shape_Data *pd,
61 double s) 61 double s)
62{ 62{
63 pd->stroke.scale = s; 63 pd->stroke.scale = s;
64 64
65 _evas_vg_node_changed(obj); 65 _efl_vg_base_changed(obj);
66} 66}
67 67
68static double 68static double
69_evas_vg_shape_efl_gfx_shape_stroke_scale_get(Eo *obj EINA_UNUSED, 69_efl_vg_shape_efl_gfx_shape_stroke_scale_get(Eo *obj EINA_UNUSED,
70 Evas_VG_Shape_Data *pd) 70 Efl_VG_Shape_Data *pd)
71{ 71{
72 return pd->stroke.scale; 72 return pd->stroke.scale;
73} 73}
74 74
75static void 75static void
76_evas_vg_shape_efl_gfx_shape_stroke_color_set(Eo *obj EINA_UNUSED, 76_efl_vg_shape_efl_gfx_shape_stroke_color_set(Eo *obj EINA_UNUSED,
77 Evas_VG_Shape_Data *pd, 77 Efl_VG_Shape_Data *pd,
78 int r, int g, int b, int a) 78 int r, int g, int b, int a)
79{ 79{
80 pd->stroke.r = r; 80 pd->stroke.r = r;
81 pd->stroke.g = g; 81 pd->stroke.g = g;
82 pd->stroke.b = b; 82 pd->stroke.b = b;
83 pd->stroke.a = a; 83 pd->stroke.a = a;
84 84
85 _evas_vg_node_changed(obj); 85 _efl_vg_base_changed(obj);
86} 86}
87 87
88static Eina_Bool 88static Eina_Bool
89_evas_vg_shape_efl_gfx_base_color_part_set(Eo *obj, Evas_VG_Shape_Data *pd, 89_efl_vg_shape_efl_gfx_base_color_part_set(Eo *obj, Efl_VG_Shape_Data *pd,
90 const char * part, 90 const char * part,
91 int r, int g, int b, int a) 91 int r, int g, int b, int a)
92{ 92{
93 Eina_Bool ret; 93 Eina_Bool ret;
94 94
95 if (part && !strcmp(part, "stroke")) 95 if (part && !strcmp(part, "stroke"))
96 { 96 {
97 _evas_vg_shape_efl_gfx_shape_stroke_color_set(obj, pd, r, g, b, a); 97 _efl_vg_shape_efl_gfx_shape_stroke_color_set(obj, pd, r, g, b, a);
98 return EINA_TRUE; 98 return EINA_TRUE;
99 } 99 }
100 100
@@ -105,9 +105,9 @@ _evas_vg_shape_efl_gfx_base_color_part_set(Eo *obj, Evas_VG_Shape_Data *pd,
105} 105}
106 106
107static void 107static void
108_evas_vg_shape_efl_gfx_shape_stroke_color_get(Eo *obj EINA_UNUSED, 108_efl_vg_shape_efl_gfx_shape_stroke_color_get(Eo *obj EINA_UNUSED,
109 Evas_VG_Shape_Data *pd, 109 Efl_VG_Shape_Data *pd,
110 int *r, int *g, int *b, int *a) 110 int *r, int *g, int *b, int *a)
111{ 111{
112 if (r) *r = pd->stroke.r; 112 if (r) *r = pd->stroke.r;
113 if (g) *g = pd->stroke.g; 113 if (g) *g = pd->stroke.g;
@@ -116,15 +116,15 @@ _evas_vg_shape_efl_gfx_shape_stroke_color_get(Eo *obj EINA_UNUSED,
116} 116}
117 117
118static Eina_Bool 118static Eina_Bool
119_evas_vg_shape_efl_gfx_base_color_part_get(Eo *obj, Evas_VG_Shape_Data *pd, 119_efl_vg_shape_efl_gfx_base_color_part_get(Eo *obj, Efl_VG_Shape_Data *pd,
120 const char * part, 120 const char * part,
121 int *r, int *g, int *b, int *a) 121 int *r, int *g, int *b, int *a)
122{ 122{
123 Eina_Bool ret; 123 Eina_Bool ret;
124 124
125 if (part && !strcmp(part, "stroke")) 125 if (part && !strcmp(part, "stroke"))
126 { 126 {
127 _evas_vg_shape_efl_gfx_shape_stroke_color_get(obj, pd, r, g, b, a); 127 _efl_vg_shape_efl_gfx_shape_stroke_color_get(obj, pd, r, g, b, a);
128 return EINA_TRUE; 128 return EINA_TRUE;
129 } 129 }
130 130
@@ -135,64 +135,64 @@ _evas_vg_shape_efl_gfx_base_color_part_get(Eo *obj, Evas_VG_Shape_Data *pd,
135} 135}
136 136
137static void 137static void
138_evas_vg_shape_stroke_fill_set(Eo *obj EINA_UNUSED, 138_efl_vg_shape_stroke_fill_set(Eo *obj EINA_UNUSED,
139 Evas_VG_Shape_Data *pd, 139 Efl_VG_Shape_Data *pd,
140 Evas_VG_Node *f) 140 Efl_VG *f)
141{ 141{
142 Evas_VG_Node *tmp = pd->fill; 142 Efl_VG *tmp = pd->fill;
143 143
144 pd->stroke.fill = eo_ref(f); 144 pd->stroke.fill = eo_ref(f);
145 eo_unref(tmp); 145 eo_unref(tmp);
146 146
147 _evas_vg_node_changed(obj); 147 _efl_vg_base_changed(obj);
148} 148}
149 149
150static Evas_VG_Node * 150static Efl_VG *
151_evas_vg_shape_stroke_fill_get(Eo *obj EINA_UNUSED, 151_efl_vg_shape_stroke_fill_get(Eo *obj EINA_UNUSED,
152 Evas_VG_Shape_Data *pd) 152 Efl_VG_Shape_Data *pd)
153{ 153{
154 return pd->stroke.fill; 154 return pd->stroke.fill;
155} 155}
156 156
157static void 157static void
158_evas_vg_shape_efl_gfx_shape_stroke_width_set(Eo *obj EINA_UNUSED, 158_efl_vg_shape_efl_gfx_shape_stroke_width_set(Eo *obj EINA_UNUSED,
159 Evas_VG_Shape_Data *pd, 159 Efl_VG_Shape_Data *pd,
160 double w) 160 double w)
161{ 161{
162 pd->stroke.width = w; 162 pd->stroke.width = w;
163 163
164 _evas_vg_node_changed(obj); 164 _efl_vg_base_changed(obj);
165} 165}
166 166
167static double 167static double
168_evas_vg_shape_efl_gfx_shape_stroke_width_get(Eo *obj EINA_UNUSED, 168_efl_vg_shape_efl_gfx_shape_stroke_width_get(Eo *obj EINA_UNUSED,
169 Evas_VG_Shape_Data *pd) 169 Efl_VG_Shape_Data *pd)
170{ 170{
171 return pd->stroke.width; 171 return pd->stroke.width;
172} 172}
173 173
174static void 174static void
175_evas_vg_shape_efl_gfx_shape_stroke_location_set(Eo *obj EINA_UNUSED, 175_efl_vg_shape_efl_gfx_shape_stroke_location_set(Eo *obj EINA_UNUSED,
176 Evas_VG_Shape_Data *pd, 176 Efl_VG_Shape_Data *pd,
177 double centered) 177 double centered)
178{ 178{
179 pd->stroke.centered = centered; 179 pd->stroke.centered = centered;
180 180
181 _evas_vg_node_changed(obj); 181 _efl_vg_base_changed(obj);
182} 182}
183 183
184static double 184static double
185_evas_vg_shape_efl_gfx_shape_stroke_location_get(Eo *obj EINA_UNUSED, 185_efl_vg_shape_efl_gfx_shape_stroke_location_get(Eo *obj EINA_UNUSED,
186 Evas_VG_Shape_Data *pd) 186 Efl_VG_Shape_Data *pd)
187{ 187{
188 return pd->stroke.centered; 188 return pd->stroke.centered;
189} 189}
190 190
191static void 191static void
192_evas_vg_shape_efl_gfx_shape_stroke_dash_set(Eo *obj EINA_UNUSED, 192_efl_vg_shape_efl_gfx_shape_stroke_dash_set(Eo *obj EINA_UNUSED,
193 Evas_VG_Shape_Data *pd, 193 Efl_VG_Shape_Data *pd,
194 const Efl_Gfx_Dash *dash, 194 const Efl_Gfx_Dash *dash,
195 unsigned int length) 195 unsigned int length)
196{ 196{
197 free(pd->stroke.dash); 197 free(pd->stroke.dash);
198 pd->stroke.dash = NULL; 198 pd->stroke.dash = NULL;
@@ -204,87 +204,87 @@ _evas_vg_shape_efl_gfx_shape_stroke_dash_set(Eo *obj EINA_UNUSED,
204 memcpy(pd->stroke.dash, dash, sizeof (Efl_Gfx_Dash) * length); 204 memcpy(pd->stroke.dash, dash, sizeof (Efl_Gfx_Dash) * length);
205 pd->stroke.dash_count = length; 205 pd->stroke.dash_count = length;
206 206
207 _evas_vg_node_changed(obj); 207 _efl_vg_base_changed(obj);
208} 208}
209 209
210static void 210static void
211_evas_vg_shape_efl_gfx_shape_stroke_dash_get(Eo *obj EINA_UNUSED, 211_efl_vg_shape_efl_gfx_shape_stroke_dash_get(Eo *obj EINA_UNUSED,
212 Evas_VG_Shape_Data *pd, 212 Efl_VG_Shape_Data *pd,
213 const Efl_Gfx_Dash **dash, 213 const Efl_Gfx_Dash **dash,
214 unsigned int *length) 214 unsigned int *length)
215{ 215{
216 if (dash) *dash = pd->stroke.dash; 216 if (dash) *dash = pd->stroke.dash;
217 if (length) *length = pd->stroke.dash_count; 217 if (length) *length = pd->stroke.dash_count;
218} 218}
219 219
220static void 220static void
221_evas_vg_shape_stroke_marker_set(Eo *obj EINA_UNUSED, 221_efl_vg_shape_stroke_marker_set(Eo *obj EINA_UNUSED,
222 Evas_VG_Shape_Data *pd, 222 Efl_VG_Shape_Data *pd,
223 Evas_VG_Shape *m) 223 Efl_VG_Shape *m)
224{ 224{
225 Evas_VG_Node *tmp = pd->stroke.marker; 225 Efl_VG *tmp = pd->stroke.marker;
226 226
227 pd->stroke.marker = eo_ref(m); 227 pd->stroke.marker = eo_ref(m);
228 eo_unref(tmp); 228 eo_unref(tmp);
229 229
230 _evas_vg_node_changed(obj); 230 _efl_vg_base_changed(obj);
231} 231}
232 232
233static Evas_VG_Shape * 233static Efl_VG_Shape *
234_evas_vg_shape_stroke_marker_get(Eo *obj EINA_UNUSED, 234_efl_vg_shape_stroke_marker_get(Eo *obj EINA_UNUSED,
235 Evas_VG_Shape_Data *pd) 235 Efl_VG_Shape_Data *pd)
236{ 236{
237 return pd->stroke.marker; 237 return pd->stroke.marker;
238} 238}
239 239
240static void 240static void
241_evas_vg_shape_efl_gfx_shape_stroke_cap_set(Eo *obj EINA_UNUSED, 241_efl_vg_shape_efl_gfx_shape_stroke_cap_set(Eo *obj EINA_UNUSED,
242 Evas_VG_Shape_Data *pd, 242 Efl_VG_Shape_Data *pd,
243 Efl_Gfx_Cap c) 243 Efl_Gfx_Cap c)
244{ 244{
245 pd->stroke.cap = c; 245 pd->stroke.cap = c;
246 246
247 _evas_vg_node_changed(obj); 247 _efl_vg_base_changed(obj);
248} 248}
249 249
250static Efl_Gfx_Cap 250static Efl_Gfx_Cap
251_evas_vg_shape_efl_gfx_shape_stroke_cap_get(Eo *obj EINA_UNUSED, 251_efl_vg_shape_efl_gfx_shape_stroke_cap_get(Eo *obj EINA_UNUSED,
252 Evas_VG_Shape_Data *pd) 252 Efl_VG_Shape_Data *pd)
253{ 253{
254 return pd->stroke.cap; 254 return pd->stroke.cap;
255} 255}
256 256
257static void 257static void
258_evas_vg_shape_efl_gfx_shape_stroke_join_set(Eo *obj EINA_UNUSED, 258_efl_vg_shape_efl_gfx_shape_stroke_join_set(Eo *obj EINA_UNUSED,
259 Evas_VG_Shape_Data *pd, 259 Efl_VG_Shape_Data *pd,
260 Efl_Gfx_Join j) 260 Efl_Gfx_Join j)
261{ 261{
262 pd->stroke.join = j; 262 pd->stroke.join = j;
263 263
264 _evas_vg_node_changed(obj); 264 _efl_vg_base_changed(obj);
265} 265}
266 266
267static Efl_Gfx_Join 267static Efl_Gfx_Join
268_evas_vg_shape_efl_gfx_shape_stroke_join_get(Eo *obj EINA_UNUSED, 268_efl_vg_shape_efl_gfx_shape_stroke_join_get(Eo *obj EINA_UNUSED,
269 Evas_VG_Shape_Data *pd) 269 Efl_VG_Shape_Data *pd)
270{ 270{
271 return pd->stroke.join; 271 return pd->stroke.join;
272} 272}
273 273
274static void 274static void
275_evas_vg_shape_render_pre(Eo *obj EINA_UNUSED, 275_efl_vg_shape_render_pre(Eo *obj EINA_UNUSED,
276 Eina_Matrix3 *parent, 276 Eina_Matrix3 *parent,
277 Ector_Surface *s, 277 Ector_Surface *s,
278 void *data, 278 void *data,
279 Evas_VG_Node_Data *nd) 279 Efl_VG_Base_Data *nd)
280{ 280{
281 Evas_VG_Shape_Data *pd = data; 281 Efl_VG_Shape_Data *pd = data;
282 Evas_VG_Node_Data *fill, *stroke_fill, *stroke_marker, *mask; 282 Efl_VG_Base_Data *fill, *stroke_fill, *stroke_marker, *mask;
283 283
284 if (!nd->changed) return ; 284 if (!nd->changed) return ;
285 nd->changed = EINA_FALSE; 285 nd->changed = EINA_FALSE;
286 286
287 EVAS_VG_COMPUTE_MATRIX(current, parent, nd); 287 EFL_VG_COMPUTE_MATRIX(current, parent, nd);
288 288
289 fill = _evas_vg_render_pre(pd->fill, s, current); 289 fill = _evas_vg_render_pre(pd->fill, s, current);
290 stroke_fill = _evas_vg_render_pre(pd->stroke.fill, s, current); 290 stroke_fill = _evas_vg_render_pre(pd->stroke.fill, s, current);
@@ -310,9 +310,9 @@ _evas_vg_shape_render_pre(Eo *obj EINA_UNUSED,
310} 310}
311 311
312static void 312static void
313_evas_vg_shape_eo_base_constructor(Eo *obj, Evas_VG_Shape_Data *pd) 313_efl_vg_shape_eo_base_constructor(Eo *obj, Efl_VG_Shape_Data *pd)
314{ 314{
315 Evas_VG_Node_Data *nd; 315 Efl_VG_Base_Data *nd;
316 316
317 eo_do_super(obj, MY_CLASS, eo_constructor()); 317 eo_do_super(obj, MY_CLASS, eo_constructor());
318 318
@@ -322,15 +322,227 @@ _evas_vg_shape_eo_base_constructor(Eo *obj, Evas_VG_Shape_Data *pd)
322 pd->stroke.a = 1; 322 pd->stroke.a = 1;
323 pd->stroke.centered = 0.5; 323 pd->stroke.centered = 0.5;
324 324
325 nd = eo_data_scope_get(obj, EVAS_VG_NODE_CLASS); 325 nd = eo_data_scope_get(obj, EFL_VG_BASE_CLASS);
326 nd->render_pre = _evas_vg_shape_render_pre; 326 nd->render_pre = _efl_vg_shape_render_pre;
327 nd->data = pd; 327 nd->data = pd;
328} 328}
329 329
330static void 330static void
331_evas_vg_shape_eo_base_destructor(Eo *obj, Evas_VG_Shape_Data *pd EINA_UNUSED) 331_efl_vg_shape_eo_base_destructor(Eo *obj, Efl_VG_Shape_Data *pd EINA_UNUSED)
332{ 332{
333 eo_do_super(obj, MY_CLASS, eo_destructor()); 333 eo_do_super(obj, MY_CLASS, eo_destructor());
334} 334}
335 335
336#include "evas_vg_shape.eo.c" 336EAPI double
337evas_vg_shape_stroke_scale_get(Eo *obj)
338{
339 double ret;
340
341 return eo_do_ret(obj, ret, efl_gfx_shape_stroke_scale_get());
342}
343
344EAPI void
345evas_vg_shape_stroke_scale_set(Eo *obj, double s)
346{
347 eo_do(obj, efl_gfx_shape_stroke_scale_set(s));
348}
349
350EAPI void
351evas_vg_shape_stroke_color_get(Eo *obj, int *r, int *g, int *b, int *a)
352{
353 eo_do(obj, efl_gfx_shape_stroke_color_get(r, g, b, a));
354}
355
356EAPI void
357evas_vg_shape_stroke_color_set(Eo *obj, int r, int g, int b, int a)
358{
359 eo_do(obj, efl_gfx_shape_stroke_color_set(r, g, b, a));
360}
361
362EAPI double
363evas_vg_shape_stroke_width_get(Eo *obj)
364{
365 double ret;
366
367 return eo_do_ret(obj, ret, efl_gfx_shape_stroke_width_get());
368}
369
370EAPI void
371evas_vg_shape_stroke_width_set(Eo *obj, double w)
372{
373 eo_do(obj, efl_gfx_shape_stroke_width_set(w));
374}
375
376EAPI double
377evas_vg_shape_stroke_location_get(Eo *obj)
378{
379 double ret;
380
381 return eo_do_ret(obj, ret, efl_gfx_shape_stroke_location_get());
382}
383
384EAPI void
385evas_vg_shape_stroke_location_set(Eo *obj, double centered)
386{
387 eo_do(obj, efl_gfx_shape_stroke_location_set(centered));
388}
389
390EAPI void
391evas_vg_shape_stroke_dash_get(Eo *obj, const Efl_Gfx_Dash **dash, unsigned int *length)
392{
393 eo_do(obj, efl_gfx_shape_stroke_dash_get(dash, length));
394}
395
396EAPI void
397evas_vg_shape_stroke_dash_set(Eo *obj, const Efl_Gfx_Dash *dash, unsigned int length)
398{
399 eo_do(obj, efl_gfx_shape_stroke_dash_set(dash, length));
400}
401
402EAPI Efl_Gfx_Cap
403evas_vg_shape_stroke_cap_get(Eo *obj)
404{
405 Efl_Gfx_Cap ret;
406
407 return eo_do_ret(obj, ret, efl_gfx_shape_stroke_cap_get());
408}
409
410EAPI void
411evas_vg_shape_stroke_cap_set(Eo *obj, Efl_Gfx_Cap c)
412{
413 eo_do(obj, efl_gfx_shape_stroke_cap_set(c));
414}
415
416EAPI Efl_Gfx_Join
417evas_vg_shape_stroke_join_get(Eo *obj)
418{
419 Efl_Gfx_Join ret;
420
421 return eo_do_ret(obj, ret, efl_gfx_shape_stroke_join_get());
422}
423
424EAPI void
425evas_vg_shape_stroke_join_set(Eo *obj, Efl_Gfx_Join j)
426{
427 eo_do(obj, efl_gfx_shape_stroke_join_set(j));
428}
429
430EAPI void
431evas_vg_shape_shape_path_set(Eo *obj, const Efl_Gfx_Path_Command *op, const double *points)
432{
433 eo_do(obj, efl_gfx_shape_path_set(op, points));
434}
435
436EAPI void
437evas_vg_shape_shape_path_get(Eo *obj, const Efl_Gfx_Path_Command **op, const double **points)
438{
439 eo_do(obj, efl_gfx_shape_path_get(op, points));
440}
441
442EAPI void
443evas_vg_shape_shape_path_length_get(Eo *obj, unsigned int *commands, unsigned int *points)
444{
445 eo_do(obj, efl_gfx_shape_path_length_get(commands, points));
446}
447
448EAPI void
449evas_vg_shape_shape_current_get(Eo *obj, double *x, double *y)
450{
451 eo_do(obj, efl_gfx_shape_current_get(x, y));
452}
453
454EAPI void
455evas_vg_shape_shape_current_ctrl_get(Eo *obj, double *x, double *y)
456{
457 eo_do(obj, efl_gfx_shape_current_ctrl_get(x, y));
458}
459
460EAPI void
461evas_vg_shape_shape_dup(Eo *obj, Eo *dup_from)
462{
463 eo_do(obj, efl_gfx_shape_dup(dup_from));
464}
465
466EAPI void
467evas_vg_shape_shape_reset(Eo *obj)
468{
469 eo_do(obj, efl_gfx_shape_reset());
470}
471
472EAPI void
473evas_vg_shape_shape_append_move_to(Eo *obj, double x, double y)
474{
475 eo_do(obj, efl_gfx_shape_append_move_to(x, y));
476}
477
478EAPI void
479evas_vg_shape_shape_append_line_to(Eo *obj, double x, double y)
480{
481 eo_do(obj, efl_gfx_shape_append_line_to(x, y));
482}
483
484EAPI void
485evas_vg_shape_shape_append_quadratic_to(Eo *obj, double x, double y, double ctrl_x, double ctrl_y)
486{
487 eo_do(obj, efl_gfx_shape_append_quadratic_to(x, y, ctrl_x, ctrl_y));
488}
489
490EAPI void
491evas_vg_shape_shape_append_squadratic_to(Eo *obj, double x, double y)
492{
493 eo_do(obj, efl_gfx_shape_append_squadratic_to(x, y));
494}
495
496EAPI void
497evas_vg_shape_shape_append_cubic_to(Eo *obj, double x, double y, double ctrl_x0, double ctrl_y0, double ctrl_x1, double ctrl_y1)
498{
499 eo_do(obj, efl_gfx_shape_append_cubic_to(x, y, ctrl_x0, ctrl_y0, ctrl_x1, ctrl_y1));
500}
501
502EAPI void
503evas_vg_shape_shape_append_scubic_to(Eo *obj, double x, double y, double ctrl_x, double ctrl_y)
504{
505 eo_do(obj, efl_gfx_shape_append_scubic_to(x, y, ctrl_x, ctrl_y));
506}
507
508EAPI void
509evas_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)
510{
511 eo_do(obj, efl_gfx_shape_append_arc_to(x, y, rx, ry, angle, large_arc, sweep));
512}
513
514EAPI void
515evas_vg_shape_shape_append_close(Eo *obj)
516{
517 eo_do(obj, efl_gfx_shape_append_close());
518}
519
520EAPI void
521evas_vg_shape_shape_append_circle(Eo *obj, double x, double y, double radius)
522{
523 eo_do(obj, efl_gfx_shape_append_circle(x, y, radius));
524}
525
526EAPI void
527evas_vg_shape_shape_append_svg_path(Eo *obj, const char *svg_path_data)
528{
529 eo_do(obj, efl_gfx_shape_append_svg_path(svg_path_data));
530}
531
532EAPI Eina_Bool
533evas_vg_shape_shape_interpolate(Eo *obj, const Eo *from, const Eo *to, double pos_map)
534{
535 Eina_Bool ret;
536
537 return eo_do_ret(obj, ret, efl_gfx_shape_interpolate(from, to, pos_map));
538}
539
540EAPI Eina_Bool
541evas_vg_shape_shape_equal_commands(Eo *obj, const Eo *with)
542{
543 Eina_Bool ret;
544
545 return eo_do_ret(obj, ret, efl_gfx_shape_equal_commands(with));
546}
547
548#include "efl_vg_shape.eo.c"