diff --git a/CMakeLists.txt b/CMakeLists.txt index 13250b2..dc8d912 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,6 +5,7 @@ project(eosio-keygen VERSION 0.1.3) # Options option(USE_THREADS "Compile with support for threads (if available)." ON) +option(FORCE_ANSI "Force ANSI console colors even on windows" OFF) # Use installpath from GNUInstallDirs as default. include(GNUInstallDirs) @@ -16,7 +17,6 @@ include(GNUInstallDirs) set (PROGRAM_EXE ${CMAKE_PROJECT_NAME}) set (PROGRAM_SOURCE - src/console_ansi.cpp src/string.cpp src/ec.cpp src/base58.cpp @@ -27,6 +27,13 @@ set (PROGRAM_SOURCE src/main.cpp ) +if (WIN32 AND NOT FORCE_ANSI) + set (PROGRAM_SOURCE ${PROGRAM_SOURCE} src/console_win32.cpp) +else() + # *nix should have ansi support. + set (PROGRAM_SOURCE ${PROGRAM_SOURCE} src/console_ansi.cpp) +endif() + # Configure the compiler options set( CMAKE_CXX_STANDARD 11 ) set( CMAKE_CXX_STANDARD_REQUIRED ON ) diff --git a/src/console_win32.cpp b/src/console_win32.cpp new file mode 100644 index 0000000..d250dfa --- /dev/null +++ b/src/console_win32.cpp @@ -0,0 +1,68 @@ + +#include +#include +#include "console.h" + +// WinAPI colors +#define FG_BLACK 0 +#define FG_BLUE FOREGROUND_BLUE +#define FG_GREEN FOREGROUND_GREEN +#define FG_RED FOREGROUND_RED +#define FG_CYAN (FOREGROUND_GREEN | FOREGROUND_BLUE) +#define FG_YELLOW (FOREGROUND_RED | FOREGROUND_GREEN) +#define FG_MAGENTA (FOREGROUND_RED | FOREGROUND_BLUE) +#define FG_DARKGREY FOREGROUND_INTENSITY +#define FG_GREY (FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE) +#define FG_LIGHTBLUE (FOREGROUND_INTENSITY | FOREGROUND_BLUE) +#define FG_LIGHTGREEN (FOREGROUND_INTENSITY | FOREGROUND_GREEN) +#define FG_LIGHTCYAN (FOREGROUND_INTENSITY | FOREGROUND_GREEN | FOREGROUND_BLUE) +#define FG_LIGHTRED (FOREGROUND_INTENSITY | FOREGROUND_RED) +#define FG_LIGHTMAGENTA (FOREGROUND_INTENSITY | FOREGROUND_RED | FOREGROUND_BLUE) +#define FG_LIGHTYELLOW (FOREGROUND_INTENSITY | FOREGROUND_RED | FOREGROUND_GREEN) +#define FG_WHITE (FOREGROUND_INTENSITY | FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE) +#define FG_DEFAULT FG_GREY + +namespace console { + +std::ostream& reset(std::ostream& os) { + + ::SetConsoleTextAttribute(::GetStdHandle(STD_OUTPUT_HANDLE), FG_DEFAULT); + + return os; +} + +// Foreground +std::ostream& operator<<(std::ostream& os, const fg& obj) { + + int code; + + switch(obj._color) { + case black : code = FG_BLACK; break; + case red : code = FG_RED; break; + case green : code = FG_GREEN; break; + case blue : code = FG_BLUE; break; + case yellow : code = FG_YELLOW; break; + case magenta : code = FG_MAGENTA; break; + case cyan : code = FG_CYAN; break; + case light_grey : code = FG_GREY; break; + case light_red : code = FG_LIGHTRED; break; + case light_green : code = FG_LIGHTGREEN; break; + case light_yellow : code = FG_LIGHTYELLOW; break; + case light_blue : code = FG_LIGHTBLUE; break; + case light_magenta : code = FG_LIGHTMAGENTA; break; + case light_cyan : code = FG_LIGHTCYAN; break; + case dark_grey : code = FG_DARKGREY; break; + case white : code = FG_WHITE; break; + case default_fg : default : + code = FG_DEFAULT; + } + + ::SetConsoleTextAttribute(::GetStdHandle(STD_OUTPUT_HANDLE), code); + + // WinAPI does not support text attributes in the console. + // so we ignore those. + + return os; +} + +} // namespace console