Tweak mouse cursor startup behaviour (#2855)

Author: lopezloo

Client/core/CCore.cpp

@@ -894,6 +894,30 @@ void CCore::SetCenterCursor(bool bEnabled)
         m_pSetCursorPosHook->DisableSetCursorPos();
 }
 
+// Changes visibility of the system mouse cursor within application window
+void CCore::SetSystemCursorVisible(bool bVisible)
+{
+    if (m_pMultiplayer)
+    {
+        m_pMultiplayer->AllowWindowsCursorShowing(bVisible);
+        ShowCursor(bVisible);
+    }
+}
+
+////////////////////////////////////////////////////////////////////////
+//
+// ShouldShowSystemCursorDuringLoad
+//
+// Whenever system cursor should be shown during game load.
+// It should be if game is being launched in windowed mode or user has multiple monitors and full screen minimize is disabled.
+//
+////////////////////////////////////////////////////////////////////////
+bool CCore::ShouldShowSystemCursorDuringLoad()
+{
+    CVideoModeManagerInterface* pVidMan = GetVideoModeManager();
+    return pVidMan->IsDisplayModeWindowed() || (pVidMan->IsMultiMonitor() && !pVidMan->IsMinimizeEnabled());
+}
+
 ////////////////////////////////////////////////////////////////////////
 //
 // LoadModule
@@ -1020,6 +1044,11 @@ void CCore::DeinitGUI()
 void CCore::InitGUI(IDirect3DDevice9* pDevice)
 {
     m_pGUI = InitModule<CGUI>(m_GUIModule, "GUI", "InitGUIInterface", pDevice);
+
+    SetSystemCursorVisible(ShouldShowSystemCursorDuringLoad());
+
+    // Hide GUI mouse cursor during game startup
+    m_pGUI->SetCursorEnabled(false);
 }
 
 void CCore::CreateGUI()
@@ -1261,6 +1290,9 @@ void CCore::DoPostFramePulse()
             {
                 m_bFirstFrame = false;
 
+                // Make sure system mouse cursor is not visible
+                CCore::GetSingletonPtr()->SetSystemCursorVisible(false);
+
                 // Disable vsync while it's all dark
                 m_pGame->DisableVSync();
 

Client/core/CCore.h

@@ -143,6 +143,8 @@ class CCore : public CCoreInterface, public CSingleton<CCore>
     bool IsCursorControlsToggled() { return m_bCursorToggleControls; }
     void HideMainMenu();
     void SetCenterCursor(bool bEnabled);
+    void SetSystemCursorVisible(bool bVisible);
+    bool ShouldShowSystemCursorDuringLoad();
 
     void ShowServerInfo(unsigned int WindowType);
 

Client/core/CGUI.cpp

@@ -44,6 +44,8 @@ CLocalGUI::CLocalGUI()
 
     m_LastSettingsRevision = -1;
     m_LocaleChangeCounter = 0;
+
+    m_StoredMousePosition = {-1, -1};
 }
 
 CLocalGUI::~CLocalGUI()
@@ -711,8 +713,7 @@ bool CLocalGUI::InputGoesToGUI()
 
     // Here we're supposed to check if things like menues are up, console is up or the chatbox is expecting input
     // If the console is visible OR the chat is expecting input OR the mainmenu is visible
-    return (IsConsoleVisible() || IsMainMenuVisible() || IsChatBoxInputEnabled() || m_bForceCursorVisible || pGUI->GetGUIInputEnabled() ||
-            !CCore::GetSingleton().IsFocused() || IsWebRequestGUIVisible());
+    return (IsConsoleVisible() || IsMainMenuVisible() || IsChatBoxInputEnabled() || m_bForceCursorVisible || pGUI->GetGUIInputEnabled() || IsWebRequestGUIVisible());
 }
 
 void CLocalGUI::ForceCursorVisible(bool bVisible)
@@ -726,14 +727,18 @@ void CLocalGUI::UpdateCursor()
 
     static DWORD dwWidth = CDirect3DData::GetSingleton().GetViewportWidth();
     static DWORD dwHeight = CDirect3DData::GetSingleton().GetViewportHeight();
-    static bool  bFirstRun = true;
+    static bool bFirstRun = true;
 
     if (bFirstRun)
     {
-        m_StoredMousePosition.x = dwWidth / 2;
-        m_StoredMousePosition.y = dwHeight / 2;
+        if (!CCore::GetSingleton().ShouldShowSystemCursorDuringLoad())
+        {
+            m_StoredMousePosition.x = dwWidth / 2;
+            m_StoredMousePosition.y = dwHeight / 2;
+        }
         bFirstRun = false;
     }
+
     // Called in each frame to make sure the mouse is only visible when a GUI control that uses the
     // mouse requires it.
     if (InputGoesToGUI())
@@ -746,7 +751,8 @@ void CLocalGUI::UpdateCursor()
             CCore::GetSingleton ().GetGame ()->GetPad ()->Clear ();*/
 
             // Restore the mouse cursor to its old position
-            SetCursorPos(m_StoredMousePosition.x, m_StoredMousePosition.y);
+            if (m_StoredMousePosition.x != -1 && m_StoredMousePosition.y != -1)
+                SetCursorPos(m_StoredMousePosition.x, m_StoredMousePosition.y);
 
             // Enable our mouse cursor
             CSetCursorPosHook::GetSingleton().DisableSetCursorPos();

Client/multiplayer_sa/CMultiplayerSA.cpp

@@ -1558,6 +1558,9 @@ void CMultiplayerSA::InitHooks()
     // by skipping some entity flag check in CShadows::CastPlayerShadowSectorList()
     MemSet((void*)0x70A4CB, 0x90, 6);
 
+    // Disable setting system mouse cursor position to the center on game init
+    MemSet((void*)0x748A01, 0x90, 0x748A23 - 0x748A01);
+  
     // Allow vertical camera movement during a camera fade (#411)
     MemPut<BYTE>(0x524084, 0xFF);
     MemPut<BYTE>(0x524089, 0xFF);