Changeset 20698

Timestamp:

08/11/07 14:20:24 (1 year ago)

Author:

aronb

Message:

First pass at getting colored output on windows.

Files:

• juggler/trunk/modules/vapor/vpr/Util/Debug.cpp (modified) (3 diffs)
• juggler/trunk/modules/vapor/vpr/Util/Debug.h (modified) (4 diffs)

juggler/trunk/modules/vapor/vpr/Util/Debug.cpp

@@ -61 +61 @@
-// If I did, then we could not output debug info in the Thread manager itself
-TSObjectProxy<std::vector<int> > gVprDebugCurColumn;       // What column to indent to
-std::string
+color_out_t
-
-// Register DEBUG categories
@@ -223 +223 @@
-      else
-      {
-
+
+
-      }
-   }
@@ -502 +503 @@
-}
-
-std::string
+color_out_t
-{
-   (*gVprDebugCurColor).push_back(color);

juggler/trunk/modules/vapor/vpr/Util/Debug.h

@@ -73 +73 @@
-#define vprDBG_HEX_LVL 8
-
+#ifndef VPR_OS_Windows
-// ANSI COLOR CONTROL CODES
-// TODO: Make the work for windows
@@ -89 +90 @@
-#define clrWHITE "37"
-
+#else
+
+#define clrNONE     FOREGROUND_RED|FOREGROUND_GREEN|FOREGROUND_BLUE
+#define clrBOLD     FOREGROUND_INTENSITY
+#define clrBLACK    FOREGROUND_RED|FOREGROUND_GREEN|FOREGROUND_BLUE
+#define clrRED      FOREGROUND_RED
+#define clrGREEN    FOREGROUND_GREEN
+#define clrYELLOW   FOREGROUND_GREEN|FOREGROUND_RED
+#define clrBLUE     FOREGROUND_BLUE
+#define clrMAGENTA  FOREGROUND_RED|FOREGROUND_BLUE
+#define clrCYAN     FOREGROUND_GREEN|FOREGROUND_BLUE
+#define clrWHITE    FOREGROUND_RED|FOREGROUND_GREEN|FOREGROUND_BLUE
+#endif
+
+namespace vpr
+{
-#ifdef VPR_OS_Windows
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-#else
-#  define clrESC char(27)
@@ -305 +342 @@
-      void pushThreadLocalColumn(int column);
-      void popThreadLocalColumn();
-std::string
+color_out_t
-      void popThreadLocalColor();
-      //@}
@@ -404 +441 @@
-   struct DebugColorGuard
-   {
-std::string
+color_out_t
-      {
-         vprDEBUG_PushTSColor(color_val);