Changeset 6171

Timestamp:

Nov 27, 2009, 12:30:29 PM (15 years ago)

Author:

scheusso

Message:

fixed problem with ioconsole not restoring terminal settings when a segfault/sigabrt/etc occured

Location:

code/branches/presentation2/src/libraries/core

Files:

• IOConsole.cc (modified) (6 diffs)
• IOConsole.h (modified) (2 diffs)

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

@@ -51 +51 @@
         {
             level = (*text)[0];
-            if (level == -1 || level >= 1 && level <= 6)
+            if (level == -1 || (level >= 1 && level <= 6))
             {
                 *text = text->substr(1);
@@ -117 +117 @@
 namespace orxonox
 {
+    termios* IOConsole::originalTerminalSettings_s = 0;
+    
     namespace EscapeMode
     {
@@ -133 +135 @@
         , bStatusPrinted_(false)
         , promptString_("orxonox # ")
-        , originalTerminalSettings_(new termios())
     {
         this->setTerminalMode();
@@ -168 +169 @@
 
         resetTerminalMode();
-        delete this->originalTerminalSettings_;
         this->shell_->destroy();
 
@@ -369 +369 @@
     {
         termios new_settings;
-
-        tcgetattr(0, this->originalTerminalSettings_);
-        new_settings = *this->originalTerminalSettings_;
+        IOConsole::originalTerminalSettings_s = new termios();
+
+        tcgetattr(0, this->originalTerminalSettings_s);
+        new_settings = *this->originalTerminalSettings_s;
         new_settings.c_lflag &= ~(ICANON | ECHO);
         //new_settings.c_lflag |= (ISIG | IEXTEN);
@@ -377 +378 @@
         new_settings.c_cc[VMIN]  = 0;
         tcsetattr(0, TCSANOW, &new_settings);
-    }
-
-    void IOConsole::resetTerminalMode()
-    {
-        tcsetattr(0, TCSANOW, IOConsole::originalTerminalSettings_);
+        atexit(&IOConsole::resetTerminalMode);
+    }
+
+    /*static*/ void IOConsole::resetTerminalMode()
+    {
+        if(IOConsole::originalTerminalSettings_s)
+        {
+            tcsetattr(0, TCSANOW, IOConsole::originalTerminalSettings_s);
+            delete IOConsole::originalTerminalSettings_s;
+            IOConsole::originalTerminalSettings_s = 0;
+        }
     }
 

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

@@ -60 +60 @@
     private:
         void setTerminalMode();
-        void resetTerminalMode();
+        static void resetTerminalMode();
         void getTerminalSize();
         bool willPrintStatusLines();
@@ -93 +93 @@
 
 #ifdef ORXONOX_PLATFORM_UNIX
-        termios*                originalTerminalSettings_;
+        static termios*         originalTerminalSettings_s;
 #elif defined(ORXONOX_PLATFORM_WINDOWS)
         void moveCursor(int dx, int dy);