Changeset 1272 for code/branches/merge/src/core/SignalHandler.cc

Timestamp:

May 14, 2008, 11:44:17 AM (16 years ago)

Author:

rgrieder

Message:

merged input branch into merge branch

File:

• code/branches/merge/src/core/SignalHandler.cc (modified) (4 diffs)

code/branches/merge/src/core/SignalHandler.cc

@@ -35 +35 @@
 
 #include <assert.h>
+#include <iostream>
 
 #include "Debug.h"
@@ -43 +44 @@
 
 #include <wait.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/keysym.h>
+
+bool SignalHandler::bXAutoKeyRepeatOn_ = false;
 
 SignalHandler::SignalHandler()
@@ -58 +64 @@
   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 );
@@ -120 +145 @@
       sigName = "SIGILL";
       break;
+  }
+
+  if (bXAutoKeyRepeatOn_)
+  {
+    std::cout << "Trying to restore XAutoKeyRepeat" << std::endl;
+        Display* display;
+          if ((display = XOpenDisplay(0)))
+    {
+                        XAutoRepeatOn(display);
+                  XCloseDisplay(display);
+    }
   }