summaryrefslogtreecommitdiff
path: root/src/lib/evas
diff options
context:
space:
mode:
authorsubhransu mohanty <sub.mohanty@samsung.com>2017-10-24 15:19:52 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-10-24 15:19:53 +0900
commit880dd63a0c884642a0f87aa3a08338a7b244e37a (patch)
tree242da6ff1f0778327821cec7a7c6ba4a18a8b604 /src/lib/evas
parent006546a042a4f945a4936e2f29a55bb1c67648ea (diff)
evas/vg: renamed the evas_vg class to efl_canvas_vg
Reviewers: jpeg Subscribers: jenkins, cedric Differential Revision: https://phab.enlightenment.org/D5357
Diffstat (limited to 'src/lib/evas')
-rw-r--r--src/lib/evas/Evas_Eo.h2
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg.c (renamed from src/lib/evas/canvas/evas_object_vg.c)86
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg.eo (renamed from src/lib/evas/canvas/evas_vg.eo)2
-rw-r--r--src/lib/evas/canvas/evas_main.c4
-rw-r--r--src/lib/evas/canvas/evas_vg_node.c2
-rw-r--r--src/lib/evas/canvas/evas_vg_private.h4
6 files changed, 50 insertions, 50 deletions
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index 030a18fc63..dbd65e1555 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -305,7 +305,7 @@ typedef void (Evas_Canvas3D_Surface_Func)(Evas_Real *out_x,
305 * 305 *
306 * @{ 306 * @{
307 */ 307 */
308#include "canvas/evas_vg.eo.h" 308#include "canvas/efl_canvas_vg.eo.h"
309/** 309/**
310 * @} 310 * @}
311 */ 311 */
diff --git a/src/lib/evas/canvas/evas_object_vg.c b/src/lib/evas/canvas/efl_canvas_vg.c
index 386dcb85c9..55ad5d3b8d 100644
--- a/src/lib/evas/canvas/evas_object_vg.c
+++ b/src/lib/evas/canvas/efl_canvas_vg.c
@@ -3,7 +3,7 @@
3 3
4#include "evas_vg_private.h" 4#include "evas_vg_private.h"
5 5
6#define MY_CLASS EVAS_VG_CLASS 6#define MY_CLASS EFL_CANVAS_VG_CLASS
7 7
8/* private magic number for rectangle objects */ 8/* private magic number for rectangle objects */
9static const char o_type[] = "vectors"; 9static const char o_type[] = "vectors";
@@ -11,24 +11,24 @@ static const char o_type[] = "vectors";
11const char *o_vg_type = o_type; 11const char *o_vg_type = o_type;
12 12
13 13
14static void evas_object_vg_render(Evas_Object *eo_obj, 14static void _efl_canvas_vg_render(Evas_Object *eo_obj,
15 Evas_Object_Protected_Data *obj, 15 Evas_Object_Protected_Data *obj,
16 void *type_private_data, 16 void *type_private_data,
17 void *engine, void *output, void *context, void *surface, 17 void *engine, void *output, void *context, void *surface,
18 int x, int y, Eina_Bool do_async); 18 int x, int y, Eina_Bool do_async);
19static void evas_object_vg_render_pre(Evas_Object *eo_obj, 19static void _efl_canvas_vg_render_pre(Evas_Object *eo_obj,
20 Evas_Object_Protected_Data *obj, 20 Evas_Object_Protected_Data *obj,
21 void *type_private_data); 21 void *type_private_data);
22static void evas_object_vg_render_post(Evas_Object *eo_obj, 22static void _efl_canvas_vg_render_post(Evas_Object *eo_obj,
23 Evas_Object_Protected_Data *obj, 23 Evas_Object_Protected_Data *obj,
24 void *type_private_data); 24 void *type_private_data);
25static unsigned int evas_object_vg_id_get(Evas_Object *eo_obj); 25static unsigned int _efl_canvas_vg_id_get(Evas_Object *eo_obj);
26static unsigned int evas_object_vg_visual_id_get(Evas_Object *eo_obj); 26static unsigned int _efl_canvas_vg_visual_id_get(Evas_Object *eo_obj);
27static void *evas_object_vg_engine_data_get(Evas_Object *eo_obj); 27static void *_efl_canvas_vg_engine_data_get(Evas_Object *eo_obj);
28static int evas_object_vg_is_opaque(Evas_Object *eo_obj, 28static int _efl_canvas_vg_is_opaque(Evas_Object *eo_obj,
29 Evas_Object_Protected_Data *obj, 29 Evas_Object_Protected_Data *obj,
30 void *type_private_data); 30 void *type_private_data);
31static int evas_object_vg_was_opaque(Evas_Object *eo_obj, 31static int _efl_canvas_vg_was_opaque(Evas_Object *eo_obj,
32 Evas_Object_Protected_Data *obj, 32 Evas_Object_Protected_Data *obj,
33 void *type_private_data); 33 void *type_private_data);
34 34
@@ -36,19 +36,19 @@ static const Evas_Object_Func object_func =
36{ 36{
37 /* methods (compulsory) */ 37 /* methods (compulsory) */
38 NULL, 38 NULL,
39 evas_object_vg_render, 39 _efl_canvas_vg_render,
40 evas_object_vg_render_pre, 40 _efl_canvas_vg_render_pre,
41 evas_object_vg_render_post, 41 _efl_canvas_vg_render_post,
42 evas_object_vg_id_get, 42 _efl_canvas_vg_id_get,
43 evas_object_vg_visual_id_get, 43 _efl_canvas_vg_visual_id_get,
44 evas_object_vg_engine_data_get, 44 _efl_canvas_vg_engine_data_get,
45 /* these are optional. NULL = nothing */ 45 /* these are optional. NULL = nothing */
46 NULL, 46 NULL,
47 NULL, 47 NULL,
48 NULL, 48 NULL,
49 NULL, 49 NULL,
50 evas_object_vg_is_opaque, 50 _efl_canvas_vg_is_opaque,
51 evas_object_vg_was_opaque, 51 _efl_canvas_vg_was_opaque,
52 NULL, 52 NULL,
53 NULL, 53 NULL,
54 NULL, 54 NULL,
@@ -64,7 +64,7 @@ static void
64_evas_vg_tree_changed(void *data, const Efl_Event *event EINA_UNUSED) 64_evas_vg_tree_changed(void *data, const Efl_Event *event EINA_UNUSED)
65{ 65{
66 Evas_Object_Protected_Data *obj = data; 66 Evas_Object_Protected_Data *obj = data;
67 Evas_VG_Data *pd = efl_data_scope_get(obj->object, MY_CLASS); 67 Efl_Canvas_Vg_Data *pd = efl_data_scope_get(obj->object, MY_CLASS);
68 68
69 if (pd->changed) return; 69 if (pd->changed) return;
70 70
@@ -85,13 +85,13 @@ evas_object_vg_add(Evas *e)
85} 85}
86 86
87Efl_VG * 87Efl_VG *
88_evas_vg_root_node_get(Eo *obj EINA_UNUSED, Evas_VG_Data *pd) 88_efl_canvas_vg_root_node_get(Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Data *pd)
89{ 89{
90 return pd->vg_tree; 90 return pd->vg_tree;
91} 91}
92 92
93void 93void
94_evas_vg_root_node_set(Eo *obj EINA_UNUSED, Evas_VG_Data *pd, Efl_VG *root_node) 94_efl_canvas_vg_root_node_set(Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Data *pd, Efl_VG *root_node)
95{ 95{
96 // if the same root is already set 96 // if the same root is already set
97 if (pd->vg_tree == root_node) 97 if (pd->vg_tree == root_node)
@@ -118,7 +118,7 @@ _evas_vg_root_node_set(Eo *obj EINA_UNUSED, Evas_VG_Data *pd, Efl_VG *root_node)
118static void 118static void
119_cleanup_reference(void *data, const Efl_Event *event EINA_UNUSED) 119_cleanup_reference(void *data, const Efl_Event *event EINA_UNUSED)
120{ 120{
121 Evas_VG_Data *pd = data; 121 Efl_Canvas_Vg_Data *pd = data;
122 Eo *renderer; 122 Eo *renderer;
123 123
124 /* unref all renderer and may also destroy them async */ 124 /* unref all renderer and may also destroy them async */
@@ -127,7 +127,7 @@ _cleanup_reference(void *data, const Efl_Event *event EINA_UNUSED)
127} 127}
128 128
129void 129void
130_evas_vg_efl_object_destructor(Eo *eo_obj, Evas_VG_Data *pd) 130_efl_canvas_vg_efl_object_destructor(Eo *eo_obj, Efl_Canvas_Vg_Data *pd)
131{ 131{
132 Evas_Object_Protected_Data *obj; 132 Evas_Object_Protected_Data *obj;
133 Evas *e = evas_object_evas_get(eo_obj); 133 Evas *e = evas_object_evas_get(eo_obj);
@@ -144,7 +144,7 @@ _evas_vg_efl_object_destructor(Eo *eo_obj, Evas_VG_Data *pd)
144} 144}
145 145
146Eo * 146Eo *
147_evas_vg_efl_object_constructor(Eo *eo_obj, Evas_VG_Data *pd) 147_efl_canvas_vg_efl_object_constructor(Eo *eo_obj, Efl_Canvas_Vg_Data *pd)
148{ 148{
149 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 149 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
150 150
@@ -166,7 +166,7 @@ _evas_vg_efl_object_constructor(Eo *eo_obj, Evas_VG_Data *pd)
166} 166}
167 167
168static Efl_Object * 168static Efl_Object *
169_evas_vg_efl_object_finalize(Eo *obj, Evas_VG_Data *pd) 169_efl_canvas_vg_efl_object_finalize(Eo *obj, Efl_Canvas_Vg_Data *pd)
170{ 170{
171 Evas *e = evas_object_evas_get(obj); 171 Evas *e = evas_object_evas_get(obj);
172 172
@@ -178,7 +178,7 @@ _evas_vg_efl_object_finalize(Eo *obj, Evas_VG_Data *pd)
178} 178}
179 179
180static void 180static void
181_evas_vg_render(Evas_Object_Protected_Data *obj, Evas_VG_Data *vd, 181_evas_vg_render(Evas_Object_Protected_Data *obj, Efl_Canvas_Vg_Data *vd,
182 void *engine, void *output, void *context, void *surface, Efl_VG *n, 182 void *engine, void *output, void *context, void *surface, Efl_VG *n,
183 Eina_Array *clips, Eina_Bool do_async) 183 Eina_Array *clips, Eina_Bool do_async)
184{ 184{
@@ -209,13 +209,13 @@ _evas_vg_render(Evas_Object_Protected_Data *obj, Evas_VG_Data *vd,
209} 209}
210 210
211static void 211static void
212evas_object_vg_render(Evas_Object *eo_obj EINA_UNUSED, 212_efl_canvas_vg_render(Evas_Object *eo_obj EINA_UNUSED,
213 Evas_Object_Protected_Data *obj, 213 Evas_Object_Protected_Data *obj,
214 void *type_private_data, 214 void *type_private_data,
215 void *engine, void *output, void *context, void *surface, 215 void *engine, void *output, void *context, void *surface,
216 int x, int y, Eina_Bool do_async) 216 int x, int y, Eina_Bool do_async)
217{ 217{
218 Evas_VG_Data *vd = type_private_data; 218 Efl_Canvas_Vg_Data *vd = type_private_data;
219 Ector_Surface *ector = evas_ector_get(obj->layer->evas); 219 Ector_Surface *ector = evas_ector_get(obj->layer->evas);
220 220
221 obj->layer->evas->engine.func->ector_output_set(engine, surface, output); 221 obj->layer->evas->engine.func->ector_output_set(engine, surface, output);
@@ -255,11 +255,11 @@ evas_object_vg_render(Evas_Object *eo_obj EINA_UNUSED,
255} 255}
256 256
257static void 257static void
258evas_object_vg_render_pre(Evas_Object *eo_obj, 258_efl_canvas_vg_render_pre(Evas_Object *eo_obj,
259 Evas_Object_Protected_Data *obj, 259 Evas_Object_Protected_Data *obj,
260 void *type_private_data) 260 void *type_private_data)
261{ 261{
262 Evas_VG_Data *vd = type_private_data; 262 Efl_Canvas_Vg_Data *vd = type_private_data;
263 int is_v, was_v; 263 int is_v, was_v;
264 Ector_Surface *s; 264 Ector_Surface *s;
265 265
@@ -376,7 +376,7 @@ evas_object_vg_render_pre(Evas_Object *eo_obj,
376} 376}
377 377
378static void 378static void
379evas_object_vg_render_post(Evas_Object *eo_obj EINA_UNUSED, 379_efl_canvas_vg_render_post(Evas_Object *eo_obj EINA_UNUSED,
380 Evas_Object_Protected_Data *obj, 380 Evas_Object_Protected_Data *obj,
381 void *type_private_data EINA_UNUSED) 381 void *type_private_data EINA_UNUSED)
382{ 382{
@@ -390,30 +390,30 @@ evas_object_vg_render_post(Evas_Object *eo_obj EINA_UNUSED,
390} 390}
391 391
392static unsigned int 392static unsigned int
393evas_object_vg_id_get(Evas_Object *eo_obj) 393_efl_canvas_vg_id_get(Evas_Object *eo_obj)
394{ 394{
395 Evas_VG_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 395 Efl_Canvas_Vg_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
396 if (!o) return 0; 396 if (!o) return 0;
397 return MAGIC_OBJ_VG; 397 return MAGIC_OBJ_VG;
398} 398}
399 399
400static unsigned int 400static unsigned int
401evas_object_vg_visual_id_get(Evas_Object *eo_obj) 401_efl_canvas_vg_visual_id_get(Evas_Object *eo_obj)
402{ 402{
403 Evas_VG_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 403 Efl_Canvas_Vg_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
404 if (!o) return 0; 404 if (!o) return 0;
405 return MAGIC_OBJ_SHAPE; 405 return MAGIC_OBJ_SHAPE;
406} 406}
407 407
408static void * 408static void *
409evas_object_vg_engine_data_get(Evas_Object *eo_obj) 409_efl_canvas_vg_engine_data_get(Evas_Object *eo_obj)
410{ 410{
411 Evas_VG_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 411 Efl_Canvas_Vg_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
412 return o->engine_data; 412 return o->engine_data;
413} 413}
414 414
415static int 415static int
416evas_object_vg_is_opaque(Evas_Object *eo_obj EINA_UNUSED, 416_efl_canvas_vg_is_opaque(Evas_Object *eo_obj EINA_UNUSED,
417 Evas_Object_Protected_Data *obj EINA_UNUSED, 417 Evas_Object_Protected_Data *obj EINA_UNUSED,
418 void *type_private_data EINA_UNUSED) 418 void *type_private_data EINA_UNUSED)
419{ 419{
@@ -421,7 +421,7 @@ evas_object_vg_is_opaque(Evas_Object *eo_obj EINA_UNUSED,
421} 421}
422 422
423static int 423static int
424evas_object_vg_was_opaque(Evas_Object *eo_obj EINA_UNUSED, 424_efl_canvas_vg_was_opaque(Evas_Object *eo_obj EINA_UNUSED,
425 Evas_Object_Protected_Data *obj EINA_UNUSED, 425 Evas_Object_Protected_Data *obj EINA_UNUSED,
426 void *type_private_data EINA_UNUSED) 426 void *type_private_data EINA_UNUSED)
427{ 427{
@@ -429,28 +429,28 @@ evas_object_vg_was_opaque(Evas_Object *eo_obj EINA_UNUSED,
429} 429}
430 430
431EOLIAN static Eina_Size2D 431EOLIAN static Eina_Size2D
432_evas_vg_efl_gfx_view_view_size_get(Eo *obj EINA_UNUSED, Evas_VG_Data *pd) 432_efl_canvas_vg_efl_gfx_view_view_size_get(Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Data *pd)
433{ 433{
434 return EINA_SIZE2D(pd->width, pd->height); 434 return EINA_SIZE2D(pd->width, pd->height);
435} 435}
436 436
437EOLIAN static void 437EOLIAN static void
438_evas_vg_efl_gfx_view_view_size_set(Eo *obj EINA_UNUSED, Evas_VG_Data *pd, Eina_Size2D sz) 438_efl_canvas_vg_efl_gfx_view_view_size_set(Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Data *pd, Eina_Size2D sz)
439{ 439{
440 pd->width = sz.w; 440 pd->width = sz.w;
441 pd->height = sz.h; 441 pd->height = sz.h;
442} 442}
443 443
444void 444void
445_evas_vg_efl_gfx_fill_fill_set(Eo *obj EINA_UNUSED, Evas_VG_Data *pd, Eina_Rect fill) 445_efl_canvas_vg_efl_gfx_fill_fill_set(Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Data *pd, Eina_Rect fill)
446{ 446{
447 pd->fill = fill; 447 pd->fill = fill;
448} 448}
449 449
450Eina_Rect 450Eina_Rect
451_evas_vg_efl_gfx_fill_fill_get(Eo *obj EINA_UNUSED, Evas_VG_Data *pd) 451_efl_canvas_vg_efl_gfx_fill_fill_get(Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Data *pd)
452{ 452{
453 return pd->fill; 453 return pd->fill;
454} 454}
455 455
456#include "evas_vg.eo.c" 456#include "efl_canvas_vg.eo.c"
diff --git a/src/lib/evas/canvas/evas_vg.eo b/src/lib/evas/canvas/efl_canvas_vg.eo
index 4eac040637..3f4becd056 100644
--- a/src/lib/evas/canvas/evas_vg.eo
+++ b/src/lib/evas/canvas/efl_canvas_vg.eo
@@ -1,4 +1,4 @@
1class Evas.VG (Efl.Canvas.Object, Efl.Gfx.Fill, Efl.Gfx.View) 1class Efl.Canvas.Vg (Efl.Canvas.Object, Efl.Gfx.Fill, Efl.Gfx.View)
2{ 2{
3 [[Efl vector graphics class]] 3 [[Efl vector graphics class]]
4 legacy_prefix: evas_object_vg; 4 legacy_prefix: evas_object_vg;
diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c
index d519f2ee49..bcc2334ace 100644
--- a/src/lib/evas/canvas/evas_main.c
+++ b/src/lib/evas/canvas/evas_main.c
@@ -891,7 +891,7 @@ _image_data_unset(Evas_Object_Protected_Data *obj, Eina_List **list)
891 } 891 }
892 CHECK(EFL_CANVAS_IMAGE_INTERNAL_CLASS, Evas_Image_Data, 892 CHECK(EFL_CANVAS_IMAGE_INTERNAL_CLASS, Evas_Image_Data,
893 ENFN->image_free(ENC, data->engine_data)) 893 ENFN->image_free(ENC, data->engine_data))
894 else CHECK(EVAS_VG_CLASS, Evas_VG_Data, 894 else CHECK(EFL_CANVAS_VG_CLASS, Efl_Canvas_Vg_Data,
895 obj->layer->evas->engine.func->ector_free(data->engine_data)) 895 obj->layer->evas->engine.func->ector_free(data->engine_data))
896 else CHECK(EFL_CANVAS_POLYGON_CLASS, Efl_Canvas_Polygon_Data, 896 else CHECK(EFL_CANVAS_POLYGON_CLASS, Efl_Canvas_Polygon_Data,
897 data->engine_data = 897 data->engine_data =
@@ -957,7 +957,7 @@ _image_data_regenerate(Evas_Object *eo_obj)
957 CHECK(EFL_CANVAS_IMAGE_INTERNAL_CLASS, Evas_Image_Data, _image_image_data_regenerate(eo_obj, obj, data)) 957 CHECK(EFL_CANVAS_IMAGE_INTERNAL_CLASS, Evas_Image_Data, _image_image_data_regenerate(eo_obj, obj, data))
958 else CHECK(EFL_CANVAS_IMAGE_CLASS, Evas_Image_Data, _image_image_data_regenerate(eo_obj, obj, data)) 958 else CHECK(EFL_CANVAS_IMAGE_CLASS, Evas_Image_Data, _image_image_data_regenerate(eo_obj, obj, data))
959 else CHECK(EFL_CANVAS_SCENE3D_CLASS, Evas_Image_Data, _image_image_data_regenerate(eo_obj, obj, data)) 959 else CHECK(EFL_CANVAS_SCENE3D_CLASS, Evas_Image_Data, _image_image_data_regenerate(eo_obj, obj, data))
960 //else CHECK(EVAS_VG_CLASS, Evas_VG_Data,) 960 //else CHECK(EFL_CANVAS_VG_CLASS, Efl_Canvas_Vg_Data,)
961 //else CHECK(EFL_CANVAS_POLYGON_CLASS, Efl_Canvas_Polygon_Data,) 961 //else CHECK(EFL_CANVAS_POLYGON_CLASS, Efl_Canvas_Polygon_Data,)
962 //else CHECK(EVAS_CANVAS3D_TEXTURE_CLASS, Evas_Canvas3D_Texture_Data, 962 //else CHECK(EVAS_CANVAS3D_TEXTURE_CLASS, Evas_Canvas3D_Texture_Data,
963} 963}
diff --git a/src/lib/evas/canvas/evas_vg_node.c b/src/lib/evas/canvas/evas_vg_node.c
index 116f9f49ef..04f576eb16 100644
--- a/src/lib/evas/canvas/evas_vg_node.c
+++ b/src/lib/evas/canvas/evas_vg_node.c
@@ -220,7 +220,7 @@ _efl_vg_parent_checked_get(Eo *obj,
220 goto on_error; 220 goto on_error;
221 } 221 }
222 } 222 }
223 else if (efl_isa(*parent, EVAS_VG_CLASS)) 223 else if (efl_isa(*parent, EFL_CANVAS_VG_CLASS))
224 { 224 {
225 goto on_error; 225 goto on_error;
226 } 226 }
diff --git a/src/lib/evas/canvas/evas_vg_private.h b/src/lib/evas/canvas/evas_vg_private.h
index 47003def5b..f45ba0a3ac 100644
--- a/src/lib/evas/canvas/evas_vg_private.h
+++ b/src/lib/evas/canvas/evas_vg_private.h
@@ -8,9 +8,9 @@ typedef struct _Efl_VG_Container_Data Efl_VG_Container_Data;
8typedef struct _Efl_VG_Gradient_Data Efl_VG_Gradient_Data; 8typedef struct _Efl_VG_Gradient_Data Efl_VG_Gradient_Data;
9typedef struct _Efl_VG_Interpolation Efl_VG_Interpolation; 9typedef struct _Efl_VG_Interpolation Efl_VG_Interpolation;
10 10
11typedef struct _Evas_VG_Data Evas_VG_Data; 11typedef struct _Efl_Canvas_Vg_Data Efl_Canvas_Vg_Data;
12 12
13struct _Evas_VG_Data 13struct _Efl_Canvas_Vg_Data
14{ 14{
15 void *engine_data; 15 void *engine_data;
16 Efl_VG *root; 16 Efl_VG *root;