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>
This commit is contained in:
Xavi Artigas 2018-04-04 13:38:34 +02:00 committed by Cedric Bail
parent a26fbbbc66
commit a217d4b455
21 changed files with 208 additions and 208 deletions

View File

@ -118,7 +118,7 @@ lib/evas/canvas/evas_canvas3d_object.eo.cs \
lib/evas/canvas/evas_canvas3d_primitive.eo.cs \ lib/evas/canvas/evas_canvas3d_primitive.eo.cs \
lib/evas/canvas/evas_canvas3d_scene.eo.cs \ lib/evas/canvas/evas_canvas3d_scene.eo.cs \
lib/evas/canvas/evas_canvas3d_texture.eo.cs \ lib/evas/canvas/evas_canvas3d_texture.eo.cs \
lib/evas/canvas/efl_canvas_vg.eo.cs \ lib/evas/canvas/efl_canvas_vg_object.eo.cs \
lib/evas/canvas/efl_vg.eo.cs \ lib/evas/canvas/efl_vg.eo.cs \
lib/evas/canvas/efl_vg_container.eo.cs \ lib/evas/canvas/efl_vg_container.eo.cs \
lib/evas/canvas/efl_vg_gradient.eo.cs \ lib/evas/canvas/efl_vg_gradient.eo.cs \

View File

@ -19,7 +19,7 @@ evas_canvas_eolian_pub_files = \
lib/evas/canvas/evas_canvas3d_node.eo\ lib/evas/canvas/evas_canvas3d_node.eo\
lib/evas/canvas/evas_canvas3d_scene.eo\ lib/evas/canvas/evas_canvas3d_scene.eo\
lib/evas/canvas/evas_canvas3d_object.eo \ lib/evas/canvas/evas_canvas3d_object.eo \
lib/evas/canvas/efl_canvas_vg.eo \ lib/evas/canvas/efl_canvas_vg_object.eo \
lib/evas/canvas/efl_canvas_vg_node.eo \ lib/evas/canvas/efl_canvas_vg_node.eo \
lib/evas/canvas/efl_canvas_vg_container.eo \ lib/evas/canvas/efl_canvas_vg_container.eo \
lib/evas/canvas/efl_canvas_vg_shape.eo \ lib/evas/canvas/efl_canvas_vg_shape.eo \
@ -377,7 +377,7 @@ lib/evas/common3d/primitives/primitive_common.c
# Evas_VG # Evas_VG
lib_evas_libevas_la_SOURCES += \ lib_evas_libevas_la_SOURCES += \
lib/evas/canvas/efl_canvas_vg.c \ lib/evas/canvas/efl_canvas_vg_object.c \
lib/evas/canvas/evas_vg_node.c \ lib/evas/canvas/evas_vg_node.c \
lib/evas/canvas/evas_vg_container.c \ lib/evas/canvas/evas_vg_container.c \
lib/evas/canvas/evas_vg_gradient.c \ lib/evas/canvas/evas_vg_gradient.c \

View File

@ -3190,11 +3190,11 @@ _edje_svg_recalc_apply(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *p3 EINA_U
snprintf(dest_key, sizeof(dest_key), "edje/vectors/%i", new_svg); snprintf(dest_key, sizeof(dest_key), "edje/vectors/%i", new_svg);
efl_file_set(ep->object, ed->file->path, src_key); efl_file_set(ep->object, ed->file->path, src_key);
src_root = efl_canvas_vg_root_node_get(ep->object); src_root = efl_canvas_vg_object_root_node_get(ep->object);
efl_ref(src_root); efl_ref(src_root);
efl_file_set(ep->object, ed->file->path, dest_key); efl_file_set(ep->object, ed->file->path, dest_key);
dest_root = efl_canvas_vg_root_node_get(ep->object); dest_root = efl_canvas_vg_object_root_node_get(ep->object);
efl_ref(dest_root); efl_ref(dest_root);
root = efl_duplicate(src_root); 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
{ {
ERR("Can't interpolate check the svg file"); ERR("Can't interpolate check the svg file");
} }
efl_canvas_vg_root_node_set(ep->object, root); efl_canvas_vg_object_root_node_set(ep->object, root);
efl_unref(src_root); efl_unref(src_root);
efl_unref(dest_root); efl_unref(dest_root);
} }

View File

