Changeset 2604

Timestamp:

01/30/06 00:56:46 (3 years ago)

Author:

madcat

Message:

Adds support for colors on win32.

Files:

• hydranode/hnbase/log.cpp (modified) (1 diff)
• hydranode/hnbase/log.h (modified) (1 diff)
• hydranode/hnbase/osdep.h (modified) (2 diffs)
• hydranode/hnbase/schedbase.cpp (modified) (2 diffs)

hydranode/hnbase/log.cpp

@@ -105 +105 @@
-}
-
+void Log::writeMsg(const std::string &msg) {
+#ifdef WIN32 // custom code for win32 console colors handling
+        std::string tmp;
+        DWORD cWritten;
+        WORD wOldColors;
+        CONSOLE_SCREEN_BUFFER_INFO csbiInfo;
+        GetConsoleScreenBufferInfo(GetStdHandle(STD_ERROR_HANDLE), &csbiInfo);
+        wOldColors = csbiInfo.wAttributes;
+        for (size_t i = 0; i < msg.size(); ++i) {
+                if (msg[i] == '\33' && msg[i+1] == '[' && msg.size() >= i+5) {
+                        DWORD color = 0;
+                        if (msg[i+2] == '1') {
+                                color |= FOREGROUND_INTENSITY;
+                        }
+                        if (msg[i+5] == '1') {
+                                color |= FOREGROUND_RED;
+                        } else if (msg[i+5] == '2') {
+                                color |= FOREGROUND_GREEN;
+                        } else if (msg[i+5] == '3') {
+                                color |= FOREGROUND_RED;
+                                color |= FOREGROUND_GREEN;
+                        } else if (msg[i+5] == '4') {
+                                color |= FOREGROUND_BLUE;
+                        } else if (msg[i+5] == '5') {
+                                color |= FOREGROUND_BLUE;
+                                color |= FOREGROUND_RED;
+                        } else if (msg[i+5] == '6') {
+                                color |= FOREGROUND_GREEN;
+                                color |= FOREGROUND_BLUE;
+                        } else {
+                                color = wOldColors;
+                        }
+                        WriteConsole(
+                                GetStdHandle(STD_ERROR_HANDLE), 
+                                tmp.c_str(), tmp.size(), &cWritten, NULL
+                        );
+                        tmp.clear();
+                        SetConsoleTextAttribute(
+                                GetStdHandle(STD_ERROR_HANDLE), color
+                        );
+                        if (msg[i+5] == 'm') {
+                                i += 5;
+                        } else if (msg[i+6] == 'm') {
+                                i += 6;
+                        }
+                } else {
+                        tmp.push_back(msg[i]);
+                }
+        }
+        if (tmp.size()) {
+                WriteConsole(
+                        GetStdHandle(STD_ERROR_HANDLE), 
+                        tmp.c_str(), tmp.size(), &cWritten, NULL
+                        );
+                tmp.clear();
+        }
+#else
+        std::cerr << msg;
+#endif
+}
+
-void Log::doLogString(MessageType t, const std::string &msg) {
-        if (m_output) {
-                // clear any existing garbage
-
+
+
-                int amount = 77 - (m_preStr.size() + msg.size());
-                if (amount > 0) {

hydranode/hnbase/log.h

@@ -233 +233 @@
-                return std::string("");
-        }
+
+        /**
+         * Platform-independent console output method.
+         *
+         * @param msg        Message to be written
+         *
+         * On POSIX systems, this method merely writes the specified message
+         * to std::cerr. However, custom code is required on windows to set
+         * console colors, so this method transforms the POSIX color escape
+         * sequences into win32 API calls.
+         *
+         * As a rule, when performing custom console output (Log functions use
+         * this method internally already), use this method instead of direct
+         * console IO.
+         */
+        static void writeMsg(const std::string &msg);
-
-        /**

hydranode/hnbase/osdep.h

@@ -216 +216 @@
-#endif
-
-//! Enable ansi colors for all non-windows platforms
-#ifndef WIN32
-        #define __ANSI_COLORS__
-#endif
-
-/**
- * Ansi color codes. These can be used to colourize text output to terminal
@@ -226 +221 @@
- * be done on runtime (perhaps using a commandline argument?).
- */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-//! Compile code only when compiling with GNU GCC

hydranode/hnbase/schedbase.cpp

@@ -148 +148 @@
-        logMsg(
-                boost::format(
-: UpSpeedLimit:
- DownSpeedLimit: %s/s
+ (upload
+, download %s/s).
-                ) % Utils::bytesToString(m_upLimit)
-                % Utils::bytesToString(m_downLimit)
@@ -382 +382 @@
-                fmt3 % m_displayUpSpeed % m_displayDownSpeed % m_connCnt;
-                boost::recursive_mutex::scoped_lock l(Log::getIosLock());
-
-
+
+
+
-                nextUpdate = m_curTick + 100;
-        }