Changeset 6004 for code/branches/console/src/libraries/core/Shell.cc

Timestamp:

Oct 30, 2009, 12:39:51 PM (15 years ago)

Author:

rgrieder

Message:

De-singletonised Shell so that both consoles have their own Shell instance. However they share the history.
Also modified IOConsole to hopefully work with status lines.

File:

• code/branches/console/src/libraries/core/Shell.cc (modified) (17 diffs)

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

@@ -34 +34 @@
 #include "CoreIncludes.h"
 #include "ConfigValueIncludes.h"
-#include "Core.h"
 #include "ConsoleCommand.h"
 
 namespace orxonox
 {
-    SetConsoleCommand(Shell, clearShell, true);
-    SetConsoleCommand(Shell, history, true);
-
     SetConsoleCommandShortcut(OutputHandler, log);
     SetConsoleCommandShortcut(OutputHandler, error);
@@ -48 +44 @@
     SetConsoleCommandShortcut(OutputHandler, debug);
 
-    Shell* Shell::singletonPtr_s = 0;
-
-    Shell::Shell()
-        : OutputListener("shell")
+    Shell::Shell(const std::string& consoleName, bool bScrollable)
+        : inputBuffer_(new InputBuffer())
+        , OutputListener(consoleName)
+        , consoleName_(consoleName)
+        , bScrollable_(bScrollable)
     {
         RegisterRootObject(Shell);
@@ -63 +60 @@
 
         this->clearLines();
-
-        this->inputBuffer_ = new InputBuffer();
         this->configureInputBuffer();
 
@@ -79 +74 @@
         for (OutputHandler::OutputVectorIterator it = OutputHandler::getInstance().getOutputVectorBegin();
             it != OutputHandler::getInstance().getOutputVectorEnd(); ++it)
-            this->addLine(it->second, it->first);
+        {
+            if (it->first <= this->getSoftDebugLevel())
+            {
+                this->outputBuffer_ << it->second;
+                this->outputChanged(it->first);
+            }
+        }
 
         // Register the shell as output listener
@@ -93 +94 @@
     void Shell::setConfigValues()
     {
-        SetConfigValueGeneric(commandHistoryConfigFileType_, maxHistoryLength_, "maxHistoryLength_", "Shell", 100)
+        SetConfigValue(maxHistoryLength_, 100)
             .callback(this, &Shell::commandHistoryLengthChanged);
-        SetConfigValueGeneric(commandHistoryConfigFileType_, historyOffset_, "historyOffset_", "Shell", 0)
+        SetConfigValue(historyOffset_, 0)
             .callback(this, &Shell::commandHistoryOffsetChanged);
         SetConfigValueVectorGeneric(commandHistoryConfigFileType_, commandHistory_, std::vector<std::string>());
@@ -104 +105 @@
         const unsigned int defaultLevel = 3;
 #endif
-        SetConfigValueGeneric(ConfigFileType::Settings, softDebugLevel_, "softDebugLevelShell", "OutputHandler", defaultLevel)
+        SetConfigValueGeneric(ConfigFileType::Settings, softDebugLevel_, "softDebugLevel" + this->consoleName_, "OutputHandler", defaultLevel)
             .description("The maximal level of debug output shown in the Shell");
-        OutputHandler::getInstance().setSoftDebugLevel("shell", this->softDebugLevel_);
+        this->setSoftDebugLevel(this->softDebugLevel_);
     }
 
@@ -149 +150 @@
     }
 
-    void Shell::clearShell()
-    {
-        Shell::getInstance().clearLines();
-    }
-
+    /*
     void Shell::history()
     {
@@ -163 +160 @@
             instance.addLine(instance.commandHistory_[i], -1);
     }
+    */
 
     void Shell::registerListener(ShellListener* listener)
@@ -195 +193 @@
     {
         if (level <= this->softDebugLevel_)
-            this->lines_.push_front(line);
+            this->outputLines_.push_front(line);
         this->updateListeners<&ShellListener::lineAdded>();
     }
@@ -201 +199 @@
     void Shell::clearLines()
     {
-        this->lines_.clear();
-        this->scrollIterator_ = this->lines_.begin();
+        this->outputLines_.clear();
+        this->scrollIterator_ = this->outputLines_.begin();
 
         this->scrollPosition_ = 0;
@@ -215 +213 @@
             return this->scrollIterator_;
         else
-            return this->lines_.begin();
+            return this->outputLines_.begin();
     }
 
     std::list<std::string>::const_iterator Shell::getEndIterator() const
     {
-        return this->lines_.end();
+        return this->outputLines_.end();
     }
 
@@ -239 +237 @@
     }
 
-    void Shell::outputChanged()
-    {
-        std::string output;
-        bool newline;
+    void Shell::outputChanged(int level)
+    {
+        bool newline = false;
         do
         {
+            std::string output;
             std::getline(this->outputBuffer_, output);
 
@@ -261 +259 @@
             {
                 if (this->bAddOutputLevel_)
-                    output.insert(0, 1, static_cast<char>(OutputHandler::getInstance().getOutputLevel()));
-
-                this->lines_.push_front(output);
+                    output.insert(0, 1, static_cast<char>(level));
+
+                this->outputLines_.push_front(output);
 
                 if (this->scrollPosition_)
                     this->scrollPosition_++;
                 else
-                    this->scrollIterator_ = this->lines_.begin();
+                    this->scrollIterator_ = this->outputLines_.begin();
 
                 this->finishedLastLine_ = newline;
@@ -279 +277 @@
             else
             {
-                (*this->lines_.begin()) += output;
+                (*this->outputLines_.begin()) += output;
                 this->finishedLastLine_ = newline;
                 this->updateListeners<&ShellListener::onlyLastLineChanged>();
@@ -413 +411 @@
     void Shell::scroll_up()
     {
-        if (this->scrollIterator_ != this->lines_.end())
+        if (this->scrollIterator_ != this->outputLines_.end())
         {
             ++this->scrollIterator_;
@@ -424 +422 @@
     void Shell::scroll_down()
     {
-        if (this->scrollIterator_ != this->lines_.begin())
+        if (this->scrollIterator_ != this->outputLines_.begin())
         {
             --this->scrollIterator_;
@@ -443 +441 @@
         this->clear();
         this->scrollPosition_ = 0;
-        this->scrollIterator_ = this->lines_.begin();
+        this->scrollIterator_ = this->outputLines_.begin();
 
         this->updateListeners<&ShellListener::exit>();