mirror of
https://github.com/fmtlib/fmt.git
synced 2024-12-24 12:14:26 +00:00
Update the contributed code to the used coding conventions
This commit is contained in:
parent
d5ab6ba728
commit
7004d1edf6
23
format.cc
23
format.cc
@ -120,15 +120,14 @@ struct IntChecker<true> {
|
||||
};
|
||||
|
||||
#ifdef _WIN32
|
||||
uint8_t win32_colors[] =
|
||||
{
|
||||
const uint8_t WIN32_COLORS[] = {
|
||||
0,
|
||||
FOREGROUND_RED | FOREGROUND_INTENSITY,
|
||||
FOREGROUND_GREEN | FOREGROUND_INTENSITY,
|
||||
FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_INTENSITY,
|
||||
FOREGROUND_BLUE | FOREGROUND_INTENSITY,
|
||||
FOREGROUND_BLUE | FOREGROUND_RED | FOREGROUND_INTENSITY,
|
||||
FOREGROUND_INTENSITY | FOREGROUND_GREEN | FOREGROUND_BLUE,
|
||||
FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY,
|
||||
FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY
|
||||
};
|
||||
#else
|
||||
@ -1116,23 +1115,21 @@ FMT_FUNC void fmt::print_colored(Color c, StringRef format, ArgList args) {
|
||||
HANDLE handle = GetStdHandle(STD_OUTPUT_HANDLE);
|
||||
if (handle == INVALID_HANDLE_VALUE)
|
||||
FMT_THROW(GetLastError(), "cannot get output handle");
|
||||
CONSOLE_SCREEN_BUFFER_INFO infoCon;
|
||||
if(!GetConsoleScreenBufferInfo(handle, &infoCon))
|
||||
FMT_THROW(GetLastError(), "cannot get console informations");
|
||||
WORD reset_color = infoCon.wAttributes;
|
||||
WORD color = static_cast<int>(c) >= ARRAYSIZE(win32_colors) ? reset_color : win32_colors[c];
|
||||
CONSOLE_SCREEN_BUFFER_INFO info_con;
|
||||
if (!GetConsoleScreenBufferInfo(handle, &info_con))
|
||||
FMT_THROW(GetLastError(), "cannot get console information");
|
||||
WORD reset_color = info_con.wAttributes;
|
||||
WORD color = static_cast<int>(c) >= ARRAYSIZE(WIN32_COLORS) ? reset_color : WIN32_COLORS[c];
|
||||
if (!SetConsoleTextAttribute(handle, color))
|
||||
FMT_THROW(GetLastError(), "cannot set console color");
|
||||
print(format, args);
|
||||
if (!SetConsoleTextAttribute(handle, reset_color))
|
||||
FMT_THROW(GetLastError(), "cannot set console color");
|
||||
#else
|
||||
char escape[] = "\x1b[30m";
|
||||
escape[3] = '0' + static_cast<char>(c);
|
||||
std::fputs(escape, stdout);
|
||||
#endif
|
||||
print(format, args);
|
||||
#ifdef _WIN32
|
||||
if(!SetConsoleTextAttribute(handle, reset_color))
|
||||
FMT_THROW(GetLastError(), "cannot set console color");
|
||||
#else
|
||||
std::fputs(RESET_COLOR, stdout);
|
||||
#endif
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user