Extract port binding code to a function and improve output.

[user/henk/code/inspircd.git] / include / consolecolors.h

diff --git a/include/consolecolors.h b/include/consolecolors.h
index d92be58bc706f9dafa78f9771ad671a1f2f1eda7..70696fbf9d19ec786b200a7665c8cf0fb5fcfc5e 100644 (file)
--- a/include/consolecolors.h
+++ b/include/consolecolors.h
@@ -18,6 +18,27 @@
 #pragma once
 
 #include <ostream>
+#include <stdio.h>
+
+#ifdef _WIN32
+# include <io.h>
+# define isatty(x) _isatty((x))
+# define fileno(x) _fileno((x))
+#else
+# include <unistd.h>
+#endif
+
+namespace
+{
+       inline bool CanUseColors()
+       {
+#ifdef INSPIRCD_DISABLE_COLORS
+               return false;
+#else
+               return isatty(fileno(stdout));
+#endif
+       }
+}
 
 #ifdef _WIN32
 
@@ -27,72 +48,90 @@ extern WORD g_wOriginalColors;
 extern WORD g_wBackgroundColor;
 extern HANDLE g_hStdout;
 
-inline std::ostream& con_green(std::ostream &s)
+inline std::ostream& con_green(std::ostream& stream)
 {
-       SetConsoleTextAttribute(g_hStdout, FOREGROUND_GREEN|FOREGROUND_INTENSITY|g_wBackgroundColor);
-       return s;
+       if (CanUseColors())
+               SetConsoleTextAttribute(g_hStdout, FOREGROUND_GREEN|FOREGROUND_INTENSITY|g_wBackgroundColor);
+       return stream;
 }
 
-inline std::ostream& con_red(std::ostream &s)
+inline std::ostream& con_red(std::ostream& stream)
 {
-       SetConsoleTextAttribute(g_hStdout, FOREGROUND_RED|FOREGROUND_INTENSITY|g_wBackgroundColor);
-       return s;
+       if (CanUseColors())
+               SetConsoleTextAttribute(g_hStdout, FOREGROUND_RED|FOREGROUND_INTENSITY|g_wBackgroundColor);
+       return stream;
 }
 
-inline std::ostream& con_white(std::ostream &s)
+inline std::ostream& con_white(std::ostream& stream)
 {
-       SetConsoleTextAttribute(g_hStdout, FOREGROUND_RED|FOREGROUND_BLUE|FOREGROUND_GREEN|g_wBackgroundColor);
-       return s;
+       if (CanUseColors())
+               SetConsoleTextAttribute(g_hStdout, FOREGROUND_RED|FOREGROUND_BLUE|FOREGROUND_GREEN|g_wBackgroundColor);
+       return stream;
 }
 
-inline std::ostream& con_white_bright(std::ostream &s)
+inline std::ostream& con_white_bright(std::ostream& stream)
 {
-       SetConsoleTextAttribute(g_hStdout, FOREGROUND_RED|FOREGROUND_BLUE|FOREGROUND_GREEN|FOREGROUND_INTENSITY|g_wBackgroundColor);
-       return s;
+       if (CanUseColors())
+               SetConsoleTextAttribute(g_hStdout, FOREGROUND_RED|FOREGROUND_BLUE|FOREGROUND_GREEN|FOREGROUND_INTENSITY|g_wBackgroundColor);
+       return stream;
 }
 
-inline std::ostream& con_bright(std::ostream &s)
+inline std::ostream& con_bright(std::ostream& stream)
 {
-       SetConsoleTextAttribute(g_hStdout, FOREGROUND_INTENSITY|g_wBackgroundColor);
-       return s;
+       if (CanUseColors())
+               SetConsoleTextAttribute(g_hStdout, FOREGROUND_INTENSITY|g_wBackgroundColor);
+       return stream;
 }
 
-inline std::ostream& con_reset(std::ostream &s)
+inline std::ostream& con_reset(std::ostream& stream)
 {
-       SetConsoleTextAttribute(g_hStdout, g_wOriginalColors);
-       return s;
+       if (CanUseColors())
+               SetConsoleTextAttribute(g_hStdout, g_wOriginalColors);
+       return stream;
 }
 
 #else
 
-inline std::ostream& con_green(std::ostream &s)
+inline std::ostream& con_green(std::ostream& stream)
 {
-       return s << "\033[1;32m";
+       if (!CanUseColors())
+               return stream;
+       return stream << "\033[1;32m";
 }
 
-inline std::ostream& con_red(std::ostream &s)
+inline std::ostream& con_red(std::ostream& stream)
 {
-       return s << "\033[1;31m";
+       if (!CanUseColors())
+               return stream;
+       return stream << "\033[1;31m";
 }
 
-inline std::ostream& con_white(std::ostream &s)
+inline std::ostream& con_white(std::ostream& stream)
 {
-       return s << "\033[0m";
+       if (!CanUseColors())
+               return stream;
+       return stream << "\033[0m";
 }
 
-inline std::ostream& con_white_bright(std::ostream &s)
+inline std::ostream& con_white_bright(std::ostream& stream)
 {
-       return s << "\033[1m";
+       if (!CanUseColors())
+               return stream;
+       return stream << "\033[1m";
 }
 
-inline std::ostream& con_bright(std::ostream &s)
+inline std::ostream& con_bright(std::ostream& stream)
 {
-       return s << "\033[1m";
+       if (!CanUseColors())
+               return stream;
+       return stream << "\033[1m";
 }
 
-inline std::ostream& con_reset(std::ostream &s)
+inline std::ostream& con_reset(std::ostream& stream)
 {
-       return s << "\033[0m";
+       if (!CanUseColors())
+               return stream;
+       return stream << "\033[0m";
 }
 
 #endif