@ -7,7 +7,7 @@
#ifndef _EFL_CANVAS_VG_NODE_EO_CLASS_TYPE #ifndef _EFL_CANVAS_VG_NODE_EO_CLASS_TYPE
#define _EFL_CANVAS_VG_NODE_EO_CLASS_TYPE #define _EFL_CANVAS_VG_NODE_EO_CLASS_TYPE
typedef Eo Efl_Canvas_VG_Node; typedef Eo Efl_Canvas_Vg_Node;
#endif #endif
@ -434,7 +434,7 @@ typedef void (Evas_Canvas3D_Surface_Func)(Evas_Real *out_x,
* *
* @{ * @{
*/ */
#include "canvas/efl_canvas_vg.eo.h" #include "canvas/efl_canvas_vg_object.eo.h"
/** /**
* @} * @}
*/ */

View File

@ -3605,7 +3605,7 @@ EAPI Evas_Object *evas_object_rectangle_add(Evas *e) EINA_WARN_UNUSED_RESULT EIN
EAPI Evas_Object *evas_object_vg_add(Evas *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_MALLOC; EAPI Evas_Object *evas_object_vg_add(Evas *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_MALLOC;
#include "canvas/efl_canvas_vg_node.eo.legacy.h" #include "canvas/efl_canvas_vg_node.eo.legacy.h"
#include "canvas/efl_canvas_vg.eo.legacy.h" #include "canvas/efl_canvas_vg_object.eo.legacy.h"
#include "canvas/efl_canvas_vg_container.eo.legacy.h" #include "canvas/efl_canvas_vg_container.eo.legacy.h"
/** /**
* Creates a new vector shape object \. * Creates a new vector shape object \.

View File

@ -1,4 +1,4 @@
class Efl.Canvas.VG.Container (Efl.Canvas.VG.Node) class Efl.Canvas.Vg.Container (Efl.Canvas.Vg.Node)
{ {
[[Efl vector graphics container class]] [[Efl vector graphics container class]]
legacy_prefix: evas_vg_container; legacy_prefix: evas_vg_container;
@ -8,11 +8,11 @@ class Efl.Canvas.VG.Container (Efl.Canvas.VG.Node)
params { params {
@in name: string; [[Child node name]] @in name: string; [[Child node name]]
} }
return: Efl.Canvas.VG.Node; [[Child object]] return: Efl.Canvas.Vg.Node; [[Child object]]
} }
children_get { children_get {
[[Get all children of container]] [[Get all children of container]]
return: iterator<Efl.Canvas.VG.Node> @owned @warn_unused; [[Iterator to children]] return: iterator<Efl.Canvas.Vg.Node> @owned @warn_unused; [[Iterator to children]]
} }
} }
implements { implements {

View File

@ -1,4 +1,4 @@
abstract Efl.Canvas.VG.Gradient (Efl.Canvas.VG.Node, Efl.Gfx.Gradient) abstract Efl.Canvas.Vg.Gradient (Efl.Canvas.Vg.Node, Efl.Gfx.Gradient)
{ {
[[Efl vectopr graphics gradient abstract class]] [[Efl vectopr graphics gradient abstract class]]
legacy_prefix: evas_vg_gradient; legacy_prefix: evas_vg_gradient;

View File

@ -1,4 +1,4 @@
class Efl.Canvas.VG.Gradient.Linear (Efl.Canvas.VG.Gradient, Efl.Gfx.Gradient.Linear) class Efl.Canvas.Vg.Gradient_Linear (Efl.Canvas.Vg.Gradient, Efl.Gfx.Gradient.Linear)
{ {
[[Efl vector graphics gradient linear class]] [[Efl vector graphics gradient linear class]]
legacy_prefix: evas_vg_gradient_linear; legacy_prefix: evas_vg_gradient_linear;

View File

@ -1,4 +1,4 @@
class Efl.Canvas.VG.Gradient.Radial (Efl.Canvas.VG.Gradient, Efl.Gfx.Gradient.Radial) class Efl.Canvas.Vg.Gradient_Radial (Efl.Canvas.Vg.Gradient, Efl.Gfx.Gradient.Radial)
{ {
[[Efl vector graphics gradient radial class]] [[Efl vector graphics gradient radial class]]
legacy_prefix: evas_vg_gradient_radial; legacy_prefix: evas_vg_gradient_radial;

View File

@ -1,6 +1,6 @@
import eina_types; import eina_types;
abstract Efl.Canvas.VG.Node (Efl.Object, Efl.Gfx, Efl.Gfx.Color, Efl.Gfx.Stack, Efl.Duplicate, Efl.Gfx.Path) abstract Efl.Canvas.Vg.Node (Efl.Object, Efl.Gfx, Efl.Gfx.Color, Efl.Gfx.Stack, Efl.Duplicate, Efl.Gfx.Path)
{ {
[[Efl vector graphics abstract class]] [[Efl vector graphics abstract class]]
eo_prefix: efl_canvas_vg_node; 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,
get { get {
} }
values { values {
m: Efl.Canvas.VG.Node; [[Object mask]] m: Efl.Canvas.Vg.Node; [[Object mask]]
} }
} }
/* quality { /* quality {

View File

@ -5,7 +5,7 @@
#include "evas_vg_private.h" #include "evas_vg_private.h"
#define MY_CLASS EFL_CANVAS_VG_CLASS #define MY_CLASS EFL_CANVAS_VG_OBJECT_CLASS
/* private magic number for rectangle objects */ /* private magic number for rectangle objects */
static const char o_type[] = "vectors"; static const char o_type[] = "vectors";
@ -65,7 +65,7 @@ static void
_evas_vg_tree_changed(void *data, const Efl_Event *event EINA_UNUSED) _evas_vg_tree_changed(void *data, const Efl_Event *event EINA_UNUSED)
{ {
Evas_Object_Protected_Data *obj = data; Evas_Object_Protected_Data *obj = data;
Efl_Canvas_Vg_Data *pd = efl_data_scope_get(obj->object, MY_CLASS); Efl_Canvas_Vg_Object_Data *pd = efl_data_scope_get(obj->object, MY_CLASS);
if (pd->changed) return; if (pd->changed) return;
@ -75,7 +75,7 @@ _evas_vg_tree_changed(void *data, const Efl_Event *event EINA_UNUSED)
} }
static void static void
_update_vgtree_viewport(Eo *obj, Efl_Canvas_Vg_Data *pd) _update_vgtree_viewport(Eo *obj, Efl_Canvas_Vg_Object_Data *pd)
{ {
double vb_w, vb_h, vp_w, vp_h, scale_w, scale_h, scale; double vb_w, vb_h, vp_w, vp_h, scale_w, scale_h, scale;
Eina_Size2D sz = efl_gfx_size_get(obj); Eina_Size2D sz = efl_gfx_size_get(obj);
@ -113,7 +113,7 @@ _update_vgtree_viewport(Eo *obj, Efl_Canvas_Vg_Data *pd)
static void static void
_evas_vg_resize(void *data, const Efl_Event *ev) _evas_vg_resize(void *data, const Efl_Event *ev)
{ {
Efl_Canvas_Vg_Data *pd = data; Efl_Canvas_Vg_Object_Data *pd = data;
if (eina_rectangle_is_empty(&pd->viewbox.rect)) if (eina_rectangle_is_empty(&pd->viewbox.rect))
return; return;
@ -132,7 +132,7 @@ evas_object_vg_add(Evas *e)
} }
EOLIAN static Efl_VG * EOLIAN static Efl_VG *
_efl_canvas_vg_root_node_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Data *pd) _efl_canvas_vg_object_root_node_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Object_Data *pd)
{ {
Efl_VG *root = NULL; Efl_VG *root = NULL;
@ -145,7 +145,7 @@ _efl_canvas_vg_root_node_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Data *pd)
} }
EOLIAN static void EOLIAN static void
_efl_canvas_vg_root_node_set(Eo *obj, Efl_Canvas_Vg_Data *pd, Efl_VG *root_node) _efl_canvas_vg_object_root_node_set(Eo *obj, Efl_Canvas_Vg_Object_Data *pd, Efl_VG *root_node)
{ {
// if the same root is already set // if the same root is already set
if (pd->user_entry && pd->user_entry->root == root_node) 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)
} }
EOLIAN static void EOLIAN static void
_efl_canvas_vg_fill_mode_set(Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Data *pd, Efl_Canvas_Vg_Fill_Mode fill_mode) _efl_canvas_vg_object_fill_mode_set(Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Object_Data *pd, Efl_Canvas_Vg_Fill_Mode fill_mode)
{ {
pd->fill_mode = fill_mode; pd->fill_mode = fill_mode;
} }
EOLIAN static Efl_Canvas_Vg_Fill_Mode EOLIAN static Efl_Canvas_Vg_Fill_Mode
_efl_canvas_vg_fill_mode_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Data *pd) _efl_canvas_vg_object_fill_mode_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Object_Data *pd)
{ {
return pd->fill_mode; return pd->fill_mode;
} }
EOLIAN static void EOLIAN static void
_efl_canvas_vg_viewbox_set(Eo *obj, Efl_Canvas_Vg_Data *pd, Eina_Rect viewbox) _efl_canvas_vg_object_viewbox_set(Eo *obj, Efl_Canvas_Vg_Object_Data *pd, Eina_Rect viewbox)
{ {
// viewbox should be a valid rectangle // viewbox should be a valid rectangle
if (eina_rectangle_is_empty(&viewbox.rect)) 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)
} }
EOLIAN static Eina_Rect EOLIAN static Eina_Rect
_efl_canvas_vg_viewbox_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Data *pd) _efl_canvas_vg_object_viewbox_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Object_Data *pd)
{ {
return pd->viewbox; return pd->viewbox;
} }
EOLIAN static void EOLIAN static void
_efl_canvas_vg_viewbox_align_set(Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Data *pd, double align_x, double align_y) _efl_canvas_vg_object_viewbox_align_set(Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Object_Data *pd, double align_x, double align_y)
{ {
align_x = align_x < 0 ? 0 : align_x; align_x = align_x < 0 ? 0 : align_x;
align_x = align_x > 1 ? 1 : align_x; 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
} }
EOLIAN static void EOLIAN static void
_efl_canvas_vg_viewbox_align_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Data *pd, double *align_x, double *align_y) _efl_canvas_vg_object_viewbox_align_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Object_Data *pd, double *align_x, double *align_y)
{ {
if (align_x) *align_x = pd->align_x; if (align_x) *align_x = pd->align_x;
if (align_y) *align_y = pd->align_y; 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 *
// file set and save api implementation // file set and save api implementation
EOLIAN static Eina_Bool EOLIAN static Eina_Bool
_efl_canvas_vg_efl_file_file_set(Eo *obj, Efl_Canvas_Vg_Data *pd, const char *file, const char *key) _efl_canvas_vg_object_efl_file_file_set(Eo *obj, Efl_Canvas_Vg_Object_Data *pd, const char *file, const char *key)
{ {
Evas_Cache_Vg_Entry *old_entry; Evas_Cache_Vg_Entry *old_entry;
int w, h; int w, h;
@ -273,7 +273,7 @@ _efl_canvas_vg_efl_file_file_set(Eo *obj, Efl_Canvas_Vg_Data *pd, const char *fi
} }
EOLIAN static void EOLIAN static void
_efl_canvas_vg_efl_file_file_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Data *pd, const char **file, const char **key) _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)
{ {
if (pd->vg_entry) if (pd->vg_entry)
{ {
@ -283,7 +283,7 @@ _efl_canvas_vg_efl_file_file_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Data *
} }
EOLIAN static Eina_Bool EOLIAN static Eina_Bool
_efl_canvas_vg_efl_file_save(const Eo *obj, Efl_Canvas_Vg_Data *pd, const char *file, const char *key, const char *flags) _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)
{ {
Vg_File_Data tmp = {}; Vg_File_Data tmp = {};
Vg_File_Data *info = &tmp; 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 *
static void static void
_cleanup_reference(void *data, const Efl_Event *event EINA_UNUSED) _cleanup_reference(void *data, const Efl_Event *event EINA_UNUSED)
{ {
Efl_Canvas_Vg_Data *pd = data; Efl_Canvas_Vg_Object_Data *pd = data;
Eo *renderer; Eo *renderer;
/* unref all renderer and may also destroy them async */ /* unref all renderer and may also destroy them async */
@ -315,7 +315,7 @@ _cleanup_reference(void *data, const Efl_Event *event EINA_UNUSED)
} }
EOLIAN static void EOLIAN static void
_efl_canvas_vg_efl_object_destructor(Eo *eo_obj, Efl_Canvas_Vg_Data *pd) _efl_canvas_vg_object_efl_object_destructor(Eo *eo_obj, Efl_Canvas_Vg_Object_Data *pd)
{ {
Evas *e = evas_object_evas_get(eo_obj); Evas *e = evas_object_evas_get(eo_obj);
@ -327,7 +327,7 @@ _efl_canvas_vg_efl_object_destructor(Eo *eo_obj, Efl_Canvas_Vg_Data *pd)
} }
EOLIAN static Eo * EOLIAN static Eo *
_efl_canvas_vg_efl_object_constructor(Eo *eo_obj, Efl_Canvas_Vg_Data *pd) _efl_canvas_vg_object_efl_object_constructor(Eo *eo_obj, Efl_Canvas_Vg_Object_Data *pd)
{ {
Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
@ -349,7 +349,7 @@ _efl_canvas_vg_efl_object_constructor(Eo *eo_obj, Efl_Canvas_Vg_Data *pd)
} }
static Efl_Object * static Efl_Object *
_efl_canvas_vg_efl_object_finalize(Eo *obj, Efl_Canvas_Vg_Data *pd) _efl_canvas_vg_object_efl_object_finalize(Eo *obj, Efl_Canvas_Vg_Object_Data *pd)
{ {
Evas *e = evas_object_evas_get(obj); Evas *e = evas_object_evas_get(obj);
@ -361,13 +361,13 @@ _efl_canvas_vg_efl_object_finalize(Eo *obj, Efl_Canvas_Vg_Data *pd)
} }
static void static void
_evas_vg_render(Evas_Object_Protected_Data *obj, Efl_Canvas_Vg_Data *vd, _evas_vg_render(Evas_Object_Protected_Data *obj, Efl_Canvas_Vg_Object_Data *vd,
void *engine, void *output, void *context, void *surface, Efl_VG *n, void *engine, void *output, void *context, void *surface, Efl_VG *n,
Eina_Array *clips, Eina_Bool do_async) Eina_Array *clips, Eina_Bool do_async)
{ {
if (efl_isa(n, EFL_CANVAS_VG_CONTAINER_CLASS)) if (efl_isa(n, EFL_CANVAS_VG_CONTAINER_CLASS))
{ {
Efl_Canvas_VG_Container_Data *vc; Efl_Canvas_Vg_Container_Data *vc;
Efl_VG *child; Efl_VG *child;
Eina_List *l; Eina_List *l;
@ -380,7 +380,7 @@ _evas_vg_render(Evas_Object_Protected_Data *obj, Efl_Canvas_Vg_Data *vd,
} }
else else
{ {
Efl_Canvas_VG_Node_Data *nd; Efl_Canvas_Vg_Node_Data *nd;
nd = efl_data_scope_get(n, EFL_CANVAS_VG_NODE_CLASS); nd = efl_data_scope_get(n, EFL_CANVAS_VG_NODE_CLASS);
@ -394,7 +394,7 @@ _evas_vg_render(Evas_Object_Protected_Data *obj, Efl_Canvas_Vg_Data *vd,
// renders a vg_tree to an offscreen buffer // renders a vg_tree to an offscreen buffer
// and push it to the cache. // and push it to the cache.
static void * static void *
_render_to_buffer(Evas_Object_Protected_Data *obj, Efl_Canvas_Vg_Data *vd, _render_to_buffer(Evas_Object_Protected_Data *obj, Efl_Canvas_Vg_Object_Data *vd,
void *engine, void *surface, void *engine, void *surface,
Efl_VG *root, int w, int h, void *key, Efl_VG *root, int w, int h, void *key,
void *buffer, Eina_Bool do_async) void *buffer, Eina_Bool do_async)
@ -473,7 +473,7 @@ _render_buffer_to_screen(Evas_Object_Protected_Data *obj,
static void static void
_cache_vg_entry_render(Evas_Object_Protected_Data *obj, _cache_vg_entry_render(Evas_Object_Protected_Data *obj,
Efl_Canvas_Vg_Data *vd, Efl_Canvas_Vg_Object_Data *vd,
void *engine, void *output, void *context, void *surface, void *engine, void *output, void *context, void *surface,
int x, int y, int w, int h, Eina_Bool do_async) int x, int y, int w, int h, Eina_Bool do_async)
{ {
@ -521,7 +521,7 @@ _cache_vg_entry_render(Evas_Object_Protected_Data *obj,
static void static void
_user_vg_entry_render(Evas_Object_Protected_Data *obj, _user_vg_entry_render(Evas_Object_Protected_Data *obj,
Efl_Canvas_Vg_Data *vd, Efl_Canvas_Vg_Object_Data *vd,
void *engine, void *output, void *context, void *surface, void *engine, void *output, void *context, void *surface,
int x, int y, int w, int h, Eina_Bool do_async) int x, int y, int w, int h, Eina_Bool do_async)
{ {
@ -578,7 +578,7 @@ _efl_canvas_vg_render(Evas_Object *eo_obj EINA_UNUSED,
void *engine, void *output, void *context, void *surface, void *engine, void *output, void *context, void *surface,
int x, int y, Eina_Bool do_async) int x, int y, Eina_Bool do_async)
{ {
Efl_Canvas_Vg_Data *vd = type_private_data; Efl_Canvas_Vg_Object_Data *vd = type_private_data;
/* render object to surface with context, and offxet by x,y */ /* render object to surface with context, and offxet by x,y */
obj->layer->evas->engine.func->context_color_set(engine, obj->layer->evas->engine.func->context_color_set(engine,
@ -619,7 +619,7 @@ _efl_canvas_vg_render_pre(Evas_Object *eo_obj,
Evas_Object_Protected_Data *obj, Evas_Object_Protected_Data *obj,
void *type_private_data) void *type_private_data)
{ {
Efl_Canvas_Vg_Data *vd = type_private_data; Efl_Canvas_Vg_Object_Data *vd = type_private_data;
int is_v, was_v; int is_v, was_v;
Ector_Surface *s; Ector_Surface *s;
@ -752,7 +752,7 @@ _efl_canvas_vg_render_post(Evas_Object *eo_obj EINA_UNUSED,
static unsigned int static unsigned int
_efl_canvas_vg_id_get(Evas_Object *eo_obj) _efl_canvas_vg_id_get(Evas_Object *eo_obj)
{ {
Efl_Canvas_Vg_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); Efl_Canvas_Vg_Object_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
if (!o) return 0; if (!o) return 0;
return MAGIC_OBJ_VG; return MAGIC_OBJ_VG;
} }
@ -760,7 +760,7 @@ _efl_canvas_vg_id_get(Evas_Object *eo_obj)
static unsigned int static unsigned int
_efl_canvas_vg_visual_id_get(Evas_Object *eo_obj) _efl_canvas_vg_visual_id_get(Evas_Object *eo_obj)
{ {
Efl_Canvas_Vg_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); Efl_Canvas_Vg_Object_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
if (!o) return 0; if (!o) return 0;
return MAGIC_OBJ_SHAPE; return MAGIC_OBJ_SHAPE;
} }
@ -768,7 +768,7 @@ _efl_canvas_vg_visual_id_get(Evas_Object *eo_obj)
static void * static void *
_efl_canvas_vg_engine_data_get(Evas_Object *eo_obj) _efl_canvas_vg_engine_data_get(Evas_Object *eo_obj)
{ {
Efl_Canvas_Vg_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); Efl_Canvas_Vg_Object_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
return o->engine_data; return o->engine_data;
} }
@ -788,4 +788,4 @@ _efl_canvas_vg_was_opaque(Evas_Object *eo_obj EINA_UNUSED,
return 0; return 0;
} }
#include "efl_canvas_vg.eo.c" #include "efl_canvas_vg_object.eo.c"

View File

@ -21,7 +21,7 @@ enum Efl.Canvas.Vg.Fill_Mode
dimension of the viewport.]] dimension of the viewport.]]
} }
class Efl.Canvas.Vg (Efl.Canvas.Object, Efl.File) class Efl.Canvas.Vg.Object (Efl.Canvas.Object, Efl.File)
{ {
[[Efl vector graphics class]] [[Efl vector graphics class]]
legacy_prefix: evas_object_vg; legacy_prefix: evas_object_vg;
@ -65,7 +65,7 @@ class Efl.Canvas.Vg (Efl.Canvas.Object, Efl.File)
It takes the ownership of the root node. ]] It takes the ownership of the root node. ]]
} }
values { values {
root: Efl.Canvas.VG.Node; [[Root node of the VG canvas.]] root: Efl.Canvas.Vg.Node; [[Root node of the VG canvas.]]
} }
} }
} }

View File

@ -1,4 +1,4 @@
class Efl.Canvas.VG.Shape (Efl.Canvas.VG.Node, Efl.Gfx.Shape) class Efl.Canvas.Vg.Shape (Efl.Canvas.Vg.Node, Efl.Gfx.Shape)
{ {
[[Efl vector graphics shape class]] [[Efl vector graphics shape class]]
legacy_prefix: evas_vg_shape; legacy_prefix: evas_vg_shape;
@ -10,7 +10,7 @@ class Efl.Canvas.VG.Shape (Efl.Canvas.VG.Node, Efl.Gfx.Shape)
get { get {
} }
values { values {
f: Efl.Canvas.VG.Node; [[Fill object]] f: Efl.Canvas.Vg.Node; [[Fill object]]
} }
} }
@property stroke_fill { @property stroke_fill {
@ -20,7 +20,7 @@ class Efl.Canvas.VG.Shape (Efl.Canvas.VG.Node, Efl.Gfx.Shape)
get { get {
} }
values { values {
f: Efl.Canvas.VG.Node; [[Stroke fill object]] f: Efl.Canvas.Vg.Node; [[Stroke fill object]]
} }
} }
@property stroke_marker { @property stroke_marker {
@ -30,7 +30,7 @@ class Efl.Canvas.VG.Shape (Efl.Canvas.VG.Node, Efl.Gfx.Shape)
get { get {
} }
values { values {
m: Efl.Canvas.VG.Node; [[Stroke marker object]] m: Efl.Canvas.Vg.Node; [[Stroke marker object]]
} }
} }
} }

View File

@ -964,7 +964,7 @@ _image_data_regenerate(Evas_Object *eo_obj)
CHECK(EFL_CANVAS_IMAGE_INTERNAL_CLASS, Evas_Image_Data, _image_image_data_regenerate(eo_obj, obj, data)) CHECK(EFL_CANVAS_IMAGE_INTERNAL_CLASS, Evas_Image_Data, _image_image_data_regenerate(eo_obj, obj, data))
else CHECK(EFL_CANVAS_IMAGE_CLASS, Evas_Image_Data, _image_image_data_regenerate(eo_obj, obj, data)) else CHECK(EFL_CANVAS_IMAGE_CLASS, Evas_Image_Data, _image_image_data_regenerate(eo_obj, obj, data))
else CHECK(EFL_CANVAS_SCENE3D_CLASS, Evas_Image_Data, _image_image_data_regenerate(eo_obj, obj, data)) else CHECK(EFL_CANVAS_SCENE3D_CLASS, Evas_Image_Data, _image_image_data_regenerate(eo_obj, obj, data))
//else CHECK(EFL_CANVAS_VG_CLASS, Efl_Canvas_Vg_Data,) //else CHECK(EFL_CANVAS_VG_OBJECT_CLASS, Efl_Canvas_Vg_Object_Data,)
//else CHECK(EFL_CANVAS_POLYGON_CLASS, Efl_Canvas_Polygon_Data,) //else CHECK(EFL_CANVAS_POLYGON_CLASS, Efl_Canvas_Polygon_Data,)
//else CHECK(EVAS_CANVAS3D_TEXTURE_CLASS, Evas_Canvas3D_Texture_Data, //else CHECK(EVAS_CANVAS3D_TEXTURE_CLASS, Evas_Canvas3D_Texture_Data,
} }

