From b6ca49a232c24701ba72630619683672303386c8 Mon Sep 17 00:00:00 2001 From: linuxdaemon Date: Thu, 3 Jan 2019 07:17:23 -0600 Subject: [PATCH] Add the ability to disable console colors in stdout logging (#1539). --- include/consolecolors.h | 51 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 45 insertions(+), 6 deletions(-) diff --git a/include/consolecolors.h b/include/consolecolors.h index d92be58bc..8d154f7ee 100644 --- a/include/consolecolors.h +++ b/include/consolecolors.h @@ -18,6 +18,27 @@ #pragma once #include +#include + +#ifdef _WIN32 +# include +# define isatty(x) _isatty((x)) +# define fileno(x) _fileno((x)) +#else +# include +#endif + +namespace +{ + inline bool CanUseColors() + { +#ifdef INSPIRCD_DISABLE_COLORS + return false; +#else + return isatty(fileno(stdout)); +#endif + } +} #ifdef _WIN32 @@ -29,37 +50,43 @@ extern HANDLE g_hStdout; inline std::ostream& con_green(std::ostream &s) { - SetConsoleTextAttribute(g_hStdout, FOREGROUND_GREEN|FOREGROUND_INTENSITY|g_wBackgroundColor); + if (CanUseColors()) + SetConsoleTextAttribute(g_hStdout, FOREGROUND_GREEN|FOREGROUND_INTENSITY|g_wBackgroundColor); return s; } inline std::ostream& con_red(std::ostream &s) { - SetConsoleTextAttribute(g_hStdout, FOREGROUND_RED|FOREGROUND_INTENSITY|g_wBackgroundColor); + if (CanUseColors()) + SetConsoleTextAttribute(g_hStdout, FOREGROUND_RED|FOREGROUND_INTENSITY|g_wBackgroundColor); return s; } inline std::ostream& con_white(std::ostream &s) { - SetConsoleTextAttribute(g_hStdout, FOREGROUND_RED|FOREGROUND_BLUE|FOREGROUND_GREEN|g_wBackgroundColor); + if (CanUseColors()) + SetConsoleTextAttribute(g_hStdout, FOREGROUND_RED|FOREGROUND_BLUE|FOREGROUND_GREEN|g_wBackgroundColor); return s; } inline std::ostream& con_white_bright(std::ostream &s) { - SetConsoleTextAttribute(g_hStdout, FOREGROUND_RED|FOREGROUND_BLUE|FOREGROUND_GREEN|FOREGROUND_INTENSITY|g_wBackgroundColor); + if (CanUseColors()) + SetConsoleTextAttribute(g_hStdout, FOREGROUND_RED|FOREGROUND_BLUE|FOREGROUND_GREEN|FOREGROUND_INTENSITY|g_wBackgroundColor); return s; } inline std::ostream& con_bright(std::ostream &s) { - SetConsoleTextAttribute(g_hStdout, FOREGROUND_INTENSITY|g_wBackgroundColor); + if (CanUseColors()) + SetConsoleTextAttribute(g_hStdout, FOREGROUND_INTENSITY|g_wBackgroundColor); return s; } inline std::ostream& con_reset(std::ostream &s) { - SetConsoleTextAttribute(g_hStdout, g_wOriginalColors); + if (CanUseColors()) + SetConsoleTextAttribute(g_hStdout, g_wOriginalColors); return s; } @@ -67,31 +94,43 @@ inline std::ostream& con_reset(std::ostream &s) inline std::ostream& con_green(std::ostream &s) { + if (!CanUseColors()) + return s; return s << "\033[1;32m"; } inline std::ostream& con_red(std::ostream &s) { + if (!CanUseColors()) + return s; return s << "\033[1;31m"; } inline std::ostream& con_white(std::ostream &s) { + if (!CanUseColors()) + return s; return s << "\033[0m"; } inline std::ostream& con_white_bright(std::ostream &s) { + if (!CanUseColors()) + return s; return s << "\033[1m"; } inline std::ostream& con_bright(std::ostream &s) { + if (!CanUseColors()) + return s; return s << "\033[1m"; } inline std::ostream& con_reset(std::ostream &s) { + if (!CanUseColors()) + return s; return s << "\033[0m"; } -- 2.39.5