Changeset 8801 for code/branches/output/src/libraries/core

Timestamp:

Jul 30, 2011, 9:31:05 PM (13 years ago)

Author:

landauf

Message:

fixed bug with multiple lines in shell.
adjusted colors in IOConsole and InGameConsole a bit

Location:

code/branches/output/src/libraries/core

Files:

• LuaState.cc (modified) (1 diff)
• command/IOConsoleWindows.cc (modified) (1 diff)
• command/Shell.cc (modified) (4 diffs)
• command/Shell.h (modified) (1 diff)

code/branches/output/src/libraries/core/LuaState.cc

@@ -239 +239 @@
     void LuaState::luaLog(unsigned int level, const std::string& message)
     {
-#pragma message(__FILE__ "("BOOST_PP_STRINGIZE(__LINE__)") : Warning: TODO: use correct level (and remove boost include)")
+#pragma message(__FILE__ "("BOOST_PP_STRINGIZE(__LINE__)") : Warning: TODO: use correct level, inspect lua support (and remove boost include)")
         orxout(debug_output, context::lua) << "luaLog (level: " << level << "): " << message << endl;
     }

code/branches/output/src/libraries/core/command/IOConsoleWindows.cc

@@ -214 +214 @@
 
             case Shell::Verbose:         colour = FOREGROUND_INTENSITY | 0              | 0                | FOREGROUND_BLUE; break;
-            case Shell::VerboseMore:     colour = 0                    | 0              | 0                | FOREGROUND_BLUE; break;
-            case Shell::VerboseUltra:    colour = 0                    | 0              | 0                | FOREGROUND_BLUE; break;
+            case Shell::VerboseMore:     colour = FOREGROUND_INTENSITY | 0              | 0                | FOREGROUND_BLUE; break;
+            case Shell::VerboseUltra:    colour = FOREGROUND_INTENSITY | 0              | 0                | FOREGROUND_BLUE; break;
 
             case Shell::Command:         colour = FOREGROUND_INTENSITY | FOREGROUND_RED | 0                | FOREGROUND_BLUE; break;

code/branches/output/src/libraries/core/command/Shell.cc

@@ -33 +33 @@
 
 #include "Shell.h"
+
+#include <boost/preprocessor/stringize.hpp>
 
 #include "util/Math.h"
@@ -48 +50 @@
 namespace orxonox
 {
+#pragma message(__FILE__ "("BOOST_PP_STRINGIZE(__LINE__)") : Warning: TODO: add commands again, inspect tcl support (and remove boost include)")
 //    SetConsoleCommand("log",     OutputHandler::log    );
 //    SetConsoleCommand("error",   OutputHandler::error  ).hide();
@@ -251 +254 @@
 
     /**
-        @brief Sends output to the internal output buffer.
+        @brief Adds multiple lines to the internal output buffer.
     */
     void Shell::addOutput(const std::string& text, LineType type)
     {
+        std::vector<std::string> lines;
+        vectorize(text, '\n', &lines);
+
+        for (size_t i = 0; i < lines.size(); ++i)
+            this->addLine(lines[i], type);
+    }
+
+    /**
+        @brief Adds a line to the internal output buffer.
+    */
+    void Shell::addLine(const std::string& line, LineType type)
+    {
         // yes it was - push the new line to the list
-        this->outputLines_.push_front(std::make_pair(text, static_cast<LineType>(type)));
+        this->outputLines_.push_front(std::make_pair(line, static_cast<LineType>(type)));
 
         // adjust the scroll position if needed
@@ -286 +301 @@
     void Shell::printLine(const std::string& line, OutputLevel level)
     {
-        this->addOutput(line, static_cast<LineType>(level));
+        this->addLine(line, static_cast<LineType>(level));
     }
 

code/branches/output/src/libraries/core/command/Shell.h

@@ -132 +132 @@
 
             void addOutput(const std::string& text, LineType type = DebugOutput);
+            void addLine(const std::string& line, LineType type = DebugOutput);
             void clearOutput();