Changeset 1313 for code/branches/console/src/core/Shell.h

Timestamp:

May 17, 2008, 3:58:19 AM (16 years ago)

Author:

landauf

Message:

• implemented Shell, but not yet linked with the graphical console
• added new features (cursor, OIS::KeyCode listener) to InputBuffer
• changed some includes to avoid circular header-dependencies in OrxonoxClass and Shell

File:

• code/branches/console/src/core/Shell.h (modified) (5 diffs)

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

@@ -30 +30 @@
 #define _Shell_H__
 
+#include <list>
+#include <vector>
+
 #include "CorePrereqs.h"
 
@@ -38 +41 @@
 namespace orxonox
 {
-    class ShellListener
+    class _CoreExport ShellListener
     {
-        virtual void outputChanged() = 0;
-        virtual void lastLineChanged() = 0;
-        virtual void inputChanged() = 0;
-        virtual void exit() = 0;
-    }
+        friend class Shell;
+
+        virtual void linesChanged() {}
+        virtual void onlyLastLineChanged() {}
+        virtual void lineAdded() {}
+        virtual void inputChanged() {}
+        virtual void cursorChanged() {}
+        virtual void exit() {}
+    };
 
     class _CoreExport Shell : virtual public OrxonoxClass, public InputBufferListener, public OutputBufferListener
@@ -53 +60 @@
             virtual void setConfigValues();
 
+            void registerListener(ShellListener* listener);
+            void unregisterListener(ShellListener* listener);
+
+            inline InputBuffer& getInputBuffer()
+                { return this->inputBuffer_; }
+            inline OutputBuffer& getOutputBuffer()
+                { return this->outputBuffer_; }
+
+            void setCursorPosition(unsigned int cursor);
+            inline unsigned int getCursorPosition() const
+                { return this->inputBuffer_.getCursorPosition(); }
+
+            void setInput(const std::string& input);
+
+            inline void clearInput()
+                { this->setInput(""); }
+            inline std::string getInput() const
+                { return this->inputBuffer_.get(); }
+
+            inline std::list<std::string>::const_iterator getNewestLineIterator() const;
+            inline std::list<std::string>::const_iterator getEndIterator() const;
+
+            void addLine(const std::string& line, unsigned int level);
+            void clearLines();
+
+            inline unsigned int getNumLines() const
+                { return this->lines_.size(); }
+            inline unsigned int getScrollPosition() const
+                { return this->scrollPosition_; }
+
         private:
             Shell();
             Shell(const Shell& other);
-            ~Shell() {}
+            virtual ~Shell() {}
+
+            void addToHistory(const std::string& command);
+            std::string getFromHistory() const;
 
             virtual void outputChanged();
@@ -63 +103 @@
             void hintandcomplete();
             void backspace();
+            void deletechar();
+            void clear();
             void cursor_right();
             void cursor_left();
+            void cursor_end();
+            void cursor_home();
             void history_up();
             void history_down();
@@ -71 +115 @@
             void exit();
 
+            std::list<ShellListener*> listeners_;
             InputBuffer inputBuffer_;
-            OutputBuffer OutputBuffer_;
+            OutputBuffer outputBuffer_;
             std::list<std::string> lines_;
-            unsigned int cursor_;
+            std::list<std::string>::const_iterator scrollIterator_;
+            unsigned int scrollPosition_;
             std::vector<std::string> commandHistory_;
             unsigned int maxHistoryLength_;
+            unsigned int historyPosition_;
+            unsigned int historyOffset_;
     };
 }