summaryrefslogtreecommitdiff
path: root/src/lib/evas/canvas/evas_vg_shape.c
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2015-04-03 16:15:02 +0200
committerCedric BAIL <cedric@osg.samsung.com>2015-04-03 16:15:02 +0200
commit1d49ff7df2c513088ec75a841705f7fab100340e (patch)
tree80b27457c7e7323cf02ca1695926da6ac47dc666 /src/lib/evas/canvas/evas_vg_shape.c
parent3635b6370866418fae5d8fdb3b95be932702a754 (diff)
efl: rename geometry to graphics to be more general.
Diffstat (limited to 'src/lib/evas/canvas/evas_vg_shape.c')
-rw-r--r--src/lib/evas/canvas/evas_vg_shape.c62
1 files changed, 31 insertions, 31 deletions
diff --git a/src/lib/evas/canvas/evas_vg_shape.c b/src/lib/evas/canvas/evas_vg_shape.c
index 2a0f5d2..c062ccb 100644
--- a/src/lib/evas/canvas/evas_vg_shape.c
+++ b/src/lib/evas/canvas/evas_vg_shape.c
@@ -8,13 +8,13 @@
8typedef struct _Evas_VG_Shape_Data Evas_VG_Shape_Data; 8typedef struct _Evas_VG_Shape_Data Evas_VG_Shape_Data;
9struct _Evas_VG_Shape_Data 9struct _Evas_VG_Shape_Data
10{ 10{
11 Efl_Geometry_Path_Command *op; 11 Efl_Graphics_Path_Command *op;
12 double *points; 12 double *points;
13 13
14 Evas_VG_Node *fill; 14 Evas_VG_Node *fill;
15 15
16 struct { 16 struct {
17 Efl_Geometry_Dash *dash; 17 Efl_Graphics_Dash *dash;
18 Evas_VG_Node *fill; 18 Evas_VG_Node *fill;
19 Evas_VG_Node *marker; 19 Evas_VG_Node *marker;
20 20
@@ -26,8 +26,8 @@ struct _Evas_VG_Shape_Data
26 26
27 unsigned int dash_count; 27 unsigned int dash_count;
28 28
29 Efl_Geometry_Cap cap; 29 Efl_Graphics_Cap cap;
30 Efl_Geometry_Join join; 30 Efl_Graphics_Join join;
31 } stroke; 31 } stroke;
32 32
33 unsigned int op_count; 33 unsigned int op_count;
@@ -35,9 +35,9 @@ struct _Evas_VG_Shape_Data
35}; 35};
36 36
37Eina_Bool 37Eina_Bool
38_evas_vg_shape_efl_geometry_shape_path_set(Eo *obj EINA_UNUSED, 38_evas_vg_shape_efl_graphics_shape_path_set(Eo *obj EINA_UNUSED,
39 Evas_VG_Shape_Data *pd, 39 Evas_VG_Shape_Data *pd,
40 const Efl_Geometry_Path_Command *op, 40 const Efl_Graphics_Path_Command *op,
41 const double *points) 41 const double *points)
42{ 42{
43 free(pd->points); 43 free(pd->points);
@@ -45,7 +45,7 @@ _evas_vg_shape_efl_geometry_shape_path_set(Eo *obj EINA_UNUSED,
45 free(pd->op); 45 free(pd->op);
46 pd->op = NULL; 46 pd->op = NULL;
47 47
48 return efl_geometry_path_dup(&pd->op, &pd->points, op, points); 48 return efl_graphics_path_dup(&pd->op, &pd->points, op, points);
49} 49}
50 50
51Eina_Bool 51Eina_Bool
@@ -59,8 +59,8 @@ void
59_evas_vg_shape_eo_base_constructor(Eo *obj, Evas_VG_Shape_Data *pd EINA_UNUSED) 59_evas_vg_shape_eo_base_constructor(Eo *obj, Evas_VG_Shape_Data *pd EINA_UNUSED)
60{ 60{
61 eo_do_super(obj, MY_CLASS, eo_constructor()); 61 eo_do_super(obj, MY_CLASS, eo_constructor());
62 pd->stroke.cap = EFL_GEOMETRY_CAP_BUTT; 62 pd->stroke.cap = EFL_GRAPHICS_CAP_BUTT;
63 pd->stroke.join = EFL_GEOMETRY_JOIN_MITER; 63 pd->stroke.join = EFL_GRAPHICS_JOIN_MITER;
64 pd->stroke.scale = 1; 64 pd->stroke.scale = 1;
65 pd->stroke.a = 1; 65 pd->stroke.a = 1;
66 pd->stroke.centered = 0.5; 66 pd->stroke.centered = 0.5;
@@ -90,7 +90,7 @@ _evas_vg_shape_fill_get(Eo *obj EINA_UNUSED, Evas_VG_Shape_Data *pd)
90} 90}
91 91
92void 92void
93_evas_vg_shape_efl_geometry_shape_stroke_scale_set(Eo *obj EINA_UNUSED, 93_evas_vg_shape_efl_graphics_shape_stroke_scale_set(Eo *obj EINA_UNUSED,
94 Evas_VG_Shape_Data *pd, 94 Evas_VG_Shape_Data *pd,
95 double s) 95 double s)
96{ 96{
@@ -98,14 +98,14 @@ _evas_vg_shape_efl_geometry_shape_stroke_scale_set(Eo *obj EINA_UNUSED,
98} 98}
99 99
100double 100double
101_evas_vg_shape_efl_geometry_shape_stroke_scale_get(Eo *obj EINA_UNUSED, 101_evas_vg_shape_efl_graphics_shape_stroke_scale_get(Eo *obj EINA_UNUSED,
102 Evas_VG_Shape_Data *pd) 102 Evas_VG_Shape_Data *pd)
103{ 103{
104 return pd->stroke.scale; 104 return pd->stroke.scale;
105} 105}
106 106
107void 107void
108_evas_vg_shape_efl_geometry_shape_stroke_color_set(Eo *obj EINA_UNUSED, 108_evas_vg_shape_efl_graphics_shape_stroke_color_set(Eo *obj EINA_UNUSED,
109 Evas_VG_Shape_Data *pd, 109 Evas_VG_Shape_Data *pd,
110 int r, int g, int b, int a) 110 int r, int g, int b, int a)
111{ 111{
@@ -116,7 +116,7 @@ _evas_vg_shape_efl_geometry_shape_stroke_color_set(Eo *obj EINA_UNUSED,
116} 116}
117 117
118void 118void
119_evas_vg_shape_efl_geometry_shape_stroke_color_get(Eo *obj EINA_UNUSED, 119_evas_vg_shape_efl_graphics_shape_stroke_color_get(Eo *obj EINA_UNUSED,
120 Evas_VG_Shape_Data *pd, 120 Evas_VG_Shape_Data *pd,
121 int *r, int *g, int *b, int *a) 121 int *r, int *g, int *b, int *a)
122{ 122{
@@ -145,7 +145,7 @@ _evas_vg_shape_stroke_fill_get(Eo *obj EINA_UNUSED,
145} 145}
146 146
147void 147void
148_evas_vg_shape_efl_geometry_shape_stroke_width_set(Eo *obj EINA_UNUSED, 148_evas_vg_shape_efl_graphics_shape_stroke_width_set(Eo *obj EINA_UNUSED,
149 Evas_VG_Shape_Data *pd, 149 Evas_VG_Shape_Data *pd,
150 double w) 150 double w)
151{ 151{
@@ -153,14 +153,14 @@ _evas_vg_shape_efl_geometry_shape_stroke_width_set(Eo *obj EINA_UNUSED,
153} 153}
154 154
155double 155double
156_evas_vg_shape_efl_geometry_shape_stroke_width_get(Eo *obj EINA_UNUSED, 156_evas_vg_shape_efl_graphics_shape_stroke_width_get(Eo *obj EINA_UNUSED,
157 Evas_VG_Shape_Data *pd) 157 Evas_VG_Shape_Data *pd)
158{ 158{
159 return pd->stroke.width; 159 return pd->stroke.width;
160} 160}
161 161
162void 162void
163_evas_vg_shape_efl_geometry_shape_stroke_location_set(Eo *obj EINA_UNUSED, 163_evas_vg_shape_efl_graphics_shape_stroke_location_set(Eo *obj EINA_UNUSED,
164 Evas_VG_Shape_Data *pd, 164 Evas_VG_Shape_Data *pd,
165 double centered) 165 double centered)
166{ 166{
@@ -168,33 +168,33 @@ _evas_vg_shape_efl_geometry_shape_stroke_location_set(Eo *obj EINA_UNUSED,
168} 168}
169 169
170double 170double
171_evas_vg_shape_efl_geometry_shape_stroke_location_get(Eo *obj EINA_UNUSED, 171_evas_vg_shape_efl_graphics_shape_stroke_location_get(Eo *obj EINA_UNUSED,
172 Evas_VG_Shape_Data *pd) 172 Evas_VG_Shape_Data *pd)
173{ 173{
174 return pd->stroke.centered; 174 return pd->stroke.centered;
175} 175}
176 176
177void 177void
178_evas_vg_shape_efl_geometry_shape_stroke_dash_set(Eo *obj EINA_UNUSED, 178_evas_vg_shape_efl_graphics_shape_stroke_dash_set(Eo *obj EINA_UNUSED,
179 Evas_VG_Shape_Data *pd, 179 Evas_VG_Shape_Data *pd,
180 const Efl_Geometry_Dash *dash, 180 const Efl_Graphics_Dash *dash,
181 unsigned int length) 181 unsigned int length)
182{ 182{
183 free(pd->stroke.dash); 183 free(pd->stroke.dash);
184 pd->stroke.dash = NULL; 184 pd->stroke.dash = NULL;
185 pd->stroke.dash_count = 0; 185 pd->stroke.dash_count = 0;
186 186
187 pd->stroke.dash = malloc(sizeof (Efl_Geometry_Dash) * length); 187 pd->stroke.dash = malloc(sizeof (Efl_Graphics_Dash) * length);
188 if (!pd->stroke.dash) return ; 188 if (!pd->stroke.dash) return ;
189 189
190 memcpy(pd->stroke.dash, dash, sizeof (Efl_Geometry_Dash) * length); 190 memcpy(pd->stroke.dash, dash, sizeof (Efl_Graphics_Dash) * length);
191 pd->stroke.dash_count = length; 191 pd->stroke.dash_count = length;
192} 192}
193 193
194void 194void
195_evas_vg_shape_efl_geometry_shape_stroke_dash_get(Eo *obj EINA_UNUSED, 195_evas_vg_shape_efl_graphics_shape_stroke_dash_get(Eo *obj EINA_UNUSED,
196 Evas_VG_Shape_Data *pd, 196 Evas_VG_Shape_Data *pd,
197 const Efl_Geometry_Dash **dash, 197 const Efl_Graphics_Dash **dash,
198 unsigned int *length) 198 unsigned int *length)
199{ 199{
200 if (dash) *dash = pd->stroke.dash; 200 if (dash) *dash = pd->stroke.dash;
@@ -220,30 +220,30 @@ _evas_vg_shape_stroke_marker_get(Eo *obj EINA_UNUSED,
220} 220}
221 221
222void 222void
223_evas_vg_shape_efl_geometry_shape_stroke_cap_set(Eo *obj EINA_UNUSED, 223_evas_vg_shape_efl_graphics_shape_stroke_cap_set(Eo *obj EINA_UNUSED,
224 Evas_VG_Shape_Data *pd, 224 Evas_VG_Shape_Data *pd,
225 Efl_Geometry_Cap c) 225 Efl_Graphics_Cap c)
226{ 226{
227 pd->stroke.cap = c; 227 pd->stroke.cap = c;
228} 228}
229 229
230Efl_Geometry_Cap 230Efl_Graphics_Cap
231_evas_vg_shape_efl_geometry_shape_stroke_cap_get(Eo *obj EINA_UNUSED, 231_evas_vg_shape_efl_graphics_shape_stroke_cap_get(Eo *obj EINA_UNUSED,
232 Evas_VG_Shape_Data *pd) 232 Evas_VG_Shape_Data *pd)
233{ 233{
234 return pd->stroke.cap; 234 return pd->stroke.cap;
235} 235}
236 236
237void 237void
238_evas_vg_shape_efl_geometry_shape_stroke_join_set(Eo *obj EINA_UNUSED, 238_evas_vg_shape_efl_graphics_shape_stroke_join_set(Eo *obj EINA_UNUSED,
239 Evas_VG_Shape_Data *pd, 239 Evas_VG_Shape_Data *pd,
240 Efl_Geometry_Join j) 240 Efl_Graphics_Join j)
241{ 241{
242 pd->stroke.join = j; 242 pd->stroke.join = j;
243} 243}
244 244
245Efl_Geometry_Join 245Efl_Graphics_Join
246_evas_vg_shape_efl_geometry_shape_stroke_join_get(Eo *obj EINA_UNUSED, 246_evas_vg_shape_efl_graphics_shape_stroke_join_get(Eo *obj EINA_UNUSED,
247 Evas_VG_Shape_Data *pd) 247 Evas_VG_Shape_Data *pd)
248{ 248{
249 return pd->stroke.join; 249 return pd->stroke.join;