Changeset 6010 for code/branches/console/src/libraries/core/IOConsole.cc

Timestamp:

Oct 31, 2009, 11:13:52 PM (15 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/IOConsole.cc (modified) (12 diffs)

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

@@ -50 +50 @@
 {
     IOConsole* IOConsole::singletonPtr_s = NULL;
-    const std::string promptString_g = "orxonox>";
 
 #ifdef ORXONOX_PLATFORM_UNIX
@@ -65 +64 @@
 
     IOConsole::IOConsole()
-        : shell_(new Shell("IOConsole", false))
+        : shell_(new Shell("IOConsole", false, true))
         , buffer_(shell_->getInputBuffer())
         , originalTerminalSettings_(new termios())
         , bStatusPrinted_(false)
+        , promptString_("orxonox> ")
     {
         this->setTerminalMode();
@@ -143 +143 @@
                     this->buffer_->buttonPressed(KeyEvent(KeyCode::End,      0, 0));
                 else if (escapeSequence == "5~")
-                    this->buffer_->buttonPressed(KeyEvent(KeyCode::AltPageUp,   0, 0));
+                    this->buffer_->buttonPressed(KeyEvent(KeyCode::PageUp,   0, 0));
                 else if (escapeSequence == "6~")
-                    this->buffer_->buttonPressed(KeyEvent(KeyCode::AltPageDown, 0, 0));
+                    this->buffer_->buttonPressed(KeyEvent(KeyCode::PageDown, 0, 0));
                 else
                     // Waiting for sequence to complete
@@ -192 +192 @@
         this->printStatusLines();
         this->printInputLine();
+        std::cout.flush();
     }
 
@@ -227 +228 @@
         // Reset colour to white
 //        std::cout << "\033[37m";
-        std::cout.flush();
     }
 
@@ -244 +244 @@
         if (this->buffer_->getCursorPosition() > 0)
             std::cout << "\033[" << this->buffer_->getCursorPosition() << "C";
-        std::cout.flush();
     }
 
@@ -259 +258 @@
             }
             std::cout << "Status" << std::endl;
-            std::cout.flush();
             this->bStatusPrinted_ = true;
         }
@@ -332 +330 @@
     }
 
+    void IOConsole::printStatusLines()
+    {
+    }
+
 #endif /* ORXONOX_PLATFORM_UNIX */
 
@@ -378 +380 @@
         this->printStatusLines();
         this->printInputLine();
+        std::cout.flush();
     }
 
@@ -387 +390 @@
     {
         this->printInputLine();
+        std::cout.flush();
     }
 
@@ -396 +400 @@
     {
         this->printInputLine();
+        std::cout.flush();
     }
 
@@ -404 +409 @@
     void IOConsole::executed()
     {
-        // Move cursor the beginning of the line
-        std::cout << "\033[1G";
-        // Print command so the user knows what he has typed
-        std::cout << promptString_g << this->shell_->getInput() << std::endl;
-        this->printInputLine();
+        this->shell_->addOutputLine(this->promptString_ + this->shell_->getInput());
     }