Changeset 2753

Timestamp:

Mar 6, 2009, 7:02:07 PM (15 years ago)

Author:

rgrieder

Message:

Signalhandler should not append to orxonox_crash.log but write to the file.
Also removed the XAutoKeyRepeat re-enabling feature because we don't modify XAutoKeyRepeat anymore.

Location:

code/trunk/src/util

Files:

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

code/trunk/src/util/SignalHandler.cc

@@ -53 +53 @@
 namespace orxonox
 {
-    bool SignalHandler::bXAutoKeyRepeatOn_ = false;
-
     /**
      * register signal handlers for SIGSEGV and SIGABRT
@@ -65 +63 @@
       this->filename = filename;
 
-      // prepare for restoring XAutoKeyRepeat
-      Display* display;
-      if ((display = XOpenDisplay(0)))
-      {
-        XKeyboardState oldState;
-        XGetKeyboardControl(display, &oldState);
-        if (oldState.global_auto_repeat == AutoRepeatModeOn)
-          bXAutoKeyRepeatOn_ = true;
-        else
-          bXAutoKeyRepeatOn_ = false;
-        XCloseDisplay(display);
-      }
-      else
-      {
-        std::cout << "Warning: couldn't open X display to restore XAutoKeyRepeat." << std::endl;
-        bXAutoKeyRepeatOn_ = false;
-      }
-
-
       // make sure doCatch is only called once without calling dontCatch
       assert( sigRecList.size() == 0 );
@@ -146 +125 @@
           sigName = "SIGILL";
           break;
-      }
-
-      if (bXAutoKeyRepeatOn_)
-      {
-        std::cout << "Trying to restore XAutoKeyRepeat" << std::endl;
-        Display* display;
-        if ((display = XOpenDisplay(0)))
-        {
-          XAutoRepeatOn(display);
-          XCloseDisplay(display);
-        }
       }
 
@@ -326 +294 @@
       bt.insert(0, timeString);
 
-      FILE * f = fopen( getInstance().filename.c_str(), "a" );
+      FILE * f = fopen( getInstance().filename.c_str(), "w" );
 
       if ( !f )

code/trunk/src/util/SignalHandler.h

@@ -91 +91 @@
         std::string appName;
         std::string filename;
-
-        // used to turn on KeyAutoRepeat if OIS crashes
-        static bool bXAutoKeyRepeatOn_;
     };
 }