Changeset 8797

Timestamp:

Jul 30, 2011, 10:39:33 AM (13 years ago)

Author:

landauf

Message:

removed onlyLastLineChanged() callback from ShellListener, since it's not possible to print a line of output word by word anymore, instead only whole lines are printed.

Location:

code/branches/output/src

Files:

• libraries/core/command/IOConsolePOSIX.cc (modified) (1 diff)
• libraries/core/command/IOConsolePOSIX.h (modified) (1 diff)
• libraries/core/command/IOConsoleWindows.cc (modified) (1 diff)
• libraries/core/command/IOConsoleWindows.h (modified) (1 diff)
• libraries/core/command/Shell.h (modified) (1 diff)
• orxonox/overlays/InGameConsole.cc (modified) (1 diff)
• orxonox/overlays/InGameConsole.h (modified) (1 diff)

code/branches/output/src/libraries/core/command/IOConsolePOSIX.cc

@@ -391 +391 @@
     }
 
-    //! Called if only the last output-line has changed
-    void IOConsole::onlyLastLineChanged()
-    {
-        // Save cursor position and move it to the beginning of the first output line
-        this->cout_ << "\033[s\033[1A\033[1G";
-        // Erase the line
-        this->cout_ << "\033[K";
-        // Reprint the last output line
-        this->printOutputLine(this->shell_->getNewestLineIterator()->first, this->shell_->getNewestLineIterator()->second);
-        // Restore cursor
-        this->cout_ << "\033[u";
-        this->cout_.flush();
-    }
-
     //! Called if a new output-line was added
     void IOConsole::lineAdded()

code/branches/output/src/libraries/core/command/IOConsolePOSIX.h

@@ -66 +66 @@
         // Methods from ShellListener
         void linesChanged();
-        void onlyLastLineChanged();
         void lineAdded();
         void inputChanged();

code/branches/output/src/libraries/core/command/IOConsoleWindows.cc

@@ -388 +388 @@
     }
 
-    //! Called if only the last output-line has changed
-    void IOConsole::onlyLastLineChanged()
-    {
-        int newLineHeight = 1 + this->shell_->getNewestLineIterator()->first.size() / this->terminalWidth_;
-        // Compute the number of new lines needed
-        int newLines = newLineHeight - this->lastOutputLineHeight_;
-        this->lastOutputLineHeight_ = newLineHeight;
-        // Scroll console if necessary
-        if (newLines > 0) // newLines < 0 is assumed impossible
-            this->createNewOutputLines(newLines);
-        Shell::LineList::const_iterator it = this->shell_->getNewestLineIterator();
-        this->printOutputLine(it->first, it->second, makeCOORD(0, this->inputLineRow_ - newLineHeight));
-    }
-
     //! Called if a new output line was added
     void IOConsole::lineAdded()

code/branches/output/src/libraries/core/command/IOConsoleWindows.h

@@ -68 +68 @@
         // Methods from ShellListener
         void linesChanged();
-        void onlyLastLineChanged();
         void lineAdded();
         void inputChanged();

code/branches/output/src/libraries/core/command/Shell.h

@@ -66 +66 @@
         private:
             virtual void linesChanged() {}          ///< Called if all output-lines have changed
-            virtual void onlyLastLineChanged() {}   ///< Called if only the last output-line has changed
             virtual void lineAdded() {}             ///< Called if a new line was added to the output
             virtual void inputChanged() {}          ///< Called if the input has changed

code/branches/output/src/orxonox/overlays/InGameConsole.cc

@@ -299 +299 @@
 
     /**
-        @brief Called if only the last output-line has changed.
-    */
-    void InGameConsole::onlyLastLineChanged()
-    {
+        @brief Called if a new output-line was added.
+    */
+    void InGameConsole::lineAdded()
+    {
+        this->numLinesShifted_ = 0;
+        this->shiftLines();
         if (LINES > 1)
             this->print(this->shell_->getNewestLineIterator()->first, this->shell_->getNewestLineIterator()->second, 1);
-    }
-
-    /**
-        @brief Called if a new output-line was added.
-    */
-    void InGameConsole::lineAdded()
-    {
-        this->numLinesShifted_ = 0;
-        this->shiftLines();
-        this->onlyLastLineChanged();
     }
 

code/branches/output/src/orxonox/overlays/InGameConsole.h

@@ -64 +64 @@
 
         void linesChanged();
-        void onlyLastLineChanged();
         void lineAdded();
         void inputChanged();