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

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.h (modified) (6 diffs)

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

@@ -32 +32 @@
 #include "CorePrereqs.h"
 
-#include <cassert>
 #include <list>
 #include <sstream>
@@ -39 +38 @@
 
 #include "util/OutputHandler.h"
-#include "input/InputBuffer.h"
 #include "OrxonoxClass.h"
 #include "ConfigFileManager.h"
+#include "input/InputBuffer.h"
 
 namespace orxonox
@@ -62 +61 @@
     };
 
-    class _CoreExport Shell : public Singleton<Shell>, virtual public OrxonoxClass, public OutputListener
+    class _CoreExport Shell : virtual public OrxonoxClass, public OutputListener
     {
-        friend class Singleton<Shell>;
         public:
-            Shell();
+            Shell(const std::string& consoleName, bool bScrollable);
             virtual ~Shell();
-
-            static void clearShell();
-            static void history();
 
             void setConfigValues();
@@ -100 +95 @@
 
             inline unsigned int getNumLines() const
-                { return this->lines_.size(); }
+                { return this->outputLines_.size(); }
             inline unsigned int getScrollPosition() const
                 { return this->scrollPosition_; }
@@ -115 +110 @@
             std::string getFromHistory() const;
 
-            virtual void outputChanged();
+            virtual void outputChanged(int level);
 
             void inputChanged();
@@ -146 +141 @@
             std::stringstream outputBuffer_;
             bool finishedLastLine_;
-            std::list<std::string> lines_;
+            std::list<std::string> outputLines_;
             std::list<std::string>::const_iterator scrollIterator_;
             unsigned int scrollPosition_;
+            unsigned int historyPosition_;
+            bool bAddOutputLevel_;
+            ConfigFileType commandHistoryConfigFileType_;
+            const std::string consoleName_;
+            const bool bScrollable_;
+
+            // Config values
+            unsigned int maxHistoryLength_;
+            unsigned int historyOffset_;
             std::vector<std::string> commandHistory_;
-            unsigned int maxHistoryLength_;
-            unsigned int historyPosition_;
-            unsigned int historyOffset_;
-            bool bAddOutputLevel_;
             int softDebugLevel_;
-
-            ConfigFileType commandHistoryConfigFileType_;
-
-            static Shell* singletonPtr_s;
     };
 }