diff --git a/src/Makefile_Ector.am b/src/Makefile_Ector.am index 1bbd35adc4..f907ee17d1 100644 --- a/src/Makefile_Ector.am +++ b/src/Makefile_Ector.am @@ -1,12 +1,12 @@ ### Library ector_eolian_files = \ - lib/ector/ector_surface.eo \ - lib/ector/ector_renderer_base.eo \ - lib/ector/ector_renderer_shape.eo \ - lib/ector/ector_renderer_gradient.eo \ - lib/ector/ector_renderer_gradient_radial.eo \ - lib/ector/ector_renderer_gradient_linear.eo + lib/ector/ector_generic_surface.eo \ + lib/ector/ector_renderer_generic_base.eo \ + lib/ector/ector_renderer_generic_shape.eo \ + lib/ector/ector_renderer_generic_gradient.eo \ + lib/ector/ector_renderer_generic_gradient_radial.eo \ + lib/ector/ector_renderer_generic_gradient_linear.eo ector_eolian_c = $(ector_eolian_files:%.eo=%.eo.c) ector_eolian_h = $(ector_eolian_files:%.eo=%.eo.h) diff --git a/src/lib/ector/ector_surface.eo b/src/lib/ector/ector_generic_surface.eo similarity index 94% rename from src/lib/ector/ector_surface.eo rename to src/lib/ector/ector_generic_surface.eo index 36dd9981a2..c852943843 100644 --- a/src/lib/ector/ector_surface.eo +++ b/src/lib/ector/ector_generic_surface.eo @@ -1,4 +1,4 @@ -abstract Ector.Surface (Eo.Base) +abstract Ector.Generic.Surface (Eo.Base) { eo_prefix: ector_surface; properties { diff --git a/src/lib/ector/ector_renderer.h b/src/lib/ector/ector_renderer.h index 4901eb1d10..4c69a41cce 100644 --- a/src/lib/ector/ector_renderer.h +++ b/src/lib/ector/ector_renderer.h @@ -1,10 +1,10 @@ #ifndef ECTOR_RENDERER_H #define ECTOR_RENDERER_H -#include "ector_renderer_base.eo.h" -#include "ector_renderer_shape.eo.h" -#include "ector_renderer_gradient.eo.h" -#include "ector_renderer_gradient_linear.eo.h" -#include "ector_renderer_gradient_radial.eo.h" +#include "ector_renderer_generic_base.eo.h" +#include "ector_renderer_generic_shape.eo.h" +#include "ector_renderer_generic_gradient.eo.h" +#include "ector_renderer_generic_gradient_linear.eo.h" +#include "ector_renderer_generic_gradient_radial.eo.h" #endif diff --git a/src/lib/ector/ector_renderer_base.c b/src/lib/ector/ector_renderer_base.c index b39b7372e2..e2a88d25d7 100644 --- a/src/lib/ector/ector_renderer_base.c +++ b/src/lib/ector/ector_renderer_base.c @@ -7,8 +7,8 @@ #include "ector_private.h" -typedef struct _Ector_Renderer_Base_Data Ector_Renderer_Base_Data; -struct _Ector_Renderer_Base_Data +typedef struct _Ector_Renderer_Generic_Base_Data Ector_Renderer_Generic_Base_Data; +struct _Ector_Renderer_Generic_Base_Data { Eina_Matrix3 *m; @@ -29,7 +29,7 @@ struct _Ector_Renderer_Base_Data void _ector_renderer_base_transformation_set(Eo *obj EINA_UNUSED, - Ector_Renderer_Base_Data *pd, + Ector_Renderer_Generic_Base_Data *pd, const Eina_Matrix3 *m) { Eina_Matrix3 *tmp = pd->m; @@ -53,14 +53,14 @@ _ector_renderer_base_transformation_set(Eo *obj EINA_UNUSED, const Eina_Matrix3 * _ector_renderer_base_transformation_get(Eo *obj EINA_UNUSED, - Ector_Renderer_Base_Data *pd) + Ector_Renderer_Generic_Base_Data *pd) { return pd->m; } void _ector_renderer_base_origin_set(Eo *obj EINA_UNUSED, - Ector_Renderer_Base_Data *pd, + Ector_Renderer_Generic_Base_Data *pd, double x, double y) { pd->origin.x = x; @@ -69,7 +69,7 @@ _ector_renderer_base_origin_set(Eo *obj EINA_UNUSED, void _ector_renderer_base_origin_get(Eo *obj EINA_UNUSED, - Ector_Renderer_Base_Data *pd, + Ector_Renderer_Generic_Base_Data *pd, double *x, double *y) { if (x) *x = pd->origin.x; @@ -78,7 +78,7 @@ _ector_renderer_base_origin_get(Eo *obj EINA_UNUSED, void _ector_renderer_base_visibility_set(Eo *obj EINA_UNUSED, - Ector_Renderer_Base_Data *pd, + Ector_Renderer_Generic_Base_Data *pd, Eina_Bool v) { pd->visibility = v; @@ -86,14 +86,14 @@ _ector_renderer_base_visibility_set(Eo *obj EINA_UNUSED, Eina_Bool _ector_renderer_base_visibility_get(Eo *obj EINA_UNUSED, - Ector_Renderer_Base_Data *pd) + Ector_Renderer_Generic_Base_Data *pd) { return pd->visibility; } void _ector_renderer_base_color_set(Eo *obj EINA_UNUSED, - Ector_Renderer_Base_Data *pd, + Ector_Renderer_Generic_Base_Data *pd, int r, int g, int b, int a) { pd->color.r = r; @@ -104,7 +104,7 @@ _ector_renderer_base_color_set(Eo *obj EINA_UNUSED, void _ector_renderer_base_color_get(Eo *obj EINA_UNUSED, - Ector_Renderer_Base_Data *pd, + Ector_Renderer_Generic_Base_Data *pd, int *r, int *g, int *b, int *a) { if (r) *r = pd->color.r; @@ -115,7 +115,7 @@ _ector_renderer_base_color_get(Eo *obj EINA_UNUSED, void _ector_renderer_base_mask_set(Eo *obj EINA_UNUSED, - Ector_Renderer_Base_Data *pd, + Ector_Renderer_Generic_Base_Data *pd, Ector_Renderer *r) { _ector_renderer_replace(&pd->mask, r); @@ -123,14 +123,14 @@ _ector_renderer_base_mask_set(Eo *obj EINA_UNUSED, Ector_Renderer * _ector_renderer_base_mask_get(Eo *obj EINA_UNUSED, - Ector_Renderer_Base_Data *pd) + Ector_Renderer_Generic_Base_Data *pd) { return pd->mask; } void _ector_renderer_base_quality_set(Eo *obj EINA_UNUSED, - Ector_Renderer_Base_Data *pd, + Ector_Renderer_Generic_Base_Data *pd, Ector_Quality q) { pd->q = q; @@ -138,33 +138,33 @@ _ector_renderer_base_quality_set(Eo *obj EINA_UNUSED, Ector_Quality _ector_renderer_base_quality_get(Eo *obj EINA_UNUSED, - Ector_Renderer_Base_Data *pd) + Ector_Renderer_Generic_Base_Data *pd) { return pd->q; } Eina_Bool -_ector_renderer_base_bounds_get(Eo *obj, Ector_Renderer_Base_Data *pd, +_ector_renderer_base_bounds_get(Eo *obj, Ector_Renderer_Generic_Base_Data *pd, Eina_Rectangle **r) { } Eina_Bool -_ector_renderer_base_draw(Eo *obj, Ector_Renderer_Base_Data *pd, +_ector_renderer_base_draw(Eo *obj, Ector_Renderer_Generic_Base_Data *pd, Ector_Surface *s, Ector_Rop op, Eina_Array *clips, int x, int y) { } Eina_Bool -_ector_renderer_base_prepare(Eo *obj, Ector_Renderer_Base_Data *pd, +_ector_renderer_base_prepare(Eo *obj, Ector_Renderer_Generic_Base_Data *pd, Ector_Surface *s) { } Eina_Bool -_ector_renderer_base_done(Eo *obj, Ector_Renderer_Base_Data *pd) +_ector_renderer_base_done(Eo *obj, Ector_Renderer_Generic_Base_Data *pd) { } -#include "ector_renderer_base.eo.c" +#include "ector_renderer_generic_base.eo.c" diff --git a/src/lib/ector/ector_renderer_base.eo b/src/lib/ector/ector_renderer_generic_base.eo similarity index 98% rename from src/lib/ector/ector_renderer_base.eo rename to src/lib/ector/ector_renderer_generic_base.eo index 1e2e9eab8f..4b051b4ba1 100644 --- a/src/lib/ector/ector_renderer_base.eo +++ b/src/lib/ector/ector_renderer_generic_base.eo @@ -1,4 +1,4 @@ -abstract Ector.Renderer.Base (Eo.Base) +abstract Ector.Renderer.Generic.Base (Eo.Base) { eo_prefix: ector_renderer; legacy_prefix: null; diff --git a/src/lib/ector/ector_renderer_gradient.eo b/src/lib/ector/ector_renderer_generic_gradient.eo similarity index 72% rename from src/lib/ector/ector_renderer_gradient.eo rename to src/lib/ector/ector_renderer_generic_gradient.eo index d513b5490d..bd6a9bb70a 100644 --- a/src/lib/ector/ector_renderer_gradient.eo +++ b/src/lib/ector/ector_renderer_generic_gradient.eo @@ -1,4 +1,4 @@ -abstract Ector.Renderer.Gradient (Ector.Renderer.Base, Efl.Graphics.Gradient) +abstract Ector.Renderer.Generic.Gradient (Ector.Renderer.Generic.Base, Efl.Graphics.Gradient) { eo_prefix: ector_renderer_gradient; legacy_prefix: null; diff --git a/src/lib/ector/ector_renderer_gradient_linear.eo b/src/lib/ector/ector_renderer_generic_gradient_linear.eo similarity index 71% rename from src/lib/ector/ector_renderer_gradient_linear.eo rename to src/lib/ector/ector_renderer_generic_gradient_linear.eo index fbe3fef5fd..45bb5e3729 100644 --- a/src/lib/ector/ector_renderer_gradient_linear.eo +++ b/src/lib/ector/ector_renderer_generic_gradient_linear.eo @@ -1,4 +1,4 @@ -abstract Ector.Renderer.Gradient_Linear (Ector.Renderer.Gradient, Efl.Graphics.Gradient_Linear) +abstract Ector.Renderer.Generic.Gradient_Linear (Ector.Renderer.Generic.Gradient, Efl.Graphics.Gradient_Linear) { eo_prefix: ector_renderer_gradient_linear; legacy_prefix: null; diff --git a/src/lib/ector/ector_renderer_gradient_radial.eo b/src/lib/ector/ector_renderer_generic_gradient_radial.eo similarity index 77% rename from src/lib/ector/ector_renderer_gradient_radial.eo rename to src/lib/ector/ector_renderer_generic_gradient_radial.eo index 0067de44e3..50c35bcdb4 100644 --- a/src/lib/ector/ector_renderer_gradient_radial.eo +++ b/src/lib/ector/ector_renderer_generic_gradient_radial.eo @@ -1,4 +1,4 @@ -abstract Ector.Renderer.Gradient_Radial (Ector.Renderer.Gradient, Efl.Graphics.Gradient_Radial) +abstract Ector.Renderer.Generic.Gradient_Radial (Ector.Renderer.Generic.Gradient, Efl.Graphics.Gradient_Radial) { eo_prefix: ector_renderer_gradient_radial; legacy_prefix: null; diff --git a/src/lib/ector/ector_renderer_shape.eo b/src/lib/ector/ector_renderer_generic_shape.eo similarity index 88% rename from src/lib/ector/ector_renderer_shape.eo rename to src/lib/ector/ector_renderer_generic_shape.eo index 4cd46016e0..20cad35771 100644 --- a/src/lib/ector/ector_renderer_shape.eo +++ b/src/lib/ector/ector_renderer_generic_shape.eo @@ -1,4 +1,4 @@ -class Ector.Renderer.Shape (Ector.Renderer.Base, Efl.Graphics.Shape) +class Ector.Renderer.Generic.Shape (Ector.Renderer.Generic.Base, Efl.Graphics.Shape) { eo_prefix: ector_renderer_shape; legacy_prefix: null; @@ -40,7 +40,6 @@ class Ector.Renderer.Shape (Ector.Renderer.Base, Efl.Graphics.Shape) Efl.Graphics.Shape.stroke_cap; Efl.Graphics.Shape.stroke_join; Efl.Graphics.Shape.path_set; - Ector.Renderer.Base.prepare; Eo.Base.constructor; Eo.Base.destructor; } diff --git a/src/lib/ector/ector_renderer_gradient.c b/src/lib/ector/ector_renderer_gradient.c index 7de90413af..610fb93809 100644 --- a/src/lib/ector/ector_renderer_gradient.c +++ b/src/lib/ector/ector_renderer_gradient.c @@ -7,14 +7,14 @@ #include "ector_private.h" -typedef struct _Ector_Renderer_Gradient_Data Ector_Renderer_Gradient_Data; -struct _Ector_Renderer_Gradient_Data +typedef struct _Ector_Renderer_Generic_Gradient_Data Ector_Renderer_Generic_Gradient_Data; +struct _Ector_Renderer_Generic_Gradient_Data { }; void _ector_renderer_gradient_efl_graphics_gradient_stop_set(Eo *obj, - Ector_Renderer_Gradient_Data *pd, + Ector_Renderer_Generic_Gradient_Data *pd, const Efl_Graphics_Gradient_Stop *colors, unsigned int length) { @@ -22,7 +22,7 @@ _ector_renderer_gradient_efl_graphics_gradient_stop_set(Eo *obj, void _ector_renderer_gradient_efl_graphics_gradient_stop_get(Eo *obj, - Ector_Renderer_Gradient_Data *pd, + Ector_Renderer_Generic_Gradient_Data *pd, const Efl_Graphics_Gradient_Stop **colors, unsigned int *length) { @@ -30,16 +30,16 @@ _ector_renderer_gradient_efl_graphics_gradient_stop_get(Eo *obj, void _ector_renderer_gradient_efl_graphics_gradient_spread_set(Eo *obj, - Ector_Renderer_Gradient_Data *pd, + Ector_Renderer_Generic_Gradient_Data *pd, Efl_Graphics_Gradient_Spread s) { } Efl_Graphics_Gradient_Spread _ector_renderer_gradient_efl_graphics_gradient_spread_get(Eo *obj, - Ector_Renderer_Gradient_Data *pd) + Ector_Renderer_Generic_Gradient_Data *pd) { } -#include "ector_renderer_gradient.eo.c" +#include "ector_renderer_generic_gradient.eo.c" diff --git a/src/lib/ector/ector_renderer_gradient_linear.c b/src/lib/ector/ector_renderer_gradient_linear.c index 5ab442dc18..21412ceb59 100644 --- a/src/lib/ector/ector_renderer_gradient_linear.c +++ b/src/lib/ector/ector_renderer_gradient_linear.c @@ -7,8 +7,8 @@ #include "ector_private.h" -typedef struct _Ector_Renderer_Gradient_Linear_Data Ector_Renderer_Gradient_Linear_Data; -struct _Ector_Renderer_Gradient_Linear_Data +typedef struct _Ector_Renderer_Generic_Gradient_Linear_Data Ector_Renderer_Generic_Gradient_Linear_Data; +struct _Ector_Renderer_Generic_Gradient_Linear_Data { struct { double x, y; @@ -17,7 +17,7 @@ struct _Ector_Renderer_Gradient_Linear_Data void _ector_renderer_gradient_linear_efl_graphics_gradient_linear_start_set(Eo *obj EINA_UNUSED, - Ector_Renderer_Gradient_Linear_Data *pd, + Ector_Renderer_Generic_Gradient_Linear_Data *pd, double x, double y) { pd->start.x = x; @@ -26,7 +26,7 @@ _ector_renderer_gradient_linear_efl_graphics_gradient_linear_start_set(Eo *obj E void _ector_renderer_gradient_linear_efl_graphics_gradient_linear_start_get(Eo *obj EINA_UNUSED, - Ector_Renderer_Gradient_Linear_Data *pd, + Ector_Renderer_Generic_Gradient_Linear_Data *pd, double *x, double *y) { if (x) *x = pd->start.x; @@ -35,7 +35,7 @@ _ector_renderer_gradient_linear_efl_graphics_gradient_linear_start_get(Eo *obj E void _ector_renderer_gradient_linear_efl_graphics_gradient_linear_end_set(Eo *obj EINA_UNUSED, - Ector_Renderer_Gradient_Linear_Data *pd, + Ector_Renderer_Generic_Gradient_Linear_Data *pd, double x, double y) { pd->end.x = x; @@ -44,11 +44,11 @@ _ector_renderer_gradient_linear_efl_graphics_gradient_linear_end_set(Eo *obj EIN void _ector_renderer_gradient_linear_efl_graphics_gradient_linear_end_get(Eo *obj EINA_UNUSED, - Ector_Renderer_Gradient_Linear_Data *pd, + Ector_Renderer_Generic_Gradient_Linear_Data *pd, double *x, double *y) { if (x) *x = pd->end.x; if (y) *y = pd->end.y; } -#include "ector_renderer_gradient_linear.eo.c" +#include "ector_renderer_generic_gradient_linear.eo.c" diff --git a/src/lib/ector/ector_renderer_gradient_radial.c b/src/lib/ector/ector_renderer_gradient_radial.c index d813585701..26d3b5dc80 100644 --- a/src/lib/ector/ector_renderer_gradient_radial.c +++ b/src/lib/ector/ector_renderer_gradient_radial.c @@ -7,8 +7,8 @@ #include "ector_private.h" -typedef struct _Ector_Renderer_Gradient_Radial_Data Ector_Renderer_Gradient_Radial_Data; -struct _Ector_Renderer_Gradient_Radial_Data +typedef struct _Ector_Renderer_Generic_Gradient_Radial_Data Ector_Renderer_Generic_Gradient_Radial_Data; +struct _Ector_Renderer_Generic_Gradient_Radial_Data { struct { double x, y; @@ -18,7 +18,7 @@ struct _Ector_Renderer_Gradient_Radial_Data void _ector_renderer_gradient_radial_efl_graphics_gradient_radial_center_set(Eo *obj EINA_UNUSED, - Ector_Renderer_Gradient_Radial_Data *pd, + Ector_Renderer_Generic_Gradient_Radial_Data *pd, double x, double y) { pd->radial.x = x; @@ -27,7 +27,7 @@ _ector_renderer_gradient_radial_efl_graphics_gradient_radial_center_set(Eo *obj void _ector_renderer_gradient_radial_efl_graphics_gradient_radial_center_get(Eo *obj EINA_UNUSED, - Ector_Renderer_Gradient_Radial_Data *pd, + Ector_Renderer_Generic_Gradient_Radial_Data *pd, double *x, double *y) { if (x) *x = pd->radial.x; @@ -36,7 +36,7 @@ _ector_renderer_gradient_radial_efl_graphics_gradient_radial_center_get(Eo *obj void _ector_renderer_gradient_radial_efl_graphics_gradient_radial_radius_set(Eo *obj EINA_UNUSED, - Ector_Renderer_Gradient_Radial_Data *pd, + Ector_Renderer_Generic_Gradient_Radial_Data *pd, double r) { pd->radius = r; @@ -44,7 +44,7 @@ _ector_renderer_gradient_radial_efl_graphics_gradient_radial_radius_set(Eo *obj double _ector_renderer_gradient_radial_efl_graphics_gradient_radial_radius_get(Eo *obj EINA_UNUSED, - Ector_Renderer_Gradient_Radial_Data *pd) + Ector_Renderer_Generic_Gradient_Radial_Data *pd) { return pd->radius; } @@ -52,7 +52,7 @@ _ector_renderer_gradient_radial_efl_graphics_gradient_radial_radius_get(Eo *obj void _ector_renderer_gradient_radial_efl_graphics_gradient_radial_focal_set(Eo *obj EINA_UNUSED, - Ector_Renderer_Gradient_Radial_Data *pd, + Ector_Renderer_Generic_Gradient_Radial_Data *pd, double x, double y) { pd->focal.x = x; @@ -61,11 +61,11 @@ _ector_renderer_gradient_radial_efl_graphics_gradient_radial_focal_set(Eo *obj E void _ector_renderer_gradient_radial_efl_graphics_gradient_radial_focal_get(Eo *obj EINA_UNUSED, - Ector_Renderer_Gradient_Radial_Data *pd, + Ector_Renderer_Generic_Gradient_Radial_Data *pd, double *x, double *y) { if (x) *x = pd->focal.x; if (y) *y = pd->focal.y; } -#include "ector_renderer_gradient_radial.eo.c" +#include "ector_renderer_generic_gradient_radial.eo.c" diff --git a/src/lib/ector/ector_renderer_shape.c b/src/lib/ector/ector_renderer_shape.c index 6957210e93..449b8e5bc8 100644 --- a/src/lib/ector/ector_renderer_shape.c +++ b/src/lib/ector/ector_renderer_shape.c @@ -7,8 +7,8 @@ #include "ector_private.h" -typedef struct _Ector_Renderer_Shape_Data Ector_Renderer_Shape_Data; -struct _Ector_Renderer_Shape_Data +typedef struct _Ector_Renderer_Generic_Shape_Data Ector_Renderer_Generic_Shape_Data; +struct _Ector_Renderer_Generic_Shape_Data { Ector_Renderer *fill; struct { @@ -33,7 +33,7 @@ struct _Ector_Renderer_Shape_Data void _ector_renderer_shape_fill_set(Eo *obj EINA_UNUSED, - Ector_Renderer_Shape_Data *pd, + Ector_Renderer_Generic_Shape_Data *pd, const Ector_Renderer *r) { _ector_renderer_replace(&pd->fill, r); @@ -41,14 +41,14 @@ _ector_renderer_shape_fill_set(Eo *obj EINA_UNUSED, const Ector_Renderer * _ector_renderer_shape_fill_get(Eo *obj EINA_UNUSED, - Ector_Renderer_Shape_Data *pd) + Ector_Renderer_Generic_Shape_Data *pd) { return pd->fill; } void _ector_renderer_shape_stroke_fill_set(Eo *obj EINA_UNUSED, - Ector_Renderer_Shape_Data *pd, + Ector_Renderer_Generic_Shape_Data *pd, const Ector_Renderer *r) { _ector_renderer_replace(&pd->stroke.fill, r); @@ -56,14 +56,14 @@ _ector_renderer_shape_stroke_fill_set(Eo *obj EINA_UNUSED, const Ector_Renderer * _ector_renderer_shape_stroke_fill_get(Eo *obj EINA_UNUSED, - Ector_Renderer_Shape_Data *pd) + Ector_Renderer_Generic_Shape_Data *pd) { return pd->stroke.fill; } void _ector_renderer_shape_stroke_marker_set(Eo *obj EINA_UNUSED, - Ector_Renderer_Shape_Data *pd, + Ector_Renderer_Generic_Shape_Data *pd, const Ector_Renderer *r) { _ector_renderer_replace(&pd->stroke.marker, r); @@ -71,14 +71,14 @@ _ector_renderer_shape_stroke_marker_set(Eo *obj EINA_UNUSED, const Ector_Renderer * _ector_renderer_shape_stroke_marker_get(Eo *obj EINA_UNUSED, - Ector_Renderer_Shape_Data *pd) + Ector_Renderer_Generic_Shape_Data *pd) { return pd->stroke.marker; } void _ector_renderer_shape_efl_graphics_shape_stroke_scale_set(Eo *obj EINA_UNUSED, - Ector_Renderer_Shape_Data *pd, + Ector_Renderer_Generic_Shape_Data *pd, double s) { pd->stroke.scale = s; @@ -86,14 +86,14 @@ _ector_renderer_shape_efl_graphics_shape_stroke_scale_set(Eo *obj EINA_UNUSED, double _ector_renderer_shape_efl_graphics_shape_stroke_scale_get(Eo *obj EINA_UNUSED, - Ector_Renderer_Shape_Data *pd) + Ector_Renderer_Generic_Shape_Data *pd) { return pd->stroke.scale; } void _ector_renderer_shape_efl_graphics_shape_stroke_color_set(Eo *obj EINA_UNUSED, - Ector_Renderer_Shape_Data *pd, + Ector_Renderer_Generic_Shape_Data *pd, int r, int g, int b, int a) { pd->stroke.color.r = r; @@ -105,7 +105,7 @@ _ector_renderer_shape_efl_graphics_shape_stroke_color_set(Eo *obj EINA_UNUSED, void _ector_renderer_shape_efl_graphics_shape_stroke_color_get(Eo *obj EINA_UNUSED, - Ector_Renderer_Shape_Data *pd, + Ector_Renderer_Generic_Shape_Data *pd, int *r, int *g, int *b, int *a) { if (r) *r = pd->stroke.color.r; @@ -116,7 +116,7 @@ _ector_renderer_shape_efl_graphics_shape_stroke_color_get(Eo *obj EINA_UNUSED, void _ector_renderer_shape_efl_graphics_shape_stroke_width_set(Eo *obj EINA_UNUSED, - Ector_Renderer_Shape_Data *pd, + Ector_Renderer_Generic_Shape_Data *pd, double w) { pd->stroke.width = w; @@ -124,14 +124,14 @@ _ector_renderer_shape_efl_graphics_shape_stroke_width_set(Eo *obj EINA_UNUSED, double _ector_renderer_shape_efl_graphics_shape_stroke_width_get(Eo *obj EINA_UNUSED, - Ector_Renderer_Shape_Data *pd) + Ector_Renderer_Generic_Shape_Data *pd) { return pd->stroke.width; } void _ector_renderer_shape_efl_graphics_shape_stroke_location_set(Eo *obj EINA_UNUSED, - Ector_Renderer_Shape_Data *pd, + Ector_Renderer_Generic_Shape_Data *pd, double centered) { pd->stroke.centered = centered; @@ -139,14 +139,14 @@ _ector_renderer_shape_efl_graphics_shape_stroke_location_set(Eo *obj EINA_UNUSED double _ector_renderer_shape_efl_graphics_shape_stroke_location_get(Eo *obj EINA_UNUSED, - Ector_Renderer_Shape_Data *pd) + Ector_Renderer_Generic_Shape_Data *pd) { return pd->stroke.centered; } void _ector_renderer_shape_efl_graphics_shape_stroke_dash_set(Eo *obj EINA_UNUSED, - Ector_Renderer_Shape_Data *pd, + Ector_Renderer_Generic_Shape_Data *pd, const Efl_Graphics_Dash *dash, unsigned int length) { @@ -170,7 +170,7 @@ _ector_renderer_shape_efl_graphics_shape_stroke_dash_set(Eo *obj EINA_UNUSED, void _ector_renderer_shape_efl_graphics_shape_stroke_dash_get(Eo *obj EINA_UNUSED, - Ector_Renderer_Shape_Data *pd, + Ector_Renderer_Generic_Shape_Data *pd, const Efl_Graphics_Dash **dash, unsigned int *length) { @@ -180,7 +180,7 @@ _ector_renderer_shape_efl_graphics_shape_stroke_dash_get(Eo *obj EINA_UNUSED, void _ector_renderer_shape_efl_graphics_shape_stroke_cap_set(Eo *obj EINA_UNUSED, - Ector_Renderer_Shape_Data *pd, + Ector_Renderer_Generic_Shape_Data *pd, Efl_Graphics_Cap c) { pd->stroke.cap = c; @@ -188,14 +188,14 @@ _ector_renderer_shape_efl_graphics_shape_stroke_cap_set(Eo *obj EINA_UNUSED, Efl_Graphics_Cap _ector_renderer_shape_efl_graphics_shape_stroke_cap_get(Eo *obj EINA_UNUSED, - Ector_Renderer_Shape_Data *pd) + Ector_Renderer_Generic_Shape_Data *pd) { return pd->stroke.cap; } void _ector_renderer_shape_efl_graphics_shape_stroke_join_set(Eo *obj EINA_UNUSED, - Ector_Renderer_Shape_Data *pd, + Ector_Renderer_Generic_Shape_Data *pd, Efl_Graphics_Join j) { pd->stroke.join = j; @@ -203,35 +203,28 @@ _ector_renderer_shape_efl_graphics_shape_stroke_join_set(Eo *obj EINA_UNUSED, Efl_Graphics_Join _ector_renderer_shape_efl_graphics_shape_stroke_join_get(Eo *obj EINA_UNUSED, - Ector_Renderer_Shape_Data *pd) + Ector_Renderer_Generic_Shape_Data *pd) { return pd->stroke.join; } Eina_Bool _ector_renderer_shape_efl_graphics_shape_path_set(Eo *obj, - Ector_Renderer_Shape_Data *pd, + Ector_Renderer_Generic_Shape_Data *pd, const Efl_Graphics_Path_Command *op, const double *points) { } -Eina_Bool -_ector_renderer_shape_ector_renderer_base_prepare(Eo *obj, - Ector_Renderer_Shape_Data *pd, - Ector_Surface *s) -{ -} - void _ector_renderer_shape_eo_base_constructor(Eo *obj, - Ector_Renderer_Shape_Data *pd) + Ector_Renderer_Generic_Shape_Data *pd) { } void -_ector_renderer_shape_eo_base_destructor(Eo *obj, Ector_Renderer_Shape_Data *pd) +_ector_renderer_shape_eo_base_destructor(Eo *obj, Ector_Renderer_Generic_Shape_Data *pd) { } -#include "ector_renderer_shape.eo.c" +#include "ector_renderer_generic_shape.eo.c" diff --git a/src/lib/ector/ector_surface.h b/src/lib/ector/ector_surface.h index a1096bd714..424726a235 100644 --- a/src/lib/ector/ector_surface.h +++ b/src/lib/ector/ector_surface.h @@ -1,6 +1,6 @@ #ifndef ECTOR_SURFACE_H #define ECTOR_SURFACE_H -#include "ector_surface.eo.h" +#include "ector_generic_surface.eo.h" #endif