summaryrefslogtreecommitdiff
path: root/legacy/evas/src/lib
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2009-09-21 16:08:51 +0000
committerCedric BAIL <cedric.bail@free.fr>2009-09-21 16:08:51 +0000
commitc259d8adddf7b72641c42adb9713d7d9a29a123c (patch)
tree9c0a55308034d1aaddbe856696a71ece75ddb9cf /legacy/evas/src/lib
parentdb6bee8c04fa464916d63a553e392f36ac0a659c (diff)
* evas: Use eina_log.
Patch from Matthieu. SVN revision: 42598
Diffstat (limited to '')
-rw-r--r--legacy/evas/src/lib/canvas/evas_events.c6
-rw-r--r--legacy/evas/src/lib/canvas/evas_font_dir.c2
-rw-r--r--legacy/evas/src/lib/canvas/evas_main.c13
-rw-r--r--legacy/evas/src/lib/canvas/evas_object_box.c10
-rw-r--r--legacy/evas/src/lib/canvas/evas_object_image.c5
-rw-r--r--legacy/evas/src/lib/canvas/evas_object_smart.c6
-rw-r--r--legacy/evas/src/lib/canvas/evas_object_table.c51
-rw-r--r--legacy/evas/src/lib/canvas/evas_render.c2
-rw-r--r--legacy/evas/src/lib/canvas/evas_smart.c4
-rw-r--r--legacy/evas/src/lib/canvas/evas_stack.c4
-rw-r--r--legacy/evas/src/lib/cserve/evas_cs_client.c4
-rw-r--r--legacy/evas/src/lib/cserve/evas_cs_server.c4
-rw-r--r--legacy/evas/src/lib/engines/common/evas_convert_main.c2
-rw-r--r--legacy/evas/src/lib/engines/common/evas_convert_rgb_16.c2
-rw-r--r--legacy/evas/src/lib/engines/common/evas_cpu.c3
-rw-r--r--legacy/evas/src/lib/engines/common/evas_font_draw.c1
-rw-r--r--legacy/evas/src/lib/engines/common/evas_font_main.c2
-rw-r--r--legacy/evas/src/lib/engines/common/evas_font_query.c4
-rw-r--r--legacy/evas/src/lib/engines/common/evas_image_main.c4
-rw-r--r--legacy/evas/src/lib/engines/common/evas_image_scalecache.c26
-rw-r--r--legacy/evas/src/lib/engines/common/evas_op_add_main_.c1
-rw-r--r--legacy/evas/src/lib/engines/common/evas_pipe.c8
-rw-r--r--legacy/evas/src/lib/engines/common/evas_tiler.c13
-rw-r--r--legacy/evas/src/lib/engines/common_16/evas_soft16_image_scaled_sampled.c17
-rw-r--r--legacy/evas/src/lib/engines/common_16/evas_soft16_image_unscaled.c15
-rw-r--r--legacy/evas/src/lib/engines/common_16/evas_soft16_main.c2
-rw-r--r--legacy/evas/src/lib/engines/common_16/evas_soft16_rectangle.c4
-rw-r--r--legacy/evas/src/lib/include/evas_common.h59
-rw-r--r--legacy/evas/src/lib/main.c25
29 files changed, 170 insertions, 129 deletions
diff --git a/legacy/evas/src/lib/canvas/evas_events.c b/legacy/evas/src/lib/canvas/evas_events.c
index 883fd62b01..64d2a1d10b 100644
--- a/legacy/evas/src/lib/canvas/evas_events.c
+++ b/legacy/evas/src/lib/canvas/evas_events.c
@@ -398,13 +398,13 @@ evas_event_feed_mouse_up(Evas *e, int b, Evas_Button_Flags flags, unsigned int t
398 398
399 if (e->pointer.mouse_grabbed < 0) 399 if (e->pointer.mouse_grabbed < 0)
400 { 400 {
401 fprintf(stderr, "BUG? e->pointer.mouse_grabbed (=%d) < 0!\n", 401 ERROR("BUG? e->pointer.mouse_grabbed (=%d) < 0!",
402 e->pointer.mouse_grabbed); 402 e->pointer.mouse_grabbed);
403 } 403 }
404 404
405 if ((e->pointer.button == 0) && (e->pointer.mouse_grabbed != 0)) 405 if ((e->pointer.button == 0) && (e->pointer.mouse_grabbed != 0))
406 { 406 {
407 printf("restore to 0 grabs (from %i)\n", e->pointer.mouse_grabbed); 407 INFO("restore to 0 grabs (from %i)", e->pointer.mouse_grabbed);
408 e->pointer.mouse_grabbed = 0; 408 e->pointer.mouse_grabbed = 0;
409 } 409 }
410 _evas_unwalk(e); 410 _evas_unwalk(e);
diff --git a/legacy/evas/src/lib/canvas/evas_font_dir.c b/legacy/evas/src/lib/canvas/evas_font_dir.c
index 72d4475cf7..2d2fe47bf6 100644
--- a/legacy/evas/src/lib/canvas/evas_font_dir.c
+++ b/legacy/evas/src/lib/canvas/evas_font_dir.c
@@ -394,7 +394,7 @@ evas_font_load(Evas *evas, const char *name, const char *source, int size)
394 set = FcFontSort(NULL, p_nm, FcTrue, NULL, &res); 394 set = FcFontSort(NULL, p_nm, FcTrue, NULL, &res);
395 if (!set) 395 if (!set)
396 { 396 {
397 fprintf(stderr, "ERROR: no fontconfig font matches '%s'. It was the last resource, no font found!\n", name); 397 ERROR("No fontconfig font matches '%s'. It was the last resource, no font found!", name);
398 goto fc_end; 398 goto fc_end;
399 } 399 }
400 400
diff --git a/legacy/evas/src/lib/canvas/evas_main.c b/legacy/evas/src/lib/canvas/evas_main.c
index 26b3ea52cb..0e4a74ea91 100644
--- a/legacy/evas/src/lib/canvas/evas_main.c
+++ b/legacy/evas/src/lib/canvas/evas_main.c
@@ -3,7 +3,7 @@
3#include "evas_cs.h" 3#include "evas_cs.h"
4 4
5static int initcount = 0; 5static int initcount = 0;
6 6int _evas_log_dom_global = -1;
7/** 7/**
8 * Initialize Evas 8 * Initialize Evas
9 * 9 *
@@ -22,6 +22,13 @@ evas_init(void)
22 { 22 {
23 if (!eina_init()) 23 if (!eina_init())
24 return 0; 24 return 0;
25 _evas_log_dom_global = eina_log_domain_register("evas_main",EVAS_DEFAULT_LOG_COLOR);
26 if(_evas_log_dom_global < 0)
27 {
28 fprintf(stderr,"Error: Evas could not create a default log domain\n");
29 eina_shutdown();
30 return 0;
31 }
25 evas_module_init(); 32 evas_module_init();
26#ifdef BUILD_ASYNC_EVENTS 33#ifdef BUILD_ASYNC_EVENTS
27 if (!evas_async_events_init()) 34 if (!evas_async_events_init())
@@ -36,6 +43,7 @@ evas_init(void)
36#ifdef BUILD_ASYNC_EVENTS 43#ifdef BUILD_ASYNC_EVENTS
37 shutdown_module: 44 shutdown_module:
38 evas_module_shutdown(); 45 evas_module_shutdown();
46 eina_log_domain_unregister(_evas_log_dom_global);
39 eina_shutdown(); 47 eina_shutdown();
40 48
41 return 0; 49 return 0;
@@ -69,6 +77,7 @@ evas_shutdown(void)
69 evas_font_dir_cache_free(); 77 evas_font_dir_cache_free();
70 evas_common_shutdown(); 78 evas_common_shutdown();
71 evas_module_shutdown(); 79 evas_module_shutdown();
80 eina_log_domain_unregister(_evas_log_dom_global);
72 eina_shutdown(); 81 eina_shutdown();
73 } 82 }
74 return initcount; 83 return initcount;
@@ -477,7 +486,7 @@ evas_output_viewport_set(Evas *e, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas
477 if (h <= 0) return; 486 if (h <= 0) return;
478 if ((x != 0) || (y != 0)) 487 if ((x != 0) || (y != 0))
479 { 488 {
480 printf("EVAS: compat error. viewport x,y != 0,0 not supported\n"); 489 ERROR("EVAS: compat error. viewport x,y != 0,0 not supported");
481 x = 0; 490 x = 0;
482 y = 0; 491 y = 0;
483 } 492 }
diff --git a/legacy/evas/src/lib/canvas/evas_object_box.c b/legacy/evas/src/lib/canvas/evas_object_box.c
index 374a3df04e..47f03e3956 100644
--- a/legacy/evas/src/lib/canvas/evas_object_box.c
+++ b/legacy/evas/src/lib/canvas/evas_object_box.c
@@ -32,8 +32,8 @@ struct _Evas_Object_Box_Accessor
32 EVAS_OBJECT_BOX_DATA_GET(o, ptr); \ 32 EVAS_OBJECT_BOX_DATA_GET(o, ptr); \
33 if (!ptr) \ 33 if (!ptr) \
34 { \ 34 { \
35 fprintf(stderr, "CRITICAL: no widget data for object %p (%s)\n", \ 35 CRITICAL("no widget data for object %p (%s)", \
36 o, evas_object_type_get(o)); \ 36 o, evas_object_type_get(o)); \
37 fflush(stderr); \ 37 fflush(stderr); \
38 abort(); \ 38 abort(); \
39 return; \ 39 return; \
@@ -43,7 +43,7 @@ struct _Evas_Object_Box_Accessor
43 EVAS_OBJECT_BOX_DATA_GET(o, ptr); \ 43 EVAS_OBJECT_BOX_DATA_GET(o, ptr); \
44 if (!ptr) \ 44 if (!ptr) \
45 { \ 45 { \
46 fprintf(stderr, "CRITICAL: no widget data for object %p (%s)\n", \ 46 CRITICAL("no widget data for object %p (%s)", \
47 o, evas_object_type_get(o)); \ 47 o, evas_object_type_get(o)); \
48 fflush(stderr); \ 48 fflush(stderr); \
49 abort(); \ 49 abort(); \
@@ -355,7 +355,7 @@ _evas_object_box_remove_at_default(Evas_Object *o, Evas_Object_Box_Data *priv, u
355 node = eina_list_nth_list(priv->children, pos); 355 node = eina_list_nth_list(priv->children, pos);
356 if (!node) 356 if (!node)
357 { 357 {
358 fprintf(stderr, "ERROR: no item to be removed at position %d\n", pos); 358 ERROR("ERROR: no item to be removed at position %d\n", pos);
359 return NULL; 359 return NULL;
360 } 360 }
361 361
@@ -451,7 +451,7 @@ _evas_object_box_smart_calculate(Evas_Object *o)
451 if (priv->layout.cb) 451 if (priv->layout.cb)
452 priv->layout.cb(o, priv, priv->layout.data); 452 priv->layout.cb(o, priv, priv->layout.data);
453 else 453 else
454 fprintf(stderr, "ERROR: no layout function set for %p box.\n", o); 454 ERROR("No layout function set for %p box.", o);
455} 455}
456 456
457static Evas_Smart * 457static Evas_Smart *
diff --git a/legacy/evas/src/lib/canvas/evas_object_image.c b/legacy/evas/src/lib/canvas/evas_object_image.c
index 3fd7bba828..f929a96ee9 100644
--- a/legacy/evas/src/lib/canvas/evas_object_image.c
+++ b/legacy/evas/src/lib/canvas/evas_object_image.c
@@ -2496,9 +2496,8 @@ evas_object_image_render_pre(Evas_Object *obj)
2496 2496
2497 if ((o->cur.fill.w < 1) || (o->cur.fill.h < 1)) 2497 if ((o->cur.fill.w < 1) || (o->cur.fill.h < 1))
2498 { 2498 {
2499 fprintf(stderr, 2499 ERROR("evas image: %p has invalid fill size: %dx%d. Ignored",
2500 "ERROR: evas image: %p has invalid fill size: %dx%d. Ignored\n", 2500 obj, o->cur.fill.w, o->cur.fill.h);
2501 obj, o->cur.fill.w, o->cur.fill.h);
2502 return; 2501 return;
2503 } 2502 }
2504 2503
diff --git a/legacy/evas/src/lib/canvas/evas_object_smart.c b/legacy/evas/src/lib/canvas/evas_object_smart.c
index 2005ef45df..a7262039c4 100644
--- a/legacy/evas/src/lib/canvas/evas_object_smart.c
+++ b/legacy/evas/src/lib/canvas/evas_object_smart.c
@@ -174,20 +174,20 @@ evas_object_smart_member_add(Evas_Object *obj, Evas_Object *smart_obj)
174 174
175 if (obj->delete_me) 175 if (obj->delete_me)
176 { 176 {
177 printf("EVAS ERROR: Adding deleted object %p to smart obj %p\n", obj, smart_obj); 177 ERROR("Adding deleted object %p to smart obj %p", obj, smart_obj);
178 abort(); 178 abort();
179 return; 179 return;
180 } 180 }
181 if (smart_obj->delete_me) 181 if (smart_obj->delete_me)
182 { 182 {
183 printf("EVAS ERROR: Adding object %p to deleted smart obj %p\n", obj, smart_obj); 183 ERROR("Adding object %p to deleted smart obj %p", obj, smart_obj);
184 abort(); 184 abort();
185 return; 185 return;
186 } 186 }
187 if (obj->layer && smart_obj->layer 187 if (obj->layer && smart_obj->layer
188 && obj->layer->evas != smart_obj->layer->evas) 188 && obj->layer->evas != smart_obj->layer->evas)
189 { 189 {
190 printf("EVAS ERROR: Adding object %p from Evas (%p) from another Evas (%p)\n", obj, obj->layer->evas, smart_obj->layer->evas); 190 ERROR("EVAS ERROR: Adding object %p from Evas (%p) from another Evas (%p)", obj, obj->layer->evas, smart_obj->layer->evas);
191 abort(); 191 abort();
192 return; 192 return;
193 } 193 }
diff --git a/legacy/evas/src/lib/canvas/evas_object_table.c b/legacy/evas/src/lib/canvas/evas_object_table.c
index faa67770a1..2de05bd97c 100644
--- a/legacy/evas/src/lib/canvas/evas_object_table.c
+++ b/legacy/evas/src/lib/canvas/evas_object_table.c
@@ -91,9 +91,8 @@ struct _Evas_Object_Table_Accessor
91 EVAS_OBJECT_TABLE_DATA_GET(o, ptr); \ 91 EVAS_OBJECT_TABLE_DATA_GET(o, ptr); \
92 if (!ptr) \ 92 if (!ptr) \
93 { \ 93 { \
94 fprintf(stderr, "CRITICAL: no widget data for object %p (%s)\n", \ 94 CRITICAL("CRITICAL: no widget data for object %p (%s)", \
95 o, evas_object_type_get(o)); \ 95 o, evas_object_type_get(o)); \
96 fflush(stderr); \
97 abort(); \ 96 abort(); \
98 return; \ 97 return; \
99} 98}
@@ -102,9 +101,8 @@ struct _Evas_Object_Table_Accessor
102 EVAS_OBJECT_TABLE_DATA_GET(o, ptr); \ 101 EVAS_OBJECT_TABLE_DATA_GET(o, ptr); \
103 if (!ptr) \ 102 if (!ptr) \
104 { \ 103 { \
105 fprintf(stderr, "CRITICAL: no widget data for object %p (%s)\n", \ 104 CRITICAL("No widget data for object %p (%s)", \
106 o, evas_object_type_get(o)); \ 105 o, evas_object_type_get(o)); \
107 fflush(stderr); \
108 abort(); \ 106 abort(); \
109 return val; \ 107 return val; \
110 } 108 }
@@ -170,9 +168,8 @@ _evas_object_table_cache_alloc(int cols, int rows)
170 cache = malloc(size); 168 cache = malloc(size);
171 if (!cache) 169 if (!cache)
172 { 170 {
173 fprintf(stderr, 171 ERROR("Could not allocate table cache %dx%d (%d bytes): %s",
174 "ERROR: could not allocate table cache %dx%d (%d bytes): %s\n", 172 cols, rows, size, strerror(errno));
175 cols, rows, size, strerror(errno));
176 return NULL; 173 return NULL;
177 } 174 }
178 175
@@ -319,8 +316,7 @@ _evas_object_table_calculate_cell(const Evas_Object_Table_Option *opt, Evas_Coor
319/* } */ 316/* } */
320/* else if (min < 1) */ 317/* else if (min < 1) */
321/* { */ 318/* { */
322/* fprintf(stderr, */ 319/* WARN("Child %p [%s, %s] has no minimum width " */
323/* "WARNING: child %p [%s, %s] has no minimum width " */
324/* "and no %s expand (weight is not > 0.0). " */ 320/* "and no %s expand (weight is not > 0.0). " */
325/* "Assuming weight > 0.0\n", */ 321/* "Assuming weight > 0.0\n", */
326/* child, evas_object_type_get(child), evas_object_name_get(child), */ 322/* child, evas_object_type_get(child), evas_object_name_get(child), */
@@ -419,16 +415,14 @@ _evas_object_table_calculate_hints_homogeneous(Evas_Object *o, Evas_Object_Table
419 { 415 {
420 if (o_minw < 1) 416 if (o_minw < 1)
421 { 417 {
422 fputs("ERROR: homogeneous table based on item size but no " 418 ERROR("homogeneous table based on item size but no "
423 "horizontal mininum size specified! Using expand.\n", 419 "horizontal mininum size specified! Using expand.");
424 stderr);
425 expand_h = 1; 420 expand_h = 1;
426 } 421 }
427 if (o_minh < 1) 422 if (o_minh < 1)
428 { 423 {
429 fputs("ERROR: homogeneous table based on item size but no " 424 ERROR("homogeneous table based on item size but no "
430 "vertical mininum size specified! Using expand.\n", 425 "vertical mininum size specified! Using expand.");
431 stderr);
432 expand_v = 1; 426 expand_v = 1;
433 } 427 }
434 } 428 }
@@ -730,9 +724,8 @@ _evas_object_table_calculate_layout_regular(Evas_Object *o, Evas_Object_Table_Da
730 cols = malloc(size); 724 cols = malloc(size);
731 if (!cols) 725 if (!cols)
732 { 726 {
733 fprintf(stderr, 727 ERROR("Could not allocate temp columns (%d bytes): %s",
734 "ERROR: could not allocate temp columns (%d bytes): %s\n", 728 size, strerror(errno));
735 size, strerror(errno));
736 return; 729 return;
737 } 730 }
738 memcpy(cols, c->sizes.h, size); 731 memcpy(cols, c->sizes.h, size);
@@ -754,8 +747,7 @@ _evas_object_table_calculate_layout_regular(Evas_Object *o, Evas_Object_Table_Da
754 rows = malloc(size); 747 rows = malloc(size);
755 if (!rows) 748 if (!rows)
756 { 749 {
757 fprintf(stderr, 750 ERROR("could not allocate temp rows (%d bytes): %s",
758 "ERROR: could not allocate temp rows (%d bytes): %s\n",
759 size, strerror(errno)); 751 size, strerror(errno));
760 goto end; 752 goto end;
761 } 753 }
@@ -812,7 +804,7 @@ _evas_object_table_smart_add(Evas_Object *o)
812 priv = calloc(1, sizeof(*priv)); 804 priv = calloc(1, sizeof(*priv));
813 if (!priv) 805 if (!priv)
814 { 806 {
815 fputs("ERROR: could not allocate object private data.\n", stderr); 807 ERROR("could not allocate object private data.");
816 return; 808 return;
817 } 809 }
818 evas_object_smart_data_set(o, priv); 810 evas_object_smart_data_set(o, priv);
@@ -870,8 +862,8 @@ _evas_object_table_smart_calculate(Evas_Object *o)
870 862
871 if ((priv->size.cols < 1) || (priv->size.rows < 1)) 863 if ((priv->size.cols < 1) || (priv->size.rows < 1))
872 { 864 {
873 fprintf(stderr, "DBG: nothing to do: cols=%d, rows=%d\n", 865 DEBUG("Nothing to do: cols=%d, rows=%d",
874 priv->size.cols, priv->size.rows); 866 priv->size.cols, priv->size.rows);
875 return; 867 return;
876 } 868 }
877 869
@@ -1103,27 +1095,26 @@ evas_object_table_pack(Evas_Object *o, Evas_Object *child, unsigned short col, u
1103 1095
1104 if (rowspan < 1) 1096 if (rowspan < 1)
1105 { 1097 {
1106 fputs("ERROR: rowspan < 1\n", stderr); 1098 ERROR("rowspan < 1");
1107 return EINA_FALSE; 1099 return EINA_FALSE;
1108 } 1100 }
1109 if (colspan < 1) 1101 if (colspan < 1)
1110 { 1102 {
1111 fputs("ERROR: colspan < 1\n", stderr); 1103 ERROR("colspan < 1");
1112 return EINA_FALSE; 1104 return EINA_FALSE;
1113 } 1105 }
1114 1106
1115 opt = _evas_object_table_option_get(child); 1107 opt = _evas_object_table_option_get(child);
1116 if (opt) 1108 if (opt)
1117 { 1109 {
1118 fputs("ERROR: cannot add object that is already part of a table!\n", 1110 ERROR("cannot add object that is already part of a table!");
1119 stderr);
1120 return EINA_FALSE; 1111 return EINA_FALSE;
1121 } 1112 }
1122 1113
1123 opt = malloc(sizeof(*opt)); 1114 opt = malloc(sizeof(*opt));
1124 if (!opt) 1115 if (!opt)
1125 { 1116 {
1126 fputs("ERROR: could not allocate table option data.\n", stderr); 1117 ERROR("could not allocate table option data.");
1127 return EINA_FALSE; 1118 return EINA_FALSE;
1128 } 1119 }
1129 1120
@@ -1226,14 +1217,14 @@ evas_object_table_unpack(Evas_Object *o, Evas_Object *child)
1226 1217
1227 if (o != evas_object_smart_parent_get(child)) 1218 if (o != evas_object_smart_parent_get(child))
1228 { 1219 {
1229 fputs("ERROR: cannot unpack child from incorrect table!\n", stderr); 1220 ERROR("cannot unpack child from incorrect table!");
1230 return EINA_FALSE; 1221 return EINA_FALSE;
1231 } 1222 }
1232 1223
1233 opt = _evas_object_table_option_del(child); 1224 opt = _evas_object_table_option_del(child);
1234 if (!opt) 1225 if (!opt)
1235 { 1226 {
1236 fputs("ERROR: cannot unpack child with no packing option!\n", stderr); 1227 ERROR("cannot unpack child with no packing option!");
1237 return EINA_FALSE; 1228 return EINA_FALSE;
1238 } 1229 }
1239 1230
diff --git a/legacy/evas/src/lib/canvas/evas_render.c b/legacy/evas/src/lib/canvas/evas_render.c
index 21d8558e63..39eb429916 100644
--- a/legacy/evas/src/lib/canvas/evas_render.c
+++ b/legacy/evas/src/lib/canvas/evas_render.c
@@ -404,7 +404,7 @@ evas_render_updates_internal(Evas *e, unsigned char make_updates, unsigned char
404 } 404 }
405 if ((e->output.w != e->viewport.w) || (e->output.h != e->viewport.h)) 405 if ((e->output.w != e->viewport.w) || (e->output.h != e->viewport.h))
406 { 406 {
407 printf("EVAS: error: viewport size != output size!\n"); 407 ERROR("viewport size != output size!");
408 } 408 }
409 /* phase 5. add obscures */ 409 /* phase 5. add obscures */
410 EINA_LIST_FOREACH(e->obscures, ll, r) 410 EINA_LIST_FOREACH(e->obscures, ll, r)
diff --git a/legacy/evas/src/lib/canvas/evas_smart.c b/legacy/evas/src/lib/canvas/evas_smart.c
index eed9a6aac9..09769e1736 100644
--- a/legacy/evas/src/lib/canvas/evas_smart.c
+++ b/legacy/evas/src/lib/canvas/evas_smart.c
@@ -65,8 +65,8 @@ evas_smart_new(const char *name,
65 Evas_Smart *s; 65 Evas_Smart *s;
66 Evas_Smart_Class *sc; 66 Evas_Smart_Class *sc;
67 67
68 printf("----- WARNING. evas_smart_new() will be deprecated and removed soon\n" 68 WARN("----- WARNING. evas_smart_new() will be deprecated and removed soon"
69 "----- Please use evas_smart_class_new() instead\n"); 69 "----- Please use evas_smart_class_new() instead");
70 70
71 if (!name) return NULL; 71 if (!name) return NULL;
72 72
diff --git a/legacy/evas/src/lib/canvas/evas_stack.c b/legacy/evas/src/lib/canvas/evas_stack.c
index d70db5edd2..84e600a883 100644
--- a/legacy/evas/src/lib/canvas/evas_stack.c
+++ b/legacy/evas/src/lib/canvas/evas_stack.c
@@ -187,7 +187,7 @@ evas_object_stack_above(Evas_Object *obj, Evas_Object *above)
187 { 187 {
188 if (obj->smart.parent != above->smart.parent) 188 if (obj->smart.parent != above->smart.parent)
189 { 189 {
190// printf("BITCH! evas_object_stack_above(), %p not inside same smart as %p!\n", obj, above); 190// ERROR("BITCH! evas_object_stack_above(), %p not inside same smart as %p!", obj, above);
191 return; 191 return;
192 } 192 }
193 evas_object_smart_member_stack_above(obj, above); 193 evas_object_smart_member_stack_above(obj, above);
@@ -275,7 +275,7 @@ evas_object_stack_below(Evas_Object *obj, Evas_Object *below)
275 { 275 {
276 if (obj->smart.parent != below->smart.parent) 276 if (obj->smart.parent != below->smart.parent)
277 { 277 {
278// printf("BITCH! evas_object_stack_below(), %p not inside same smart as %p!\n", obj, below); 278// ERROR("BITCH! evas_object_stack_below(), %p not inside same smart as %p!", obj, below);
279 return; 279 return;
280 } 280 }
281 evas_object_smart_member_stack_below(obj, below); 281 evas_object_smart_member_stack_below(obj, below);
diff --git a/legacy/evas/src/lib/cserve/evas_cs_client.c b/legacy/evas/src/lib/cserve/evas_cs_client.c
index e1148a3039..ea3da306b2 100644
--- a/legacy/evas/src/lib/cserve/evas_cs_client.c
+++ b/legacy/evas/src/lib/cserve/evas_cs_client.c
@@ -145,8 +145,8 @@ server_read(Server *s, int channel, int *opcode, int *size)
145 if ((*size < 0) || (*size > (1024 * 1024))) return NULL; 145 if ((*size < 0) || (*size > (1024 * 1024))) return NULL;
146 if (ints[2] != (s->ch[channel].req_from + 1)) 146 if (ints[2] != (s->ch[channel].req_from + 1))
147 { 147 {
148 printf("EEK! sequence number mismatch from serer with pid: %i\n" 148 ERROR("EEK! sequence number mismatch from serer with pid: %i\n"
149 "---- num %i is not 1 more than %i\n" 149 "---- num %i is not 1 more than %i"
150 , 150 ,
151 s->pid, ints[2], s->ch[channel].req_from); 151 s->pid, ints[2], s->ch[channel].req_from);
152 return NULL; 152 return NULL;
diff --git a/legacy/evas/src/lib/cserve/evas_cs_server.c b/legacy/evas/src/lib/cserve/evas_cs_server.c
index b10e038b61..d73f04278d 100644
--- a/legacy/evas/src/lib/cserve/evas_cs_server.c
+++ b/legacy/evas/src/lib/cserve/evas_cs_server.c
@@ -225,8 +225,8 @@ server_parse(Server *s, Client *c)
225 data = c->inbuf + (sizeof(int) * 3); 225 data = c->inbuf + (sizeof(int) * 3);
226 if (ints[2] != (c->req_from + 1)) 226 if (ints[2] != (c->req_from + 1))
227 { 227 {
228 printf("EEK! sequence number mismatch from client with pid: %i\n" 228 ERROR("EEK! sequence number mismatch from client with pid: %i\n"
229 "---- num %i is not 1 more than %i\n" 229 "---- num %i is not 1 more than %i"
230 , 230 ,
231 c->pid, ints[2], c->req_from); 231 c->pid, ints[2], c->req_from);
232 return 0; 232 return 0;
diff --git a/legacy/evas/src/lib/engines/common/evas_convert_main.c b/legacy/evas/src/lib/engines/common/evas_convert_main.c
index 6182667d0a..a460109db9 100644
--- a/legacy/evas/src/lib/engines/common/evas_convert_main.c
+++ b/legacy/evas/src/lib/engines/common/evas_convert_main.c
@@ -591,7 +591,7 @@ evas_common_convert_func_get(DATA8 *dest, int w, int h, int depth, DATA32 rmask,
591 } 591 }
592#endif 592#endif
593 } 593 }
594 printf("depth = %i mode = %i\n", depth, pal_mode); 594 INFO("depth = %i mode = %i", depth, pal_mode);
595 if (depth == 8) 595 if (depth == 8)
596 { 596 {
597#ifdef BUILD_CONVERT_8_RGB_332 597#ifdef BUILD_CONVERT_8_RGB_332
diff --git a/legacy/evas/src/lib/engines/common/evas_convert_rgb_16.c b/legacy/evas/src/lib/engines/common/evas_convert_rgb_16.c
index 844fe38698..f46f770549 100644
--- a/legacy/evas/src/lib/engines/common/evas_convert_rgb_16.c
+++ b/legacy/evas/src/lib/engines/common/evas_convert_rgb_16.c
@@ -715,7 +715,7 @@ evas_common_convert_rgba_to_16bpp_bgr_565_dith_rot_180 (DATA32 *src, DATA8 *dst,
715 715
716 dst_ptr = (DATA16 *)dst; 716 dst_ptr = (DATA16 *)dst;
717 717
718 fprintf(stderr, "evas_common_convert_rgba_to_16bpp_bgr_565_dith_rot_180\n"); 718 ERROR("evas_common_convert_rgba_to_16bpp_bgr_565_dith_rot_180");
719 719
720 CONVERT_LOOP_START_ROT_180(); 720 CONVERT_LOOP_START_ROT_180();
721 721
diff --git a/legacy/evas/src/lib/engines/common/evas_cpu.c b/legacy/evas/src/lib/engines/common/evas_cpu.c
index 1cc567f497..f4cc528e30 100644
--- a/legacy/evas/src/lib/engines/common/evas_cpu.c
+++ b/legacy/evas/src/lib/engines/common/evas_cpu.c
@@ -3,7 +3,6 @@
3 */ 3 */
4 4
5#include "evas_common.h" 5#include "evas_common.h"
6
7#if defined BUILD_MMX || defined BUILD_SSE 6#if defined BUILD_MMX || defined BUILD_SSE
8#include "evas_mmx.h" 7#include "evas_mmx.h"
9#endif 8#endif
@@ -222,7 +221,7 @@ evas_common_cpu_can_do(int *mmx, int *sse, int *sse2)
222 if (cpu_feature_mask & CPU_FEATURE_MMX2) do_sse = 1; 221 if (cpu_feature_mask & CPU_FEATURE_MMX2) do_sse = 1;
223 if (cpu_feature_mask & CPU_FEATURE_SSE) do_sse = 1; 222 if (cpu_feature_mask & CPU_FEATURE_SSE) do_sse = 1;
224 } 223 }
225// printf("%i %i %i\n", do_mmx, do_sse, do_sse2); 224// INFO("%i %i %i", do_mmx, do_sse, do_sse2);
226 *mmx = do_mmx; 225 *mmx = do_mmx;
227 *sse = do_sse; 226 *sse = do_sse;
228 *sse2 = do_sse2; 227 *sse2 = do_sse2;
diff --git a/legacy/evas/src/lib/engines/common/evas_font_draw.c b/legacy/evas/src/lib/engines/common/evas_font_draw.c
index 9f531f0082..c2076d5f33 100644
--- a/legacy/evas/src/lib/engines/common/evas_font_draw.c
+++ b/legacy/evas/src/lib/engines/common/evas_font_draw.c
@@ -8,6 +8,7 @@
8 8
9 9
10#include "evas_common.h" 10#include "evas_common.h"
11#include "evas_private.h"
11#include "evas_blend_private.h" 12#include "evas_blend_private.h"
12 13
13#include "evas_intl_utils.h" /*defines INTERNATIONAL_SUPPORT if possible */ 14#include "evas_intl_utils.h" /*defines INTERNATIONAL_SUPPORT if possible */
diff --git a/legacy/evas/src/lib/engines/common/evas_font_main.c b/legacy/evas/src/lib/engines/common/evas_font_main.c
index ee8bf34cdd..73479cec95 100644
--- a/legacy/evas/src/lib/engines/common/evas_font_main.c
+++ b/legacy/evas/src/lib/engines/common/evas_font_main.c
@@ -3,7 +3,7 @@
3 */ 3 */
4 4
5#include "evas_common.h" 5#include "evas_common.h"
6 6#include "evas_private.h"
7FT_Library evas_ft_lib = 0; 7FT_Library evas_ft_lib = 0;
8static int initialised = 0; 8static int initialised = 0;
9 9
diff --git a/legacy/evas/src/lib/engines/common/evas_font_query.c b/legacy/evas/src/lib/engines/common/evas_font_query.c
index cd269153b6..972076b393 100644
--- a/legacy/evas/src/lib/engines/common/evas_font_query.c
+++ b/legacy/evas/src/lib/engines/common/evas_font_query.c
@@ -147,11 +147,11 @@ evas_common_font_query_inset(RGBA_Font *fn, const char *text)
147 fg = evas_common_font_int_cache_glyph_get(fi, index); 147 fg = evas_common_font_int_cache_glyph_get(fi, index);
148 if (!fg) return 0; 148 if (!fg) return 0;
149/* 149/*
150 printf("fg->glyph_out->left = %i\n" 150 INFO("fg->glyph_out->left = %i\n"
151 "fi->src->ft.face->glyph->bitmap_left = %i\n" 151 "fi->src->ft.face->glyph->bitmap_left = %i\n"
152 "fi->src->ft.face->glyph->metrics.horiBearingX = %i\n" 152 "fi->src->ft.face->glyph->metrics.horiBearingX = %i\n"
153 "fi->src->ft.face->glyph->metrics.horiBearingY = %i\n" 153 "fi->src->ft.face->glyph->metrics.horiBearingY = %i\n"
154 "fi->src->ft.face->glyph->metrics.horiAdvance = %i\n" 154 "fi->src->ft.face->glyph->metrics.horiAdvance = %i"
155 , 155 ,
156 (int)fg->glyph_out->left, 156 (int)fg->glyph_out->left,
157 (int)fi->src->ft.face->glyph->bitmap_left, 157 (int)fi->src->ft.face->glyph->bitmap_left,
diff --git a/legacy/evas/src/lib/engines/common/evas_image_main.c b/legacy/evas/src/lib/engines/common/evas_image_main.c
index 35c02b864c..4e1fe3ac14 100644
--- a/legacy/evas/src/lib/engines/common/evas_image_main.c
+++ b/legacy/evas/src/lib/engines/common/evas_image_main.c
@@ -53,7 +53,7 @@ static int _evas_common_rgba_image_dirty(Image_Entry* dst, const I
53static void 53static void
54_evas_common_rgba_image_debug(const char* context, Image_Entry *eim) 54_evas_common_rgba_image_debug(const char* context, Image_Entry *eim)
55{ 55{
56 fprintf(stderr, "%p = [%s] {%s,%s} %i [%i|%i]\n", eim, context, eim->file, eim->key, eim->references, eim->w, eim->h); 56 DEBUG("%p = [%s] {%s,%s} %i [%i|%i]", eim, context, eim->file, eim->key, eim->references, eim->w, eim->h);
57} 57}
58 58
59static const Evas_Cache_Image_Func _evas_common_image_func = 59static const Evas_Cache_Image_Func _evas_common_image_func =
@@ -83,7 +83,7 @@ evas_common_image_init(void)
83 if (!eci) 83 if (!eci)
84 eci = evas_cache_image_init(&_evas_common_image_func); 84 eci = evas_cache_image_init(&_evas_common_image_func);
85 reference++; 85 reference++;
86//// printf("REF++=%i\n", reference); 86//// ERROR("REF++=%i", reference);
87 87
88#ifdef BUILD_LOADER_EET 88#ifdef BUILD_LOADER_EET
89 eet_init(); 89 eet_init();
diff --git a/legacy/evas/src/lib/engines/common/evas_image_scalecache.c b/legacy/evas/src/lib/engines/common/evas_image_scalecache.c
index 0ac4995ee7..d66b2501b6 100644
--- a/legacy/evas/src/lib/engines/common/evas_image_scalecache.c
+++ b/legacy/evas/src/lib/engines/common/evas_image_scalecache.c
@@ -118,7 +118,7 @@ evas_common_rgba_image_scalecache_dirty(Image_Entry *ie)
118 im->cache.list = eina_list_remove(im->cache.list, sci); 118 im->cache.list = eina_list_remove(im->cache.list, sci);
119 if (sci->im) 119 if (sci->im)
120 { 120 {
121// printf(" 0- %i\n", sci->dst_w * sci->dst_h * 4); 121// INFO(" 0- %i", sci->dst_w * sci->dst_h * 4);
122 LKL(cache_lock); 122 LKL(cache_lock);
123 evas_common_rgba_image_free(&sci->im->cache_entry); 123 evas_common_rgba_image_free(&sci->im->cache_entry);
124 if (!sci->forced_unload) 124 if (!sci->forced_unload)
@@ -185,7 +185,7 @@ _sci_fix_newest(RGBA_Image *im)
185 if (sci->usage_count > im->cache.newest_usage_count) 185 if (sci->usage_count > im->cache.newest_usage_count)
186 im->cache.newest_usage_count = sci->usage_count; 186 im->cache.newest_usage_count = sci->usage_count;
187 } 187 }
188// printf("_sci_fix_newest! -> %i\n", im->cache.newest_usage); 188// INFO("_sci_fix_newest! -> %i", im->cache.newest_usage);
189} 189}
190 190
191static Scaleitem * 191static Scaleitem *
@@ -233,7 +233,7 @@ _sci_find(RGBA_Image *im,
233 cache_size -= sci->dst_w * sci->dst_h * 4; 233 cache_size -= sci->dst_w * sci->dst_h * 4;
234 else 234 else
235 cache_size -= sci->size_adjust; 235 cache_size -= sci->size_adjust;
236// printf(" 1- %i\n", sci->dst_w * sci->dst_h * 4); 236// INFO(" 1- %i", sci->dst_w * sci->dst_h * 4);
237 cache_list = eina_inlist_remove(cache_list, (Eina_Inlist *)sci); 237 cache_list = eina_inlist_remove(cache_list, (Eina_Inlist *)sci);
238 } 238 }
239 if (max_scale_items < 1) return NULL; 239 if (max_scale_items < 1) return NULL;
@@ -291,11 +291,11 @@ _cache_prune(Scaleitem *notsci, Eina_Bool copies_only)
291 cache_size -= sci->dst_w * sci->dst_h * 4; 291 cache_size -= sci->dst_w * sci->dst_h * 4;
292 else 292 else
293 cache_size -= sci->size_adjust; 293 cache_size -= sci->size_adjust;
294// printf(" 2- %i\n", sci->dst_w * sci->dst_h * 4); 294// INFO(" 2- %i", sci->dst_w * sci->dst_h * 4);
295 cache_list = eina_inlist_remove(cache_list, (Eina_Inlist *)sci); 295 cache_list = eina_inlist_remove(cache_list, (Eina_Inlist *)sci);
296 memset(sci, 0, sizeof(Eina_Inlist)); 296 memset(sci, 0, sizeof(Eina_Inlist));
297 } 297 }
298// printf("FLUSH %i > %i\n", cache_size, max_cache_size); 298// INFO("FLUSH %i > %i", cache_size, max_cache_size);
299 } 299 }
300} 300}
301#endif 301#endif
@@ -385,7 +385,7 @@ evas_common_rgba_image_scalecache_prepare(Image_Entry *ie, RGBA_Image *dst,
385 LKU(im->cache.lock); 385 LKU(im->cache.lock);
386 return; 386 return;
387 } 387 }
388// printf("%10i | %4i %4i %4ix%4i -> %4i %4i %4ix%4i | %i\n", 388// INFO("%10i | %4i %4i %4ix%4i -> %4i %4i %4ix%4i | %i",
389// (int)use_counter, 389// (int)use_counter,
390// src_region_x, src_region_y, src_region_w, src_region_h, 390// src_region_x, src_region_y, src_region_w, src_region_h,
391// dst_region_x, dst_region_y, dst_region_w, dst_region_h, 391// dst_region_x, dst_region_y, dst_region_w, dst_region_h,
@@ -413,12 +413,12 @@ evas_common_rgba_image_scalecache_prepare(Image_Entry *ie, RGBA_Image *dst,
413 LKU(cache_lock); 413 LKU(cache_lock);
414 if (sci->usage > im->cache.newest_usage) 414 if (sci->usage > im->cache.newest_usage)
415 im->cache.newest_usage = sci->usage; 415 im->cache.newest_usage = sci->usage;
416// printf("newset? %p %i > %i\n", im, 416// INFO("newset? %p %i > %i", im,
417// (int)sci->usage, 417// (int)sci->usage,
418// (int)im->cache.newest_usage); 418// (int)im->cache.newest_usage);
419 if (sci->usage_count > im->cache.newest_usage_count) 419 if (sci->usage_count > im->cache.newest_usage_count)
420 im->cache.newest_usage_count = sci->usage_count; 420 im->cache.newest_usage_count = sci->usage_count;
421// printf(" -------------- used %8i#, %8i@\n", (int)sci->usage, (int)sci->usage_count); 421// INFO(" -------------- used %8i#, %8i@", (int)sci->usage, (int)sci->usage_count);
422 LKU(im->cache.lock); 422 LKU(im->cache.lock);
423#endif 423#endif
424} 424}
@@ -449,7 +449,7 @@ evas_common_rgba_image_scalecache_do(Image_Entry *ie, RGBA_Image *dst,
449 i++; 449 i++;
450 if (i > 2000) 450 if (i > 2000)
451 { 451 {
452 printf("p: %6i, h: %6i, m: %6i, n: %6i\n", 452 INFO("p: %6i, h: %6i, m: %6i, n: %6i",
453 pops, hits, misses, noscales); 453 pops, hits, misses, noscales);
454 i = 0; 454 i = 0;
455 } 455 }
@@ -552,7 +552,7 @@ evas_common_rgba_image_scalecache_do(Image_Entry *ie, RGBA_Image *dst,
552 } 552 }
553 if (sci->populate_me) 553 if (sci->populate_me)
554 { 554 {
555// printf("##! populate!\n"); 555// INFO("##! populate!");
556 sci->im = evas_common_image_new 556 sci->im = evas_common_image_new
557 (dst_region_w, dst_region_h, im->cache_entry.flags.alpha); 557 (dst_region_w, dst_region_h, im->cache_entry.flags.alpha);
558 if (sci->im) 558 if (sci->im)
@@ -625,7 +625,7 @@ evas_common_rgba_image_scalecache_do(Image_Entry *ie, RGBA_Image *dst,
625 { 625 {
626 cache_size += sci->dst_w * sci->dst_h * 4; 626 cache_size += sci->dst_w * sci->dst_h * 4;
627 } 627 }
628// printf(" + %i @ flop: %i (%ix%i)\n", 628// INFO(" + %i @ flop: %i (%ix%i)",
629// sci->dst_w * sci->dst_h * 4, sci->flop, 629// sci->dst_w * sci->dst_h * 4, sci->flop,
630// sci->dst_w, sci->dst_h); 630// sci->dst_w, sci->dst_h);
631 cache_list = eina_inlist_append(cache_list, (Eina_Inlist *)sci); 631 cache_list = eina_inlist_append(cache_list, (Eina_Inlist *)sci);
@@ -645,7 +645,7 @@ evas_common_rgba_image_scalecache_do(Image_Entry *ie, RGBA_Image *dst,
645 { 645 {
646 if (sci->flop > 0) sci->flop -= FLOP_DEL; 646 if (sci->flop > 0) sci->flop -= FLOP_DEL;
647 } 647 }
648// printf("use cached!\n"); 648// INFO("use cached!");
649 evas_common_scale_rgba_in_to_out_clip_sample 649 evas_common_scale_rgba_in_to_out_clip_sample
650 (sci->im, dst, dc, 650 (sci->im, dst, dc,
651 0, 0, 651 0, 0,
@@ -653,7 +653,7 @@ evas_common_rgba_image_scalecache_do(Image_Entry *ie, RGBA_Image *dst,
653 dst_region_x, dst_region_y, 653 dst_region_x, dst_region_y,
654 dst_region_w, dst_region_h); 654 dst_region_w, dst_region_h);
655// hits++; 655// hits++;
656// printf("check %p %i < %i\n", 656// INFO("check %p %i < %i",
657// im, 657// im,
658// (int)im->cache.orig_usage, 658// (int)im->cache.orig_usage,
659// (int)im->cache.newest_usage); 659// (int)im->cache.newest_usage);
diff --git a/legacy/evas/src/lib/engines/common/evas_op_add_main_.c b/legacy/evas/src/lib/engines/common/evas_op_add_main_.c
index a4eface482..538fb29b56 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_add_main_.c
+++ b/legacy/evas/src/lib/engines/common/evas_op_add_main_.c
@@ -3,7 +3,6 @@
3 */ 3 */
4 4
5#include "evas_common.h" 5#include "evas_common.h"
6
7static RGBA_Gfx_Func op_add_span_funcs[SP_LAST][SM_LAST][SC_LAST][DP_LAST][CPU_LAST]; 6static RGBA_Gfx_Func op_add_span_funcs[SP_LAST][SM_LAST][SC_LAST][DP_LAST][CPU_LAST];
8static RGBA_Gfx_Pt_Func op_add_pt_funcs[SP_LAST][SM_LAST][SC_LAST][DP_LAST][CPU_LAST]; 7static RGBA_Gfx_Pt_Func op_add_pt_funcs[SP_LAST][SM_LAST][SC_LAST][DP_LAST][CPU_LAST];
9 8
diff --git a/legacy/evas/src/lib/engines/common/evas_pipe.c b/legacy/evas/src/lib/engines/common/evas_pipe.c
index 9d35b257c9..e33093dd00 100644
--- a/legacy/evas/src/lib/engines/common/evas_pipe.c
+++ b/legacy/evas/src/lib/engines/common/evas_pipe.c
@@ -73,7 +73,7 @@ evas_common_pipe_thread(void *data)
73{ 73{
74 Thinfo *thinfo; 74 Thinfo *thinfo;
75 75
76// printf("TH [...........\n"); 76// INFO("TH [...........");
77 thinfo = data; 77 thinfo = data;
78 for (;;) 78 for (;;)
79 { 79 {
@@ -81,13 +81,13 @@ evas_common_pipe_thread(void *data)
81 RGBA_Pipe *p; 81 RGBA_Pipe *p;
82 82
83 /* wait for start signal */ 83 /* wait for start signal */
84// printf(" TH %i START...\n", thinfo->thread_num); 84// INFO(" TH %i START...", thinfo->thread_num);
85 pthread_barrier_wait(&(thinfo->barrier[0])); 85 pthread_barrier_wait(&(thinfo->barrier[0]));
86 info = thinfo->info; 86 info = thinfo->info;
87// if (info) 87// if (info)
88// { 88// {
89// thinfo->info = NULL; 89// thinfo->info = NULL;
90// printf(" TH %i GO\n", thinfo->thread_num); 90// INFO(" TH %i GO", thinfo->thread_num);
91 EINA_INLIST_FOREACH(EINA_INLIST_GET(info->im->pipe), p) 91 EINA_INLIST_FOREACH(EINA_INLIST_GET(info->im->pipe), p)
92 { 92 {
93 int i; 93 int i;
@@ -100,7 +100,7 @@ evas_common_pipe_thread(void *data)
100 } 100 }
101 free(info); 101 free(info);
102// } 102// }
103// printf(" TH %i DONE\n", thinfo->thread_num); 103// INFO(" TH %i DONE", thinfo->thread_num);
104 /* send finished signal */ 104 /* send finished signal */
105 pthread_barrier_wait(&(thinfo->barrier[1])); 105 pthread_barrier_wait(&(thinfo->barrier[1]));
106 } 106 }
diff --git a/legacy/evas/src/lib/engines/common/evas_tiler.c b/legacy/evas/src/lib/engines/common/evas_tiler.c
index 66f20819ce..c28641cc45 100644
--- a/legacy/evas/src/lib/engines/common/evas_tiler.c
+++ b/legacy/evas/src/lib/engines/common/evas_tiler.c
@@ -1,5 +1,4 @@
1#include "evas_common.h" 1#include "evas_common.h"
2
3#ifdef EVAS_RECT_SPLIT 2#ifdef EVAS_RECT_SPLIT
4 3
5static const list_node_t list_node_zeroed = { NULL }; 4static const list_node_t list_node_zeroed = { NULL };
@@ -95,7 +94,7 @@ rect_init(rect_t *r, int x, int y, int w, int h)
95void 94void
96rect_print(const rect_t r) 95rect_print(const rect_t r)
97{ 96{
98 printf("<rect(%d, %d, %d, %d)>", r.left, r.top, r.width, r.height); 97 INFO("<rect(%d, %d, %d, %d)>", r.left, r.top, r.width, r.height);
99} 98}
100 99
101void 100void
@@ -107,7 +106,7 @@ rect_list_print(const list_t rects)
107 len = 0; 106 len = 0;
108 for (node = rects.head; node != NULL; node = node->next) len++; 107 for (node = rects.head; node != NULL; node = node->next) len++;
109 108
110 printf("["); 109 putchar('[');
111 for (node = rects.head; node != NULL; node = node->next) 110 for (node = rects.head; node != NULL; node = node->next)
112 { 111 {
113 rect_print(((rect_node_t *)node)->rect); 112 rect_print(((rect_node_t *)node)->rect);
@@ -122,7 +121,7 @@ rect_list_print(const list_t rects)
122 } 121 }
123 } 122 }
124 } 123 }
125 printf("]\n"); 124 putchar(']');
126} 125}
127 126
128inline void 127inline void
@@ -717,7 +716,7 @@ rect_list_add_split_fuzzy(list_t *rects, list_node_t *node, int accepted_error)
717 */ 716 */
718 /* prev_cur_node = cur_node; */ 717 /* prev_cur_node = cur_node; */
719 /* cur_node = cur_node->next; */ 718 /* cur_node = cur_node->next; */
720 printf("Should not get here!\n"); 719 WARN("Should not get here!");
721 abort(); 720 abort();
722 } 721 }
723 722
@@ -920,7 +919,7 @@ _add_redraw(list_t *rects, int max_w, int max_h, int x, int y, int w, int h)
920 rn = (rect_node_t *)rect_list_node_pool_get(); 919 rn = (rect_node_t *)rect_list_node_pool_get();
921 rn->_lst = list_node_zeroed; 920 rn->_lst = list_node_zeroed;
922 rect_init(&rn->rect, x, y, w, h); 921 rect_init(&rn->rect, x, y, w, h);
923 //fprintf(stderr, "ACCOUNTING: add_redraw: %4d,%4d %3dx%3d\n", x, y, w, h); 922 //INFO(stderr, "ACCOUNTING: add_redraw: %4d,%4d %3dx%3d", x, y, w, h);
924 //testing on my core2 duo desktop - fuzz of 32 or 48 is best. 923 //testing on my core2 duo desktop - fuzz of 32 or 48 is best.
925#define FUZZ 32 924#define FUZZ 32
926 rect_list_add_split_fuzzy_and_merge(rects, (list_node_t *)rn, 925 rect_list_add_split_fuzzy_and_merge(rects, (list_node_t *)rn,
@@ -1008,7 +1007,7 @@ evas_common_tilebuf_del_redraw(Tilebuf *tb, int x, int y, int w, int h)
1008 if ((w <= 0) || (h <= 0)) return 0; 1007 if ((w <= 0) || (h <= 0)) return 0;
1009 1008
1010 rect_init(&r, x, y, w, h); 1009 rect_init(&r, x, y, w, h);
1011 //fprintf(stderr, "ACCOUNTING: del_redraw: %4d,%4d %3dx%3d\n", x, y, w, h); 1010 //ERROR("ACCOUNTING: del_redraw: %4d,%4d %3dx%3d", x, y, w, h);
1012 1011
1013 rect_list_del_split_strict(&tb->rects, r); 1012 rect_list_del_split_strict(&tb->rects, r);
1014 tb->need_merge = 1; 1013 tb->need_merge = 1;
diff --git a/legacy/evas/src/lib/engines/common_16/evas_soft16_image_scaled_sampled.c b/legacy/evas/src/lib/engines/common_16/evas_soft16_image_scaled_sampled.c
index 71f9914755..675be741da 100644
--- a/legacy/evas/src/lib/engines/common_16/evas_soft16_image_scaled_sampled.c
+++ b/legacy/evas/src/lib/engines/common_16/evas_soft16_image_scaled_sampled.c
@@ -101,9 +101,8 @@ _soft16_image_draw_scaled_no_mul(Soft16_Image *src, Soft16_Image *dst,
101 _soft16_image_draw_scaled_solid_solid 101 _soft16_image_draw_scaled_solid_solid
102 (src, dst, dc, dst_offset, w, h, offset_x, offset_y); 102 (src, dst, dc, dst_offset, w, h, offset_x, offset_y);
103 else 103 else
104 fprintf(stderr, 104 ERROR("Unsupported draw of scaled images src->cache_entry.flags.alpha=%d, "
105 "Unsupported draw of scaled images src->cache_entry.flags.alpha=%d, " 105 "dst->cache_entry.flags.alpha=%d, WITHOUT COLOR MUL",
106 "dst->cache_entry.flags.alpha=%d, WITHOUT COLOR MUL\n",
107 src->cache_entry.flags.alpha, dst->cache_entry.flags.alpha); 106 src->cache_entry.flags.alpha, dst->cache_entry.flags.alpha);
108} 107}
109 108
@@ -214,10 +213,9 @@ _soft16_image_draw_scaled_mul_alpha(Soft16_Image *src, Soft16_Image *dst,
214 _soft16_image_draw_scaled_solid_solid_mul_alpha 213 _soft16_image_draw_scaled_solid_solid_mul_alpha
215 (src, dst, dc, dst_offset, w, h, offset_x, offset_y, a); 214 (src, dst, dc, dst_offset, w, h, offset_x, offset_y, a);
216 else 215 else
217 fprintf(stderr, 216 ERROR("Unsupported draw of scaled images src->cache_entry.flags.alpha=%d, "
218 "Unsupported draw of scaled images src->cache_entry.flags.alpha=%d, " 217 "dst->cache_entry.flags.alpha=%d, WITH ALPHA MUL %d",
219 "dst->cache_entry.flags.alpha=%d, WITH ALPHA MUL %d\n", 218 src->cache_entry.flags.alpha, dst->cache_entry.flags.alpha, A_VAL(&dc->mul.col));
220 src->cache_entry.flags.alpha, dst->cache_entry.flags.alpha, A_VAL(&dc->mul.col));
221} 219}
222 220
223static void 221static void
@@ -397,9 +395,8 @@ _soft16_image_draw_scaled_mul_color(Soft16_Image *src, Soft16_Image *dst,
397 _soft16_image_draw_scaled_solid_solid_mul_color 395 _soft16_image_draw_scaled_solid_solid_mul_color
398 (src, dst, dc, dst_offset, w, h, offset_x, offset_y, r, g, b, a); 396 (src, dst, dc, dst_offset, w, h, offset_x, offset_y, r, g, b, a);
399 else 397 else
400 fprintf(stderr, 398 ERROR("Unsupported draw of scaled images src->cache_entry.flags.alpha=%d, "
401 "Unsupported draw of scaled images src->cache_entry.flags.alpha=%d, " 399 "dst->cache_entry.flags.alpha=%d, WITH COLOR MUL 0x%08x",
402 "dst->cache_entry.flags.alpha=%d, WITH COLOR MUL 0x%08x\n",
403 src->cache_entry.flags.alpha, dst->cache_entry.flags.alpha, dc->mul.col); 400 src->cache_entry.flags.alpha, dst->cache_entry.flags.alpha, dc->mul.col);
404} 401}
405 402
diff --git a/legacy/evas/src/lib/engines/common_16/evas_soft16_image_unscaled.c b/legacy/evas/src/lib/engines/common_16/evas_soft16_image_unscaled.c
index 73d7d44ef5..fc782ad94a 100644
--- a/legacy/evas/src/lib/engines/common_16/evas_soft16_image_unscaled.c
+++ b/legacy/evas/src/lib/engines/common_16/evas_soft16_image_unscaled.c
@@ -60,9 +60,8 @@ _soft16_image_draw_unscaled_no_mul(Soft16_Image *src, Soft16_Image *dst,
60 src_offset, dst_offset, 60 src_offset, dst_offset,
61 width, height); 61 width, height);
62 else 62 else
63 fprintf(stderr, 63 ERROR("Unsupported draw of unscaled images src->cache_entry.flags.alpha=%d, "
64 "Unsupported draw of unscaled images src->cache_entry.flags.alpha=%d, " 64 "dst->cache_entry.flags.alpha=%d, WITHOUT COLOR MUL",
65 "dst->cache_entry.flags.alpha=%d, WITHOUT COLOR MUL\n",
66 src->cache_entry.flags.alpha, dst->cache_entry.flags.alpha); 65 src->cache_entry.flags.alpha, dst->cache_entry.flags.alpha);
67} 66}
68 67
@@ -128,9 +127,8 @@ _soft16_image_draw_unscaled_mul_alpha(Soft16_Image *src, Soft16_Image *dst,
128 _soft16_image_draw_unscaled_solid_solid_mul_alpha 127 _soft16_image_draw_unscaled_solid_solid_mul_alpha
129 (src, dst, dc, src_offset, dst_offset, width, height, a); 128 (src, dst, dc, src_offset, dst_offset, width, height, a);
130 else 129 else
131 fprintf(stderr, 130 ERROR("Unsupported draw of unscaled images src->cache_entry.flags.alpha=%d, "
132 "Unsupported draw of unscaled images src->cache_entry.flags.alpha=%d, " 131 "dst->cache_entry.flags.alpha=%d, WITH ALPHA MUL %d",
133 "dst->cache_entry.flags.alpha=%d, WITH ALPHA MUL %d\n",
134 src->cache_entry.flags.alpha, dst->cache_entry.flags.alpha, A_VAL(&dc->mul.col)); 132 src->cache_entry.flags.alpha, dst->cache_entry.flags.alpha, A_VAL(&dc->mul.col));
135} 133}
136 134
@@ -219,9 +217,8 @@ _soft16_image_draw_unscaled_mul_color(Soft16_Image *src, Soft16_Image *dst,
219 _soft16_image_draw_unscaled_solid_solid_mul_color 217 _soft16_image_draw_unscaled_solid_solid_mul_color
220 (src, dst, dc, src_offset, dst_offset, width, height, r, g, b, a); 218 (src, dst, dc, src_offset, dst_offset, width, height, r, g, b, a);
221 else 219 else
222 fprintf(stderr, 220 ERROR("Unsupported draw of unscaled images src->cache_entry.flags.alpha=%d, "
223 "Unsupported draw of unscaled images src->cache_entry.flags.alpha=%d, " 221 "dst->cache_entry.flags.alpha=%d, WITH COLOR MUL 0x%08x",
224 "dst->cache_entry.flags.alpha=%d, WITH COLOR MUL 0x%08x\n",
225 src->cache_entry.flags.alpha, dst->cache_entry.flags.alpha, dc->mul.col); 222 src->cache_entry.flags.alpha, dst->cache_entry.flags.alpha, dc->mul.col);
226} 223}
227 224
diff --git a/legacy/evas/src/lib/engines/common_16/evas_soft16_main.c b/legacy/evas/src/lib/engines/common_16/evas_soft16_main.c
index 18d3e65725..64b9cb83cc 100644
--- a/legacy/evas/src/lib/engines/common_16/evas_soft16_main.c
+++ b/legacy/evas/src/lib/engines/common_16/evas_soft16_main.c
@@ -28,7 +28,7 @@ static int _evas_common_load_soft16_image_data_from_file(Image_Ent
28/* static void */ 28/* static void */
29/* _evas_common_soft16_image_debug(const char* context, Image_Entry *eim) */ 29/* _evas_common_soft16_image_debug(const char* context, Image_Entry *eim) */
30/* { */ 30/* { */
31/* fprintf(stderr, "[16] %p = [%s] {%s,%s} %i [%i|%i]\n", eim, context, eim->file, eim->key, eim->references, eim->w, eim->h); */ 31/* DEBUG("[16] %p = [%s] {%s,%s} %i [%i|%i]", eim, context, eim->file, eim->key, eim->references, eim->w, eim->h); */
32/* } */ 32/* } */
33 33
34static const Evas_Cache_Image_Func _evas_common_soft16_image_func = 34static const Evas_Cache_Image_Func _evas_common_soft16_image_func =
diff --git a/legacy/evas/src/lib/engines/common_16/evas_soft16_rectangle.c b/legacy/evas/src/lib/engines/common_16/evas_soft16_rectangle.c
index 6e78d6074e..dd5571df71 100644
--- a/legacy/evas/src/lib/engines/common_16/evas_soft16_rectangle.c
+++ b/legacy/evas/src/lib/engines/common_16/evas_soft16_rectangle.c
@@ -71,9 +71,7 @@ _soft16_rectangle_draw_int(Soft16_Image *dst, RGBA_Draw_Context *dc,
71 (dst, dst_offset, dr.w, dr.h, rgb565, alpha); 71 (dst, dst_offset, dr.w, dr.h, rgb565, alpha);
72 } 72 }
73 else 73 else
74 fprintf(stderr, 74 ERROR("Unsupported feature: drawing rectangle to non-opaque destination.");
75 "Unsupported feature: drawing rectangle to non-opaque "
76 "destination.\n");
77} 75}
78 76
79void 77void
diff --git a/legacy/evas/src/lib/include/evas_common.h b/legacy/evas/src/lib/include/evas_common.h
index e00fdb7302..4e848a76ed 100644
--- a/legacy/evas/src/lib/include/evas_common.h
+++ b/legacy/evas/src/lib/include/evas_common.h
@@ -12,6 +12,64 @@
12#include <Eina.h> 12#include <Eina.h>
13#include "Evas.h" 13#include "Evas.h"
14 14
15/* macros needed to log message through eina_log */
16extern int _evas_log_dom_global;
17#ifdef _EVAS_DEFAULT_MODULE_LOG_DOM
18#undef _EVAS_DEFAULT_MODULE_LOG_DOM
19#endif
20#define _EVAS_DEFAULT_MODULE_LOG_DOM _evas_log_dom_global
21
22#ifdef EVAS_DEFAULT_LOG_COLOR
23#undef EVAS_DEFAULT_LOG_COLOR
24#endif
25#define EVAS_DEFAULT_LOG_COLOR "\033[36m"
26#ifdef ERROR
27#undef ERROR
28#endif
29#define ERROR(...) EINA_LOG_DOM_ERR(_evas_log_dom_global, __VA_ARGS__)
30#ifdef DEBUG
31#undef DEBUG
32#endif
33#define DEBUG(...) EINA_LOG_DOM_DBG(_evas_log_dom_global, __VA_ARGS__)
34#ifdef INFO
35#undef INFO
36#endif
37#define INFO(...) EINA_LOG_DOM_INFO(_evas_log_dom_global, __VA_ARGS__)
38#ifdef WARN
39#undef WARN
40#endif
41#define WARN(...) EINA_LOG_DOM_WARN(_evas_log_dom_global, __VA_ARGS__)
42#ifdef CRITICAL
43#undef CRITICAL
44#endif
45#define CRITICAL(...) EINA_LOG_DOM_CRIT(_evas_log_dom_global, __VA_ARGS__)
46/**
47 * macros that are used all around the code for message processing
48 * four macros are defined ERR, WRN, DGB, INF.
49 * EFREET_MODULE_LOG_DOM should be defined individually for each module
50 */
51
52#ifdef ERR
53#undef ERR
54#endif
55#define ERR(...) EINA_LOG_DOM_ERR(_EVAS_DEFAULT_MODULE_LOG_DOM, __VA_ARGS__)
56#ifdef DBG
57#undef DBG
58#endif
59#define DBG(...) EINA_LOG_DOM_DBG(_EVAS_DEFAULT_MODULE_LOG_DOM, __VA_ARGS__)
60#ifdef INF
61#undef INF
62#endif
63#define INF(...) EINA_LOG_DOM_INFO(_EVAS_DEFAULT__MODULE_LOG_DOM, __VA_ARGS__)
64#ifdef WRN
65#undef WRN
66#endif
67#define WRN(...) EINA_LOG_DOM_WARN(_EVAS_DEFAULT_MODULE_LOG_DOM, __VA_ARGS__)
68#ifdef CRIT
69#undef CRIT
70#endif
71#define CRIT(...) EINA_LOG_DOM_CRIT(_EVAS_DEFAULT_MODULE_LOG_DOM, __VA_ARGS__)
72
15/*****************************************************************************/ 73/*****************************************************************************/
16 74
17#include "evas_options.h" 75#include "evas_options.h"
@@ -1156,5 +1214,4 @@ void evas_font_dir_cache_free(void);
1156#ifdef __cplusplus 1214#ifdef __cplusplus
1157} 1215}
1158#endif 1216#endif
1159
1160#endif 1217#endif
diff --git a/legacy/evas/src/lib/main.c b/legacy/evas/src/lib/main.c
index 798bb1685c..f95da6f136 100644
--- a/legacy/evas/src/lib/main.c
+++ b/legacy/evas/src/lib/main.c
@@ -101,8 +101,7 @@ evas_debug_error(void)
101 _evas_debug_init = 1; 101 _evas_debug_init = 1;
102 } 102 }
103 if (_evas_debug_show) 103 if (_evas_debug_show)
104 fprintf(stderr, 104 DEBUG("*** EVAS ERROR: Evas Magic Check Failed!!!");
105 "*** EVAS ERROR: Evas Magic Check Failed!!!\n");
106} 105}
107 106
108void 107void
@@ -115,8 +114,7 @@ evas_debug_input_null(void)
115 _evas_debug_init = 1; 114 _evas_debug_init = 1;
116 } 115 }
117 if (_evas_debug_show) 116 if (_evas_debug_show)
118 fprintf(stderr, 117 DEBUG("Input object pointer is NULL!");
119 " Input object pointer is NULL!\n");
120 if (_evas_debug_abort) abort(); 118 if (_evas_debug_abort) abort();
121} 119}
122 120
@@ -130,8 +128,7 @@ evas_debug_magic_null(void)
130 _evas_debug_init = 1; 128 _evas_debug_init = 1;
131 } 129 }
132 if (_evas_debug_show) 130 if (_evas_debug_show)
133 fprintf(stderr, 131 DEBUG("Input object is zero'ed out (maybe a freed object or zero-filled RAM)!");
134 " Input object is zero'ed out (maybe a freed object or zero-filled RAM)!\n");
135 if (_evas_debug_abort) abort(); 132 if (_evas_debug_abort) abort();
136} 133}
137 134
@@ -145,12 +142,11 @@ evas_debug_magic_wrong(DATA32 expected, DATA32 supplied)
145 _evas_debug_init = 1; 142 _evas_debug_init = 1;
146 } 143 }
147 if (_evas_debug_show) 144 if (_evas_debug_show)
148 fprintf(stderr, 145 DEBUG(" Input object is wrong type\n"
149 " Input object is wrong type\n" 146 " Expected: %08x - %s\n"
150 " Expected: %08x - %s\n" 147 " Supplied: %08x - %s",
151 " Supplied: %08x - %s\n", 148 expected, evas_debug_magic_string_get(expected),
152 expected, evas_debug_magic_string_get(expected), 149 supplied, evas_debug_magic_string_get(supplied));
153 supplied, evas_debug_magic_string_get(supplied));
154 if (_evas_debug_abort) abort(); 150 if (_evas_debug_abort) abort();
155} 151}
156 152
@@ -164,9 +160,8 @@ evas_debug_generic(const char *str)
164 _evas_debug_init = 1; 160 _evas_debug_init = 1;
165 } 161 }
166 if (_evas_debug_show) 162 if (_evas_debug_show)
167 fprintf(stderr, 163 DEBUG("*** EVAS ERROR:\n"
168 "*** EVAS ERROR:\n" 164 "%s", (char *)str);
169 "%s", (char *)str);
170 if (_evas_debug_abort) abort(); 165 if (_evas_debug_abort) abort();
171} 166}
172 167