[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[myserver-commit] [2949] By default, don't colorize the console backgrou
From: |
Francesco Pipita |
Subject: |
[myserver-commit] [2949] By default, don't colorize the console background. |
Date: |
Sat, 08 Nov 2008 20:06:42 +0000 |
Revision: 2949
http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=2949
Author: francesco_pipita
Date: 2008-11-08 20:06:42 +0000 (Sat, 08 Nov 2008)
Log Message:
-----------
By default, don't colorize the console background.
Modified Paths:
--------------
trunk/myserver/include/filter/console.h
trunk/myserver/src/filter/console.cpp
trunk/myserver/src/log/stream/console_stream.cpp
Modified: trunk/myserver/include/filter/console.h
===================================================================
--- trunk/myserver/include/filter/console.h 2008-11-08 17:35:26 UTC (rev
2948)
+++ trunk/myserver/include/filter/console.h 2008-11-08 20:06:42 UTC (rev
2949)
@@ -37,6 +37,7 @@
MYSERVER_FG_COLOR_CYAN,
MYSERVER_FG_COLOR_WHITE,
MYSERVER_FG_COLOR_RESET,
+ MYSERVER_FG_COLOR_NONE,
/* Background colors */
MYSERVER_BG_COLOR_BLACK,
MYSERVER_BG_COLOR_RED,
@@ -46,7 +47,8 @@
MYSERVER_BG_COLOR_MAGENTA,
MYSERVER_BG_COLOR_CYAN,
MYSERVER_BG_COLOR_WHITE,
- MYSERVER_BG_COLOR_RESET
+ MYSERVER_BG_COLOR_RESET,
+ MYSERVER_BG_COLOR_NONE
};
#ifdef WIN32
Modified: trunk/myserver/src/filter/console.cpp
===================================================================
--- trunk/myserver/src/filter/console.cpp 2008-11-08 17:35:26 UTC (rev
2948)
+++ trunk/myserver/src/filter/console.cpp 2008-11-08 20:06:42 UTC (rev
2949)
@@ -26,10 +26,11 @@
FOREGROUND_GREEN, // Green
FOREGROUND_RED | FOREGROUND_GREEN, // Yellow
FOREGROUND_BLUE, // Blue
- FOREGROUND_RED | FOREGROUND_BLUE // Magenta
- FOREGROUND_BLUE | FOREGROUND_GREEN // Cyan
+ FOREGROUND_RED | FOREGROUND_BLUE, // Magenta
+ FOREGROUND_BLUE | FOREGROUND_GREEN, // Cyan
FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE, // White
- FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE // Reset
+ FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE, // Reset
+ -1, // None
/* Background colors */
0, // Black
BACKGROUND_RED, // Red
@@ -39,7 +40,8 @@
BACKGROUND_RED | BACKGROUND_BLUE, // Magenta
BACKGROUND_BLUE | BACKGROUND_GREEN, // Cyan
BACKGROUND_RED | BACKGROUND_GREEN | BACKGROUND_BLUE, // White
- 0 // Reset
+ 0, // Reset
+ -1 // None
};
#endif
#ifdef NOT_WIN
@@ -55,6 +57,7 @@
"\033[36m", // Cyan
"\033[37m", // White
"\033[0m", // Reset
+ "NO_COLOR", // None
/* Background colors */
"\033[40m", // Black
"\033[41m", // Red
@@ -64,7 +67,8 @@
"\033[45m", // Magenta
"\033[46m", // Cyan
"\033[47m", // White
- "\033[0m" // Reset
+ "\033[0m", // Reset
+ "NO_COLOR" // None
};
#endif
@@ -141,9 +145,9 @@
{
return
c[0] < MYSERVER_FG_COLOR_BLACK ||
- c[0] > MYSERVER_FG_COLOR_RESET ||
+ c[0] > MYSERVER_FG_COLOR_NONE ||
c[1] < MYSERVER_BG_COLOR_BLACK ||
- c[1] > MYSERVER_BG_COLOR_RESET;
+ c[1] > MYSERVER_BG_COLOR_NONE;
}
/*!
@@ -157,11 +161,22 @@
if (!checkColors (c))
{
#ifdef WIN32
- SetConsoleTextAttribute (GetStdHandle ((fd == &cout) ? STD_OUTPUT_HANDLE
: STD_ERROR_HANDLE),
- colors[c[0]] | colors[c[1]]);
+ WORD attrs =
+ ((c[0] != MYSERVER_FG_COLOR_NONE) ? colors[c[0]] : 0) |
+ ((c[1] != MYSERVER_BG_COLOR_NONE) ? colors[c[1]] : 0);
+ DWORD nStdHandle = (fd == &cout) ? STD_OUTPUT_HANDLE : STD_ERROR_HANDLE;
+ HANDLE h = GetStdHandle (nStdHandle);
+ SetConsoleTextAttribute (attrs, h);
#endif
#ifdef NOT_WIN
- *fd << colors[c[0]] << colors[c[1]];
+ if (c[0] != MYSERVER_FG_COLOR_NONE)
+ {
+ *fd << colors[c[0]];
+ }
+ if (c[1] != MYSERVER_BG_COLOR_NONE)
+ {
+ *fd << colors[c[1]];
+ }
#endif
return 0;
}
Modified: trunk/myserver/src/log/stream/console_stream.cpp
===================================================================
--- trunk/myserver/src/log/stream/console_stream.cpp 2008-11-08 17:35:26 UTC
(rev 2948)
+++ trunk/myserver/src/log/stream/console_stream.cpp 2008-11-08 20:06:42 UTC
(rev 2949)
@@ -21,8 +21,8 @@
* Default color values to use when outputting log messages over the
* console. Change them according to your tastes :)
*
- * c[i][0] = Foreground color for the LoggingLevel `i'
- * c[i][1] = Background color for the LoggingLevel `i'
+ * defaultColors[i][0] = Foreground color for the LoggingLevel `i'
+ * defaultColors[i][1] = Background color for the LoggingLevel `i'
*/
MyServerColor defaultColors[][2] =
{
@@ -32,15 +32,15 @@
},
{
MYSERVER_FG_COLOR_WHITE, // } MYSERVER_LOG_MSG_INFO
- MYSERVER_BG_COLOR_BLACK // }
+ MYSERVER_BG_COLOR_NONE // }
},
{
MYSERVER_FG_COLOR_YELLOW, // } MYSERVER_LOG_MSG_WARNING
- MYSERVER_BG_COLOR_BLACK // }
+ MYSERVER_BG_COLOR_NONE // }
},
{
MYSERVER_FG_COLOR_RED, // } MYSERVER_LOG_MSG_ERROR
- MYSERVER_BG_COLOR_BLACK // }
+ MYSERVER_BG_COLOR_NONE // }
}
};
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [myserver-commit] [2949] By default, don't colorize the console background.,
Francesco Pipita <=