summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg_object.c22
-rw-r--r--src/lib/evas/canvas/evas_object_image.c22
-rw-r--r--src/lib/evas/canvas/evas_object_line.c23
-rw-r--r--src/lib/evas/canvas/evas_object_polygon.c20
-rw-r--r--src/lib/evas/canvas/evas_object_rectangle.c20
-rw-r--r--src/lib/evas/canvas/evas_object_smart.c20
-rw-r--r--src/lib/evas/canvas/evas_object_text.c22
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c20
-rw-r--r--src/lib/evas/canvas/evas_object_textgrid.c30
-rw-r--r--src/lib/evas/include/evas_private.h18
-rw-r--r--src/lib/evas/main.c60
11 files changed, 2 insertions, 275 deletions
diff --git a/src/lib/evas/canvas/efl_canvas_vg_object.c b/src/lib/evas/canvas/efl_canvas_vg_object.c
index 7db12f1..6aa798a 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_object.c
+++ b/src/lib/evas/canvas/efl_canvas_vg_object.c
@@ -22,8 +22,6 @@ static void _efl_canvas_vg_render_pre(Evas_Object *eo_obj,
22static void _efl_canvas_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 _efl_canvas_vg_id_get(Evas_Object *eo_obj);
26static unsigned int _efl_canvas_vg_visual_id_get(Evas_Object *eo_obj);
27static void *_efl_canvas_vg_engine_data_get(Evas_Object *eo_obj); 25static void *_efl_canvas_vg_engine_data_get(Evas_Object *eo_obj);
28static int _efl_canvas_vg_is_opaque(Evas_Object *eo_obj, 26static int _efl_canvas_vg_is_opaque(Evas_Object *eo_obj,
29 Evas_Object_Protected_Data *obj, 27 Evas_Object_Protected_Data *obj,
@@ -39,14 +37,10 @@ static const Evas_Object_Func object_func =
39 _efl_canvas_vg_render, 37 _efl_canvas_vg_render,
40 _efl_canvas_vg_render_pre, 38 _efl_canvas_vg_render_pre,
41 _efl_canvas_vg_render_post, 39 _efl_canvas_vg_render_post,
42 _efl_canvas_vg_id_get,
43 _efl_canvas_vg_visual_id_get,
44 _efl_canvas_vg_engine_data_get, 40 _efl_canvas_vg_engine_data_get,
45 /* these are optional. NULL = nothing */ 41 /* these are optional. NULL = nothing */
46 NULL, 42 NULL,
47 NULL, 43 NULL,
48 NULL,
49 NULL,
50 _efl_canvas_vg_is_opaque, 44 _efl_canvas_vg_is_opaque,
51 _efl_canvas_vg_was_opaque, 45 _efl_canvas_vg_was_opaque,
52 NULL, 46 NULL,
@@ -754,22 +748,6 @@ _efl_canvas_vg_render_post(Evas_Object *eo_obj EINA_UNUSED,
754 evas_object_cur_prev(obj); 748 evas_object_cur_prev(obj);
755} 749}
756 750
757static unsigned int
758_efl_canvas_vg_id_get(Evas_Object *eo_obj)
759{
760 Efl_Canvas_Vg_Object_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
761 if (!o) return 0;
762 return MAGIC_OBJ_VG;
763}
764
765static unsigned int
766_efl_canvas_vg_visual_id_get(Evas_Object *eo_obj)
767{
768 Efl_Canvas_Vg_Object_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
769 if (!o) return 0;
770 return MAGIC_OBJ_SHAPE;
771}
772
773static void * 751static void *
774_efl_canvas_vg_engine_data_get(Evas_Object *eo_obj) 752_efl_canvas_vg_engine_data_get(Evas_Object *eo_obj)
775{ 753{
diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c
index 8966033..8aa9ded 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -30,8 +30,6 @@ static void evas_object_image_render_post(Evas_Object *eo_obj,
30 Evas_Object_Protected_Data *obj, 30 Evas_Object_Protected_Data *obj,
31 void *type_private_data); 31 void *type_private_data);
32 32
33static unsigned int evas_object_image_id_get(Evas_Object *eo_obj);
34static unsigned int evas_object_image_visual_id_get(Evas_Object *eo_obj);
35static void *evas_object_image_engine_data_get(Evas_Object *eo_obj); 33static void *evas_object_image_engine_data_get(Evas_Object *eo_obj);
36 34
37static int evas_object_image_is_opaque(Evas_Object *eo_obj, 35static int evas_object_image_is_opaque(Evas_Object *eo_obj,
@@ -63,14 +61,10 @@ static const Evas_Object_Func object_func =
63 evas_object_image_render, 61 evas_object_image_render,
64 evas_object_image_render_pre, 62 evas_object_image_render_pre,
65 evas_object_image_render_post, 63 evas_object_image_render_post,
66 evas_object_image_id_get,
67 evas_object_image_visual_id_get,
68 evas_object_image_engine_data_get, 64 evas_object_image_engine_data_get,
69 /* these are optional. NULL = nothing */ 65 /* these are optional. NULL = nothing */
70 NULL, 66 NULL,
71 NULL, 67 NULL,
72 NULL,
73 NULL,
74 evas_object_image_is_opaque, 68 evas_object_image_is_opaque,
75 evas_object_image_was_opaque, 69 evas_object_image_was_opaque,
76 evas_object_image_is_inside, 70 evas_object_image_is_inside,
@@ -2699,22 +2693,6 @@ evas_object_image_render_post(Evas_Object *eo_obj EINA_UNUSED,
2699 /* FIXME: copy strings across */ 2693 /* FIXME: copy strings across */
2700} 2694}
2701 2695
2702static unsigned int
2703evas_object_image_id_get(Evas_Object *eo_obj)
2704{
2705 Evas_Image_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
2706 if (!o) return 0;
2707 return MAGIC_OBJ_IMAGE;
2708}
2709
2710static unsigned int
2711evas_object_image_visual_id_get(Evas_Object *eo_obj)
2712{
2713 Evas_Image_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
2714 if (!o) return 0;
2715 return MAGIC_OBJ_IMAGE;
2716}
2717
2718static void * 2696static void *
2719evas_object_image_engine_data_get(Evas_Object *eo_obj) 2697evas_object_image_engine_data_get(Evas_Object *eo_obj)
2720{ 2698{
diff --git a/src/lib/evas/canvas/evas_object_line.c b/src/lib/evas/canvas/evas_object_line.c
index ef6cf14..47adade 100644
--- a/src/lib/evas/canvas/evas_object_line.c
+++ b/src/lib/evas/canvas/evas_object_line.c
@@ -39,8 +39,6 @@ static void evas_object_line_render_post(Evas_Object *eo_obj,
39 Evas_Object_Protected_Data *obj, 39 Evas_Object_Protected_Data *obj,
40 void *type_private_data); 40 void *type_private_data);
41 41
42static unsigned int evas_object_line_id_get(Evas_Object *eo_obj);
43static unsigned int evas_object_line_visual_id_get(Evas_Object *eo_obj);
44static void *evas_object_line_engine_data_get(Evas_Object *eo_obj); 42static void *evas_object_line_engine_data_get(Evas_Object *eo_obj);
45 43
46static int evas_object_line_is_opaque(Evas_Object *eo_obj, 44static int evas_object_line_is_opaque(Evas_Object *eo_obj,
@@ -68,14 +66,10 @@ static const Evas_Object_Func object_func =
68 evas_object_line_render, 66 evas_object_line_render,
69 evas_object_line_render_pre, 67 evas_object_line_render_pre,
70 evas_object_line_render_post, 68 evas_object_line_render_post,
71 evas_object_line_id_get,
72 evas_object_line_visual_id_get,
73 evas_object_line_engine_data_get, 69 evas_object_line_engine_data_get,
74 /* these are optional. NULL = nothing */ 70 /* these are optional. NULL = nothing */
75 NULL, 71 NULL,
76 NULL, 72 NULL,
77 NULL,
78 NULL,
79 evas_object_line_is_opaque, 73 evas_object_line_is_opaque,
80 evas_object_line_was_opaque, 74 evas_object_line_was_opaque,
81 evas_object_line_is_inside, 75 evas_object_line_is_inside,
@@ -84,8 +78,7 @@ static const Evas_Object_Func object_func =
84 NULL, 78 NULL,
85 NULL, 79 NULL,
86 NULL, 80 NULL,
87 NULL, // render_prepare 81 NULL // render_prepare
88 NULL
89}; 82};
90 83
91/* the actual api call to add a rect */ 84/* the actual api call to add a rect */
@@ -358,20 +351,6 @@ evas_object_line_render_post(Evas_Object *eo_obj EINA_UNUSED,
358 o->prev = o->cur; 351 o->prev = o->cur;
359} 352}
360 353
361static unsigned int evas_object_line_id_get(Evas_Object *eo_obj)
362{
363 Evas_Line_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
364 if (!o) return 0;
365 return MAGIC_OBJ_LINE;
366}
367
368static unsigned int evas_object_line_visual_id_get(Evas_Object *eo_obj)
369{
370 Evas_Line_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
371 if (!o) return 0;
372 return MAGIC_OBJ_SHAPE;
373}
374
375static void *evas_object_line_engine_data_get(Evas_Object *eo_obj) 354static void *evas_object_line_engine_data_get(Evas_Object *eo_obj)
376{ 355{
377 Evas_Line_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 356 Evas_Line_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
diff --git a/src/lib/evas/canvas/evas_object_polygon.c b/src/lib/evas/canvas/evas_object_polygon.c
index 8993f5f..985420b 100644
--- a/src/lib/evas/canvas/evas_object_polygon.c
+++ b/src/lib/evas/canvas/evas_object_polygon.c
@@ -32,8 +32,6 @@ static void evas_object_polygon_render_post(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
35static unsigned int evas_object_polygon_id_get(Evas_Object *eo_obj);
36static unsigned int evas_object_polygon_visual_id_get(Evas_Object *eo_obj);
37static void *evas_object_polygon_engine_data_get(Evas_Object *eo_obj); 35static void *evas_object_polygon_engine_data_get(Evas_Object *eo_obj);
38 36
39static int evas_object_polygon_is_opaque(Evas_Object *eo_obj, 37static int evas_object_polygon_is_opaque(Evas_Object *eo_obj,
@@ -58,14 +56,10 @@ static const Evas_Object_Func object_func =
58 evas_object_polygon_render, 56 evas_object_polygon_render,
59 evas_object_polygon_render_pre, 57 evas_object_polygon_render_pre,
60 evas_object_polygon_render_post, 58 evas_object_polygon_render_post,
61 evas_object_polygon_id_get,
62 evas_object_polygon_visual_id_get,
63 evas_object_polygon_engine_data_get, 59 evas_object_polygon_engine_data_get,
64 /* these are optional. NULL = nothing */ 60 /* these are optional. NULL = nothing */
65 NULL, 61 NULL,
66 NULL, 62 NULL,
67 NULL,
68 NULL,
69 evas_object_polygon_is_opaque, 63 evas_object_polygon_is_opaque,
70 evas_object_polygon_was_opaque, 64 evas_object_polygon_was_opaque,
71 evas_object_polygon_is_inside, 65 evas_object_polygon_is_inside,
@@ -416,20 +410,6 @@ evas_object_polygon_render_post(Evas_Object *eo_obj EINA_UNUSED,
416 evas_object_cur_prev(obj); 410 evas_object_cur_prev(obj);
417} 411}
418 412
419static unsigned int evas_object_polygon_id_get(Evas_Object *eo_obj)
420{
421 Efl_Canvas_Polygon_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
422 if (!o) return 0;
423 return MAGIC_OBJ_POLYGON;
424}
425
426static unsigned int evas_object_polygon_visual_id_get(Evas_Object *eo_obj)
427{
428 Efl_Canvas_Polygon_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
429 if (!o) return 0;
430 return MAGIC_OBJ_SHAPE;
431}
432
433static void *evas_object_polygon_engine_data_get(Evas_Object *eo_obj) 413static void *evas_object_polygon_engine_data_get(Evas_Object *eo_obj)
434{ 414{
435 Efl_Canvas_Polygon_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 415 Efl_Canvas_Polygon_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
diff --git a/src/lib/evas/canvas/evas_object_rectangle.c b/src/lib/evas/canvas/evas_object_rectangle.c
index ee9177b..d2dd430 100644
--- a/src/lib/evas/canvas/evas_object_rectangle.c
+++ b/src/lib/evas/canvas/evas_object_rectangle.c
@@ -30,8 +30,6 @@ static void evas_object_rectangle_render_post(Evas_Object *eo_obj,
30 Evas_Object_Protected_Data *obj, 30 Evas_Object_Protected_Data *obj,
31 void *type_private_data); 31 void *type_private_data);
32 32
33static unsigned int evas_object_rectangle_id_get(Evas_Object *eo_obj);
34static unsigned int evas_object_rectangle_visual_id_get(Evas_Object *eo_obj);
35static void *evas_object_rectangle_engine_data_get(Evas_Object *eo_obj); 33static void *evas_object_rectangle_engine_data_get(Evas_Object *eo_obj);
36 34
37static int evas_object_rectangle_is_opaque(Evas_Object *eo_obj, 35static int evas_object_rectangle_is_opaque(Evas_Object *eo_obj,
@@ -58,14 +56,10 @@ static const Evas_Object_Func object_func =
58 evas_object_rectangle_render, 56 evas_object_rectangle_render,
59 evas_object_rectangle_render_pre, 57 evas_object_rectangle_render_pre,
60 evas_object_rectangle_render_post, 58 evas_object_rectangle_render_post,
61 evas_object_rectangle_id_get,
62 evas_object_rectangle_visual_id_get,
63 evas_object_rectangle_engine_data_get, 59 evas_object_rectangle_engine_data_get,
64 /* these are optional. NULL = nothing */ 60 /* these are optional. NULL = nothing */
65 NULL, 61 NULL,
66 NULL, 62 NULL,
67 NULL,
68 NULL,
69 evas_object_rectangle_is_opaque, 63 evas_object_rectangle_is_opaque,
70 evas_object_rectangle_was_opaque, 64 evas_object_rectangle_was_opaque,
71 NULL, 65 NULL,
@@ -303,20 +297,6 @@ evas_object_rectangle_was_opaque(Evas_Object *eo_obj EINA_UNUSED,
303 return (obj->prev->cache.clip.a == 255) ? 1 : 0; 297 return (obj->prev->cache.clip.a == 255) ? 1 : 0;
304} 298}
305 299
306static unsigned int evas_object_rectangle_id_get(Evas_Object *eo_obj)
307{
308 Efl_Canvas_Rectangle_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
309 if (!o) return 0;
310 return MAGIC_OBJ_RECTANGLE;
311}
312
313static unsigned int evas_object_rectangle_visual_id_get(Evas_Object *eo_obj)
314{
315 Efl_Canvas_Rectangle_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
316 if (!o) return 0;
317 return MAGIC_OBJ_SHAPE;
318}
319
320static void *evas_object_rectangle_engine_data_get(Evas_Object *eo_obj) 300static void *evas_object_rectangle_engine_data_get(Evas_Object *eo_obj)
321{ 301{
322 Efl_Canvas_Rectangle_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 302 Efl_Canvas_Rectangle_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c
index 52ad3cd..11d8feb 100644
--- a/src/lib/evas/canvas/evas_object_smart.c
+++ b/src/lib/evas/canvas/evas_object_smart.c
@@ -91,8 +91,6 @@ static void evas_object_smart_render_post(Evas_Object *eo_obj,
91 Evas_Object_Protected_Data *obj, 91 Evas_Object_Protected_Data *obj,
92 void *type_private_data); 92 void *type_private_data);
93 93
94static unsigned int evas_object_smart_id_get(Evas_Object *eo_obj);
95static unsigned int evas_object_smart_visual_id_get(Evas_Object *eo_obj);
96static void *evas_object_smart_engine_data_get(Evas_Object *eo_obj); 94static void *evas_object_smart_engine_data_get(Evas_Object *eo_obj);
97static void _efl_canvas_group_group_paragraph_direction_set_internal(Eo *eo_obj, 95static void _efl_canvas_group_group_paragraph_direction_set_internal(Eo *eo_obj,
98 Evas_BiDi_Direction dir); 96 Evas_BiDi_Direction dir);
@@ -104,8 +102,6 @@ static const Evas_Object_Func object_func =
104 evas_object_smart_render, 102 evas_object_smart_render,
105 evas_object_smart_render_pre, 103 evas_object_smart_render_pre,
106 evas_object_smart_render_post, 104 evas_object_smart_render_post,
107 evas_object_smart_id_get,
108 evas_object_smart_visual_id_get,
109 evas_object_smart_engine_data_get, 105 evas_object_smart_engine_data_get,
110 /* these are optional. NULL = nothing */ 106 /* these are optional. NULL = nothing */
111 NULL, 107 NULL,
@@ -118,8 +114,6 @@ static const Evas_Object_Func object_func =
118 NULL, 114 NULL,
119 NULL, 115 NULL,
120 NULL, 116 NULL,
121 NULL,
122 NULL,
123 NULL // render_prepare 117 NULL // render_prepare
124}; 118};
125 119
@@ -1737,20 +1731,6 @@ evas_object_smart_render_post(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Prote
1737 o->prev = o->cur; 1731 o->prev = o->cur;
1738} 1732}
1739 1733
1740static unsigned int evas_object_smart_id_get(Evas_Object *eo_obj)
1741{
1742 Evas_Smart_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
1743 if (!o) return 0;
1744 return MAGIC_OBJ_SMART;
1745}
1746
1747static unsigned int evas_object_smart_visual_id_get(Evas_Object *eo_obj)
1748{
1749 Evas_Smart_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
1750 if (!o) return 0;
1751 return MAGIC_OBJ_CONTAINER;
1752}
1753
1754static void *evas_object_smart_engine_data_get(Evas_Object *eo_obj) 1734static void *evas_object_smart_engine_data_get(Evas_Object *eo_obj)
1755{ 1735{
1756 Evas_Smart_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 1736 Evas_Smart_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
diff --git a/src/lib/evas/canvas/evas_object_text.c b/src/lib/evas/canvas/evas_object_text.c
index 4474c85..07b8202 100644
--- a/src/lib/evas/canvas/evas_object_text.c
+++ b/src/lib/evas/canvas/evas_object_text.c
@@ -103,8 +103,6 @@ static void evas_object_text_render_post(Evas_Object *eo_obj,
103 Evas_Object_Protected_Data *obj, 103 Evas_Object_Protected_Data *obj,
104 void *type_private_data); 104 void *type_private_data);
105 105
106static unsigned int evas_object_text_id_get(Evas_Object *eo_obj);
107static unsigned int evas_object_text_visual_id_get(Evas_Object *eo_obj);
108static void *evas_object_text_engine_data_get(Evas_Object *eo_obj); 106static void *evas_object_text_engine_data_get(Evas_Object *eo_obj);
109 107
110static int evas_object_text_is_opaque(Evas_Object *eo_obj, 108static int evas_object_text_is_opaque(Evas_Object *eo_obj,
@@ -123,14 +121,10 @@ static const Evas_Object_Func object_func =
123 evas_object_text_render, 121 evas_object_text_render,
124 evas_object_text_render_pre, 122 evas_object_text_render_pre,
125 evas_object_text_render_post, 123 evas_object_text_render_post,
126 evas_object_text_id_get,
127 evas_object_text_visual_id_get,
128 evas_object_text_engine_data_get, 124 evas_object_text_engine_data_get,
129 /* these are optional. NULL = nothing */ 125 /* these are optional. NULL = nothing */
130 NULL, 126 NULL,
131 NULL, 127 NULL,
132 NULL,
133 NULL,
134 evas_object_text_is_opaque, 128 evas_object_text_is_opaque,
135 evas_object_text_was_opaque, 129 evas_object_text_was_opaque,
136 NULL, 130 NULL,
@@ -2165,22 +2159,6 @@ evas_object_text_render_post(Evas_Object *eo_obj EINA_UNUSED,
2165 evas_object_cur_prev(obj); 2159 evas_object_cur_prev(obj);
2166} 2160}
2167 2161
2168static unsigned int
2169evas_object_text_id_get(Evas_Object *eo_obj)
2170{
2171 Evas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
2172 if (!o) return 0;
2173 return MAGIC_OBJ_TEXT;
2174}
2175
2176static unsigned int
2177evas_object_text_visual_id_get(Evas_Object *eo_obj)
2178{
2179 Evas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
2180 if (!o) return 0;
2181 return MAGIC_OBJ_SHAPE;
2182}
2183
2184static void * 2162static void *
2185evas_object_text_engine_data_get(Evas_Object *eo_obj) 2163evas_object_text_engine_data_get(Evas_Object *eo_obj)
2186{ 2164{
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index 8be4865..c0f9637 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -695,8 +695,6 @@ static void evas_object_textblock_render_post(Evas_Object *eo_obj,
695 void *type_private_data); 695 void *type_private_data);
696static Evas_Object_Textblock_Node_Text *_evas_textblock_node_text_new(void); 696static Evas_Object_Textblock_Node_Text *_evas_textblock_node_text_new(void);
697 697
698static unsigned int evas_object_textblock_id_get(Evas_Object *eo_obj);
699static unsigned int evas_object_textblock_visual_id_get(Evas_Object *eo_obj);
700static void *evas_object_textblock_engine_data_get(Evas_Object *eo_obj); 698static void *evas_object_textblock_engine_data_get(Evas_Object *eo_obj);
701 699
702static int evas_object_textblock_is_opaque(Evas_Object *eo_obj, 700static int evas_object_textblock_is_opaque(Evas_Object *eo_obj,
@@ -716,14 +714,10 @@ static const Evas_Object_Func object_func =
716 evas_object_textblock_render, 714 evas_object_textblock_render,
717 evas_object_textblock_render_pre, 715 evas_object_textblock_render_pre,
718 evas_object_textblock_render_post, 716 evas_object_textblock_render_post,
719 evas_object_textblock_id_get,
720 evas_object_textblock_visual_id_get,
721 evas_object_textblock_engine_data_get, 717 evas_object_textblock_engine_data_get,
722 /* these are optional. NULL = nothing */ 718 /* these are optional. NULL = nothing */
723 NULL, 719 NULL,
724 NULL, 720 NULL,
725 NULL,
726 NULL,
727 evas_object_textblock_is_opaque, 721 evas_object_textblock_is_opaque,
728 evas_object_textblock_was_opaque, 722 evas_object_textblock_was_opaque,
729 NULL, 723 NULL,
@@ -14869,20 +14863,6 @@ evas_object_textblock_render_post(Evas_Object *eo_obj EINA_UNUSED,
14869 _filter_output_cache_prune(obj, o); 14863 _filter_output_cache_prune(obj, o);
14870} 14864}
14871 14865
14872static unsigned int evas_object_textblock_id_get(Evas_Object *eo_obj)
14873{
14874 Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
14875 if (!o) return 0;
14876 return MAGIC_OBJ_TEXTBLOCK;
14877}
14878
14879static unsigned int evas_object_textblock_visual_id_get(Evas_Object *eo_obj)
14880{
14881 Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
14882 if (!o) return 0;
14883 return MAGIC_OBJ_CUSTOM;
14884}
14885
14886static void *evas_object_textblock_engine_data_get(Evas_Object *eo_obj) 14866static void *evas_object_textblock_engine_data_get(Evas_Object *eo_obj)
14887{ 14867{
14888 Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 14868 Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
diff --git a/src/lib/evas/canvas/evas_object_textgrid.c b/src/lib/evas/canvas/evas_object_textgrid.c
index 15a8dff..52cfe66 100644
--- a/src/lib/evas/canvas/evas_object_textgrid.c
+++ b/src/lib/evas/canvas/evas_object_textgrid.c
@@ -20,8 +20,6 @@ typedef struct _Evas_Object_Textgrid_Line Evas_Object_Textgrid_Line;
20 20
21struct _Evas_Textgrid_Data 21struct _Evas_Textgrid_Data
22{ 22{
23 DATA32 magic;
24
25 struct { 23 struct {
26 int w, h; 24 int w, h;
27 int char_width; 25 int char_width;
@@ -102,8 +100,6 @@ static void evas_object_textgrid_render_post(Evas_Object *eo_obj,
102 Evas_Object_Protected_Data *obj, 100 Evas_Object_Protected_Data *obj,
103 void *type_private_data); 101 void *type_private_data);
104 102
105static unsigned int evas_object_textgrid_id_get(Evas_Object *eo_obj);
106static unsigned int evas_object_textgrid_visual_id_get(Evas_Object *eo_obj);
107static void *evas_object_textgrid_engine_data_get(Evas_Object *eo_obj); 103static void *evas_object_textgrid_engine_data_get(Evas_Object *eo_obj);
108 104
109static int evas_object_textgrid_is_opaque(Evas_Object *eo_obj, 105static int evas_object_textgrid_is_opaque(Evas_Object *eo_obj,
@@ -120,14 +116,10 @@ static const Evas_Object_Func object_func =
120 evas_object_textgrid_render, 116 evas_object_textgrid_render,
121 evas_object_textgrid_render_pre, 117 evas_object_textgrid_render_pre,
122 evas_object_textgrid_render_post, 118 evas_object_textgrid_render_post,
123 evas_object_textgrid_id_get,
124 evas_object_textgrid_visual_id_get,
125 evas_object_textgrid_engine_data_get, 119 evas_object_textgrid_engine_data_get,
126 /* these are optional. NULL = nothing */ 120 /* these are optional. NULL = nothing */
127 NULL, 121 NULL,
128 NULL, 122 NULL,
129 NULL,
130 NULL,
131 evas_object_textgrid_is_opaque, 123 evas_object_textgrid_is_opaque,
132 evas_object_textgrid_was_opaque, 124 evas_object_textgrid_was_opaque,
133 NULL, 125 NULL,
@@ -136,8 +128,7 @@ static const Evas_Object_Func object_func =
136 NULL, 128 NULL,
137 NULL, 129 NULL,
138 NULL, 130 NULL,
139 NULL, // render_prepare 131 NULL // render_prepare
140 NULL
141}; 132};
142 133
143/* all nice and private */ 134/* all nice and private */
@@ -151,7 +142,6 @@ evas_object_textgrid_init(Evas_Object *eo_obj)
151 obj->type = o_type; 142 obj->type = o_type;
152 143
153 Evas_Textgrid_Data *o = obj->private_data; 144 Evas_Textgrid_Data *o = obj->private_data;
154 o->magic = MAGIC_OBJ_TEXTGRID;
155 o->prev.bitmap_scalable = o->cur.bitmap_scalable = EFL_TEXT_FONT_BITMAP_SCALABLE_COLOR; 145 o->prev.bitmap_scalable = o->cur.bitmap_scalable = EFL_TEXT_FONT_BITMAP_SCALABLE_COLOR;
156 o->prev = o->cur; 146 o->prev = o->cur;
157 eina_array_step_set(&o->cur.palette_standard, sizeof (Eina_Array), 16); 147 eina_array_step_set(&o->cur.palette_standard, sizeof (Eina_Array), 16);
@@ -230,8 +220,6 @@ evas_object_textgrid_free(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj E
230 while ((c = eina_array_pop(&o->cur.palette_extended))) 220 while ((c = eina_array_pop(&o->cur.palette_extended)))
231 free(c); 221 free(c);
232 eina_array_flush(&o->cur.palette_extended); 222 eina_array_flush(&o->cur.palette_extended);
233
234 o->magic = 0;
235} 223}
236 224
237EOLIAN static void 225EOLIAN static void
@@ -827,22 +815,6 @@ evas_object_textgrid_render_post(Evas_Object *eo_obj EINA_UNUSED,
827 o->prev = o->cur; 815 o->prev = o->cur;
828} 816}
829 817
830static unsigned int
831evas_object_textgrid_id_get(Evas_Object *eo_obj)
832{
833 Evas_Textgrid_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
834 if (!o) return 0;
835 return MAGIC_OBJ_TEXTGRID;
836}
837
838static unsigned int
839evas_object_textgrid_visual_id_get(Evas_Object *eo_obj)
840{
841 Evas_Textgrid_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
842 if (!o) return 0;
843 return MAGIC_OBJ_SHAPE;
844}
845
846static void * 818static void *
847evas_object_textgrid_engine_data_get(Evas_Object *eo_obj) 819evas_object_textgrid_engine_data_get(Evas_Object *eo_obj)
848{ 820{
diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h
index 76bb46c..38f6e89 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -509,19 +509,8 @@ OPAQUE_TYPE(Evas_Font_Instance); /* General type for RGBA_Font_Int */
509 509
510#define MAGIC_EVAS 0x70777770 510#define MAGIC_EVAS 0x70777770
511#define MAGIC_OBJ 0x71737723 511#define MAGIC_OBJ 0x71737723
512#define MAGIC_OBJ_RECTANGLE 0x76748772
513#define MAGIC_OBJ_LINE 0x7a27f839
514#define MAGIC_OBJ_POLYGON 0x7bb7577e
515#define MAGIC_OBJ_IMAGE 0x747ad76c
516#define MAGIC_OBJ_TEXT 0x77757721
517#define MAGIC_OBJ_SMART 0x78c7c73f
518#define MAGIC_OBJ_TEXTBLOCK 0x71737744
519#define MAGIC_OBJ_TEXTGRID 0x7377a7ca
520#define MAGIC_SMART 0x7c6977c5 512#define MAGIC_SMART 0x7c6977c5
521#define MAGIC_OBJ_SHAPE 0x747297f7 513#define MAGIC_OBJ_SHAPE 0x747297f7
522#define MAGIC_OBJ_CONTAINER 0x71877776
523#define MAGIC_OBJ_VG 0x77817EE7
524#define MAGIC_OBJ_CUSTOM 0x7b7857ab
525#define MAGIC_EVAS_GL 0x77976718 514#define MAGIC_EVAS_GL 0x77976718
526#define MAGIC_MAP 0x7575177d 515#define MAGIC_MAP 0x7575177d
527#define MAGIC_DEV 0x7d773738 516#define MAGIC_DEV 0x7d773738
@@ -1246,13 +1235,8 @@ struct _Evas_Object_Func
1246 void (*render_pre) (Evas_Object *obj, Evas_Object_Protected_Data *pd, void *type_private_data); 1235 void (*render_pre) (Evas_Object *obj, Evas_Object_Protected_Data *pd, void *type_private_data);
1247 void (*render_post) (Evas_Object *obj, Evas_Object_Protected_Data *pd, void *type_private_data); 1236 void (*render_post) (Evas_Object *obj, Evas_Object_Protected_Data *pd, void *type_private_data);
1248 1237
1249 unsigned int (*type_id_get) (Evas_Object *obj);
1250 unsigned int (*visual_id_get) (Evas_Object *obj);
1251 void *(*engine_data_get) (Evas_Object *obj); 1238 void *(*engine_data_get) (Evas_Object *obj);
1252 1239
1253 void (*store) (Evas_Object *obj);
1254 void (*unstore) (Evas_Object *obj);
1255
1256 int (*is_visible) (Evas_Object *obj); 1240 int (*is_visible) (Evas_Object *obj);
1257 int (*was_visible) (Evas_Object *obj); 1241 int (*was_visible) (Evas_Object *obj);
1258 1242
@@ -1583,8 +1567,6 @@ void evas_object_event_callback_call(Evas_Object *obj, Evas_Object_Protected_Dat
1583Eina_List *evas_event_objects_event_list(Evas *e, Evas_Object *stop, int x, int y); 1567Eina_List *evas_event_objects_event_list(Evas *e, Evas_Object *stop, int x, int y);
1584void evas_debug_error(void); 1568void evas_debug_error(void);
1585void evas_debug_input_null(void); 1569void evas_debug_input_null(void);
1586void evas_debug_magic_null(void);
1587void evas_debug_magic_wrong(DATA32 expected, DATA32 supplied);
1588void evas_debug_generic(const char *str); 1570void evas_debug_generic(const char *str);
1589const char *evas_debug_magic_string_get(DATA32 magic); 1571const char *evas_debug_magic_string_get(DATA32 magic);
1590void evas_render_update_del(Evas_Public_Data *e, int x, int y, int w, int h); 1572void evas_render_update_del(Evas_Public_Data *e, int x, int y, int w, int h);
diff --git a/src/lib/evas/main.c b/src/lib/evas/main.c
index c0f7e91..2c8bccb 100644
--- a/src/lib/evas/main.c
+++ b/src/lib/evas/main.c
@@ -56,36 +56,6 @@ evas_debug_input_null(void)
56} 56}
57 57
58void 58void
59evas_debug_magic_null(void)
60{
61 if (!_evas_debug_init)
62 {
63 _evas_debug_init_from_env();
64 }
65 if ((_evas_debug_show == _EVAS_DEBUG_SHOW) ||
66 (_evas_debug_show == _EVAS_DEBUG_DEFAULT))
67 CRI("Input object is zero'ed out (maybe a freed object or zero-filled RAM)!");
68 if (_evas_debug_abort) abort();
69}
70
71void
72evas_debug_magic_wrong(DATA32 expected, DATA32 supplied)
73{
74 if (!_evas_debug_init)
75 {
76 _evas_debug_init_from_env();
77 }
78 if ((_evas_debug_show == _EVAS_DEBUG_SHOW) ||
79 (_evas_debug_show == _EVAS_DEBUG_DEFAULT))
80 CRI("Input object is wrong type\n"
81 " Expected: %08x - %s\n"
82 " Supplied: %08x - %s",
83 expected, evas_debug_magic_string_get(expected),
84 supplied, evas_debug_magic_string_get(supplied));
85 if (_evas_debug_abort) abort();
86}
87
88void
89evas_debug_generic(const char *str) 59evas_debug_generic(const char *str)
90{ 60{
91 if (!_evas_debug_init) 61 if (!_evas_debug_init)
@@ -97,33 +67,3 @@ evas_debug_generic(const char *str)
97 CRI("%s", str); 67 CRI("%s", str);
98 if (_evas_debug_abort) abort(); 68 if (_evas_debug_abort) abort();
99} 69}
100
101const char *
102evas_debug_magic_string_get(DATA32 magic)
103{
104 switch (magic)
105 {
106 case MAGIC_EVAS:
107 return "Evas";
108 case MAGIC_OBJ:
109 return "Evas_Object";
110 case MAGIC_OBJ_RECTANGLE:
111 return "Evas_Object (Rectangle)";
112 case MAGIC_OBJ_LINE:
113 return "Evas_Object (Line)";
114 case MAGIC_OBJ_POLYGON:
115 return "Evas_Object (Polygon)";
116 case MAGIC_OBJ_IMAGE:
117 return "Evas_Object (Image)";
118 case MAGIC_OBJ_TEXT:
119 return "Evas_Object (Text)";
120 case MAGIC_OBJ_SMART:
121 return "Evas_Object (Smart)";
122 case MAGIC_EVAS_GL:
123 return "Evas_GL";
124 case MAGIC_MAP:
125 return "Evas_Map";
126 default:
127 return "<UNKNOWN>";
128 };
129}