Changeset 8023

Timestamp:

Mar 5, 2011, 11:07:39 PM (14 years ago)

Author:

landauf

Message:

update exclusive mouse mode and cursor visibility when changing fullscreen/window mode

Location:

code/branches/usability

Files:

• data/gui/scripts/GraphicsMenu.lua (modified) (1 diff)
• data/gui/scripts/SheetManager.lua (modified) (2 diffs)
• src/libraries/core/input/InputManager.cc (modified) (1 diff)
• src/libraries/core/input/InputManager.h (modified) (1 diff)

code/branches/usability/data/gui/scripts/GraphicsMenu.lua

@@ -337 +337 @@
     -- prompt for confirmation
     openDecisionPopup("Do you want to keep these settings? (Settings will be reverted in 10 seconds if not accepted)", GraphicsMenu.callback_ApplyDecisionPopup)
+    if checkedFullscreen then
+        showCursor()
+    end
 end
 

code/branches/usability/data/gui/scripts/SheetManager.lua

@@ -10 +10 @@
 orxonox.GUIManager:subscribeEventHelper(menuSheetsRoot, "Sized", "windowResized")
 
------------------------
---- Local functions ---
------------------------
-
-local function hideCursor()
-    if cursor:isVisible() then
-        cursor:hide()
-    end
-end
-
-local function showCursor()
-    if not cursor:isVisible() and inputMgr:isMouseExclusive() then
-        cursor:show()
-    end
-end
-
-
 ------------------------
 --- Global functions ---
 ------------------------
+
+function hideCursor()
+    if cursor:isVisible() then
+        cursor:hide()
+    end
+end
+
+function showCursor()
+    if not cursor:isVisible() and inputMgr:isMouseExclusive() then
+        cursor:show()
+    end
+end
 
 -- Loads the GUI with the specified name
@@ -257 +252 @@
 
 function windowResized(e)
-    local sheet = activeMenuSheets[activeMenuSheets.size]
-    if sheet then
-        sheet.sheet:windowResized()
+    for name, sheet in pairs(loadedSheets) do
+        if orxonox.GraphicsManager:getInstance():isFullScreen() or sheet.tShowCursor == TriBool.False then
+            inputMgr:setMouseExclusive(sheet.inputState, TriBool.True)
+        else
+            inputMgr:setMouseExclusive(sheet.inputState, TriBool.False)
+        end
+    end
+    local sheetTuple = activeMenuSheets[activeMenuSheets.size]
+    if sheetTuple then
+        if orxonox.GraphicsManager:getInstance():isFullScreen() and sheetTuple.sheet.tShowCursor ~= TriBool.False then
+            showCursor()
+        else
+            hideCursor()
+        end
+        sheetTuple.sheet:windowResized()
     end
 end

code/branches/usability/src/libraries/core/input/InputManager.cc

@@ -641 +641 @@
         state->destroy();
     }
+
+    bool InputManager::setMouseExclusive(const std::string& name, TriBool::Value value)
+    {
+        if (name == "empty")
+        {
+            COUT(2) << "InputManager: Changing the empty state is not allowed!" << std::endl;
+            return false;
+        }
+        std::map<std::string, InputState*>::iterator it = statesByName_.find(name);
+        if (it != statesByName_.end())
+        {
+            it->second->setMouseExclusive(value);
+            return true;
+        }
+        return false;
+    }
 }

code/branches/usability/src/libraries/core/input/InputManager.h

@@ -163 +163 @@
         */
         bool destroyState(const std::string& name); // tolua_export
+        /**
+        @brief
+            Changes the mouse mode of an input state.
+        @return
+            True if the call was successful, fals if the name was not found
+        */
+        bool setMouseExclusive(const std::string& name, TriBool::Value value); // tolua_export
 
         //-------------------------------