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

Timestamp:

Oct 31, 2009, 11:13:52 PM (16 years ago)

Author:

rgrieder

Message:

Sorted out some small stuff in the Shell and hopefully fixed IOConsole problems (flickering and too much output).

File:

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

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

@@ -23 +23 @@
  *      Fabian 'x3n' Landau
  *   Co-authors:
- *      ...
+ *      Reto Grieder
  *
  */
@@ -61 +61 @@
     };
 
+
     class _CoreExport Shell : virtual public OrxonoxClass, public OutputListener
     {
         public:
-            Shell(const std::string& consoleName, bool bScrollable);
-            virtual ~Shell();
+            Shell(const std::string& consoleName, bool bScrollable, bool bPrependOutputLevel = false);
+            ~Shell();
 
             void setConfigValues();
@@ -81 +82 @@
                 { return this->inputBuffer_->getCursorPosition(); }
 
-            void setInput(const std::string& input);
-
-            inline void clearInput()
-                { this->setInput(""); }
             inline std::string getInput() const
                 { return this->inputBuffer_->get(); }
@@ -91 +88 @@
             std::list<std::string>::const_iterator getEndIterator() const;
 
-            void addLine(const std::string& line, int level = 0);
-            void clearLines();
+            void addOutputLine(const std::string& line, int level = 0);
+            void clearOutput();
 
             inline unsigned int getNumLines() const
@@ -99 +96 @@
                 { return this->scrollPosition_; }
 
-            inline void addOutputLevel(bool bAddOutputLevel)
-                { this->bAddOutputLevel_ = bAddOutputLevel; }
+            inline const std::string& getPromptPrefix() const { return this->promptPrefix_; }
+            void setPromptPrefix(const std::string& str);
 
         private:
             Shell(const Shell& other);
 
+            void addToHistory(const std::string& command);
+            std::string getFromHistory() const;
+            void clearInput();
+            // OutputListener
+            void outputChanged(int level);
+
             void configureInputBuffer();
 
-            void addToHistory(const std::string& command);
-            std::string getFromHistory() const;
-
-            virtual void outputChanged(int level);
-
+            // InputBuffer callbacks
             void inputChanged();
             void execute();
-            void hintandcomplete();
+            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();
-            void history_search_up();
-            void history_search_down();
-            void scroll_up();
-            void scroll_down();
+            void deleteChar();
+            void cursorRight();
+            void cursorLeft();
+            void cursorEnd();
+            void cursorHome();
+            void historyUp();
+            void historyDown();
+            void historySearchUp();
+            void historySearchDown();
+            void scrollUp();
+            void scrollDown();
             void exit();
 
@@ -138 +136 @@
 
             std::list<ShellListener*> listeners_;
-            InputBuffer* inputBuffer_;
-            std::stringstream outputBuffer_;
-            bool finishedLastLine_;
-            std::list<std::string> outputLines_;
+            InputBuffer*              inputBuffer_;
+            std::stringstream         outputBuffer_;
+            bool                      bFinishedLastLine_;
+            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_;
+            unsigned int              scrollPosition_;
+            unsigned int              historyPosition_;
+            ConfigFileType            commandHistoryConfigFileType_;
+
+            std::string               promptPrefix_;
+            const std::string         consoleName_;
+            const bool                bPrependOutputLevel_;
+            const bool                bScrollable_;
 
             // Config values
-            unsigned int maxHistoryLength_;
-            unsigned int historyOffset_;
-            std::vector<std::string> commandHistory_;
-            int softDebugLevel_;
+            unsigned int              maxHistoryLength_;
+            unsigned int              historyOffset_;
+            std::vector<std::string>  commandHistory_;
+            int                       softDebugLevel_;
     };
 }