From 6687f151e73bc48d8ed578716e1822a749f4123e Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Mon, 14 Jul 2008 17:09:47 +0000 Subject: [PATCH] tweak colors on windows to match unix git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@9017 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/include/switch_types.h | 9 +++++++++ src/mod/loggers/mod_console/mod_console.c | 18 +++++------------- src/switch_log.c | 20 +++++--------------- 3 files changed, 19 insertions(+), 28 deletions(-) diff --git a/src/include/switch_types.h b/src/include/switch_types.h index d2b612b3ee..64541cba88 100644 --- a/src/include/switch_types.h +++ b/src/include/switch_types.h @@ -38,6 +38,14 @@ #include SWITCH_BEGIN_EXTERN_C #define SWITCH_BLANK_STRING "" +#ifdef WIN32 +#define SWITCH_SEQ_FWHITE FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY +#define SWITCH_SEQ_FRED FOREGROUND_RED | FOREGROUND_INTENSITY +#define SWITCH_SEQ_FMAGEN FOREGROUND_BLUE | FOREGROUND_RED +#define SWITCH_SEQ_FCYAN FOREGROUND_GREEN | FOREGROUND_BLUE +#define SWITCH_SEQ_FGREEN FOREGROUND_GREEN +#define SWITCH_SEQ_FYELLOW FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_INTENSITY +#else #define SWITCH_SEQ_ESC "\033[" /* Ansi Control character suffixes */ #define SWITCH_SEQ_HOME_CHAR 'H' @@ -91,6 +99,7 @@ SWITCH_BEGIN_EXTERN_C #define SWITCH_SEQ_CLEARLINE SWITCH_SEQ_ESC SWITCH_SEQ_CLEARLINE_CHAR_STR #define SWITCH_SEQ_CLEARLINEEND SWITCH_SEQ_ESC SWITCH_SEQ_CLEARLINEEND_CHAR #define SWITCH_SEQ_CLEARSCR SWITCH_SEQ_ESC SWITCH_SEQ_CLEARSCR_CHAR SWITCH_SEQ_HOME +#endif #define SWITCH_DEFAULT_DTMF_DURATION 2000 #define SWITCH_MAX_DTMF_DURATION 192000 #define SWITCH_DEFAULT_DIR_PERMS SWITCH_FPROT_UREAD | SWITCH_FPROT_UWRITE | SWITCH_FPROT_UEXECUTE | SWITCH_FPROT_GREAD | SWITCH_FPROT_GEXECUTE diff --git a/src/mod/loggers/mod_console/mod_console.c b/src/mod/loggers/mod_console/mod_console.c index c3b5868eb6..10a8812966 100644 --- a/src/mod/loggers/mod_console/mod_console.c +++ b/src/mod/loggers/mod_console/mod_console.c @@ -42,21 +42,13 @@ static int COLORIZE = 0; static HANDLE hStdout; static WORD wOldColorAttrs; static CONSOLE_SCREEN_BUFFER_INFO csbiInfo; -static WORD COLORS[] = { FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY, - FOREGROUND_RED | FOREGROUND_INTENSITY, - FOREGROUND_RED | FOREGROUND_INTENSITY, - FOREGROUND_RED | FOREGROUND_INTENSITY, - FOREGROUND_BLUE | FOREGROUND_INTENSITY, - FOREGROUND_BLUE | FOREGROUND_INTENSITY, - FOREGROUND_GREEN | FOREGROUND_INTENSITY, - FOREGROUND_GREEN | FOREGROUND_INTENSITY, - FOREGROUND_GREEN | FOREGROUND_INTENSITY -}; + +static WORD #else -static const char *COLORS[] = { SWITCH_SEQ_FWHITE, SWITCH_SEQ_FRED, SWITCH_SEQ_FRED, SWITCH_SEQ_FRED, SWITCH_SEQ_FMAGEN, SWITCH_SEQ_FCYAN, - SWITCH_SEQ_FGREEN, SWITCH_SEQ_FYELLOW, "" -}; +static const char* #endif +COLORS[] = { SWITCH_SEQ_FWHITE, SWITCH_SEQ_FRED, SWITCH_SEQ_FRED, SWITCH_SEQ_FRED, SWITCH_SEQ_FMAGEN, SWITCH_SEQ_FCYAN, SWITCH_SEQ_FGREEN, SWITCH_SEQ_FYELLOW }; + static switch_memory_pool_t *module_pool = NULL; static switch_hash_t *log_hash = NULL; diff --git a/src/switch_log.c b/src/switch_log.c index 26cc81e3e8..ddb6cd335c 100644 --- a/src/switch_log.c +++ b/src/switch_log.c @@ -68,22 +68,12 @@ static switch_bool_t COLORIZE = SWITCH_FALSE; static HANDLE hStdout; static WORD wOldColorAttrs; static CONSOLE_SCREEN_BUFFER_INFO csbiInfo; -static WORD COLORS[] = { FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY, - FOREGROUND_RED | FOREGROUND_INTENSITY, - FOREGROUND_RED | FOREGROUND_INTENSITY, - FOREGROUND_RED | FOREGROUND_INTENSITY, - FOREGROUND_BLUE | FOREGROUND_INTENSITY, - FOREGROUND_BLUE | FOREGROUND_INTENSITY, - FOREGROUND_GREEN | FOREGROUND_INTENSITY, - FOREGROUND_GREEN | FOREGROUND_INTENSITY, - FOREGROUND_GREEN | FOREGROUND_INTENSITY -}; -#else -static const char *COLORS[] = { SWITCH_SEQ_FWHITE, SWITCH_SEQ_FRED, SWITCH_SEQ_FRED, SWITCH_SEQ_FRED, SWITCH_SEQ_FMAGEN, SWITCH_SEQ_FCYAN, - SWITCH_SEQ_FGREEN, SWITCH_SEQ_FYELLOW, "" -}; -#endif +static WORD +#else +static const char* +#endif +COLORS[] = { SWITCH_SEQ_FWHITE, SWITCH_SEQ_FRED, SWITCH_SEQ_FRED, SWITCH_SEQ_FRED, SWITCH_SEQ_FMAGEN, SWITCH_SEQ_FCYAN, SWITCH_SEQ_FGREEN, SWITCH_SEQ_FYELLOW }; SWITCH_DECLARE(const char *) switch_log_level2str(switch_log_level_t level) {