Changeset 5983

Timestamp:

Oct 21, 2009, 10:25:59 PM (15 years ago)

Author:

rgrieder

Message:

IOConsole basically working though there are some unresolved issues and hacks. Note: Disabled std::cout output for the time being

Location:

code/branches/console/src/libraries

Files:

• core/IOConsole.cc (modified) (11 diffs)
• core/IOConsole.h (modified) (2 diffs)
• core/Shell.cc (modified) (2 diffs)
• core/Shell.h (modified) (1 diff)
• util/OutputHandler.cc (modified) (4 diffs)
• util/OutputHandler.h (modified) (2 diffs)

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

@@ -62 +62 @@
         this->originalTerminalSettings_ = new termios;
         this->setTerminalMode();
+                this->shell_.registerListener(this);
     }
 
@@ -70 +71 @@
         resetTerminalMode();
         delete this->originalTerminalSettings_;
-        COUT(0) << "Press enter to end the game..." << std::endl;
     }
 
@@ -108 +108 @@
             else if (this->escapeMode_ == Second)
             {
-                bool endOfSeq = true;
+                                this->escapeSequence_ += c;
                 this->escapeMode_ = None;
                 if      (this->escapeSequence_ == "A")
@@ -141 +141 @@
                 if (this->escapeMode_ == First)
                 {
-                    this->buffer_->buttonPressed(KeyEvent(KeyCode::Escape, 0, 0));
+                    this->buffer_->buttonPressed(KeyEvent(KeyCode::Escape, c, 0));
                     this->escapeMode_ = None;
                 }
@@ -172 +172 @@
         // If there is still an escape key pending (escape key ONLY), then
         // it sure isn't an escape sequence here
-        this->buffer_->buttonPressed(KeyEvent(KeyCode::Escape, 0, 0));
+        if (this->escapeMode_ == First)
+            this->buffer_->buttonPressed(KeyEvent(KeyCode::Escape, '\033', 0));
+        // Reset in any case because escape sequences always come in one piece
+        this->escapeMode_ = None;
 
         // Print input line
@@ -178 +181 @@
     }
 
