Changeset 6172

Timestamp:

Nov 27, 2009, 12:42:38 PM (15 years ago)

Author:

scheusso

Message:

actually i think it's nicer this way

Location:

code/branches/presentation2/src/libraries/core

Files:

• IOConsole.cc (modified) (4 diffs)
• IOConsole.h (modified) (1 diff)

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

@@ -117 +117 @@
 namespace orxonox
 {
-    termios* IOConsole::originalTerminalSettings_s = 0;
-    
     namespace EscapeMode
     {
@@ -135 +133 @@
         , bStatusPrinted_(false)
         , promptString_("orxonox # ")
+        , originalTerminalSettings_(0)
     {
         this->setTerminalMode();
@@ -369 +368 @@
     {
         termios new_settings;
-        IOConsole::originalTerminalSettings_s = new termios();
-
-        tcgetattr(0, this->originalTerminalSettings_s);
-        new_settings = *this->originalTerminalSettings_s;
+        this->originalTerminalSettings_ = new termios();
+
+        tcgetattr(0, this->originalTerminalSettings_);
+        new_settings = *this->originalTerminalSettings_;
         new_settings.c_lflag &= ~(ICANON | ECHO);
         //new_settings.c_lflag |= (ISIG | IEXTEN);
@@ -383 +382 @@
     /*static*/ void IOConsole::resetTerminalMode()
     {
-        if(IOConsole::originalTerminalSettings_s)
-        {
-            tcsetattr(0, TCSANOW, IOConsole::originalTerminalSettings_s);
-            delete IOConsole::originalTerminalSettings_s;
-            IOConsole::originalTerminalSettings_s = 0;
+        if(IOConsole::singletonPtr_s && IOConsole::singletonPtr_s->originalTerminalSettings_)
+        {
+            tcsetattr(0, TCSANOW, IOConsole::singletonPtr_s->originalTerminalSettings_);
+            delete IOConsole::singletonPtr_s->originalTerminalSettings_;
+            IOConsole::singletonPtr_s->originalTerminalSettings_ = 0;
         }
     }

code/branches/presentation2/src/libraries/core/IOConsole.h

@@ -93 +93 @@
 
 #ifdef ORXONOX_PLATFORM_UNIX
-        static termios*         originalTerminalSettings_s;
+        termios*         originalTerminalSettings_;
 #elif defined(ORXONOX_PLATFORM_WINDOWS)
         void moveCursor(int dx, int dy);