[Orxonox-commit 790] r3311 - in branches/core4/src: core/input orxonox/gui

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-07-19 12:31:28 +0200 (Sun, 19 Jul 2009)
New Revision: 3311

Modified:
   branches/core4/src/core/input/InputManager.cc
   branches/core4/src/orxonox/gui/GUIManager.cc
Log:
You can't watch out for unwanted changes every time...
Reverting some stuff with non-exclusive input mode stuff.

Modified: branches/core4/src/core/input/InputManager.cc
===================================================================
--- branches/core4/src/core/input/InputManager.cc	2009-07-19 10:27:53 UTC (rev 3310)
+++ branches/core4/src/core/input/InputManager.cc	2009-07-19 10:31:28 UTC (rev 3311)
@@ -176,10 +176,10 @@
         windowHndStr << (unsigned int)windowHnd_;
         paramList.insert(std::make_pair(std::string("WINDOW"), windowHndStr.str()));
 #if defined(ORXONOX_PLATFORM_WINDOWS)
-        paramList.insert(std::make_pair(std::string("w32_mouse"), std::string("DISCL_NONEXCLUSIVE")));
-        paramList.insert(std::make_pair(std::string("w32_mouse"), std::string("DISCL_FOREGROUND")));
-        paramList.insert(std::make_pair(std::string("w32_keyboard"), std::string("DISCL_NONEXCLUSIVE")));
-        paramList.insert(std::make_pair(std::string("w32_keyboard"), std::string("DISCL_FOREGROUND")));
+        //paramList.insert(std::make_pair(std::string("w32_mouse"), std::string("DISCL_NONEXCLUSIVE")));
+        //paramList.insert(std::make_pair(std::string("w32_mouse"), std::string("DISCL_FOREGROUND")));
+        //paramList.insert(std::make_pair(std::string("w32_keyboard"), std::string("DISCL_NONEXCLUSIVE")));
+        //paramList.insert(std::make_pair(std::string("w32_keyboard"), std::string("DISCL_FOREGROUND")));
 #elif defined(ORXONOX_PLATFORM_LINUX)
         paramList.insert(std::make_pair(std::string("XAutoRepeatOn"), std::string("true")));
         paramList.insert(std::make_pair(std::string("x11_mouse_grab"), "true"));

Modified: branches/core4/src/orxonox/gui/GUIManager.cc
===================================================================
--- branches/core4/src/orxonox/gui/GUIManager.cc	2009-07-19 10:27:53 UTC (rev 3310)
+++ branches/core4/src/orxonox/gui/GUIManager.cc	2009-07-19 10:31:28 UTC (rev 3311)
@@ -419,8 +419,7 @@
 
     void GUIManager::mouseMoved(IntVector2 abs, IntVector2 rel, IntVector2 clippingSize)
     {
-        //guiSystem_->injectMouseMove(static_cast<float>(rel.x), static_cast<float>(rel.y));
-        guiSystem_->injectMousePosition(static_cast<float>(abs.x), static_cast<float>(abs.y));
+        guiSystem_->injectMouseMove(static_cast<float>(rel.x), static_cast<float>(rel.y));
     }
     void GUIManager::mouseScrolled(int abs, int rel)
     {