View File

@ -10,12 +10,12 @@ _efl_canvas_vg_container_render_pre(Eo *obj EINA_UNUSED,
Eina_Matrix3 *parent, Eina_Matrix3 *parent,
Ector_Surface *s, Ector_Surface *s,
void *data, void *data,
Efl_Canvas_VG_Node_Data *nd) Efl_Canvas_Vg_Node_Data *nd)
{ {
Efl_Canvas_VG_Container_Data *pd = data; Efl_Canvas_Vg_Container_Data *pd = data;
Eina_List *l; Eina_List *l;
Eo *child; Eo *child;
Efl_Canvas_VG_Node_Data *child_nd; Efl_Canvas_Vg_Node_Data *child_nd;
Efl_Gfx_Change_Flag flag; Efl_Gfx_Change_Flag flag;
if (nd->flags == EFL_GFX_CHANGE_FLAG_NONE) return ; if (nd->flags == EFL_GFX_CHANGE_FLAG_NONE) return ;
@ -38,9 +38,9 @@ _efl_canvas_vg_container_render_pre(Eo *obj EINA_UNUSED,
static Eo * static Eo *
_efl_canvas_vg_container_efl_object_constructor(Eo *obj, _efl_canvas_vg_container_efl_object_constructor(Eo *obj,
Efl_Canvas_VG_Container_Data *pd) Efl_Canvas_Vg_Container_Data *pd)
{ {
Efl_Canvas_VG_Node_Data *nd; Efl_Canvas_Vg_Node_Data *nd;
pd->names = eina_hash_stringshared_new(NULL); pd->names = eina_hash_stringshared_new(NULL);
@ -56,7 +56,7 @@ _efl_canvas_vg_container_efl_object_constructor(Eo *obj,
static void static void
_efl_canvas_vg_container_efl_object_destructor(Eo *obj, _efl_canvas_vg_container_efl_object_destructor(Eo *obj,
Efl_Canvas_VG_Container_Data *pd EINA_UNUSED) Efl_Canvas_Vg_Container_Data *pd EINA_UNUSED)
{ {
efl_destructor(efl_super(obj, MY_CLASS)); efl_destructor(efl_super(obj, MY_CLASS));
@ -66,7 +66,7 @@ _efl_canvas_vg_container_efl_object_destructor(Eo *obj,
static void static void
_efl_canvas_vg_container_efl_gfx_path_bounds_get(const Eo *obj EINA_UNUSED, _efl_canvas_vg_container_efl_gfx_path_bounds_get(const Eo *obj EINA_UNUSED,
Efl_Canvas_VG_Container_Data *pd, Efl_Canvas_Vg_Container_Data *pd,
Eina_Rect *r) Eina_Rect *r)
{ {
Eina_Rect s; Eina_Rect s;
@ -92,7 +92,7 @@ _efl_canvas_vg_container_efl_gfx_path_bounds_get(const Eo *obj EINA_UNUSED,
} }
static Efl_VG * static Efl_VG *
_efl_canvas_vg_container_child_get(Eo *obj EINA_UNUSED, Efl_Canvas_VG_Container_Data *pd, const char *name) _efl_canvas_vg_container_child_get(Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Container_Data *pd, const char *name)
{ {
const char *tmp = eina_stringshare_add(name); const char *tmp = eina_stringshare_add(name);
Efl_VG *r; Efl_VG *r;
@ -104,14 +104,14 @@ _efl_canvas_vg_container_child_get(Eo *obj EINA_UNUSED, Efl_Canvas_VG_Container_
} }
static Eina_Iterator * static Eina_Iterator *
_efl_canvas_vg_container_children_get(Eo *obj EINA_UNUSED, Efl_Canvas_VG_Container_Data *pd) _efl_canvas_vg_container_children_get(Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Container_Data *pd)
{ {
return eina_list_iterator_new(pd->children); return eina_list_iterator_new(pd->children);
} }
static Eina_Bool static Eina_Bool
_efl_canvas_vg_container_efl_gfx_path_interpolate(Eo *obj, _efl_canvas_vg_container_efl_gfx_path_interpolate(Eo *obj,
Efl_Canvas_VG_Container_Data *pd, Efl_Canvas_Vg_Container_Data *pd,
const Efl_VG *from, const Efl_VG *to, const Efl_VG *from, const Efl_VG *to,
double pos_map) double pos_map)
{ {
@ -152,7 +152,7 @@ _efl_canvas_vg_container_efl_gfx_path_interpolate(Eo *obj,
} }
EOLIAN static Efl_VG * EOLIAN static Efl_VG *
_efl_canvas_vg_container_efl_duplicate_duplicate(const Eo *obj, Efl_Canvas_VG_Container_Data *pd) _efl_canvas_vg_container_efl_duplicate_duplicate(const Eo *obj, Efl_Canvas_Vg_Container_Data *pd)
{ {
Eina_List *l; Eina_List *l;
Efl_VG *child; Efl_VG *child;

View File

@ -9,7 +9,7 @@
static void static void
_efl_canvas_vg_gradient_efl_gfx_gradient_stop_set(Eo *obj EINA_UNUSED, _efl_canvas_vg_gradient_efl_gfx_gradient_stop_set(Eo *obj EINA_UNUSED,
Efl_Canvas_VG_Gradient_Data *pd, Efl_Canvas_Vg_Gradient_Data *pd,
const Efl_Gfx_Gradient_Stop *colors, const Efl_Gfx_Gradient_Stop *colors,
unsigned int length) unsigned int length)
{ {
@ -28,7 +28,7 @@ _efl_canvas_vg_gradient_efl_gfx_gradient_stop_set(Eo *obj EINA_UNUSED,
static void static void
_efl_canvas_vg_gradient_efl_gfx_gradient_stop_get(const Eo *obj EINA_UNUSED, _efl_canvas_vg_gradient_efl_gfx_gradient_stop_get(const Eo *obj EINA_UNUSED,
Efl_Canvas_VG_Gradient_Data *pd, Efl_Canvas_Vg_Gradient_Data *pd,
const Efl_Gfx_Gradient_Stop **colors, const Efl_Gfx_Gradient_Stop **colors,
unsigned int *length) unsigned int *length)
{ {
@ -38,7 +38,7 @@ _efl_canvas_vg_gradient_efl_gfx_gradient_stop_get(const Eo *obj EINA_UNUSED,
static void static void
_efl_canvas_vg_gradient_efl_gfx_gradient_spread_set(Eo *obj EINA_UNUSED, _efl_canvas_vg_gradient_efl_gfx_gradient_spread_set(Eo *obj EINA_UNUSED,
Efl_Canvas_VG_Gradient_Data *pd, Efl_Canvas_Vg_Gradient_Data *pd,
Efl_Gfx_Gradient_Spread s) Efl_Gfx_Gradient_Spread s)
{ {
pd->s = s; pd->s = s;
@ -48,18 +48,18 @@ _efl_canvas_vg_gradient_efl_gfx_gradient_spread_set(Eo *obj EINA_UNUSED,
static Efl_Gfx_Gradient_Spread static Efl_Gfx_Gradient_Spread
_efl_canvas_vg_gradient_efl_gfx_gradient_spread_get(const Eo *obj EINA_UNUSED, _efl_canvas_vg_gradient_efl_gfx_gradient_spread_get(const Eo *obj EINA_UNUSED,
Efl_Canvas_VG_Gradient_Data *pd) Efl_Canvas_Vg_Gradient_Data *pd)
{ {
return pd->s; return pd->s;
} }
static Eina_Bool static Eina_Bool
_efl_canvas_vg_gradient_efl_gfx_path_interpolate(Eo *obj, _efl_canvas_vg_gradient_efl_gfx_path_interpolate(Eo *obj,
Efl_Canvas_VG_Gradient_Data *pd, Efl_Canvas_Vg_Gradient_Data *pd,
const Efl_VG *from, const Efl_VG *to, const Efl_VG *from, const Efl_VG *to,
double pos_map) double pos_map)
{ {
Efl_Canvas_VG_Gradient_Data *fromd, *tod; Efl_Canvas_Vg_Gradient_Data *fromd, *tod;
Efl_Gfx_Gradient_Stop *colors; Efl_Gfx_Gradient_Stop *colors;
unsigned int i; unsigned int i;
double from_map; double from_map;
@ -97,7 +97,7 @@ _efl_canvas_vg_gradient_efl_gfx_path_interpolate(Eo *obj,
} }
EOLIAN static Efl_VG * EOLIAN static Efl_VG *
_efl_canvas_vg_gradient_efl_duplicate_duplicate(const Eo *obj, Efl_Canvas_VG_Gradient_Data *pd) _efl_canvas_vg_gradient_efl_duplicate_duplicate(const Eo *obj, Efl_Canvas_Vg_Gradient_Data *pd)
{ {
Efl_VG *cn = NULL; Efl_VG *cn = NULL;

View File

@ -7,8 +7,8 @@
#define MY_CLASS EFL_CANVAS_VG_GRADIENT_LINEAR_CLASS #define MY_CLASS EFL_CANVAS_VG_GRADIENT_LINEAR_CLASS
typedef struct _Efl_Canvas_VG_Gradient_Linear_Data Efl_Canvas_VG_Gradient_Linear_Data; typedef struct _Efl_Canvas_Vg_Gradient_Linear_Data Efl_Canvas_Vg_Gradient_Linear_Data;
struct _Efl_Canvas_VG_Gradient_Linear_Data struct _Efl_Canvas_Vg_Gradient_Linear_Data
{ {
struct { struct {
double x, y; double x, y;
@ -17,7 +17,7 @@ struct _Efl_Canvas_VG_Gradient_Linear_Data
static void static void
_efl_canvas_vg_gradient_linear_efl_gfx_gradient_linear_start_set(Eo *obj EINA_UNUSED, _efl_canvas_vg_gradient_linear_efl_gfx_gradient_linear_start_set(Eo *obj EINA_UNUSED,
Efl_Canvas_VG_Gradient_Linear_Data *pd, Efl_Canvas_Vg_Gradient_Linear_Data *pd,
double x, double y) double x, double y)
{ {
pd->start.x = x; pd->start.x = x;
@ -28,7 +28,7 @@ _efl_canvas_vg_gradient_linear_efl_gfx_gradient_linear_start_set(Eo *obj EINA_UN
static void static void
_efl_canvas_vg_gradient_linear_efl_gfx_gradient_linear_start_get(const Eo *obj EINA_UNUSED, _efl_canvas_vg_gradient_linear_efl_gfx_gradient_linear_start_get(const Eo *obj EINA_UNUSED,
Efl_Canvas_VG_Gradient_Linear_Data *pd, Efl_Canvas_Vg_Gradient_Linear_Data *pd,
double *x, double *y) double *x, double *y)
{ {
if (x) *x = pd->start.x; 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
static void static void
_efl_canvas_vg_gradient_linear_efl_gfx_gradient_linear_end_set(Eo *obj EINA_UNUSED, _efl_canvas_vg_gradient_linear_efl_gfx_gradient_linear_end_set(Eo *obj EINA_UNUSED,
Efl_Canvas_VG_Gradient_Linear_Data *pd, Efl_Canvas_Vg_Gradient_Linear_Data *pd,
double x, double y) double x, double y)
{ {
pd->end.x = x; pd->end.x = x;
@ -48,7 +48,7 @@ _efl_canvas_vg_gradient_linear_efl_gfx_gradient_linear_end_set(Eo *obj EINA_UNUS
static void static void
_efl_canvas_vg_gradient_linear_efl_gfx_gradient_linear_end_get(const Eo *obj EINA_UNUSED, _efl_canvas_vg_gradient_linear_efl_gfx_gradient_linear_end_get(const Eo *obj EINA_UNUSED,
Efl_Canvas_VG_Gradient_Linear_Data *pd, Efl_Canvas_Vg_Gradient_Linear_Data *pd,
double *x, double *y) double *x, double *y)
{ {
if (x) *x = pd->end.x; if (x) *x = pd->end.x;
@ -60,10 +60,10 @@ _efl_canvas_vg_gradient_linear_render_pre(Eo *obj,
Eina_Matrix3 *parent, Eina_Matrix3 *parent,
Ector_Surface *s, Ector_Surface *s,
void *data, void *data,
Efl_Canvas_VG_Node_Data *nd) Efl_Canvas_Vg_Node_Data *nd)
{ {
Efl_Canvas_VG_Gradient_Linear_Data *pd = data; Efl_Canvas_Vg_Gradient_Linear_Data *pd = data;
Efl_Canvas_VG_Gradient_Data *gd; Efl_Canvas_Vg_Gradient_Data *gd;
if (nd->flags == EFL_GFX_CHANGE_FLAG_NONE) return ; if (nd->flags == EFL_GFX_CHANGE_FLAG_NONE) return ;
@ -92,9 +92,9 @@ _efl_canvas_vg_gradient_linear_render_pre(Eo *obj,
static Eo * static Eo *
_efl_canvas_vg_gradient_linear_efl_object_constructor(Eo *obj, _efl_canvas_vg_gradient_linear_efl_object_constructor(Eo *obj,
Efl_Canvas_VG_Gradient_Linear_Data *pd) Efl_Canvas_Vg_Gradient_Linear_Data *pd)
{ {
Efl_Canvas_VG_Node_Data *nd; Efl_Canvas_Vg_Node_Data *nd;
obj = efl_constructor(efl_super(obj, MY_CLASS)); obj = efl_constructor(efl_super(obj, MY_CLASS));
@ -106,15 +106,15 @@ _efl_canvas_vg_gradient_linear_efl_object_constructor(Eo *obj,
} }
static void static void
_efl_canvas_vg_gradient_linear_efl_object_destructor(Eo *obj, Efl_Canvas_VG_Gradient_Linear_Data *pd EINA_UNUSED) _efl_canvas_vg_gradient_linear_efl_object_destructor(Eo *obj, Efl_Canvas_Vg_Gradient_Linear_Data *pd EINA_UNUSED)
{ {
efl_destructor(efl_super(obj, MY_CLASS)); efl_destructor(efl_super(obj, MY_CLASS));
} }
static void static void
_efl_canvas_vg_gradient_linear_efl_gfx_path_bounds_get(const Eo *obj, Efl_Canvas_VG_Gradient_Linear_Data *pd, Eina_Rect *r) _efl_canvas_vg_gradient_linear_efl_gfx_path_bounds_get(const Eo *obj, Efl_Canvas_Vg_Gradient_Linear_Data *pd, Eina_Rect *r)
{ {
Efl_Canvas_VG_Node_Data *nd; Efl_Canvas_Vg_Node_Data *nd;
nd = efl_data_scope_get(obj, EFL_CANVAS_VG_NODE_CLASS); nd = efl_data_scope_get(obj, EFL_CANVAS_VG_NODE_CLASS);
EINA_RECTANGLE_SET(r, EINA_RECTANGLE_SET(r,
@ -124,11 +124,11 @@ _efl_canvas_vg_gradient_linear_efl_gfx_path_bounds_get(const Eo *obj, Efl_Canvas
static Eina_Bool static Eina_Bool
_efl_canvas_vg_gradient_linear_efl_gfx_path_interpolate(Eo *obj, _efl_canvas_vg_gradient_linear_efl_gfx_path_interpolate(Eo *obj,
Efl_Canvas_VG_Gradient_Linear_Data *pd, Efl_Canvas_Vg_Gradient_Linear_Data *pd,
const Efl_VG *from, const Efl_VG *to, const Efl_VG *from, const Efl_VG *to,
double pos_map) double pos_map)
{ {
Efl_Canvas_VG_Gradient_Linear_Data *fromd, *tod; Efl_Canvas_Vg_Gradient_Linear_Data *fromd, *tod;
double from_map; double from_map;
Eina_Bool r; Eina_Bool r;
@ -154,7 +154,7 @@ _efl_canvas_vg_gradient_linear_efl_gfx_path_interpolate(Eo *obj,
} }
EOLIAN static Efl_VG * EOLIAN static Efl_VG *
_efl_canvas_vg_gradient_linear_efl_duplicate_duplicate(const Eo *obj, Efl_Canvas_VG_Gradient_Linear_Data *pd) _efl_canvas_vg_gradient_linear_efl_duplicate_duplicate(const Eo *obj, Efl_Canvas_Vg_Gradient_Linear_Data *pd)
{ {
Efl_VG *cn = NULL; Efl_VG *cn = NULL;

View File

@ -5,8 +5,8 @@
#define MY_CLASS EFL_CANVAS_VG_GRADIENT_RADIAL_CLASS #define MY_CLASS EFL_CANVAS_VG_GRADIENT_RADIAL_CLASS
typedef struct _Efl_Canvas_VG_Gradient_Radial_Data Efl_Canvas_VG_Gradient_Radial_Data; typedef struct _Efl_Canvas_Vg_Gradient_Radial_Data Efl_Canvas_Vg_Gradient_Radial_Data;
struct _Efl_Canvas_VG_Gradient_Radial_Data struct _Efl_Canvas_Vg_Gradient_Radial_Data
{ {
struct { struct {
double x, y; double x, y;
@ -16,7 +16,7 @@ struct _Efl_Canvas_VG_Gradient_Radial_Data
static void static void
_efl_canvas_vg_gradient_radial_efl_gfx_gradient_radial_center_set(Eo *obj EINA_UNUSED, _efl_canvas_vg_gradient_radial_efl_gfx_gradient_radial_center_set(Eo *obj EINA_UNUSED,
Efl_Canvas_VG_Gradient_Radial_Data *pd, Efl_Canvas_Vg_Gradient_Radial_Data *pd,
double x, double y) double x, double y)
{ {
pd->center.x = x; pd->center.x = x;
@ -27,7 +27,7 @@ _efl_canvas_vg_gradient_radial_efl_gfx_gradient_radial_center_set(Eo *obj EINA_U
static void static void
_efl_canvas_vg_gradient_radial_efl_gfx_gradient_radial_center_get(const Eo *obj EINA_UNUSED, _efl_canvas_vg_gradient_radial_efl_gfx_gradient_radial_center_get(const Eo *obj EINA_UNUSED,
Efl_Canvas_VG_Gradient_Radial_Data *pd, Efl_Canvas_Vg_Gradient_Radial_Data *pd,
double *x, double *y) double *x, double *y)
{ {
if (x) *x = pd->center.x; if (x) *x = pd->center.x;
@ -36,7 +36,7 @@ _efl_canvas_vg_gradient_radial_efl_gfx_gradient_radial_center_get(const Eo *obj
static void static void
_efl_canvas_vg_gradient_radial_efl_gfx_gradient_radial_radius_set(Eo *obj EINA_UNUSED, _efl_canvas_vg_gradient_radial_efl_gfx_gradient_radial_radius_set(Eo *obj EINA_UNUSED,
Efl_Canvas_VG_Gradient_Radial_Data *pd, Efl_Canvas_Vg_Gradient_Radial_Data *pd,
double r) double r)
{ {
pd->radius = r; pd->radius = r;
@ -46,14 +46,14 @@ _efl_canvas_vg_gradient_radial_efl_gfx_gradient_radial_radius_set(Eo *obj EINA_U
static double static double
_efl_canvas_vg_gradient_radial_efl_gfx_gradient_radial_radius_get(const Eo *obj EINA_UNUSED, _efl_canvas_vg_gradient_radial_efl_gfx_gradient_radial_radius_get(const Eo *obj EINA_UNUSED,
Efl_Canvas_VG_Gradient_Radial_Data *pd) Efl_Canvas_Vg_Gradient_Radial_Data *pd)
{ {
return pd->radius; return pd->radius;
} }
static void static void
_efl_canvas_vg_gradient_radial_efl_gfx_gradient_radial_focal_set(Eo *obj EINA_UNUSED, _efl_canvas_vg_gradient_radial_efl_gfx_gradient_radial_focal_set(Eo *obj EINA_UNUSED,
Efl_Canvas_VG_Gradient_Radial_Data *pd, Efl_Canvas_Vg_Gradient_Radial_Data *pd,
double x, double y) double x, double y)
{ {
pd->focal.x = x; pd->focal.x = x;
@ -64,7 +64,7 @@ _efl_canvas_vg_gradient_radial_efl_gfx_gradient_radial_focal_set(Eo *obj EINA_UN
static void static void
_efl_canvas_vg_gradient_radial_efl_gfx_gradient_radial_focal_get(const Eo *obj EINA_UNUSED, _efl_canvas_vg_gradient_radial_efl_gfx_gradient_radial_focal_get(const Eo *obj EINA_UNUSED,
Efl_Canvas_VG_Gradient_Radial_Data *pd, Efl_Canvas_Vg_Gradient_Radial_Data *pd,
double *x, double *y) double *x, double *y)
{ {
if (x) *x = pd->focal.x; if (x) *x = pd->focal.x;
@ -76,10 +76,10 @@ _efl_canvas_vg_gradient_radial_render_pre(Eo *obj,
Eina_Matrix3 *parent, Eina_Matrix3 *parent,
Ector_Surface *s, Ector_Surface *s,
void *data, void *data,
Efl_Canvas_VG_Node_Data *nd) Efl_Canvas_Vg_Node_Data *nd)
{ {
Efl_Canvas_VG_Gradient_Radial_Data *pd = data; Efl_Canvas_Vg_Gradient_Radial_Data *pd = data;
Efl_Canvas_VG_Gradient_Data *gd; Efl_Canvas_Vg_Gradient_Data *gd;
if (nd->flags == EFL_GFX_CHANGE_FLAG_NONE) return ; if (nd->flags == EFL_GFX_CHANGE_FLAG_NONE) return ;
@ -108,9 +108,9 @@ _efl_canvas_vg_gradient_radial_render_pre(Eo *obj,
} }
static Eo * static Eo *
_efl_canvas_vg_gradient_radial_efl_object_constructor(Eo *obj, Efl_Canvas_VG_Gradient_Radial_Data *pd) _efl_canvas_vg_gradient_radial_efl_object_constructor(Eo *obj, Efl_Canvas_Vg_Gradient_Radial_Data *pd)
{ {
Efl_Canvas_VG_Node_Data *nd; Efl_Canvas_Vg_Node_Data *nd;
obj = efl_constructor(efl_super(obj, MY_CLASS)); obj = efl_constructor(efl_super(obj, MY_CLASS));
@ -123,15 +123,15 @@ _efl_canvas_vg_gradient_radial_efl_object_constructor(Eo *obj, Efl_Canvas_VG_Gra
static void static void
_efl_canvas_vg_gradient_radial_efl_object_destructor(Eo *obj, _efl_canvas_vg_gradient_radial_efl_object_destructor(Eo *obj,
Efl_Canvas_VG_Gradient_Radial_Data *pd EINA_UNUSED) Efl_Canvas_Vg_Gradient_Radial_Data *pd EINA_UNUSED)
{ {
efl_destructor(efl_super(obj, MY_CLASS)); efl_destructor(efl_super(obj, MY_CLASS));
} }
static void static void
_efl_canvas_vg_gradient_radial_efl_gfx_path_bounds_get(const Eo *obj, Efl_Canvas_VG_Gradient_Radial_Data *pd, Eina_Rect *r) _efl_canvas_vg_gradient_radial_efl_gfx_path_bounds_get(const Eo *obj, Efl_Canvas_Vg_Gradient_Radial_Data *pd, Eina_Rect *r)
{ {
Efl_Canvas_VG_Node_Data *nd; Efl_Canvas_Vg_Node_Data *nd;
nd = efl_data_scope_get(obj, EFL_CANVAS_VG_NODE_CLASS); nd = efl_data_scope_get(obj, EFL_CANVAS_VG_NODE_CLASS);
EINA_RECTANGLE_SET(r, EINA_RECTANGLE_SET(r,
@ -142,11 +142,11 @@ _efl_canvas_vg_gradient_radial_efl_gfx_path_bounds_get(const Eo *obj, Efl_Canvas
static Eina_Bool static Eina_Bool
_efl_canvas_vg_gradient_radial_efl_gfx_path_interpolate(Eo *obj, _efl_canvas_vg_gradient_radial_efl_gfx_path_interpolate(Eo *obj,
Efl_Canvas_VG_Gradient_Radial_Data *pd, Efl_Canvas_Vg_Gradient_Radial_Data *pd,
const Efl_VG *from, const Efl_VG *to, const Efl_VG *from, const Efl_VG *to,
double pos_map) double pos_map)
{ {
Efl_Canvas_VG_Gradient_Radial_Data *fromd, *tod; Efl_Canvas_Vg_Gradient_Radial_Data *fromd, *tod;
double from_map; double from_map;
Eina_Bool r; Eina_Bool r;
@ -174,7 +174,7 @@ _efl_canvas_vg_gradient_radial_efl_gfx_path_interpolate(Eo *obj,
EOLIAN static Efl_VG * EOLIAN static Efl_VG *
_efl_canvas_vg_gradient_radial_efl_duplicate_duplicate(const Eo *obj, Efl_Canvas_VG_Gradient_Radial_Data *pd) _efl_canvas_vg_gradient_radial_efl_duplicate_duplicate(const Eo *obj, Efl_Canvas_Vg_Gradient_Radial_Data *pd)
{ {
Efl_VG *cn = NULL; Efl_VG *cn = NULL;

View File

@ -8,7 +8,7 @@
#define MY_CLASS EFL_CANVAS_VG_NODE_CLASS #define MY_CLASS EFL_CANVAS_VG_NODE_CLASS
static const Efl_Canvas_VG_Interpolation interpolation_identity = { static const Efl_Canvas_Vg_Interpolation interpolation_identity = {
{ 0, 0, 0, 1 }, { 0, 0, 0, 1 },
{ 0, 0, 0, 1 }, { 0, 0, 0, 1 },
{ 0, 0, 0 }, { 0, 0, 0 },
@ -19,7 +19,7 @@ static const Efl_Canvas_VG_Interpolation interpolation_identity = {
static void static void
_efl_canvas_vg_node_property_changed(void *data, const Efl_Event *event EINA_UNUSED) _efl_canvas_vg_node_property_changed(void *data, const Efl_Event *event EINA_UNUSED)
{ {
Efl_Canvas_VG_Node_Data *pd = data; Efl_Canvas_Vg_Node_Data *pd = data;
Eo *parent; Eo *parent;
if (!pd->flags) pd->flags = EFL_GFX_CHANGE_FLAG_ALL; 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
static void static void
_efl_canvas_vg_node_transformation_set(Eo *obj, _efl_canvas_vg_node_transformation_set(Eo *obj,
Efl_Canvas_VG_Node_Data *pd, Efl_Canvas_Vg_Node_Data *pd,
const Eina_Matrix3 *m) const Eina_Matrix3 *m)
{ {
if (pd->intp) if (pd->intp)
@ -59,14 +59,14 @@ _efl_canvas_vg_node_transformation_set(Eo *obj,
} }
const Eina_Matrix3 * const Eina_Matrix3 *
_efl_canvas_vg_node_transformation_get(const Eo *obj EINA_UNUSED, Efl_Canvas_VG_Node_Data *pd) _efl_canvas_vg_node_transformation_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Node_Data *pd)
{ {
return pd->m; return pd->m;
} }
static void static void
_efl_canvas_vg_node_origin_set(Eo *obj, _efl_canvas_vg_node_origin_set(Eo *obj,
Efl_Canvas_VG_Node_Data *pd, Efl_Canvas_Vg_Node_Data *pd,
double x, double y) double x, double y)
{ {
pd->x = x; pd->x = x;
@ -77,7 +77,7 @@ _efl_canvas_vg_node_origin_set(Eo *obj,
static void static void
_efl_canvas_vg_node_origin_get(const Eo *obj EINA_UNUSED, _efl_canvas_vg_node_origin_get(const Eo *obj EINA_UNUSED,
Efl_Canvas_VG_Node_Data *pd, Efl_Canvas_Vg_Node_Data *pd,
double *x, double *y) double *x, double *y)
{ {
if (x) *x = pd->x; if (x) *x = pd->x;
@ -85,7 +85,7 @@ _efl_canvas_vg_node_origin_get(const Eo *obj EINA_UNUSED,
} }
static void static void
_efl_canvas_vg_node_efl_gfx_position_set(Eo *obj EINA_UNUSED, Efl_Canvas_VG_Node_Data *pd, Eina_Position2D pos) _efl_canvas_vg_node_efl_gfx_position_set(Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Node_Data *pd, Eina_Position2D pos)
{ {
pd->x = (double) pos.x; pd->x = (double) pos.x;
pd->y = (double) pos.y; 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
} }
static Eina_Position2D static Eina_Position2D
_efl_canvas_vg_node_efl_gfx_position_get(const Eo *obj EINA_UNUSED, Efl_Canvas_VG_Node_Data *pd) _efl_canvas_vg_node_efl_gfx_position_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Node_Data *pd)
{ {
// NOTE: This casts double to int! // NOTE: This casts double to int!
return EINA_POSITION2D(pd->x, pd->y); 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
static void static void
_efl_canvas_vg_node_efl_gfx_visible_set(Eo *obj EINA_UNUSED, _efl_canvas_vg_node_efl_gfx_visible_set(Eo *obj EINA_UNUSED,
Efl_Canvas_VG_Node_Data *pd, Eina_Bool v) Efl_Canvas_Vg_Node_Data *pd, Eina_Bool v)
{ {
pd->visibility = v; pd->visibility = v;
@ -112,14 +112,14 @@ _efl_canvas_vg_node_efl_gfx_visible_set(Eo *obj EINA_UNUSED,
static Eina_Bool static Eina_Bool
_efl_canvas_vg_node_efl_gfx_visible_get(const Eo *obj EINA_UNUSED, _efl_canvas_vg_node_efl_gfx_visible_get(const Eo *obj EINA_UNUSED,
Efl_Canvas_VG_Node_Data *pd) Efl_Canvas_Vg_Node_Data *pd)
{ {
return pd->visibility; return pd->visibility;
} }
static void static void
_efl_canvas_vg_node_efl_gfx_color_color_set(Eo *obj EINA_UNUSED, _efl_canvas_vg_node_efl_gfx_color_color_set(Eo *obj EINA_UNUSED,
Efl_Canvas_VG_Node_Data *pd, Efl_Canvas_Vg_Node_Data *pd,
int r, int g, int b, int a) int r, int g, int b, int a)
{ {
if (r > 255) r = 255; if (r > 255) r = 255;
@ -156,7 +156,7 @@ _efl_canvas_vg_node_efl_gfx_color_color_set(Eo *obj EINA_UNUSED,
static void static void
_efl_canvas_vg_node_efl_gfx_color_color_get(const Eo *obj EINA_UNUSED, _efl_canvas_vg_node_efl_gfx_color_color_get(const Eo *obj EINA_UNUSED,
Efl_Canvas_VG_Node_Data *pd, Efl_Canvas_Vg_Node_Data *pd,
int *r, int *g, int *b, int *a) int *r, int *g, int *b, int *a)
{ {
if (r) *r = pd->r; if (r) *r = pd->r;
@ -167,7 +167,7 @@ _efl_canvas_vg_node_efl_gfx_color_color_get(const Eo *obj EINA_UNUSED,
static void static void
_efl_canvas_vg_node_mask_set(Eo *obj EINA_UNUSED, _efl_canvas_vg_node_mask_set(Eo *obj EINA_UNUSED,
Efl_Canvas_VG_Node_Data *pd, Efl_Canvas_Vg_Node_Data *pd,
Efl_VG *r) Efl_VG *r)
{ {
Efl_VG *tmp = pd->mask; Efl_VG *tmp = pd->mask;
@ -179,13 +179,13 @@ _efl_canvas_vg_node_mask_set(Eo *obj EINA_UNUSED,
} }
static Efl_VG* static Efl_VG*
_efl_canvas_vg_node_mask_get(const Eo *obj EINA_UNUSED, Efl_Canvas_VG_Node_Data *pd) _efl_canvas_vg_node_mask_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Node_Data *pd)
{ {
return pd->mask; return pd->mask;
} }
static Eina_Size2D static Eina_Size2D
_efl_canvas_vg_node_efl_gfx_size_get(const Eo *obj, Efl_Canvas_VG_Node_Data *pd EINA_UNUSED) _efl_canvas_vg_node_efl_gfx_size_get(const Eo *obj, Efl_Canvas_Vg_Node_Data *pd EINA_UNUSED)
{ {
Eina_Rect r; Eina_Rect r;
@ -194,7 +194,7 @@ _efl_canvas_vg_node_efl_gfx_size_get(const Eo *obj, Efl_Canvas_VG_Node_Data *pd
} }
EOLIAN static Eina_Rect EOLIAN static Eina_Rect
_efl_canvas_vg_node_efl_gfx_geometry_get(const Eo *obj, Efl_Canvas_VG_Node_Data *pd EINA_UNUSED) _efl_canvas_vg_node_efl_gfx_geometry_get(const Eo *obj, Efl_Canvas_Vg_Node_Data *pd EINA_UNUSED)
{ {
Eina_Rect r; Eina_Rect r;
r.pos = efl_gfx_position_get(obj); 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
static Eina_Bool static Eina_Bool
_efl_canvas_vg_node_parent_checked_get(Eo *obj, _efl_canvas_vg_node_parent_checked_get(Eo *obj,
Eo **parent, Eo **parent,
Efl_Canvas_VG_Container_Data **cd) Efl_Canvas_Vg_Container_Data **cd)
{ {
*cd = NULL; *cd = NULL;
*parent = efl_parent_get(obj); *parent = efl_parent_get(obj);
@ -220,7 +220,7 @@ _efl_canvas_vg_node_parent_checked_get(Eo *obj,
goto on_error; goto on_error;
} }
} }
else if (efl_isa(*parent, EFL_CANVAS_VG_CLASS)) else if (efl_isa(*parent, EFL_CANVAS_VG_OBJECT_CLASS))
{ {
*cd = NULL; *cd = NULL;
*parent = NULL; *parent = NULL;
@ -241,9 +241,9 @@ _efl_canvas_vg_node_parent_checked_get(Eo *obj,
static Eo * static Eo *
_efl_canvas_vg_node_efl_object_constructor(Eo *obj, _efl_canvas_vg_node_efl_object_constructor(Eo *obj,
Efl_Canvas_VG_Node_Data *pd) Efl_Canvas_Vg_Node_Data *pd)
{ {
Efl_Canvas_VG_Container_Data *cd = NULL; Efl_Canvas_Vg_Container_Data *cd = NULL;
Eo *parent; Eo *parent;
obj = efl_constructor(efl_super(obj, MY_CLASS)); obj = efl_constructor(efl_super(obj, MY_CLASS));
@ -261,7 +261,7 @@ _efl_canvas_vg_node_efl_object_constructor(Eo *obj,
} }
static void static void
_efl_canvas_vg_node_efl_object_invalidate(Eo *obj, Efl_Canvas_VG_Node_Data *pd) _efl_canvas_vg_node_efl_object_invalidate(Eo *obj, Efl_Canvas_Vg_Node_Data *pd)
{ {
if (pd->renderer) if (pd->renderer)
{ {
@ -273,7 +273,7 @@ _efl_canvas_vg_node_efl_object_invalidate(Eo *obj, Efl_Canvas_VG_Node_Data *pd)
} }
static void static void
_efl_canvas_vg_node_efl_object_destructor(Eo *obj, Efl_Canvas_VG_Node_Data *pd) _efl_canvas_vg_node_efl_object_destructor(Eo *obj, Efl_Canvas_Vg_Node_Data *pd)
{ {
if (pd->m) if (pd->m)
{ {
@ -290,7 +290,7 @@ _efl_canvas_vg_node_efl_object_destructor(Eo *obj, Efl_Canvas_VG_Node_Data *pd)
} }
static void static void
_efl_canvas_vg_node_name_insert(Eo *obj, Efl_Canvas_VG_Container_Data *cd) _efl_canvas_vg_node_name_insert(Eo *obj, Efl_Canvas_Vg_Container_Data *cd)
{ {
Eo *set; Eo *set;
const char *name = efl_name_get(efl_super(obj, MY_CLASS)); 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)
} }
static void static void
_efl_canvas_vg_node_efl_object_name_set(Eo *obj, Efl_Canvas_VG_Node_Data *pd EINA_UNUSED, const char *name) _efl_canvas_vg_node_efl_object_name_set(Eo *obj, Efl_Canvas_Vg_Node_Data *pd EINA_UNUSED, const char *name)
{ {
Efl_Canvas_VG_Container_Data *cd = NULL; Efl_Canvas_Vg_Container_Data *cd = NULL;
Eo *parent = NULL; Eo *parent = NULL;
const char *pname = efl_name_get(obj); const char *pname = efl_name_get(obj);
@ -329,11 +329,11 @@ _efl_canvas_vg_node_efl_object_name_set(Eo *obj, Efl_Canvas_VG_Node_Data *pd EIN
static void static void
_efl_canvas_vg_node_efl_object_parent_set(Eo *obj, _efl_canvas_vg_node_efl_object_parent_set(Eo *obj,
Efl_Canvas_VG_Node_Data *pd EINA_UNUSED, Efl_Canvas_Vg_Node_Data *pd EINA_UNUSED,
Eo *parent) Eo *parent)
{ {
Efl_Canvas_VG_Container_Data *cd = NULL; Efl_Canvas_Vg_Container_Data *cd = NULL;
Efl_Canvas_VG_Container_Data *old_cd = NULL; Efl_Canvas_Vg_Container_Data *old_cd = NULL;
Eo *old_parent = NULL; Eo *old_parent = NULL;
Eina_Bool parent_container = EINA_TRUE; Eina_Bool parent_container = EINA_TRUE;
@ -346,7 +346,7 @@ _efl_canvas_vg_node_efl_object_parent_set(Eo *obj,
goto on_error; goto on_error;
} }
} }
else if (efl_isa(parent, EFL_CANVAS_VG_CLASS)) else if (efl_isa(parent, EFL_CANVAS_VG_OBJECT_CLASS))
{ {
parent_container = EINA_FALSE; parent_container = EINA_FALSE;
} }
@ -389,9 +389,9 @@ _efl_canvas_vg_node_efl_object_parent_set(Eo *obj,
} }
static void static void
_efl_canvas_vg_node_efl_gfx_stack_raise(Eo *obj, Efl_Canvas_VG_Node_Data *pd EINA_UNUSED) _efl_canvas_vg_node_efl_gfx_stack_raise(Eo *obj, Efl_Canvas_Vg_Node_Data *pd EINA_UNUSED)
{ {
Efl_Canvas_VG_Container_Data *cd; Efl_Canvas_Vg_Container_Data *cd;
Eina_List *lookup, *next; Eina_List *lookup, *next;
Eo *parent; Eo *parent;
@ -418,10 +418,10 @@ _efl_canvas_vg_node_efl_gfx_stack_raise(Eo *obj, Efl_Canvas_VG_Node_Data *pd EIN
static void static void
_efl_canvas_vg_node_efl_gfx_stack_stack_above(Eo *obj, _efl_canvas_vg_node_efl_gfx_stack_stack_above(Eo *obj,
Efl_Canvas_VG_Node_Data *pd EINA_UNUSED, Efl_Canvas_Vg_Node_Data *pd EINA_UNUSED,
Efl_Gfx_Stack *above) Efl_Gfx_Stack *above)
{ {
Efl_Canvas_VG_Container_Data *cd; Efl_Canvas_Vg_Container_Data *cd;
Eina_List *lookup, *ref; Eina_List *lookup, *ref;
Eo *parent; Eo *parent;
@ -448,10 +448,10 @@ _efl_canvas_vg_node_efl_gfx_stack_stack_above(Eo *obj,
static void static void
_efl_canvas_vg_node_efl_gfx_stack_stack_below(Eo *obj, _efl_canvas_vg_node_efl_gfx_stack_stack_below(Eo *obj,
Efl_Canvas_VG_Node_Data *pd EINA_UNUSED, Efl_Canvas_Vg_Node_Data *pd EINA_UNUSED,
Efl_Gfx_Stack *below) Efl_Gfx_Stack *below)
{ {
Efl_Canvas_VG_Container_Data *cd; Efl_Canvas_Vg_Container_Data *cd;
Eina_List *lookup, *ref; Eina_List *lookup, *ref;
Eo *parent; Eo *parent;
@ -477,9 +477,9 @@ _efl_canvas_vg_node_efl_gfx_stack_stack_below(Eo *obj,
} }
static void static void
_efl_canvas_vg_node_efl_gfx_stack_lower(Eo *obj, Efl_Canvas_VG_Node_Data *pd EINA_UNUSED) _efl_canvas_vg_node_efl_gfx_stack_lower(Eo *obj, Efl_Canvas_Vg_Node_Data *pd EINA_UNUSED)
{ {
Efl_Canvas_VG_Container_Data *cd; Efl_Canvas_Vg_Container_Data *cd;
Eina_List *lookup, *prev; Eina_List *lookup, *prev;
Eo *parent; Eo *parent;
@ -527,7 +527,7 @@ _efl_canvas_vg_node_walk_down_at(const Eo *root, Eina_Array *a, Eina_Rectangle *
if (efl_isa(root, EFL_CANVAS_VG_CONTAINER_CLASS)) if (efl_isa(root, EFL_CANVAS_VG_CONTAINER_CLASS))
{ {
Efl_Canvas_VG_Container_Data *cd; Efl_Canvas_Vg_Container_Data *cd;
Eina_List *l; Eina_List *l;
Eo *child; Eo *child;
@ -549,7 +549,7 @@ _efl_canvas_vg_node_object_at(const Eo *obj, Eina_Array *a, Eina_Rectangle *r)
} }
static Efl_Gfx_Stack * static Efl_Gfx_Stack *
_efl_canvas_vg_node_efl_gfx_stack_below_get(const Eo *obj, Efl_Canvas_VG_Node_Data *pd EINA_UNUSED) _efl_canvas_vg_node_efl_gfx_stack_below_get(const Eo *obj, Efl_Canvas_Vg_Node_Data *pd EINA_UNUSED)
{ {
Eina_Rect r; Eina_Rect r;
Eina_Array a; Eina_Array a;
@ -579,7 +579,7 @@ _efl_canvas_vg_node_efl_gfx_stack_below_get(const Eo *obj, Efl_Canvas_VG_Node_Da
} }
static Efl_Gfx_Stack * static Efl_Gfx_Stack *
_efl_canvas_vg_node_efl_gfx_stack_above_get(const Eo *obj, Efl_Canvas_VG_Node_Data *pd EINA_UNUSED) _efl_canvas_vg_node_efl_gfx_stack_above_get(const Eo *obj, Efl_Canvas_Vg_Node_Data *pd EINA_UNUSED)
{ {
Eina_Rect r; Eina_Rect r;
Eina_Array a; Eina_Array a;
@ -607,15 +607,15 @@ _efl_canvas_vg_node_efl_gfx_stack_above_get(const Eo *obj, Efl_Canvas_VG_Node_Da
return above; return above;
} }
static Efl_Canvas_VG_Interpolation * static Efl_Canvas_Vg_Interpolation *
_efl_canvas_vg_node_interpolation_get(Efl_Canvas_VG_Node_Data *pd) _efl_canvas_vg_node_interpolation_get(Efl_Canvas_Vg_Node_Data *pd)
{ {
Eina_Matrix4 m; Eina_Matrix4 m;
if (!pd->m) return NULL; if (!pd->m) return NULL;
if (pd->intp) return pd->intp; if (pd->intp) return pd->intp;
pd->intp = calloc(1, sizeof (Efl_Canvas_VG_Interpolation)); pd->intp = calloc(1, sizeof (Efl_Canvas_Vg_Interpolation));
if (!pd->intp) return NULL; if (!pd->intp) return NULL;
eina_matrix3_matrix4_to(&m, pd->m); eina_matrix3_matrix4_to(&m, pd->m);
@ -646,10 +646,10 @@ _efl_canvas_vg_node_interpolate_point(Eina_Point_3D *d,
static Eina_Bool static Eina_Bool
_efl_canvas_vg_node_efl_gfx_path_interpolate(Eo *obj, _efl_canvas_vg_node_efl_gfx_path_interpolate(Eo *obj,
Efl_Canvas_VG_Node_Data *pd, const Efl_VG *from, const Efl_VG *to, Efl_Canvas_Vg_Node_Data *pd, const Efl_VG *from, const Efl_VG *to,
double pos_map) double pos_map)
{ {
Efl_Canvas_VG_Node_Data *fromd, *tod; Efl_Canvas_Vg_Node_Data *fromd, *tod;
double from_map; double from_map;
Eina_Bool r = EINA_TRUE; Eina_Bool r = EINA_TRUE;
@ -665,8 +665,8 @@ _efl_canvas_vg_node_efl_gfx_path_interpolate(Eo *obj,
if (!pd->m) pd->m = malloc(sizeof (Eina_Matrix3)); if (!pd->m) pd->m = malloc(sizeof (Eina_Matrix3));
if (pd->m) if (pd->m)
{ {
const Efl_Canvas_VG_Interpolation *fi, *ti; const Efl_Canvas_Vg_Interpolation *fi, *ti;
Efl_Canvas_VG_Interpolation result; Efl_Canvas_Vg_Interpolation result;
Eina_Matrix4 m; Eina_Matrix4 m;
fi = _efl_canvas_vg_node_interpolation_get(fromd); fi = _efl_canvas_vg_node_interpolation_get(fromd);
@ -724,10 +724,10 @@ _efl_canvas_vg_node_efl_gfx_path_interpolate(Eo *obj,
} }
EOLIAN static Efl_VG * EOLIAN static Efl_VG *
_efl_canvas_vg_node_efl_duplicate_duplicate(const Eo *obj, Efl_Canvas_VG_Node_Data *pd) _efl_canvas_vg_node_efl_duplicate_duplicate(const Eo *obj, Efl_Canvas_Vg_Node_Data *pd)
{ {
Efl_VG *cn; Efl_VG *cn;
Efl_Canvas_VG_Node_Data *cd; Efl_Canvas_Vg_Node_Data *cd;
cn = efl_add(efl_class_get(obj), NULL); cn = efl_add(efl_class_get(obj), NULL);
cd = efl_data_scope_get(cn, MY_CLASS); cd = efl_data_scope_get(cn, MY_CLASS);

View File

@ -3,13 +3,13 @@
#include <Ector.h> #include <Ector.h>
typedef struct _Efl_Canvas_VG_Node_Data Efl_Canvas_VG_Node_Data; typedef struct _Efl_Canvas_Vg_Node_Data Efl_Canvas_Vg_Node_Data;
typedef struct _Efl_Canvas_VG_Container_Data Efl_Canvas_VG_Container_Data; typedef struct _Efl_Canvas_Vg_Container_Data Efl_Canvas_Vg_Container_Data;
typedef struct _Efl_Canvas_VG_Gradient_Data Efl_Canvas_VG_Gradient_Data; typedef struct _Efl_Canvas_Vg_Gradient_Data Efl_Canvas_Vg_Gradient_Data;
typedef struct _Efl_Canvas_VG_Interpolation Efl_Canvas_VG_Interpolation; typedef struct _Efl_Canvas_Vg_Interpolation Efl_Canvas_Vg_Interpolation;
typedef struct _Efl_Canvas_Vg_Data Efl_Canvas_Vg_Data; typedef struct _Efl_Canvas_Vg_Object_Data Efl_Canvas_Vg_Object_Data;
typedef struct _Evas_Cache_Vg_Entry Evas_Cache_Vg_Entry; typedef struct _Evas_Cache_Vg_Entry Evas_Cache_Vg_Entry;
typedef struct _Evas_Cache_Vg Evas_Cache_Vg; typedef struct _Evas_Cache_Vg Evas_Cache_Vg;
@ -39,7 +39,7 @@ typedef struct _User_Vg_Entry
Efl_VG *root; Efl_VG *root;
}User_Vg_Entry; // holds the vg tree info set by the user }User_Vg_Entry; // holds the vg tree info set by the user
struct _Efl_Canvas_Vg_Data struct _Efl_Canvas_Vg_Object_Data
{ {
void *engine_data; void *engine_data;
Efl_VG *root; Efl_VG *root;
@ -54,15 +54,15 @@ struct _Efl_Canvas_Vg_Data
Eina_Bool changed; Eina_Bool changed;
}; };
struct _Efl_Canvas_VG_Node_Data struct _Efl_Canvas_Vg_Node_Data
{ {
Eina_Matrix3 *m; Eina_Matrix3 *m;
Efl_Canvas_VG_Interpolation *intp; Efl_Canvas_Vg_Interpolation *intp;
Efl_Canvas_VG_Node *mask; Efl_Canvas_Vg_Node *mask;
Ector_Renderer *renderer; Ector_Renderer *renderer;
void (*render_pre)(Eo *obj, Eina_Matrix3 *parent, Ector_Surface *s, void *data, Efl_Canvas_VG_Node_Data *nd); void (*render_pre)(Eo *obj, Eina_Matrix3 *parent, Ector_Surface *s, void *data, Efl_Canvas_Vg_Node_Data *nd);
void *data; void *data;
double x, y; double x, y;
@ -73,14 +73,14 @@ struct _Efl_Canvas_VG_Node_Data
Eina_Bool changed : 1; Eina_Bool changed : 1;
}; };
struct _Efl_Canvas_VG_Container_Data struct _Efl_Canvas_Vg_Container_Data
{ {
Eina_List *children; Eina_List *children;
Eina_Hash *names; Eina_Hash *names;
}; };
struct _Efl_Canvas_VG_Gradient_Data struct _Efl_Canvas_Vg_Gradient_Data
{ {
// FIXME: Later on we should deduplicate it somehow (Using Ector ?). // FIXME: Later on we should deduplicate it somehow (Using Ector ?).
Efl_Gfx_Gradient_Stop *colors; Efl_Gfx_Gradient_Stop *colors;
@ -89,7 +89,7 @@ struct _Efl_Canvas_VG_Gradient_Data
Efl_Gfx_Gradient_Spread s; Efl_Gfx_Gradient_Spread s;
}; };
struct _Efl_Canvas_VG_Interpolation struct _Efl_Canvas_Vg_Interpolation
{ {
Eina_Quaternion rotation; Eina_Quaternion rotation;
Eina_Quaternion perspective; Eina_Quaternion perspective;
@ -108,10 +108,10 @@ Vg_File_Data * evas_cache_vg_file_info(const char *file, const char
Eina_Bool evas_vg_save_to_file(Vg_File_Data *evg_data, const char *file, const char *key, const char *flags); Eina_Bool evas_vg_save_to_file(Vg_File_Data *evg_data, const char *file, const char *key, const char *flags);
static inline Efl_Canvas_VG_Node_Data * static inline Efl_Canvas_Vg_Node_Data *
_evas_vg_render_pre(Efl_VG *child, Ector_Surface *s, Eina_Matrix3 *m) _evas_vg_render_pre(Efl_VG *child, Ector_Surface *s, Eina_Matrix3 *m)
{ {
Efl_Canvas_VG_Node_Data *child_nd = NULL; Efl_Canvas_Vg_Node_Data *child_nd = NULL;
// FIXME: Prevent infinite loop // FIXME: Prevent infinite loop
if (child) if (child)

View File

@ -5,14 +5,14 @@
#define MY_CLASS EFL_CANVAS_VG_SHAPE_CLASS #define MY_CLASS EFL_CANVAS_VG_SHAPE_CLASS
typedef struct _Efl_Canvas_VG_Shape_Data Efl_Canvas_VG_Shape_Data; typedef struct _Efl_Canvas_Vg_Shape_Data Efl_Canvas_Vg_Shape_Data;
struct _Efl_Canvas_VG_Shape_Data struct _Efl_Canvas_Vg_Shape_Data
{ {
Efl_Canvas_VG_Node *fill; Efl_Canvas_Vg_Node *fill;
struct { struct {
Efl_Canvas_VG_Node *fill; Efl_Canvas_Vg_Node *fill;
Efl_Canvas_VG_Node *marker; Efl_Canvas_Vg_Node *marker;
} stroke; } stroke;
}; };
@ -20,10 +20,10 @@ struct _Efl_Canvas_VG_Shape_Data
static void static void
_efl_canvas_vg_shape_fill_set(Eo *obj EINA_UNUSED, _efl_canvas_vg_shape_fill_set(Eo *obj EINA_UNUSED,
Efl_Canvas_VG_Shape_Data *pd, Efl_Canvas_Vg_Shape_Data *pd,
Efl_Canvas_VG_Node *f) Efl_Canvas_Vg_Node *f)
{ {
Efl_Canvas_VG_Node *tmp = pd->fill; Efl_Canvas_Vg_Node *tmp = pd->fill;
pd->fill = efl_ref(f); pd->fill = efl_ref(f);
efl_unref(tmp); efl_unref(tmp);
@ -31,18 +31,18 @@ _efl_canvas_vg_shape_fill_set(Eo *obj EINA_UNUSED,
_efl_canvas_vg_node_changed(obj); _efl_canvas_vg_node_changed(obj);
} }
static Efl_Canvas_VG_Node * static Efl_Canvas_Vg_Node *
_efl_canvas_vg_shape_fill_get(const Eo *obj EINA_UNUSED, Efl_Canvas_VG_Shape_Data *pd) _efl_canvas_vg_shape_fill_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Shape_Data *pd)
{ {
return pd->fill; return pd->fill;
} }
static void static void
_efl_canvas_vg_shape_stroke_fill_set(Eo *obj EINA_UNUSED, _efl_canvas_vg_shape_stroke_fill_set(Eo *obj EINA_UNUSED,
Efl_Canvas_VG_Shape_Data *pd, Efl_Canvas_Vg_Shape_Data *pd,
Efl_Canvas_VG_Node *f) Efl_Canvas_Vg_Node *f)
{ {
Efl_Canvas_VG_Node *tmp = pd->fill; Efl_Canvas_Vg_Node *tmp = pd->fill;
pd->stroke.fill = efl_ref(f); pd->stroke.fill = efl_ref(f);
efl_unref(tmp); efl_unref(tmp);
@ -50,19 +50,19 @@ _efl_canvas_vg_shape_stroke_fill_set(Eo *obj EINA_UNUSED,
_efl_canvas_vg_node_changed(obj); _efl_canvas_vg_node_changed(obj);
} }
static Efl_Canvas_VG_Node * static Efl_Canvas_Vg_Node *
_efl_canvas_vg_shape_stroke_fill_get(const Eo *obj EINA_UNUSED, _efl_canvas_vg_shape_stroke_fill_get(const Eo *obj EINA_UNUSED,
Efl_Canvas_VG_Shape_Data *pd) Efl_Canvas_Vg_Shape_Data *pd)
{ {
return pd->stroke.fill; return pd->stroke.fill;
} }
static void static void
_efl_canvas_vg_shape_stroke_marker_set(Eo *obj EINA_UNUSED, _efl_canvas_vg_shape_stroke_marker_set(Eo *obj EINA_UNUSED,
Efl_Canvas_VG_Shape_Data *pd, Efl_Canvas_Vg_Shape_Data *pd,
Efl_Canvas_VG_Shape *m) Efl_Canvas_Vg_Shape *m)
{ {
Efl_Canvas_VG_Node *tmp = pd->stroke.marker; Efl_Canvas_Vg_Node *tmp = pd->stroke.marker;
pd->stroke.marker = efl_ref(m); pd->stroke.marker = efl_ref(m);
efl_unref(tmp); efl_unref(tmp);
@ -70,9 +70,9 @@ _efl_canvas_vg_shape_stroke_marker_set(Eo *obj EINA_UNUSED,
_efl_canvas_vg_node_changed(obj); _efl_canvas_vg_node_changed(obj);
} }
static Efl_Canvas_VG_Shape * static Efl_Canvas_Vg_Shape *
_efl_canvas_vg_shape_stroke_marker_get(const Eo *obj EINA_UNUSED, _efl_canvas_vg_shape_stroke_marker_get(const Eo *obj EINA_UNUSED,
Efl_Canvas_VG_Shape_Data *pd) Efl_Canvas_Vg_Shape_Data *pd)
{ {
return pd->stroke.marker; return pd->stroke.marker;
} }
@ -82,10 +82,10 @@ _efl_canvas_vg_shape_render_pre(Eo *obj EINA_UNUSED,
Eina_Matrix3 *parent, Eina_Matrix3 *parent,
Ector_Surface *s, Ector_Surface *s,
void *data, void *data,
Efl_Canvas_VG_Node_Data *nd) Efl_Canvas_Vg_Node_Data *nd)
{ {
Efl_Canvas_VG_Shape_Data *pd = data; Efl_Canvas_Vg_Shape_Data *pd = data;
Efl_Canvas_VG_Node_Data *fill, *stroke_fill, *stroke_marker, *mask; Efl_Canvas_Vg_Node_Data *fill, *stroke_fill, *stroke_marker, *mask;
if (nd->flags == EFL_GFX_CHANGE_FLAG_NONE) return ; if (nd->flags == EFL_GFX_CHANGE_FLAG_NONE) return ;
@ -118,9 +118,9 @@ _efl_canvas_vg_shape_render_pre(Eo *obj EINA_UNUSED,
} }
static Eo * static Eo *
_efl_canvas_vg_shape_efl_object_constructor(Eo *obj, Efl_Canvas_VG_Shape_Data *pd) _efl_canvas_vg_shape_efl_object_constructor(Eo *obj, Efl_Canvas_Vg_Shape_Data *pd)
{ {
Efl_Canvas_VG_Node_Data *nd; Efl_Canvas_Vg_Node_Data *nd;
obj = efl_constructor(efl_super(obj, MY_CLASS)); obj = efl_constructor(efl_super(obj, MY_CLASS));
@ -137,7 +137,7 @@ _efl_canvas_vg_shape_efl_object_constructor(Eo *obj, Efl_Canvas_VG_Shape_Data *p
} }
static void static void
_efl_canvas_vg_shape_efl_object_destructor(Eo *obj, Efl_Canvas_VG_Shape_Data *pd EINA_UNUSED) _efl_canvas_vg_shape_efl_object_destructor(Eo *obj, Efl_Canvas_Vg_Shape_Data *pd EINA_UNUSED)
{ {
efl_gfx_path_reset(obj); efl_gfx_path_reset(obj);
efl_destructor(efl_super(obj, MY_CLASS)); 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
static Eina_Bool static Eina_Bool
_efl_canvas_vg_shape_efl_gfx_path_interpolate(Eo *obj, _efl_canvas_vg_shape_efl_gfx_path_interpolate(Eo *obj,
Efl_Canvas_VG_Shape_Data *pd, Efl_Canvas_Vg_Shape_Data *pd,
const Efl_Canvas_VG_Node *from, const Efl_Canvas_VG_Node *to, const Efl_Canvas_Vg_Node *from, const Efl_Canvas_Vg_Node *to,
double pos_map) double pos_map)
{ {
Efl_Canvas_VG_Shape_Data *fromd, *tod; Efl_Canvas_Vg_Shape_Data *fromd, *tod;
Eina_Bool r; Eina_Bool r;
fromd = efl_data_scope_get(from, EFL_CANVAS_VG_SHAPE_CLASS); 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,
} }
EOLIAN static Efl_Canvas_VG_Node * EOLIAN static Efl_Canvas_Vg_Node *
_efl_canvas_vg_shape_efl_duplicate_duplicate(const Eo *obj, Efl_Canvas_VG_Shape_Data *pd) _efl_canvas_vg_shape_efl_duplicate_duplicate(const Eo *obj, Efl_Canvas_Vg_Shape_Data *pd)
{ {
Efl_Canvas_VG_Node *cn = NULL; Efl_Canvas_Vg_Node *cn = NULL;
Efl_Canvas_VG_Shape_Data *cd = NULL; Efl_Canvas_Vg_Shape_Data *cd = NULL;
cn = efl_duplicate(efl_super(obj, MY_CLASS)); cn = efl_duplicate(efl_super(obj, MY_CLASS));
cd = efl_data_scope_get(cn, MY_CLASS); cd = efl_data_scope_get(cn, MY_CLASS);
@ -403,8 +403,8 @@ evas_vg_shape_equal_commands(Eo *obj, const Eo *with)
return efl_gfx_path_equal_commands(obj, with); return efl_gfx_path_equal_commands(obj, with);
} }
EAPI Efl_Canvas_VG_Node* EAPI Efl_Canvas_Vg_Node*
evas_vg_shape_add(Efl_Canvas_VG_Node *parent) evas_vg_shape_add(Efl_Canvas_Vg_Node *parent)
{ {
return efl_add(EFL_CANVAS_VG_SHAPE_CLASS, parent); return efl_add(EFL_CANVAS_VG_SHAPE_CLASS, parent);
} }