Changeset 1240 for code/branches/input/src/core

Timestamp:

May 6, 2008, 4:51:32 PM (17 years ago)

Author:

rgrieder

Message:

completed that SignalHandler thingy: XAutoKeyRepeat is now restored if orxonox and with it OIS crashes

Location:

code/branches/input/src/core

Files:

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

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

@@ -149 +149 @@
   class InputManager;
   class JoyStickHandler;
-  class JoyStickState;
   class KeyBinder;
-  class KeyEvent;
   class KeyHandler;
   class MouseHandler;
-  class MouseState;
 
 }

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

@@ -44 +44 @@
 
 #include <wait.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/keysym.h>
+
+bool SignalHandler::bXAutoKeyRepeatOn_ = false;
 
 SignalHandler::SignalHandler()
@@ -60 +65 @@
 
   // prepare for restoring XAutoKeyRepeat
-        if (display_ = XOpenDisplay(0))
-  {
-                XGetKeyboardControl( display_, &bXAutoKeyRepeatOn_ );
-                XCloseDisplay(display_);
+    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;
-    XAutoKeyRepeatOn_ = false;
+    bXAutoKeyRepeatOn_ = false;
   }
 
@@ -136 +147 @@
   }
 
-  if (XAutoKeyRepeatOn_)
+  if (bXAutoKeyRepeatOn_)
   {
     std::cout << "Trying to restore XAutoKeyRepeat" << std::endl;
-          if (display_ = XOpenDisplay(0))
-    {
-                        XAutoRepeatOn(display_);
-                  XCloseDisplay(display_);
+        Display* display;
+          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
@@ -88 +87 @@
     std::string fileName;
 
-    // X Display, used to turn on KeyAutoRepeat if OIS crashes
-                Display *display_;
-    bool bXAutoKeyRepeatOn_;
+    // used to turn on KeyAutoRepeat if OIS crashes
+    static bool bXAutoKeyRepeatOn_;
 };