Changeset 2058 for code/branches/lod/src/core/input

Timestamp:

Oct 29, 2008, 4:00:45 PM (16 years ago)

Author:

rgrieder

Message:

Reverted unintentional changes in lod branch.

File:

• code/branches/lod/src/core/input/InputManager.cc (modified) (3 diffs)

code/branches/lod/src/core/input/InputManager.cc

@@ -47 +47 @@
 #include "core/CommandExecutor.h"
 #include "core/ConsoleCommand.h"
+#include "core/CommandLine.h"
 #include "util/Debug.h"
 
@@ -62 +63 @@
     SetConsoleCommand(InputManager, calibrate, true);
     SetConsoleCommand(InputManager, reload, false);
+    SetCommandLineSwitch(keyboard_no_grab);
 
     std::string InputManager::bindingCommmandString_s = "";
@@ -153 +155 @@
 #if defined OIS_LINUX_PLATFORM
             paramList.insert(std::make_pair(std::string("XAutoRepeatOn"), std::string("true")));
+            paramList.insert(std::make_pair(std::string("x11_mouse_grab"), "true"));
+            paramList.insert(std::make_pair(std::string("x11_mouse_hide"), "true"));
+            bool kbNoGrab;
+            CommandLine::getValue("keyboard_no_grab", &kbNoGrab);
+            if (kbNoGrab)
+                paramList.insert(std::make_pair(std::string("x11_keyboard_grab"), std::string("false")));
+            else
+                paramList.insert(std::make_pair(std::string("x11_keyboard_grab"), std::string("true")));
 #endif