summaryrefslogtreecommitdiff
path: root/legacy/ecore/src
diff options
context:
space:
mode:
authorSebastian Dransfeld <sd@tango.flipp.net>2010-01-07 00:30:05 +0000
committerSebastian Dransfeld <sd@tango.flipp.net>2010-01-07 00:30:05 +0000
commit8007e730772d012bd65237a2e8650f72590659d6 (patch)
tree89673da66c4087a7c4d3869a60ce7b968fb6c77a /legacy/ecore/src
parentff86d2766313980961245d3cde25b79c80e07330 (diff)
Patch from Mathieu Taillefumier
I modified some hearder file in ecore to ease the cleanup of the private header files in ecore. Each module has now a private header with its own log color (eina_log related). I also created two private header files for ecore_sdl and ecore_input for this purpose and corrected some typos in the xlib_xcb private header file. SVN revision: 44933
Diffstat (limited to '')
-rw-r--r--legacy/ecore/src/lib/ecore_con/ecore_con.c2
-rw-r--r--legacy/ecore/src/lib/ecore_con/ecore_con_private.h6
-rw-r--r--legacy/ecore/src/lib/ecore_config/ecore_config.c2
-rw-r--r--legacy/ecore/src/lib/ecore_config/ecore_config_private.h5
-rw-r--r--legacy/ecore/src/lib/ecore_directfb/ecore_directfb.c4
-rw-r--r--legacy/ecore/src/lib/ecore_directfb/ecore_directfb_private.h10
-rw-r--r--legacy/ecore/src/lib/ecore_evas/ecore_evas.c2
-rw-r--r--legacy/ecore/src/lib/ecore_evas/ecore_evas_private.h5
-rw-r--r--legacy/ecore/src/lib/ecore_file/ecore_file.c2
-rw-r--r--legacy/ecore/src/lib/ecore_file/ecore_file_private.h6
-rw-r--r--legacy/ecore/src/lib/ecore_imf/ecore_imf.c2
-rw-r--r--legacy/ecore/src/lib/ecore_imf/ecore_imf_private.h5
-rw-r--r--legacy/ecore/src/lib/ecore_input/ecore_input.c31
-rw-r--r--legacy/ecore/src/lib/ecore_input/ecore_input_private.h37
-rw-r--r--legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c2
-rw-r--r--legacy/ecore/src/lib/ecore_ipc/ecore_ipc_private.h6
-rw-r--r--legacy/ecore/src/lib/ecore_job/ecore_job.c2
-rw-r--r--legacy/ecore/src/lib/ecore_job/ecore_job_private.h5
-rw-r--r--legacy/ecore/src/lib/ecore_sdl/ecore_sdl.c30
-rw-r--r--legacy/ecore/src/lib/ecore_sdl/ecore_sdl_private.h35
-rw-r--r--legacy/ecore/src/lib/ecore_txt/ecore_txt_private.h5
-rw-r--r--legacy/ecore/src/lib/ecore_win32/ecore_win32.c2
-rw-r--r--legacy/ecore/src/lib/ecore_win32/ecore_win32_private.h15
-rw-r--r--legacy/ecore/src/lib/ecore_wince/ecore_wince.c2
-rw-r--r--legacy/ecore/src/lib/ecore_wince/ecore_wince_private.h14
-rw-r--r--legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb.c2
-rw-r--r--legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_private.h7
-rw-r--r--legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c2
-rw-r--r--legacy/ecore/src/lib/ecore_x/xlib/ecore_x_private.h4
29 files changed, 184 insertions, 68 deletions
diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con.c b/legacy/ecore/src/lib/ecore_con/ecore_con.c
index e600485d07..213cc1485c 100644
--- a/legacy/ecore/src/lib/ecore_con/ecore_con.c
+++ b/legacy/ecore/src/lib/ecore_con/ecore_con.c
@@ -83,7 +83,7 @@ ecore_con_init(void)
83 if (!ecore_init()) 83 if (!ecore_init())
84 return --_ecore_con_init_count; 84 return --_ecore_con_init_count;
85 85
86 _ecore_con_log_dom = eina_log_domain_register("EcoreCon", ECORE_DEFAULT_LOG_COLOR); 86 _ecore_con_log_dom = eina_log_domain_register("EcoreCon", ECORE_CON_DEFAULT_LOG_COLOR);
87 if(_ecore_con_log_dom < 0) 87 if(_ecore_con_log_dom < 0)
88 { 88 {
89 EINA_LOG_ERR("Impossible to create a log domain foe Ecore Con."); 89 EINA_LOG_ERR("Impossible to create a log domain foe Ecore Con.");
diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con_private.h b/legacy/ecore/src/lib/ecore_con/ecore_con_private.h
index 86fb340794..7734be5618 100644
--- a/legacy/ecore/src/lib/ecore_con/ecore_con_private.h
+++ b/legacy/ecore/src/lib/ecore_con/ecore_con_private.h
@@ -23,6 +23,12 @@
23#define READBUFSIZ 65536 23#define READBUFSIZ 65536
24 24
25extern int _ecore_con_log_dom ; 25extern int _ecore_con_log_dom ;
26
27#ifdef ECORE_CON_DEFAULT_LOG_COLOR
28#undef ECORE_LOG_DEFAULT_LOG_COLOR
29#endif
30#define ECORE_CON_DEFAULT_LOG_COLOR EINA_COLOR_BLUE
31
26#ifdef ERR 32#ifdef ERR
27# undef ERR 33# undef ERR
28#endif 34#endif
diff --git a/legacy/ecore/src/lib/ecore_config/ecore_config.c b/legacy/ecore/src/lib/ecore_config/ecore_config.c
index 491f121b52..956f596946 100644
--- a/legacy/ecore/src/lib/ecore_config/ecore_config.c
+++ b/legacy/ecore/src/lib/ecore_config/ecore_config.c
@@ -1674,7 +1674,7 @@ ecore_config_init(const char *name)
1674{ 1674{
1675 char *path; 1675 char *path;
1676 Ecore_Config_Prop *list; 1676 Ecore_Config_Prop *list;
1677 _ecore_config_log_dom = eina_log_domain_register("EcoreConfig", ECORE_DEFAULT_LOG_COLOR); 1677 _ecore_config_log_dom = eina_log_domain_register("EcoreConfig", ECORE_CONFIG_DEFAULT_LOG_COLOR);
1678 if(_ecore_config_log_dom < 0) 1678 if(_ecore_config_log_dom < 0)
1679 { 1679 {
1680 EINA_LOG_ERR("Impossible to create a log domain for the Ecore config module."); 1680 EINA_LOG_ERR("Impossible to create a log domain for the Ecore config module.");
diff --git a/legacy/ecore/src/lib/ecore_config/ecore_config_private.h b/legacy/ecore/src/lib/ecore_config/ecore_config_private.h
index abbb1db04c..b97f695a22 100644
--- a/legacy/ecore/src/lib/ecore_config/ecore_config_private.h
+++ b/legacy/ecore/src/lib/ecore_config/ecore_config_private.h
@@ -1,6 +1,9 @@
1#ifndef _ECORE_CONFIG_PRIVATE_H 1#ifndef _ECORE_CONFIG_PRIVATE_H
2# define _ECORE_CONFIG_PRIVATE_H 2# define _ECORE_CONFIG_PRIVATE_H
3 3#ifdef ECORE_CONFIG_DEFAULT_LOG_COLOR
4# undef ECORE_CONFIG_DEFAULT_LOG_COLOR
5#endif
6#define ECORE_CONFIG_DEFAULT_LOG_COLOR EINA_COLOR_BLUE
4 /* eina_log related things */ 7 /* eina_log related things */
5 8
6extern int _ecore_config_log_dom; 9extern int _ecore_config_log_dom;
diff --git a/legacy/ecore/src/lib/ecore_directfb/ecore_directfb.c b/legacy/ecore/src/lib/ecore_directfb/ecore_directfb.c
index b6d0706b8b..2b6c44db81 100644
--- a/legacy/ecore/src/lib/ecore_directfb/ecore_directfb.c
+++ b/legacy/ecore/src/lib/ecore_directfb/ecore_directfb.c
@@ -24,6 +24,8 @@
24 * - 24 * -
25 * */ 25 * */
26int _ecore_directfb_log_dom = -1; 26int _ecore_directfb_log_dom = -1;
27
28
27static int _ecore_directfb_init_count = 0; 29static int _ecore_directfb_init_count = 0;
28 30
29static int _window_event_fd = 0; 31static int _window_event_fd = 0;
@@ -659,7 +661,7 @@ ecore_directfb_init(const char *name __UNUSED__)
659 int i = 0; 661 int i = 0;
660 662
661 if (++_ecore_directfb_init_count != 1) return _ecore_directfb_init_count; 663 if (++_ecore_directfb_init_count != 1) return _ecore_directfb_init_count;
662 _ecore_directfb_log_dom = eina_log_domain_register("EcoreDirectFB", ECORE_DEFAULT_LOG_COLOR); 664 _ecore_directfb_log_dom = eina_log_domain_register("EcoreDirectFB", ECORE_DIRECTFB_DEFAULT_LOG_COLOR);
663 if(_ecore_directfb_log_dom < 0) 665 if(_ecore_directfb_log_dom < 0)
664 { 666 {
665 EINA_LOG_ERR("Impossible to create a log domain for the Ecore directFB module."); 667 EINA_LOG_ERR("Impossible to create a log domain for the Ecore directFB module.");
diff --git a/legacy/ecore/src/lib/ecore_directfb/ecore_directfb_private.h b/legacy/ecore/src/lib/ecore_directfb/ecore_directfb_private.h
index 0977a2fdb0..e9124aa913 100644
--- a/legacy/ecore/src/lib/ecore_directfb/ecore_directfb_private.h
+++ b/legacy/ecore/src/lib/ecore_directfb/ecore_directfb_private.h
@@ -1,7 +1,14 @@
1 1#ifndef _ECORE_DIRECTFB_PRIVATE_H
2#define _ECORE_DIRECTFB_PRIVATE_H
2/* eina_log related things */ 3/* eina_log related things */
3 4
4extern int _ecore_directfb_log_dom; 5extern int _ecore_directfb_log_dom;
6
7#ifdef ECORE_DIRECTFB_DEFAULT_LOG_COLOR
8#undef ECORE_DIRECTFB_DEFAULT_LOG_COLOR
9#endif
10#define ECORE_DIRECTFB_DEFAULT_LOG_COLOR EINA_COLOR_BLUE
11
5#ifdef ERR 12#ifdef ERR
6# undef ERR 13# undef ERR
7#endif 14#endif
@@ -42,3 +49,4 @@ struct keymap
42 char *name; 49 char *name;
43 char *string; 50 char *string;
44}; 51};
52#endif
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas.c
index ea966907d1..ca292ad819 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas.c
+++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas.c
@@ -165,7 +165,7 @@ ecore_evas_init(void)
165 if (!ecore_init()) 165 if (!ecore_init())
166 goto shutdown_evas; 166 goto shutdown_evas;
167 167
168 _ecore_evas_log_dom = eina_log_domain_register("Ecore_Evas", ECORE_DEFAULT_LOG_COLOR); 168 _ecore_evas_log_dom = eina_log_domain_register("Ecore_Evas", ECORE_EVAS_DEFAULT_LOG_COLOR);
169 if(_ecore_evas_log_dom < 0) 169 if(_ecore_evas_log_dom < 0)
170 { 170 {
171 EINA_LOG_ERR("Impossible to create a log domain for Ecore_Evas."); 171 EINA_LOG_ERR("Impossible to create a log domain for Ecore_Evas.");
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_private.h b/legacy/ecore/src/lib/ecore_evas/ecore_evas_private.h
index 026fb4cecf..d3c9b38d26 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_private.h
+++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_private.h
@@ -101,6 +101,11 @@
101 101
102extern int _ecore_evas_log_dom; 102extern int _ecore_evas_log_dom;
103 103
104#ifdef ECORE_EVAS_DEFAULT_LOG_COLOR
105# undef ECORE_EVAS_DEFAULT_LOG_COLOR
106#endif
107#define ECORE_EVAS_DEFAULT_LOG_COLOR EINA_COLOR_BLUE
108
104#ifdef ERR 109#ifdef ERR
105# undef ERR 110# undef ERR
106#endif 111#endif
diff --git a/legacy/ecore/src/lib/ecore_file/ecore_file.c b/legacy/ecore/src/lib/ecore_file/ecore_file.c
index fc61fa4f39..564c137d30 100644
--- a/legacy/ecore/src/lib/ecore_file/ecore_file.c
+++ b/legacy/ecore/src/lib/ecore_file/ecore_file.c
@@ -41,7 +41,7 @@ ecore_file_init()
41{ 41{
42 if (++_ecore_file_init_count != 1) 42 if (++_ecore_file_init_count != 1)
43 return _ecore_file_init_count; 43 return _ecore_file_init_count;
44 _ecore_file_log_dom = eina_log_domain_register("EcoreFile", ECORE_DEFAULT_LOG_COLOR); 44 _ecore_file_log_dom = eina_log_domain_register("EcoreFile", ECORE_FILE_DEFAULT_LOG_COLOR);
45 if(_ecore_file_log_dom < 0) 45 if(_ecore_file_log_dom < 0)
46 { 46 {
47 EINA_LOG_ERR("Impossible to create a log domain for the ecore file module."); 47 EINA_LOG_ERR("Impossible to create a log domain for the ecore file module.");
diff --git a/legacy/ecore/src/lib/ecore_file/ecore_file_private.h b/legacy/ecore/src/lib/ecore_file/ecore_file_private.h
index 073e446ee4..072987299a 100644
--- a/legacy/ecore/src/lib/ecore_file/ecore_file_private.h
+++ b/legacy/ecore/src/lib/ecore_file/ecore_file_private.h
@@ -19,6 +19,12 @@
19#include "Ecore_File.h" 19#include "Ecore_File.h"
20 20
21extern int _ecore_file_log_dom; 21extern int _ecore_file_log_dom;
22
23#ifdef ECORE_FILE_DEFAULT_LOG_COLOR
24#undef ECORE_FILE_DEFAULT_LOG_COLOR
25#endif
26#define ECORE_FILE_DEFAULT_LOG_COLOR EINA_COLOR_BLUE
27
22#ifdef ERR 28#ifdef ERR
23# undef ERR 29# undef ERR
24#endif 30#endif
diff --git a/legacy/ecore/src/lib/ecore_imf/ecore_imf.c b/legacy/ecore/src/lib/ecore_imf/ecore_imf.c
index f563519212..e3b29150a6 100644
--- a/legacy/ecore/src/lib/ecore_imf/ecore_imf.c
+++ b/legacy/ecore/src/lib/ecore_imf/ecore_imf.c
@@ -42,7 +42,7 @@ ecore_imf_init(void)
42 42
43 if (!ecore_init()) 43 if (!ecore_init())
44 return --_ecore_imf_init_count; 44 return --_ecore_imf_init_count;
45 _ecore_imf_log_dom = eina_log_domain_register("EcoreIMF", ECORE_DEFAULT_LOG_COLOR); 45 _ecore_imf_log_dom = eina_log_domain_register("EcoreIMF", ECORE_IMF_DEFAULT_LOG_COLOR);
46 if(_ecore_imf_log_dom < 0) 46 if(_ecore_imf_log_dom < 0)
47 { 47 {
48 EINA_LOG_ERR("Impossible to create a log domain for the Ecore IMF module."); 48 EINA_LOG_ERR("Impossible to create a log domain for the Ecore IMF module.");
diff --git a/legacy/ecore/src/lib/ecore_imf/ecore_imf_private.h b/legacy/ecore/src/lib/ecore_imf/ecore_imf_private.h
index 20e8bf46f6..76a9be404b 100644
--- a/legacy/ecore/src/lib/ecore_imf/ecore_imf_private.h
+++ b/legacy/ecore/src/lib/ecore_imf/ecore_imf_private.h
@@ -3,6 +3,11 @@
3 3
4#define ECORE_MAGIC_CONTEXT 0x56c1b39a 4#define ECORE_MAGIC_CONTEXT 0x56c1b39a
5 5
6#ifdef ECORE_IMF_DEFAULT_LOG_COLOR
7#undef ECORE_IMF_DEFAULT_LOG_COLOR
8#endif
9#define ECORE_IMF_DEFAULT_LOG_COLOR EINA_COLOR_BLUE
10
6extern int _ecore_imf_log_dom; 11extern int _ecore_imf_log_dom;
7#ifdef ERR 12#ifdef ERR
8# undef ERR 13# undef ERR
diff --git a/legacy/ecore/src/lib/ecore_input/ecore_input.c b/legacy/ecore/src/lib/ecore_input/ecore_input.c
index 6372ea2717..2a2d73ece8 100644
--- a/legacy/ecore/src/lib/ecore_input/ecore_input.c
+++ b/legacy/ecore/src/lib/ecore_input/ecore_input.c
@@ -10,37 +10,14 @@
10#include <string.h> 10#include <string.h>
11 11
12#include "Ecore.h" 12#include "Ecore.h"
13#include "ecore_input_private.h"
13#include "ecore_private.h" 14#include "ecore_private.h"
14#include "Ecore_Input.h" 15#include "Ecore_Input.h"
15#include "Evas.h" 16#include "Evas.h"
16 17
17 18
18static int _ecore_input_log_dom = -1; 19int _ecore_input_log_dom = -1;
19 20
20#ifdef ERR
21# undef ERR
22#endif
23#define ERR(...) EINA_LOG_DOM_ERR(_ecore_input_log_dom, __VA_ARGS__)
24
25#ifdef DBG
26# undef DBG
27#endif
28#define DBG(...) EINA_LOG_DOM_DBG(_ecore_input_log_dom, __VA_ARGS__)
29
30#ifdef INF
31# undef INF
32#endif
33#define INF(...) EINA_LOG_DOM_INFO(_ecore_input_log_dom, __VA_ARGS__)
34
35#ifdef WRN
36# undef WRN
37#endif
38#define WRN(...) EINA_LOG_DOM_WARN(_ecore_input_log_dom, __VA_ARGS__)
39
40#ifdef CRIT
41# undef CRIT
42#endif
43#define CRIT(...) EINA_LOG_DOM_CRIT(_ecore_input_log_dom, __VA_ARGS__)
44 21
45typedef struct _Ecore_Input_Window Ecore_Input_Window; 22typedef struct _Ecore_Input_Window Ecore_Input_Window;
46struct _Ecore_Input_Window 23struct _Ecore_Input_Window
@@ -71,12 +48,14 @@ ecore_event_init(void)
71{ 48{
72 if (++_ecore_event_init_count != 1) 49 if (++_ecore_event_init_count != 1)
73 return _ecore_event_init_count; 50 return _ecore_event_init_count;
74 _ecore_input_log_dom = eina_log_domain_register("EcoreInput", ECORE_DEFAULT_LOG_COLOR); 51
52 _ecore_input_log_dom = eina_log_domain_register("EcoreInput", ECORE_INPUT_DEFAULT_LOG_COLOR);
75 if(_ecore_input_log_dom < 0) 53 if(_ecore_input_log_dom < 0)
76 { 54 {
77 EINA_LOG_ERR("Impossible to create a log domain for the ecore input module."); 55 EINA_LOG_ERR("Impossible to create a log domain for the ecore input module.");
78 return --_ecore_event_init_count; 56 return --_ecore_event_init_count;
79 } 57 }
58
80 ECORE_EVENT_KEY_DOWN = ecore_event_type_new(); 59 ECORE_EVENT_KEY_DOWN = ecore_event_type_new();
81 ECORE_EVENT_KEY_UP = ecore_event_type_new(); 60 ECORE_EVENT_KEY_UP = ecore_event_type_new();
82 ECORE_EVENT_MOUSE_BUTTON_DOWN = ecore_event_type_new(); 61 ECORE_EVENT_MOUSE_BUTTON_DOWN = ecore_event_type_new();
diff --git a/legacy/ecore/src/lib/ecore_input/ecore_input_private.h b/legacy/ecore/src/lib/ecore_input/ecore_input_private.h
new file mode 100644
index 0000000000..5660a2024a
--- /dev/null
+++ b/legacy/ecore/src/lib/ecore_input/ecore_input_private.h
@@ -0,0 +1,37 @@
1#ifndef _ECORE_INPUT_PRIVATE_H
2#define _ECORE_INPUT_PRIVATE_H
3
4extern int _ecore_input_log_dom;
5
6#ifdef ECORE_INPUT_DEFAULT_LOG_COLOR
7# undef ECORE_INPUT_DEFAULT_LOG_COLOR
8#endif
9
10#define ECORE_INPUT_DEFAULT_LOG_COLOR EINA_COLOR_BLUE
11
12#ifdef ERR
13# undef ERR
14#endif
15#define ERR(...) EINA_LOG_DOM_ERR(_ecore_input_log_dom, __VA_ARGS__)
16
17#ifdef DBG
18# undef DBG
19#endif
20#define DBG(...) EINA_LOG_DOM_DBG(_ecore_input_log_dom, __VA_ARGS__)
21
22#ifdef INF
23# undef INF
24#endif
25#define INF(...) EINA_LOG_DOM_INFO(_ecore_input_log_dom, __VA_ARGS__)
26
27#ifdef WRN
28# undef WRN
29#endif
30#define WRN(...) EINA_LOG_DOM_WARN(_ecore_input_log_dom, __VA_ARGS__)
31
32#ifdef CRIT
33# undef CRIT
34#endif
35#define CRIT(...) EINA_LOG_DOM_CRIT(_ecore_input_log_dom, __VA_ARGS__)
36
37#endif
diff --git a/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c b/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c
index e5d8a73a88..3e6c02756d 100644
--- a/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c
+++ b/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c
@@ -267,7 +267,7 @@ ecore_ipc_init(void)
267 267
268 if (++_ecore_ipc_init_count != 1) 268 if (++_ecore_ipc_init_count != 1)
269 return _ecore_ipc_init_count; 269 return _ecore_ipc_init_count;
270 _ecore_ipc_log_dom = eina_log_domain_register("EcoreIpc", ECORE_DEFAULT_LOG_COLOR); 270 _ecore_ipc_log_dom = eina_log_domain_register("EcoreIpc", ECORE_IPC_DEFAULT_LOG_COLOR);
271 if(_ecore_ipc_log_dom < 0) 271 if(_ecore_ipc_log_dom < 0)
272 { 272 {
273 EINA_LOG_ERR("Impossible to create a log domain for the Ecore IPC module."); 273 EINA_LOG_ERR("Impossible to create a log domain for the Ecore IPC module.");
diff --git a/legacy/ecore/src/lib/ecore_ipc/ecore_ipc_private.h b/legacy/ecore/src/lib/ecore_ipc/ecore_ipc_private.h
index 4c0c7029f8..b46f62bfef 100644
--- a/legacy/ecore/src/lib/ecore_ipc/ecore_ipc_private.h
+++ b/legacy/ecore/src/lib/ecore_ipc/ecore_ipc_private.h
@@ -3,6 +3,12 @@
3 3
4 4
5extern int _ecore_ipc_log_dom; 5extern int _ecore_ipc_log_dom;
6
7#ifdef ECORE_IPC_DEFAULT_LOG_COLOR
8# undef ECORE_IPC_DEFAULT_LOG_COLOR
9#endif
10#define ECORE_IPC_DEFAULT_LOG_COLOR EINA_COLOR_BLUE
11
6#ifdef ERR 12#ifdef ERR
7# undef ERR 13# undef ERR
8#endif 14#endif
diff --git a/legacy/ecore/src/lib/ecore_job/ecore_job.c b/legacy/ecore/src/lib/ecore_job/ecore_job.c
index e125be9887..d8e3f491bc 100644
--- a/legacy/ecore/src/lib/ecore_job/ecore_job.c
+++ b/legacy/ecore/src/lib/ecore_job/ecore_job.c
@@ -26,7 +26,7 @@ ecore_job_init(void)
26{ 26{
27 if (++_ecore_job_init_count != 1) 27 if (++_ecore_job_init_count != 1)
28 return _ecore_job_init_count; 28 return _ecore_job_init_count;
29 _ecore_job_log_dom = eina_log_domain_register("EcoreJob", ECORE_DEFAULT_LOG_COLOR); 29 _ecore_job_log_dom = eina_log_domain_register("EcoreJob", ECORE_JOB_DEFAULT_LOG_COLOR);
30 if(_ecore_job_log_dom < 0) 30 if(_ecore_job_log_dom < 0)
31 { 31 {
32 EINA_LOG_ERR("Impossible to create a log domain for the Ecore Job module."); 32 EINA_LOG_ERR("Impossible to create a log domain for the Ecore Job module.");
diff --git a/legacy/ecore/src/lib/ecore_job/ecore_job_private.h b/legacy/ecore/src/lib/ecore_job/ecore_job_private.h
index 96d0db81ee..8620626659 100644
--- a/legacy/ecore/src/lib/ecore_job/ecore_job_private.h
+++ b/legacy/ecore/src/lib/ecore_job/ecore_job_private.h
@@ -4,6 +4,11 @@
4#define ECORE_MAGIC_JOB 0x76543210 4#define ECORE_MAGIC_JOB 0x76543210
5 5
6extern int _ecore_job_log_dom; 6extern int _ecore_job_log_dom;
7#ifdef ECORE_JOB_DEFAULT_LOG_COLOR
8# undef ECORE_JOB_DEFAULT_LOG_COLOR
9#endif
10#define ECORE_JOB_DEFAULT_LOG_COLOR EINA_COLOR_BLUE
11
7#ifdef ERR 12#ifdef ERR
8# undef ERR 13# undef ERR
9#endif 14#endif
diff --git a/legacy/ecore/src/lib/ecore_sdl/ecore_sdl.c b/legacy/ecore/src/lib/ecore_sdl/ecore_sdl.c
index 7537dfb20a..f2d9c4fe35 100644
--- a/legacy/ecore/src/lib/ecore_sdl/ecore_sdl.c
+++ b/legacy/ecore/src/lib/ecore_sdl/ecore_sdl.c
@@ -12,37 +12,13 @@
12#include "Ecore_Sdl.h" 12#include "Ecore_Sdl.h"
13#include "Ecore_Input.h" 13#include "Ecore_Input.h"
14#include "Ecore.h" 14#include "Ecore.h"
15#include "ecore_sdl_private.h"
15#include "ecore_private.h" 16#include "ecore_private.h"
16#include "Ecore_Sdl_Keys.h" 17#include "Ecore_Sdl_Keys.h"
17 18
18#include <eina_rbtree.h> 19#include <eina_rbtree.h>
19 20
20static int _ecore_sdl_log_dom = -1; 21int _ecore_sdl_log_dom = -1;
21
22#ifdef ERR
23# undef ERR
24#endif
25#define ERR(...) EINA_LOG_DOM_ERR(_ecore_sdl_log_dom, __VA_ARGS__)
26
27#ifdef DBG
28# undef DBG
29#endif
30#define DBG(...) EINA_LOG_DOM_DBG(_ecore_sdl_log_dom, __VA_ARGS__)
31
32#ifdef INF
33# undef INF
34#endif
35#define INF(...) EINA_LOG_DOM_INFO(_ecore_sdl_log_dom, __VA_ARGS__)
36
37#ifdef WRN
38# undef WRN
39#endif
40#define WRN(...) EINA_LOG_DOM_WARN(_ecore_sdl_log_dom, __VA_ARGS__)
41
42#ifdef CRIT
43# undef CRIT
44#endif
45#define CRIT(...) EINA_LOG_DOM_CRIT(_ecore_sdl_log_dom, __VA_ARGS__)
46 22
47typedef struct _Ecore_SDL_Pressed Ecore_SDL_Pressed; 23typedef struct _Ecore_SDL_Pressed Ecore_SDL_Pressed;
48struct _Ecore_SDL_Pressed 24struct _Ecore_SDL_Pressed
@@ -95,7 +71,7 @@ ecore_sdl_init(const char *name __UNUSED__)
95{ 71{
96 if(++_ecore_sdl_init_count != 1) 72 if(++_ecore_sdl_init_count != 1)
97 return _ecore_sdl_init_count; 73 return _ecore_sdl_init_count;
98 _ecore_sdl_log_dom = eina_log_domain_register("EcoreSdl", ECORE_DEFAULT_LOG_COLOR); 74 _ecore_sdl_log_dom = eina_log_domain_register("EcoreSdl", ECORE_SDL_DEFAULT_LOG_COLOR);
99 if(_ecore_sdl_log_dom < 0) 75 if(_ecore_sdl_log_dom < 0)
100 { 76 {
101 EINA_LOG_ERR("Impossible to create a log domain for the Ecore SDL module."); 77 EINA_LOG_ERR("Impossible to create a log domain for the Ecore SDL module.");
diff --git a/legacy/ecore/src/lib/ecore_sdl/ecore_sdl_private.h b/legacy/ecore/src/lib/ecore_sdl/ecore_sdl_private.h
new file mode 100644
index 0000000000..96ac856d06
--- /dev/null
+++ b/legacy/ecore/src/lib/ecore_sdl/ecore_sdl_private.h
@@ -0,0 +1,35 @@
1#ifndef _ECORE_SDL_PRIVATE_H
2# define _ECORE_SDL_PRIVATE_H
3
4extern int _ecore_sdl_log_dom
5#ifdef EINA_SDL_DEFAULT_LOG_COLOR
6# undef EINA_SDL_DEFAULT_LOG_COLOR
7#endif
8#define EINA_SDL_DEFAULT_LOG_COLOR EINA_COLOR_BLUE
9
10#ifdef ERR
11# undef ERR
12#endif
13#define ERR(...) EINA_LOG_DOM_ERR(_ecore_sdl_log_dom, __VA_ARGS__)
14
15#ifdef DBG
16# undef DBG
17#endif
18#define DBG(...) EINA_LOG_DOM_DBG(_ecore_sdl_log_dom, __VA_ARGS__)
19
20#ifdef INF
21# undef INF
22#endif
23#define INF(...) EINA_LOG_DOM_INFO(_ecore_sdl_log_dom, __VA_ARGS__)
24
25#ifdef WRN
26# undef WRN
27#endif
28#define WRN(...) EINA_LOG_DOM_WARN(_ecore_sdl_log_dom, __VA_ARGS__)
29
30#ifdef CRIT
31# undef CRIT
32#endif
33#define CRIT(...) EINA_LOG_DOM_CRIT(_ecore_sdl_log_dom, __VA_ARGS__)
34
35#endif
diff --git a/legacy/ecore/src/lib/ecore_txt/ecore_txt_private.h b/legacy/ecore/src/lib/ecore_txt/ecore_txt_private.h
index c6dbb36f42..8ab81db211 100644
--- a/legacy/ecore/src/lib/ecore_txt/ecore_txt_private.h
+++ b/legacy/ecore/src/lib/ecore_txt/ecore_txt_private.h
@@ -3,6 +3,11 @@
3 3
4extern int _ecore_txt_log_dom; 4extern int _ecore_txt_log_dom;
5 5
6#ifdef ECORE_TXT_DEFAULT_LOG_COLOR
7# undef ECORE_TXT_DEFAULT_LOG_COLOR
8#endif
9#define ECORE_TXT_DEFAULT_LOG_COLOR EINA_COLOR_BLUE
10
6#ifdef ERR 11#ifdef ERR
7# undef ERR 12# undef ERR
8#endif 13#endif
diff --git a/legacy/ecore/src/lib/ecore_win32/ecore_win32.c b/legacy/ecore/src/lib/ecore_win32/ecore_win32.c
index 65b450333c..eb707639e6 100644
--- a/legacy/ecore/src/lib/ecore_win32/ecore_win32.c
+++ b/legacy/ecore/src/lib/ecore_win32/ecore_win32.c
@@ -89,7 +89,7 @@ ecore_win32_init()
89 return --_ecore_win32_init_count; 89 return --_ecore_win32_init_count;
90 90
91 eina_log_print_cb_set(_ecore_win32_error_print_cb, NULL); 91 eina_log_print_cb_set(_ecore_win32_error_print_cb, NULL);
92 _ecore_win32_log_dom_global = eina_log_domain_register("ecore_win32", EINA_COLOR_LIGHTBLUE); 92 _ecore_win32_log_dom_global = eina_log_domain_register("ecore_win32", ECORE_WIN32_DEFAULT_LOG_COLOR);
93 if (_ecore_win32_log_dom_global < 0) 93 if (_ecore_win32_log_dom_global < 0)
94 { 94 {
95 EINA_LOG_ERR("Ecore_Win32: Could not register log domain"); 95 EINA_LOG_ERR("Ecore_Win32: Could not register log domain");
diff --git a/legacy/ecore/src/lib/ecore_win32/ecore_win32_private.h b/legacy/ecore/src/lib/ecore_win32/ecore_win32_private.h
index 9c12cff8b5..e824dac649 100644
--- a/legacy/ecore/src/lib/ecore_win32/ecore_win32_private.h
+++ b/legacy/ecore/src/lib/ecore_win32/ecore_win32_private.h
@@ -14,8 +14,23 @@ extern "C" {
14/* logging messages macros */ 14/* logging messages macros */
15extern int _ecore_win32_log_dom_global; 15extern int _ecore_win32_log_dom_global;
16 16
17#ifdef ECORE_WIN32_DEFAULT_LOG_COLOR
18# undef ECORE_WIN32_DEFAULT_LOG_COLOR
19#endif
20#define ECORE_WIN32_DEFAULT_LOG_COLOR EINA_COLOR_LIGHTBLUE
21
22#ifdef ERR
23# undef ERR
24#endif
17#define ERR(...) EINA_LOG_DOM_ERR(_ecore_win32_log_dom_global , __VA_ARGS__) 25#define ERR(...) EINA_LOG_DOM_ERR(_ecore_win32_log_dom_global , __VA_ARGS__)
26#ifdef DBG
27#undef DBG
28#endif
18#define DBG(...) EINA_LOG_DOM_DBG(_ecore_win32_log_dom_global , __VA_ARGS__) 29#define DBG(...) EINA_LOG_DOM_DBG(_ecore_win32_log_dom_global , __VA_ARGS__)
30
31#ifdef INF
32#undef INF
33#endif
19#define INF(...) EINA_LOG_DOM_INFO(_ecore_win32_log_dom_global , __VA_ARGS__) 34#define INF(...) EINA_LOG_DOM_INFO(_ecore_win32_log_dom_global , __VA_ARGS__)
20 35
21#define ECORE_WIN32_WINDOW_CLASS "Ecore_Win32_Window_Class" 36#define ECORE_WIN32_WINDOW_CLASS "Ecore_Win32_Window_Class"
diff --git a/legacy/ecore/src/lib/ecore_wince/ecore_wince.c b/legacy/ecore/src/lib/ecore_wince/ecore_wince.c
index 47a1fd14a8..c507471514 100644
--- a/legacy/ecore/src/lib/ecore_wince/ecore_wince.c
+++ b/legacy/ecore/src/lib/ecore_wince/ecore_wince.c
@@ -74,7 +74,7 @@ ecore_wince_init()
74 return --_ecore_wince_init_count; 74 return --_ecore_wince_init_count;
75 75
76 eina_log_print_cb_set(_ecore_wince_error_print_cb, NULL); 76 eina_log_print_cb_set(_ecore_wince_error_print_cb, NULL);
77 _ecore_wince_log_dom_global = eina_log_domain_register("ecore_wince", EINA_COLOR_LIGHTBLUE); 77 _ecore_wince_log_dom_global = eina_log_domain_register("ecore_wince", ECORE_WINCE_DEFAULT_LOG_COLOR);
78 if (_ecore_wince_log_dom_global < 0) 78 if (_ecore_wince_log_dom_global < 0)
79 { 79 {
80 EINA_LOG_ERR("Ecore_WinCE: Could not register log domain"); 80 EINA_LOG_ERR("Ecore_WinCE: Could not register log domain");
diff --git a/legacy/ecore/src/lib/ecore_wince/ecore_wince_private.h b/legacy/ecore/src/lib/ecore_wince/ecore_wince_private.h
index 256f85ba5a..09a2f0da23 100644
--- a/legacy/ecore/src/lib/ecore_wince/ecore_wince_private.h
+++ b/legacy/ecore/src/lib/ecore_wince/ecore_wince_private.h
@@ -9,8 +9,22 @@
9/* logging messages macros */ 9/* logging messages macros */
10extern int _ecore_wince_log_dom_global; 10extern int _ecore_wince_log_dom_global;
11 11
12#ifdef ECORE_WINCE_DEFAULT_LOG_COLOR
13#undef ECORE_WINCE_DEFAULT_LOG_COLOR
14#endif
15#define ECORE_WINCE_DEFAULT_LOG_COLOR EINA_COLOR_LIGHTBLUE
16
17#ifdef ERR
18# undef ERR
19#endif
12#define ERR(...) EINA_LOG_DOM_ERR(_ecore_wince_log_dom_global , __VA_ARGS__) 20#define ERR(...) EINA_LOG_DOM_ERR(_ecore_wince_log_dom_global , __VA_ARGS__)
21#ifdef DBG
22# undef DBG
23#endif
13#define DBG(...) EINA_LOG_DOM_DBG(_ecore_wince_log_dom_global , __VA_ARGS__) 24#define DBG(...) EINA_LOG_DOM_DBG(_ecore_wince_log_dom_global , __VA_ARGS__)
25#ifdef INF
26# undef INF
27#endif
14#define INF(...) EINA_LOG_DOM_INFO(_ecore_wince_log_dom_global , __VA_ARGS__) 28#define INF(...) EINA_LOG_DOM_INFO(_ecore_wince_log_dom_global , __VA_ARGS__)
15 29
16#define ECORE_WINCE_WINDOW_CLASS L"Ecore_WinCE_Window_Class" 30#define ECORE_WINCE_WINDOW_CLASS L"Ecore_WinCE_Window_Class"
diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb.c b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb.c
index d9c9e45844..f5a667de06 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb.c
+++ b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb.c
@@ -196,7 +196,7 @@ ecore_x_init(const char *name)
196 196
197 if (--_ecore_xcb_init_count != 1) 197 if (--_ecore_xcb_init_count != 1)
198 return _ecore_xcb_init_count; 198 return _ecore_xcb_init_count;
199 _ecore_x11xcb_log_dom = eina_log_domain_register("EcoreXCB", ECORE_DEFAULT_LOG_COLOR); 199 _ecore_x11xcb_log_dom = eina_log_domain_register("EcoreXCB", ECORE_XLIB_XCB_DEFAULT_LOG_COLOR);
200 if(_ecore_x11xcb_log_dom < 0) 200 if(_ecore_x11xcb_log_dom < 0)
201 { 201 {
202 EINA_LOG_ERR("Impossible to create a log domain the Ecore XCB module."); 202 EINA_LOG_ERR("Impossible to create a log domain the Ecore XCB module.");
diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_private.h b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_private.h
index 8f494d266c..115b1fd1a6 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_private.h
+++ b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_private.h
@@ -61,7 +61,12 @@
61/* FIXME: this is for simulation only */ 61/* FIXME: this is for simulation only */
62#include "Ecore_Txt.h" 62#include "Ecore_Txt.h"
63 63
64static int _ecore_x11xcb_log_dom -1; 64extern int _ecore_x11xcb_log_dom ;
65
66#ifdef ECORE_XLIB_XCB_DEFAULT_LOG_COLOR
67# undef ECORE_XLIB_XCB_DEFAULT_LOG_COLOR
68#endif
69#define ECORE_XLIB_XCB_DEFAULT_LOG_COLOR EINA_COLOR_BLUE
65 70
66#ifdef ERR 71#ifdef ERR
67# undef ERR 72# undef ERR
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c
index 9105313c7d..d24873a33e 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c
+++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c
@@ -170,7 +170,7 @@ ecore_x_init(const char *name)
170 170
171 if (++_ecore_x_init_count != 1) 171 if (++_ecore_x_init_count != 1)
172 return _ecore_x_init_count; 172 return _ecore_x_init_count;
173 _ecore_xlib_log_dom = eina_log_domain_register("EcoreX11", ECORE_DEFAULT_LOG_COLOR); 173 _ecore_xlib_log_dom = eina_log_domain_register("EcoreX11", ECORE_XLIB_DEFAULT_LOG_COLOR);
174 if(_ecore_xlib_log_dom < 0) 174 if(_ecore_xlib_log_dom < 0)
175 { 175 {
176 EINA_LOG_ERR("Impossible to create a log domain for the Ecore Xlib module."); 176 EINA_LOG_ERR("Impossible to create a log domain for the Ecore Xlib module.");
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_private.h b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_private.h
index 5874381294..20f7530f98 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_private.h
+++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_private.h
@@ -59,6 +59,10 @@
59#include "Ecore_Txt.h" 59#include "Ecore_Txt.h"
60 60
61extern int _ecore_xlib_log_dom; 61extern int _ecore_xlib_log_dom;
62#ifdef ECORE_XLIB_DEFAULT_LOG_COLOR
63# undef ECORE_XLIB_DEFAULT_LOG_COLOR
64#endif
65#define ECORE_XLIB_DEFAULT_LOG_COLOR EINA_COLOR_BLUE
62 66
63#ifdef ERR 67#ifdef ERR
64# undef ERR 68# undef ERR