Changeset 1334 for code/branches/console/src/core

Timestamp:

May 20, 2008, 1:48:40 AM (16 years ago)

Author:

landauf

Message:

• added colored output in the InGameConsole, depending on the output level (error = red, …).
• increased performance of InGameConsole and Shell

Location:

code/branches/console/src/core

Files:

• InputBuffer.cc (modified) (1 diff)
• OutputBuffer.cc (modified) (2 diffs)
• Script.cc (modified) (1 diff)
• Shell.cc (modified) (4 diffs)
• Shell.h (modified) (3 diffs)

code/branches/console/src/core/InputBuffer.cc

@@ -163 +163 @@
     bool InputBuffer::keyPressed(const OIS::KeyEvent &e)
     {
+        if (this->keyboard_->isModifierDown(OIS::Keyboard::Alt) && e.key == OIS::KC_TAB)
+            return true;
+
         for (std::list<InputBufferListenerTuple>::iterator it = this->listeners_.begin(); it != this->listeners_.end(); ++it)
         {

code/branches/console/src/core/OutputBuffer.cc

@@ -78 +78 @@
 
         bool eof = this->stream_.eof();
+        bool fail = this->stream_.fail();
 
         if (eof)
@@ -85 +86 @@
         }
 
-        return (!eof);
+        return (!eof && !fail);
     }
 

code/branches/console/src/core/Script.cc

@@ -68 +68 @@
     output_ += str;
 //    COUT(4) << "Lua_output!:" << std::endl << str << std::endl << "***" << std::endl;
-    COUT(5) << str << std::endl;
+    COUT(5) << str;
   }
 

code/branches/console/src/core/Shell.cc

@@ -48 +48 @@
         this->historyOffset_ = 0;
         this->finishedLastLine_ = true;
+        this->bAddOutputLevel_ = false;
 
         this->clearLines();
@@ -131 +132 @@
     }
 
-    void Shell::addLine(const std::string& line, unsigned int level)
+    void Shell::addLine(const std::string& line, int level)
     {
         int original_level = OutputHandler::getOutStream().getOutputLevel();
@@ -196 +197 @@
             if (this->finishedLastLine_)
             {
+                if (this->bAddOutputLevel_)
+                    output.insert(0, 1, (char)OutputHandler::getOutStream().getOutputLevel());
+
                 this->lines_.insert(this->lines_.begin(), output);
 
@@ -239 +243 @@
     void Shell::hintandcomplete()
     {
-        this->addLine(CommandExecutor::hint(this->inputBuffer_.get()), 0);
+        this->addLine(CommandExecutor::hint(this->inputBuffer_.get()), -1);
         this->inputBuffer_.set(CommandExecutor::complete(this->inputBuffer_.get()));
 

code/branches/console/src/core/Shell.h

@@ -83 +83 @@
             std::list<std::string>::const_iterator getEndIterator() const;
 
-            void addLine(const std::string& line, unsigned int level);
+            void addLine(const std::string& line, int level);
             void clearLines();
 
@@ -90 +90 @@
             inline unsigned int getScrollPosition() const
                 { return this->scrollPosition_; }
+
+            inline void addOutputLevel(bool bAddOutputLevel)
+                { this->bAddOutputLevel_ = bAddOutputLevel; }
 
         private:
@@ -127 +130 @@
             unsigned int historyPosition_;
             unsigned int historyOffset_;
+            bool bAddOutputLevel_;
     };
 }