From fce9a14986e352af26270d814add9085c609c01c Mon Sep 17 00:00:00 2001
From: scrawl <720642+scrawl@users.noreply.github.com>
Date: Tue, 26 Sep 2017 17:44:35 +0200
Subject: [PATCH] Hide the mouse cursor until it's used

---
 apps/openmw/mwbase/windowmanager.hpp    |  1 +
 apps/openmw/mwgui/windowmanagerimp.cpp  | 12 +++++++++++-
 apps/openmw/mwgui/windowmanagerimp.hpp  |  4 ++++
 apps/openmw/mwinput/inputmanagerimp.cpp |  3 +++
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwbase/windowmanager.hpp b/apps/openmw/mwbase/windowmanager.hpp
index d8bce67e4..d454067c8 100644
--- a/apps/openmw/mwbase/windowmanager.hpp
+++ b/apps/openmw/mwbase/windowmanager.hpp
@@ -180,6 +180,7 @@ namespace MWBase
             virtual void setFocusObjectScreenCoords(float min_x, float min_y, float max_x, float max_y) = 0;
 
             virtual void setCursorVisible(bool visible) = 0;
+            virtual void setCursorActive(bool active) = 0;
             virtual void getMousePosition(int &x, int &y) = 0;
             virtual void getMousePosition(float &x, float &y) = 0;
             virtual void setDragDrop(bool dragDrop) = 0;
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 7e3741ae6..8272568d3 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -176,6 +176,7 @@ namespace MWGui
       , mWerewolfOverlayEnabled(Settings::Manager::getBool ("werewolf overlay", "GUI"))
       , mHudEnabled(true)
       , mCursorVisible(true)
+      , mCursorActive(false)
       , mPlayerName()
       , mPlayerRaceId()
       , mPlayerAttributes()
@@ -1009,7 +1010,16 @@ namespace MWGui
 
     void WindowManager::setCursorVisible(bool visible)
     {
+        if (visible == mCursorVisible)
+            return;
         mCursorVisible = visible;
+        if (!visible)
+            mCursorActive = false;
+    }
+
+    void WindowManager::setCursorActive(bool active)
+    {
+        mCursorActive = active;
     }
 
     void WindowManager::onRetrieveTag(const MyGUI::UString& _tag, MyGUI::UString& _result)
@@ -1518,7 +1528,7 @@ namespace MWGui
 
     bool WindowManager::getCursorVisible()
     {
-        return mCursorVisible;
+        return mCursorVisible && mCursorActive;
     }
 
     void WindowManager::trackWindow(Layout *layout, const std::string &name)
diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp
index f6b2707ad..612470a7e 100644
--- a/apps/openmw/mwgui/windowmanagerimp.hpp
+++ b/apps/openmw/mwgui/windowmanagerimp.hpp
@@ -320,6 +320,9 @@ namespace MWGui
 
     virtual bool getCursorVisible();
 
+    /// Call when mouse cursor or buttons are used.
+    virtual void setCursorActive(bool active);
+
     /// Clear all savegame-specific data
     virtual void clear();
 
@@ -447,6 +450,7 @@ namespace MWGui
     bool mWerewolfOverlayEnabled;
     bool mHudEnabled;
     bool mCursorVisible;
+    bool mCursorActive;
 
     void setCursorVisible(bool visible);
 
diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp
index cf52cbd18..6f0b3b1b4 100644
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@@ -718,6 +718,7 @@ namespace MWInput
                     MWBase::Environment::get().getWindowManager()->playSound("Menu Click");
                 }
             }
+            MWBase::Environment::get().getWindowManager()->setCursorActive(true);
         }
 
         setPlayerControlsEnabled(!guiMode);
@@ -764,6 +765,8 @@ namespace MWInput
             MyGUI::InputManager::getInstance().injectMouseMove( int(mGuiCursorX), int(mGuiCursorY), mMouseWheel);
             // FIXME: inject twice to force updating focused widget states (tooltips) resulting from changing the viewport by scroll wheel
             MyGUI::InputManager::getInstance().injectMouseMove( int(mGuiCursorX), int(mGuiCursorY), mMouseWheel);
+
+            MWBase::Environment::get().getWindowManager()->setCursorActive(true);
         }
 
         if (mMouseLookEnabled && !mControlsDisabled)