Changeset 7287 for code/trunk/src/libraries/core/command/IOConsoleWindows.h

Timestamp:

Aug 31, 2010, 11:13:46 AM (14 years ago)

Author:

rgrieder

Message:

Split IOConsole in two separate files for better browsing.

File:

• code/trunk/src/libraries/core/command/IOConsoleWindows.h (copied) (copied from code/trunk/src/libraries/core/IOConsole.h) (7 diffs)

code/trunk/src/libraries/core/command/IOConsoleWindows.h

@@ -21 +21 @@
  *
  *   Author:
- *      Oliver Scheuss
  *      Reto Grieder
  *   Co-authors:
@@ -31 +30 @@
 #define _IOConsole_H__
 
-#include "CorePrereqs.h"
+#include "core/CorePrereqs.h"
 
 #include <sstream>
@@ -39 +38 @@
 #include "Shell.h"
 
-#ifdef ORXONOX_PLATFORM_UNIX
-struct termios;
-#elif defined(ORXONOX_PLATFORM_WINDOWS)
 #define WIN32_LEAN_AND_MEAN
 #ifndef NOMINMAX
@@ -47 +43 @@
 #endif
 #include <windows.h>
-#endif
 
 namespace orxonox
@@ -76 +71 @@
         void exit();
 
-        Shell*                  shell_;
-        InputBuffer*            buffer_;
-        std::ostream            cout_;
-        std::ostringstream      origCout_;
-        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<int>        statusLineWidths_;
-        int                     statusLineMaxWidth_;
-        static const int        minOutputLines_ = 3;
-        termios*                originalTerminalSettings_;
-
-#elif defined(ORXONOX_PLATFORM_WINDOWS)
         void resetTerminalMode();
         void moveCursor(int dx, int dy);
@@ -112 +83 @@
         }
 
+        Shell*                  shell_;
+        InputBuffer*            buffer_;
+        std::ostream            cout_;
+        std::ostringstream      origCout_;
+        int                     terminalWidth_;
+        int                     terminalHeight_;
+        int                     lastTerminalWidth_;
+        int                     lastTerminalHeight_;
+        const std::string       promptString_;
+
         DWORD                   originalTerminalSettings_;
         HANDLE                  stdInHandle_;
@@ -120 +101 @@
         int                     lastOutputLineHeight_;
         uint64_t                lastRefreshTime_;
-#endif
 
         static IOConsole* singletonPtr_s;