github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

src/WinConsoleFile.cc: fix colour 

Set default foreground/background colour correctly
pull/569/head
kwkam 2016-02-12 14:24:04 +08:00
parent 5e48e01bf9
commit 25ae17b490
1 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/WinConsoleFile.cc
View File

@ -62,6 +62,8 @@ const WORD kForeground[] = {
FOREGROUND_WHITE // white FOREGROUND_WHITE // white
}; };
const int kForegroundSize = sizeof (kForeground) / sizeof (kForeground[0]);
const WORD kBackground[] = { const WORD kBackground[] = {
BACKGROUND_BLACK, // black BACKGROUND_BLACK, // black
BACKGROUND_RED, // red BACKGROUND_RED, // red
@ -73,6 +75,8 @@ const WORD kBackground[] = {
BACKGROUND_WHITE // white BACKGROUND_WHITE // white
}; };
const int kBackgroundSize = sizeof (kBackground) / sizeof (kBackground[0]);
} // namespace } // namespace
namespace aria2 { namespace aria2 {
@ -82,30 +86,34 @@ WinConsoleFile::WinConsoleFile(DWORD stdHandle)
bold_(false), bold_(false),
underline_(false), underline_(false),
reverse_(false), reverse_(false),
fg_(FOREGROUND_WHITE), deffg_(FOREGROUND_WHITE),
bg_(BACKGROUND_BLACK) defbg_(BACKGROUND_BLACK)
{ {
if (supportsColor()) { if (supportsColor()) {
CONSOLE_SCREEN_BUFFER_INFO info; CONSOLE_SCREEN_BUFFER_INFO info;
GetConsoleScreenBufferInfo(handle(), &info); GetConsoleScreenBufferInfo(handle(), &info);
info.wAttributes &= deffg_ = info.wAttributes &
~(COMMON_LVB_LEADING_BYTE | COMMON_LVB_TRAILING_BYTE | (FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED);
COMMON_LVB_GRID_HORIZONTAL | COMMON_LVB_GRID_LVERTICAL | defbg_ = info.wAttributes &
COMMON_LVB_GRID_RVERTICAL | COMMON_LVB_REVERSE_VIDEO | (BACKGROUND_BLUE | BACKGROUND_GREEN | BACKGROUND_RED);
COMMON_LVB_UNDERSCORE);
fg_ = info.wAttributes &
~(BACKGROUND_BLUE | BACKGROUND_GREEN | BACKGROUND_RED |
BACKGROUND_INTENSITY);
bg_ = info.wAttributes &
~(FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED |
FOREGROUND_INTENSITY);
bg_ = (bg_ >> 4) & 0x0F;
bold_ = info.wAttributes & FOREGROUND_INTENSITY; bold_ = info.wAttributes & FOREGROUND_INTENSITY;
underline_ = info.wAttributes & BACKGROUND_INTENSITY; underline_ = info.wAttributes & BACKGROUND_INTENSITY;
} }
deffg_ = fg_; for (int i = 0; i < kForegroundSize; i++) {
defbg_ = bg_; if (deffg_ == kForeground[i]) {
deffg_ = i;
break;
}
}
for (int i = 0; i < kBackgroundSize; i++) {
if (defbg_ == kBackground[i]) {
defbg_ = i;
break;
}
}
fg_ = deffg_;
bg_ = defbg_;
} }
bool WinConsoleFile::supportsColor() bool WinConsoleFile::supportsColor()