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

Timestamp:

Oct 27, 2009, 2:47:14 PM (15 years ago)

Author:

rgrieder

Message:

Changed Output concept a little bit to allow for more general use.
Every output (log) target has to be implemented as OutputListener. There is already a LogFileWriter and a MemoryLogWriter (stores ALL the log in a vector and provides iterators).
The OutputListener has a unique and constant name, a stream pointer and a soft debug level (that can only be changed via OutputHandler::setSoftDebugLevel(name, level)).
This concept doesn't require the OutputBuffer anymore, so I deleted it.

The adjustments in the Shell are just preliminary for this commit.

File:

• code/branches/console/src/libraries/core/IOConsole.cc (modified) (5 diffs)

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

@@ -62 +62 @@
         this->originalTerminalSettings_ = new termios;
         this->setTerminalMode();
-                this->shell_.registerListener(this);
+        this->shell_.registerListener(this);
     }
 
@@ -234 +234 @@
     }
 
+#elif defined(ORXONOX_PLATFORM_WINDOWS)
+
+    IOConsole::IOConsole()
+        : shell_(Shell::getInstance())
+        , buffer_(Shell::getInstance().getInputBuffer())
+    {
+        this->setTerminalMode();
+    }
+
+    IOConsole::~IOConsole()
+    {
+    }
+
+    void IOConsole::setTerminalMode()
+    {
+    }
+
+    void IOConsole::resetTerminalMode()
+    {
+    }
+
+    void IOConsole::update(const Clock& time)
+    {
+    }
+
+    void IOConsole::print(const std::string& text)
+    {
+    }
+
+    void IOConsole::printInputLine()
+    {
+    }
+
 #endif /* ORXONOX_PLATFORM_UNIX */
 
@@ -256 +289 @@
     void IOConsole::onlyLastLineChanged()
     {
-                // 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();
+        // 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();
     }
 
@@ -272 +305 @@
     void IOConsole::lineAdded()
     {
-                // 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();
+        // 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();
     }
 
@@ -303 +336 @@
     void IOConsole::executed()
     {
-                // Move curosr the beginning of the line
-                std::cout << "\033[1G";
-        // Print command so the user knows what he typed
+        // Move cursor the beginning of the line
+        std::cout << "\033[1G";
+        // Print command so the user knows what he has typed
         std::cout << "orxonox>" << this->shell_.getInput() << std::endl;
-                this->printInputLine();
+        this->printInputLine();
     }