-    void IOConsole::printOutputLine(const std::string& line)
-    {
-        COUT(0) << "print output" << std::endl;
-        // Save cursor position
-        std::cout << "\033[s";
-
+    void IOConsole::print(const std::string& text)
+    {
         std::string output;
 
         // Handle line colouring by inspecting the first letter
         char level = 0;
-        if (!line.empty())
-            level = line[0];
+        if (!text.empty())
+            level = text[0];
         if (level >= -1 && level <= 6)
-            output = line.substr(1);
+            output = text.substr(1);
         else
-            output = line;
+            output = text;
 
         // Colour line
         switch (level)
         {
-        case -1: std::cout << "\033[30m"; break;
+        case -1: std::cout << "\033[37m"; break;
         case  1: std::cout << "\033[91m"; break;
         case  2: std::cout << "\033[31m"; break;
@@ -209 +208 @@
 
         // Print output line
-        std::cout << output << std::endl;
-
-        // Reset colour to black
-        std::cout << "\033[30m";
-        // Restore cursor position
-        std::cout << "\033[u";
+        std::cout << output;
+
+        // Reset colour to white
+        std::cout << "\033[37m";
         std::cout.flush();
-
-        this->printInputLine();
     }
 
@@ -223 +218 @@
     {
         // set cursor to the beginning of the line and erase the line
-        std::cout << "\033[0G\033[K";
+        std::cout << "\033[1G\033[K";
         // print status line
         //std::cout << std::fixed << std::setprecision(2) << std::setw(5) << Game::getInstance().getAvgFPS() << " fps, " << std::setprecision(2) << std::setw(5) << Game::getInstance().getAvgTickTime() << " ms avg ticktime # ";
         // Show an arrow to indicate a command prompt
-        std::cout << ">";
+        std::cout << "orxonox>";
         // save cursor position
         std::cout << "\033[s";
@@ -261 +256 @@
     void IOConsole::onlyLastLineChanged()
     {
-        // We cannot do anything here because printed lines are fixed
-        COUT(2) << "Warning: Trying to edit last console lines, which is impossible!" << std::endl;
+                // Save cursor position and move it the beginning of the second to last line
+                std::cout << "\033[s\033[1F";
+                // Erase the second to last line
+                std::cout << "\033[K";
+                this->print(*(this->shell_.getNewestLineIterator()));
+                // Restore cursor
+                std::cout << "\033[u";
+                std::cout.flush();
     }
 
@@ -271 +272 @@
     void IOConsole::lineAdded()
     {
-        this->printOutputLine(*(this->shell_.getNewestLineIterator()));
+                // Move curosr the beginning of the line and erase it
+                std::cout << "\033[1G\033[K";
+                this->print(*(this->shell_.getNewestLineIterator()));
+                std::cout << std::endl;
+                this->printInputLine();
     }
 
@@ -294 +299 @@
     /**
     @brief
+        Called if a command is about to be executed
+    */
+    void IOConsole::executed()
+    {
+                // Move curosr the beginning of the line
+                std::cout << "\033[1G";
+        // Print command so the user knows what he typed
+        std::cout << "orxonox>" << this->shell_.getInput() << std::endl;
+                this->printInputLine();
+    }
+
+
+    /**
+    @brief
         Called if the console gets closed.
     */

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

@@ -63 +63 @@
         static void resetTerminalMode();
 
-        void printOutputLine(const std::string& line);
+        void print(const std::string& line);
         void printInputLine();
 
@@ -72 +72 @@
         void inputChanged();
         void cursorChanged();
+        void executed();
         void exit();
 

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

@@ -121 +121 @@
         this->inputBuffer_->registerListener(this, &Shell::hintandcomplete, '\t', true);
         this->inputBuffer_->registerListener(this, &Shell::backspace, '\b', true);
-        this->inputBuffer_->registerListener(this, &Shell::backspace, static_cast<char>(127), true);
+        this->inputBuffer_->registerListener(this, &Shell::backspace, '\177', true);
         this->inputBuffer_->registerListener(this, &Shell::deletechar, KeyCode::Delete);
-        this->inputBuffer_->registerListener(this, &Shell::exit, static_cast<char>(27), true);
+        this->inputBuffer_->registerListener(this, &Shell::exit, '\033', true); // escape
         this->inputBuffer_->registerListener(this, &Shell::cursor_right, KeyCode::Right);
         this->inputBuffer_->registerListener(this, &Shell::cursor_left, KeyCode::Left);
@@ -278 +278 @@
     {
         this->addToHistory(this->inputBuffer_->get());
-        this->addLine(this->inputBuffer_->get(), 0);
+        this->updateListeners<&ShellListener::executed>();
 
         if (!CommandExecutor::execute(this->inputBuffer_->get()))

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

@@ -57 +57 @@
             virtual void inputChanged() {}
             virtual void cursorChanged() {}
+            virtual void executed() {}
             virtual void exit() {}
     };

code/branches/console/src/libraries/util/OutputHandler.cc

@@ -149 +149 @@
     OutputHandler& OutputHandler::operator<<(std::streambuf* sb)
     {
-        if (getSoftDebugLevel(OutputHandler::LD_Console) >= this->outputLevel_)
-            std::cout << sb;
+        //if (getSoftDebugLevel(OutputHandler::LD_Console) >= this->outputLevel_)
+        //    std::cout << sb;
 
         if (getSoftDebugLevel(OutputHandler::LD_Logfile) >= this->outputLevel_)
@@ -171 +171 @@
     OutputHandler& OutputHandler::operator<<(std::ostream& (*manipulator)(std::ostream&))
     {
-        if (getSoftDebugLevel(OutputHandler::LD_Console) >= this->outputLevel_)
-            manipulator(std::cout);
+        //if (getSoftDebugLevel(OutputHandler::LD_Console) >= this->outputLevel_)
+        //    manipulator(std::cout);
 
         if (getSoftDebugLevel(OutputHandler::LD_Logfile) >= this->outputLevel_)
@@ -193 +193 @@
     OutputHandler& OutputHandler::operator<<(std::ios& (*manipulator)(std::ios&))
     {
-        if (getSoftDebugLevel(OutputHandler::LD_Console) >= this->outputLevel_)
-            manipulator(std::cout);
+        //if (getSoftDebugLevel(OutputHandler::LD_Console) >= this->outputLevel_)
+        //    manipulator(std::cout);
 
         if (getSoftDebugLevel(OutputHandler::LD_Logfile) >= this->outputLevel_)
@@ -215 +215 @@
     OutputHandler& OutputHandler::operator<<(std::ios_base& (*manipulator)(std::ios_base&))
     {
-        if (getSoftDebugLevel(OutputHandler::LD_Console) >= this->outputLevel_)
-            manipulator(std::cout);
+        //if (getSoftDebugLevel(OutputHandler::LD_Console) >= this->outputLevel_)
+        //    manipulator(std::cout);
 
         if (getSoftDebugLevel(OutputHandler::LD_Logfile) >= this->outputLevel_)

code/branches/console/src/libraries/util/OutputHandler.h

@@ -164 +164 @@
     OutputHandler& OutputHandler::output(const T& output)
     {
-        if (OutputHandler::getSoftDebugLevel(OutputHandler::LD_Console) >= this->outputLevel_)
-            std::cout << output;
+        //if (OutputHandler::getSoftDebugLevel(OutputHandler::LD_Console) >= this->outputLevel_)
+        //    std::cout << output;
 
         if (OutputHandler::getSoftDebugLevel(OutputHandler::LD_Logfile) >= this->outputLevel_)
@@ -188 +188 @@
     OutputHandler& operator<<(OutputHandler& out, const T& output)
     {
-        if (OutputHandler::getSoftDebugLevel(OutputHandler::LD_Console) >= out.getOutputLevel())
-            std::cout << output;
+        //if (OutputHandler::getSoftDebugLevel(OutputHandler::LD_Console) >= out.getOutputLevel())
+        //    std::cout << output;
 
         if (OutputHandler::getSoftDebugLevel(OutputHandler::LD_Logfile) >= out.getOutputLevel())