Changeset 1238

Timestamp:

May 6, 2008, 3:30:26 PM (16 years ago)

Author:

rgrieder

Message:

• trying to make the signalhandler do certain things..

Location:

code/branches/input/src/core

Files:

• CorePrereqs.h (modified) (1 diff)
• InputInterfaces.h (modified) (1 diff)
• SignalHandler.cc (modified) (3 diffs)
• SignalHandler.h (modified) (2 diffs)

code/branches/input/src/core/CorePrereqs.h

@@ -144 +144 @@
 
   // input
+  //class GUIInputHandler;
   class InputBuffer;
   class InputBufferListener;
   class InputManager;
+  class JoyStickHandler;
+  class JoyStickState;
   class KeyBinder;
-  class GUIInputHandler;
+  class KeyEvent;
   class KeyHandler;
   class MouseHandler;
-  class JoyStickHandler;
+  class MouseState;
 
 }

code/branches/input/src/core/InputInterfaces.h

@@ -219 +219 @@
   }
 
-  class _CoreExport KeyboardState
-  {
-  public:
-  };
-
   struct _CoreExport Key
   {

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

@@ -35 +35 @@
 
 #include <assert.h>
+#include <iostream>
 
 #include "Debug.h"
@@ -58 +59 @@
   this->fileName = fileName;
 
+  // prepare for restoring XAutoKeyRepeat
+        if (display_ = XOpenDisplay(0))
+  {
+                XGetKeyboardControl( display_, &bXAutoKeyRepeatOn_ );
+                XCloseDisplay(display_);
+  }
+  else
+  {
+    std::cout << "Warning: couldn't open X display to restore XAutoKeyRepeat." << std::endl;
+    XAutoKeyRepeatOn_ = false;
+  }
+
+
   // make sure doCatch is only called once without calling dontCatch
   assert( sigRecList.size() == 0 );
@@ -120 +134 @@
       sigName = "SIGILL";
       break;
+  }
+
+  if (XAutoKeyRepeatOn_)
+  {
+    std::cout << "Trying to restore XAutoKeyRepeat" << std::endl;
+          if (display_ = XOpenDisplay(0))
+    {
+                        XAutoRepeatOn(display_);
+                  XCloseDisplay(display_);
+    }
   }
 

code/branches/input/src/core/SignalHandler.h

@@ -44 +44 @@
 #ifndef __WIN32__
 #include <signal.h>
+#include <X11/Xlib.h>
 
 struct SignalRec
@@ -86 +87 @@
     std::string appName;
     std::string fileName;
+
+    // X Display, used to turn on KeyAutoRepeat if OIS crashes
+                Display *display_;
+    bool bXAutoKeyRepeatOn_;
 };