tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=1c0ec6788f8f14cb1fea2dd0b85868462243e395
commit 1c0ec6788f8f14cb1fea2dd0b85868462243e395 Author: Tom Hacohen <[email protected]> Date: Wed May 11 12:38:27 2016 +0100 Ector renderer cairo: Remove the no longer needed .Base hack. --- src/Makefile_Ector.am | 4 ++-- src/lib/ector/Makefile.am | 4 ++-- src/lib/ector/cairo/Ector_Cairo.h | 2 +- src/lib/ector/cairo/ector_cairo_private.h | 4 ++-- ...enderer_cairo_base.c => ector_renderer_cairo.c} | 28 +++++++++++----------- ...derer_cairo_base.eo => ector_renderer_cairo.eo} | 2 +- .../cairo/ector_renderer_cairo_gradient_linear.c | 6 ++--- .../cairo/ector_renderer_cairo_gradient_linear.eo | 4 ++-- .../cairo/ector_renderer_cairo_gradient_radial.c | 6 ++--- .../cairo/ector_renderer_cairo_gradient_radial.eo | 4 ++-- src/lib/ector/cairo/ector_renderer_cairo_shape.c | 10 ++++---- src/lib/ector/cairo/ector_renderer_cairo_shape.eo | 4 ++-- 12 files changed, 39 insertions(+), 39 deletions(-) diff --git a/src/Makefile_Ector.am b/src/Makefile_Ector.am index e0652c5..63c8473 100644 --- a/src/Makefile_Ector.am +++ b/src/Makefile_Ector.am @@ -15,7 +15,7 @@ ector_eolian_generic_h = $(ector_eolian_files_generic:%.eo=%.eo.h) ector_eolian_files_cairo = \ lib/ector/cairo/ector_cairo_surface.eo \ lib/ector/cairo/ector_cairo_software_surface.eo \ - lib/ector/cairo/ector_renderer_cairo_base.eo \ + lib/ector/cairo/ector_renderer_cairo.eo \ lib/ector/cairo/ector_renderer_cairo_shape.eo \ lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo \ lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo @@ -100,7 +100,7 @@ lib_ector_libector_la_SOURCES += \ lib/ector/cairo/ector_renderer_cairo_gradient_linear.c \ lib/ector/cairo/ector_renderer_cairo_gradient_radial.c \ lib/ector/cairo/ector_renderer_cairo_shape.c \ -lib/ector/cairo/ector_renderer_cairo_base.c \ +lib/ector/cairo/ector_renderer_cairo.c \ lib/ector/cairo/ector_cairo_software_surface.c \ lib/ector/cairo/ector_cairo_surface.c diff --git a/src/lib/ector/Makefile.am b/src/lib/ector/Makefile.am index 0aec2f9..2456f0d 100644 --- a/src/lib/ector/Makefile.am +++ b/src/lib/ector/Makefile.am @@ -18,7 +18,7 @@ ector_eolian_generic_h = $(ector_eolian_files_generic:%.eo=%.eo.h) ector_eolian_files_cairo = \ cairo/ector_cairo_surface.eo \ cairo/ector_cairo_software_surface.eo \ - cairo/ector_renderer_cairo_base.eo \ + cairo/ector_renderer_cairo.eo \ cairo/ector_renderer_cairo_shape.eo \ cairo/ector_renderer_cairo_gradient_linear.eo \ cairo/ector_renderer_cairo_gradient_radial.eo @@ -89,7 +89,7 @@ libector_la_SOURCES += \ cairo/ector_renderer_cairo_gradient_linear.c \ cairo/ector_renderer_cairo_gradient_radial.c \ cairo/ector_renderer_cairo_shape.c \ -cairo/ector_renderer_cairo_base.c \ +cairo/ector_renderer_cairo.c \ cairo/ector_cairo_software_surface.c \ cairo/ector_cairo_surface.c diff --git a/src/lib/ector/cairo/Ector_Cairo.h b/src/lib/ector/cairo/Ector_Cairo.h index 1a99181..b0c6058 100644 --- a/src/lib/ector/cairo/Ector_Cairo.h +++ b/src/lib/ector/cairo/Ector_Cairo.h @@ -16,7 +16,7 @@ typedef struct _cairo_t cairo_t; #include "cairo/ector_cairo_surface.eo.h" #include "cairo/ector_cairo_software_surface.eo.h" -#include "cairo/ector_renderer_cairo_base.eo.h" +#include "cairo/ector_renderer_cairo.eo.h" #include "cairo/ector_renderer_cairo_shape.eo.h" #include "cairo/ector_renderer_cairo_gradient_linear.eo.h" #include "cairo/ector_renderer_cairo_gradient_radial.eo.h" diff --git a/src/lib/ector/cairo/ector_cairo_private.h b/src/lib/ector/cairo/ector_cairo_private.h index 1b38e34..d875435 100644 --- a/src/lib/ector/cairo/ector_cairo_private.h +++ b/src/lib/ector/cairo/ector_cairo_private.h @@ -12,7 +12,7 @@ typedef struct { } cairo_matrix_t; typedef struct _Ector_Cairo_Surface_Data Ector_Cairo_Surface_Data; -typedef struct _Ector_Renderer_Cairo_Base_Data Ector_Renderer_Cairo_Base_Data; +typedef struct _Ector_Renderer_Cairo_Data Ector_Renderer_Cairo_Data; struct _Ector_Cairo_Surface_Data { @@ -22,7 +22,7 @@ struct _Ector_Cairo_Surface_Data } current; }; -struct _Ector_Renderer_Cairo_Base_Data +struct _Ector_Renderer_Cairo_Data { Ector_Cairo_Surface_Data *parent; Ector_Renderer_Generic_Base_Data *generic; diff --git a/src/lib/ector/cairo/ector_renderer_cairo_base.c b/src/lib/ector/cairo/ector_renderer_cairo.c similarity index 86% rename from src/lib/ector/cairo/ector_renderer_cairo_base.c rename to src/lib/ector/cairo/ector_renderer_cairo.c index 1afc3d5..ee6e64b 100644 --- a/src/lib/ector/cairo/ector_renderer_cairo_base.c +++ b/src/lib/ector/cairo/ector_renderer_cairo.c @@ -73,8 +73,8 @@ static cairo_matrix_t identity; // Cairo need unpremul color, so force unpremul here void -_ector_renderer_cairo_base_ector_renderer_generic_base_color_set(Eo *obj EINA_UNUSED, - Ector_Renderer_Cairo_Base_Data *pd, +_ector_renderer_cairo_ector_renderer_generic_base_color_set(Eo *obj EINA_UNUSED, + Ector_Renderer_Cairo_Data *pd, int r, int g, int b, int a) { pd->generic->color.r = r; @@ -84,8 +84,8 @@ _ector_renderer_cairo_base_ector_renderer_generic_base_color_set(Eo *obj EINA_UN } void -_ector_renderer_cairo_base_ector_renderer_generic_base_color_get(Eo *obj EINA_UNUSED, - Ector_Renderer_Cairo_Base_Data *pd, +_ector_renderer_cairo_ector_renderer_generic_base_color_get(Eo *obj EINA_UNUSED, + Ector_Renderer_Cairo_Data *pd, int *r, int *g, int *b, int *a) { if (r) *r = pd->generic->color.r; @@ -95,7 +95,7 @@ _ector_renderer_cairo_base_ector_renderer_generic_base_color_get(Eo *obj EINA_UN } static Eina_Bool -_ector_renderer_cairo_base_ector_renderer_generic_base_prepare(Eo *obj, Ector_Renderer_Cairo_Base_Data *pd) +_ector_renderer_cairo_ector_renderer_generic_base_prepare(Eo *obj, Ector_Renderer_Cairo_Data *pd) { if (!pd->parent) { @@ -119,8 +119,8 @@ _ector_renderer_cairo_base_ector_renderer_generic_base_prepare(Eo *obj, Ector_Re } static Eina_Bool -_ector_renderer_cairo_base_ector_renderer_generic_base_draw(Eo *obj EINA_UNUSED, - Ector_Renderer_Cairo_Base_Data *pd, +_ector_renderer_cairo_ector_renderer_generic_base_draw(Eo *obj EINA_UNUSED, + Ector_Renderer_Cairo_Data *pd, Efl_Gfx_Render_Op op, Eina_Array *clips EINA_UNUSED, unsigned int mul_col) @@ -180,9 +180,9 @@ _ector_renderer_cairo_base_ector_renderer_generic_base_draw(Eo *obj EINA_UNUSED, } static Eo * -_ector_renderer_cairo_base_eo_base_constructor(Eo *obj, Ector_Renderer_Cairo_Base_Data *pd EINA_UNUSED) +_ector_renderer_cairo_eo_base_constructor(Eo *obj, Ector_Renderer_Cairo_Data *pd EINA_UNUSED) { - obj = eo_constructor(eo_super(obj, ECTOR_RENDERER_CAIRO_BASE_CLASS)); + obj = eo_constructor(eo_super(obj, ECTOR_RENDERER_CAIRO_CLASS)); if (!obj) return NULL; pd->generic = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_BASE_CLASS, obj); @@ -191,9 +191,9 @@ _ector_renderer_cairo_base_eo_base_constructor(Eo *obj, Ector_Renderer_Cairo_Bas } static Eo_Base * -_ector_renderer_cairo_base_eo_base_finalize(Eo *obj, Ector_Renderer_Cairo_Base_Data *pd) +_ector_renderer_cairo_eo_base_finalize(Eo *obj, Ector_Renderer_Cairo_Data *pd) { - obj = eo_finalize(eo_super(obj, ECTOR_RENDERER_CAIRO_BASE_CLASS)); + obj = eo_finalize(eo_super(obj, ECTOR_RENDERER_CAIRO_CLASS)); if (!obj) return NULL; USE(pd->generic, cairo_matrix_init, NULL); @@ -213,7 +213,7 @@ _ector_renderer_cairo_base_eo_base_finalize(Eo *obj, Ector_Renderer_Cairo_Base_D } static void -_ector_renderer_cairo_base_eo_base_destructor(Eo *obj, Ector_Renderer_Cairo_Base_Data *pd) +_ector_renderer_cairo_eo_base_destructor(Eo *obj, Ector_Renderer_Cairo_Data *pd) { Ector_Renderer_Generic_Base_Data *base; @@ -223,7 +223,7 @@ _ector_renderer_cairo_base_eo_base_destructor(Eo *obj, Ector_Renderer_Cairo_Base free(pd->m); - eo_destructor(eo_super(obj, ECTOR_RENDERER_CAIRO_BASE_CLASS)); + eo_destructor(eo_super(obj, ECTOR_RENDERER_CAIRO_CLASS)); } -#include "ector_renderer_cairo_base.eo.c" +#include "ector_renderer_cairo.eo.c" diff --git a/src/lib/ector/cairo/ector_renderer_cairo_base.eo b/src/lib/ector/cairo/ector_renderer_cairo.eo similarity index 87% rename from src/lib/ector/cairo/ector_renderer_cairo_base.eo rename to src/lib/ector/cairo/ector_renderer_cairo.eo index 374594c..9da20ec 100644 --- a/src/lib/ector/cairo/ector_renderer_cairo_base.eo +++ b/src/lib/ector/cairo/ector_renderer_cairo.eo @@ -1,4 +1,4 @@ -abstract Ector.Renderer.Cairo.Base (Ector.Renderer.Generic.Base) +abstract Ector.Renderer.Cairo (Ector.Renderer.Generic.Base) { legacy_prefix: null; methods { diff --git a/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c index 3d5b508..130c4b7 100644 --- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c +++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c @@ -91,7 +91,7 @@ _ector_renderer_cairo_gradient_linear_ector_renderer_generic_base_draw(Eo *obj, } static Eina_Bool -_ector_renderer_cairo_gradient_linear_ector_renderer_cairo_base_fill(Eo *obj, +_ector_renderer_cairo_gradient_linear_ector_renderer_cairo_fill(Eo *obj, Ector_Renderer_Cairo_Gradient_Linear_Data *pd, unsigned int mul_col) { @@ -118,10 +118,10 @@ _ector_renderer_cairo_gradient_linear_ector_renderer_generic_base_bounds_get(Eo Eina_Rectangle *r) { Ector_Renderer_Generic_Gradient_Linear_Data *gld; - Ector_Renderer_Cairo_Base_Data *bd; + Ector_Renderer_Cairo_Data *bd; gld = eo_data_scope_get(obj, ECTOR_RENDERER_GENERIC_GRADIENT_RADIAL_MIXIN); - bd = eo_data_scope_get(obj, ECTOR_RENDERER_CAIRO_BASE_CLASS); + bd = eo_data_scope_get(obj, ECTOR_RENDERER_CAIRO_CLASS); EINA_RECTANGLE_SET(r, bd->generic->origin.x + gld->start.x, bd->generic->origin.y + gld->start.y, diff --git a/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo index 31c968e..8111ebe 100644 --- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo +++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo @@ -1,4 +1,4 @@ -class Ector.Renderer.Cairo.Gradient_Linear (Ector.Renderer.Cairo.Base, Ector.Renderer.Generic.Gradient, Ector.Renderer.Generic.Gradient_Linear) +class Ector.Renderer.Cairo.Gradient_Linear (Ector.Renderer.Cairo, Ector.Renderer.Generic.Gradient, Ector.Renderer.Generic.Gradient_Linear) { eo_prefix: ector_renderer_cairo_gradient_linear; legacy_prefix: null; @@ -7,7 +7,7 @@ class Ector.Renderer.Cairo.Gradient_Linear (Ector.Renderer.Cairo.Base, Ector.Ren Ector.Renderer.Generic.Base.draw; Ector.Renderer.Generic.Base.bounds_get; Ector.Renderer.Generic.Base.crc.get; - Ector.Renderer.Cairo.Base.fill; + Ector.Renderer.Cairo.fill; Eo.Base.finalize; Eo.Base.destructor; Efl.Gfx.Gradient.stop.set; diff --git a/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c b/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c index 30cad94..209630c 100644 --- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c +++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c @@ -97,7 +97,7 @@ _ector_renderer_cairo_gradient_radial_ector_renderer_generic_base_draw(Eo *obj, // Clearly duplicated and should be in a common place... static Eina_Bool -_ector_renderer_cairo_gradient_radial_ector_renderer_cairo_base_fill(Eo *obj, +_ector_renderer_cairo_gradient_radial_ector_renderer_cairo_fill(Eo *obj, Ector_Renderer_Cairo_Gradient_Radial_Data *pd, unsigned int mul_col) { @@ -124,10 +124,10 @@ _ector_renderer_cairo_gradient_radial_ector_renderer_generic_base_bounds_get(Eo Eina_Rectangle *r) { Ector_Renderer_Generic_Gradient_Radial_Data *gld; - Ector_Renderer_Cairo_Base_Data *bd; + Ector_Renderer_Cairo_Data *bd; gld = eo_data_scope_get(obj, ECTOR_RENDERER_GENERIC_GRADIENT_RADIAL_MIXIN); - bd = eo_data_scope_get(obj, ECTOR_RENDERER_CAIRO_BASE_CLASS); + bd = eo_data_scope_get(obj, ECTOR_RENDERER_CAIRO_CLASS); EINA_RECTANGLE_SET(r, bd->generic->origin.x + gld->radial.x - gld->radius, bd->generic->origin.y + gld->radial.y - gld->radius, diff --git a/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo b/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo index caa47c7..a4f2de3 100644 --- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo +++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo @@ -1,4 +1,4 @@ -class Ector.Renderer.Cairo.Gradient_Radial (Ector.Renderer.Cairo.Base, Ector.Renderer.Generic.Gradient, Ector.Renderer.Generic.Gradient_Radial) +class Ector.Renderer.Cairo.Gradient_Radial (Ector.Renderer.Cairo, Ector.Renderer.Generic.Gradient, Ector.Renderer.Generic.Gradient_Radial) { eo_prefix: ector_renderer_cairo_gradient_radial; legacy_prefix: null; @@ -7,7 +7,7 @@ class Ector.Renderer.Cairo.Gradient_Radial (Ector.Renderer.Cairo.Base, Ector.Ren Ector.Renderer.Generic.Base.draw; Ector.Renderer.Generic.Base.bounds_get; Ector.Renderer.Generic.Base.crc.get; - Ector.Renderer.Cairo.Base.fill; + Ector.Renderer.Cairo.fill; Eo.Base.destructor; Eo.Base.finalize; Efl.Gfx.Gradient.stop.set; diff --git a/src/lib/ector/cairo/ector_renderer_cairo_shape.c b/src/lib/ector/cairo/ector_renderer_cairo_shape.c index 99e3016..66d2cca 100644 --- a/src/lib/ector/cairo/ector_renderer_cairo_shape.c +++ b/src/lib/ector/cairo/ector_renderer_cairo_shape.c @@ -175,14 +175,14 @@ _ector_renderer_cairo_shape_ector_renderer_generic_base_draw(Eo *obj, Ector_Rend cairo_set_fill_rule(pd->parent->cairo, CAIRO_FILL_RULE_WINDING); if (pd->shape->fill) - ector_renderer_cairo_base_fill(pd->shape->fill, mul_col); + ector_renderer_cairo_fill(pd->shape->fill, mul_col); if (pd->shape->stroke.fill || pd->public_shape->stroke.color.a > 0) { cairo_fill_preserve(pd->parent->cairo); if (pd->shape->stroke.fill) - ector_renderer_cairo_base_fill(pd->shape->stroke.fill, mul_col); + ector_renderer_cairo_fill(pd->shape->stroke.fill, mul_col); else { r = (((pd->public_shape->stroke.color.r * R_VAL(&mul_col)) + 0xff) >> 8); @@ -222,7 +222,7 @@ _ector_renderer_cairo_shape_ector_renderer_generic_base_draw(Eo *obj, Ector_Rend } static Eina_Bool -_ector_renderer_cairo_shape_ector_renderer_cairo_base_fill(Eo *obj EINA_UNUSED, +_ector_renderer_cairo_shape_ector_renderer_cairo_fill(Eo *obj EINA_UNUSED, Ector_Renderer_Cairo_Shape_Data *pd EINA_UNUSED, unsigned int mul_col EINA_UNUSED) { @@ -237,12 +237,12 @@ _ector_renderer_cairo_shape_ector_renderer_generic_base_bounds_get(Eo *obj, Ector_Renderer_Cairo_Shape_Data *pd EINA_UNUSED, Eina_Rectangle *r) { - Ector_Renderer_Cairo_Base_Data *bd; + Ector_Renderer_Cairo_Data *bd; // FIXME: It should be possible to actually ask cairo about that efl_gfx_shape_bounds_get(obj, r); - bd = eo_data_scope_get(obj, ECTOR_RENDERER_CAIRO_BASE_CLASS); + bd = eo_data_scope_get(obj, ECTOR_RENDERER_CAIRO_CLASS); r->x += bd->generic->origin.x; r->y += bd->generic->origin.y; } diff --git a/src/lib/ector/cairo/ector_renderer_cairo_shape.eo b/src/lib/ector/cairo/ector_renderer_cairo_shape.eo index 8b16260..aeeb030 100644 --- a/src/lib/ector/cairo/ector_renderer_cairo_shape.eo +++ b/src/lib/ector/cairo/ector_renderer_cairo_shape.eo @@ -1,4 +1,4 @@ -class Ector.Renderer.Cairo.Shape (Ector.Renderer.Cairo.Base, Ector.Renderer.Generic.Shape) +class Ector.Renderer.Cairo.Shape (Ector.Renderer.Cairo, Ector.Renderer.Generic.Shape) { eo_prefix: ector_renderer_cairo_shape; legacy_prefix: null; @@ -7,7 +7,7 @@ class Ector.Renderer.Cairo.Shape (Ector.Renderer.Cairo.Base, Ector.Renderer.Gene Ector.Renderer.Generic.Base.draw; Ector.Renderer.Generic.Base.bounds_get; Ector.Renderer.Generic.Base.crc.get; - Ector.Renderer.Cairo.Base.fill; + Ector.Renderer.Cairo.fill; Eo.Base.constructor; Eo.Base.finalize; Eo.Base.destructor; --
