X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fconsolecolors.h;h=8d154f7ee5eead60d71fcda19038b9c1a01b4fb4;hb=9982ec4e5b027ed24b1fda5e6fd3ab35b98de1a7;hp=9b7e0670afae1c68df0659e83ca870e50ca76272;hpb=8f5efbc7aa33b792e02d01e3288f553e6e98ccaa;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/consolecolors.h b/include/consolecolors.h
index 9b7e0670a..8d154f7ee 100644
--- 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
 
@@ -29,70 +50,88 @@ extern HANDLE g_hStdout;
 
 inline std::ostream& con_green(std::ostream &s)
 {
-    SetConsoleTextAttribute(g_hStdout, FOREGROUND_GREEN|FOREGROUND_INTENSITY|g_wBackgroundColor);
-    return s;
+	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);
-    return s;
+	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);
-    return s;
+	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);
-    return s;
+	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);
-    return s;
+	if (CanUseColors())
+		SetConsoleTextAttribute(g_hStdout, FOREGROUND_INTENSITY|g_wBackgroundColor);
+	return s;
 }
 
 inline std::ostream& con_reset(std::ostream &s)
 {
-    SetConsoleTextAttribute(g_hStdout, g_wOriginalColors);
-    return s;
+	if (CanUseColors())
+		SetConsoleTextAttribute(g_hStdout, g_wOriginalColors);
+	return s;
 }
 
 #else
 
 inline std::ostream& con_green(std::ostream &s)
 {
-    return s << "\033[1;32m";
+	if (!CanUseColors())
+		return s;
+	return s << "\033[1;32m";
 }
 
 inline std::ostream& con_red(std::ostream &s)
 {
-    return s << "\033[1;31m";
+	if (!CanUseColors())
+		return s;
+	return s << "\033[1;31m";
 }
 
 inline std::ostream& con_white(std::ostream &s)
 {
-    return s << "\033[0m";
+	if (!CanUseColors())
+		return s;
+	return s << "\033[0m";
 }
 
 inline std::ostream& con_white_bright(std::ostream &s)
 {
-    return s << "\033[1m";
+	if (!CanUseColors())
+		return s;
+	return s << "\033[1m";
 }
 
 inline std::ostream& con_bright(std::ostream &s)
 {
-    return s << "\033[1m";
+	if (!CanUseColors())
+		return s;
+	return s << "\033[1m";
 }
 
 inline std::ostream& con_reset(std::ostream &s)
 {
-    return s << "\033[0m";
+	if (!CanUseColors())
+		return s;
+	return s << "\033[0m";
 }
 
 #endif