Changeset 243 in pacpusframework

Timestamp:

Dec 2, 2013, 9:42:47 AM (11 years ago)

Author:

Marek Kurdej

Message:

Minor fixes for TERM

File:

• trunk/src/PacpusLib/ColorSeverityFormatter.hpp (modified) (5 diffs)

trunk/src/PacpusLib/ColorSeverityFormatter.hpp

@@ -23 +23 @@
 #include <boost/log/expressions.hpp>
 #include <boost/log/utility/functional/bind.hpp>
+#include <cstdlib>
 #include <sstream>
 
@@ -130 +131 @@
 #endif // defined(PACPUS_OS_WINDOWS) && !defined(PACPUS_OS_WINDOWS_MOBILE)
 
+bool shouldUseColor(bool stdoutIsTty)
+{
+#if defined(PACPUS_OS_WINDOWS) && !defined(PACPUS_OS_WINDOWS_MOBILE)
+    return true;
+#else
+    // On non-Windows platforms, we rely on the TERM variable.
+    const char* const term = std::getenv("TERM");
+    const bool termSupportsColor = (term == "xterm")
+            || (term, "xterm-color")
+            || (term, "xterm-256color")
+            || (term, "screen")
+            || (term, "linux")
+            || (term, "cygwin");
+    return stdoutIsTty && termSupportsColor;
+#endif // defined(PACPUS_OS_WINDOWS) && !defined(PACPUS_OS_WINDOWS_MOBILE)
+}
+
 template < typename CharT >
 struct ColorFormatter
 {
-#if defined(PACPUS_OS_WINDOWS) && !defined(PACPUS_OS_WINDOWS_MOBILE)
     ColorFormatter()
+#if defined(PACPUS_OS_WINDOWS) && !defined(PACPUS_OS_WINDOWS_MOBILE)
         : mStreamHandle(GetStdHandle(STD_OUTPUT_HANDLE))
-    {
-    }
-#endif // defined(PACPUS_OS_WINDOWS) && !defined(PACPUS_OS_WINDOWS_MOBILE)
+#endif // defined(PACPUS_OS_WINDOWS) && !defined(PACPUS_OS_WINDOWS_MOBILE)
+    {
+        mShouldUseColor = shouldUseColor(/*stdoutIsTty*/ true);
+    }
 
     void operator()(boost::log::basic_formatting_ostream<CharT>& strm, SeverityLevel const& sev)
     {
+        if (!mShouldUseColor) {
+            return;
+        }
 #if defined(PACPUS_OS_WINDOWS) && !defined(PACPUS_OS_WINDOWS_MOBILE)
         // Gets the current text color.
@@ -158 +180 @@
     }
 
+    bool mShouldUseColor;
 #if defined(PACPUS_OS_WINDOWS) && !defined(PACPUS_OS_WINDOWS_MOBILE)
     const HANDLE mStreamHandle;
@@ -167 +190 @@
 struct DefaultFormatter
 {
-#if defined(PACPUS_OS_WINDOWS) && !defined(PACPUS_OS_WINDOWS_MOBILE)
-    DefaultFormatter() //(WORD savedConsoleBufferInfo)
+    DefaultFormatter()
+#if defined(PACPUS_OS_WINDOWS) && !defined(PACPUS_OS_WINDOWS_MOBILE)
+    //DefaultFormatter(WORD savedConsoleBufferInfo)
         : mStreamHandle(GetStdHandle(STD_OUTPUT_HANDLE))
         //, mSavedConsoleBufferInfo(savedConsoleBufferInfo)
         , mSavedConsoleBufferInfo(getColorAttribute(COLOR_WHITE) | FOREGROUND_INTENSITY) // FIXME: restore old value, not just reset
-    {
-    }
-#endif // defined(PACPUS_OS_WINDOWS) && !defined(PACPUS_OS_WINDOWS_MOBILE)
+#endif // defined(PACPUS_OS_WINDOWS) && !defined(PACPUS_OS_WINDOWS_MOBILE)
+    {
+        mShouldUseColor = shouldUseColor(/*stdoutIsTty*/ true);
+    }
 
     void operator()(boost::log::basic_formatting_ostream<CharT>& strm, SeverityLevel const& /*sev*/)
     {
+        if (!mShouldUseColor) {
+            return;
+        }
 #if defined(PACPUS_OS_WINDOWS) && !defined(PACPUS_OS_WINDOWS_MOBILE)
         fflush(stdout);
@@ -187 +215 @@
     }
 
+    bool mShouldUseColor;
 #if defined(PACPUS_OS_WINDOWS) && !defined(PACPUS_OS_WINDOWS_MOBILE)
     const HANDLE mStreamHandle;