Changeset 6417 for code/trunk/src/libraries/core/IOConsole.h

Timestamp:

Dec 25, 2009, 10:23:58 PM (15 years ago)

Author:

rgrieder

Message:

Merged presentation2 branch back to trunk.
Major new features:

• Actual GUI with settings, etc.
• Improved space ship steering (human interaction)
• Rocket fire and more particle effects
• Advanced sound framework

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/libraries/core/IOConsole.h (modified) (3 diffs)

code/trunk/src/libraries/core/IOConsole.h

@@ -41 +41 @@
 #ifdef ORXONOX_PLATFORM_UNIX
 struct termios;
+#elif defined(ORXONOX_PLATFORM_WINDOWS)
+#define WIN32_LEAN_AND_MEAN
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
+#include <windows.h>
 #endif
 
@@ -53 +59 @@
         ~IOConsole();
 
-        void update(const Clock& time);
+        void preUpdate(const Clock& time);
 
     private:
         void setTerminalMode();
-        void resetTerminalMode();
         void getTerminalSize();
-        bool willPrintStatusLines();
-        int extractLogLevel(std::string* text);
-
-        void printLogText(const std::string& line);
-        void printInputLine();
         void printStatusLines();
+        static int extractLogLevel(std::string* text);
 
         // Methods from ShellListener
@@ -74 +75 @@
         void executed();
         void exit();
+
         Shell*                  shell_;
         InputBuffer*            buffer_;
         std::ostream            cout_;
         std::ostringstream      origCout_;
-        unsigned int            terminalWidth_;
-        unsigned int            terminalHeight_;
-        unsigned int            lastTerminalWidth_;
-        unsigned int            lastTerminalHeight_;
+        int                     terminalWidth_;
+        int                     terminalHeight_;
+        int                     lastTerminalWidth_;
+        int                     lastTerminalHeight_;
+        const std::string       promptString_;
+
+#ifdef ORXONOX_PLATFORM_UNIX
+        bool willPrintStatusLines();
+        void printInputLine();
+        void printOutputLine(const std::string& line, Shell::LineType type);
+        static void resetTerminalMode();
+
         bool                    bPrintStatusLine_;
         bool                    bStatusPrinted_;
-        std::vector<unsigned>   statusLineWidths_;
-        unsigned int            statusLineMaxWidth_;
-        const std::string       promptString_;
-        static const unsigned   minOutputLines_ = 3;
+        std::vector<int>        statusLineWidths_;
+        int                     statusLineMaxWidth_;
+        static const int        minOutputLines_ = 3;
+        termios*                originalTerminalSettings_;
 
-#ifdef ORXONOX_PLATFORM_UNIX
-        termios*                originalTerminalSettings_;
+#elif defined(ORXONOX_PLATFORM_WINDOWS)
+        void resetTerminalMode();
+        void moveCursor(int dx, int dy);
+        void writeText(const std::string& text, const COORD& pos, WORD attributes = FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED);
+        void createNewOutputLines(int lines);
+        void printOutputLine(const std::string& line, Shell::LineType type, const COORD& pos);
+
+        static inline COORD makeCOORD(int x, int y)
+        {
+            COORD val = {x, y};
+            return val;
+        }
+
+        DWORD                   originalTerminalSettings_;
+        HANDLE                  stdInHandle_;
+        HANDLE                  stdOutHandle_;
+        int                     inputLineRow_;
+        int                     inputLineHeight_;
+        const int               statusLines_;
+        int                     lastOutputLineHeight_;
+        uint64_t                lastRefreshTime_;
 #endif