bugfix(mouse): Prevent cursor capture when mouse is outside of app window

Author: xezon

GeneralsMD/Code/GameEngine/Include/GameClient/Mouse.h

@@ -170,6 +170,7 @@ class Mouse : public SubsystemInterface
 		CursorCaptureBlockReason_NoInit,
 		CursorCaptureBlockReason_Paused,
 		CursorCaptureBlockReason_Unfocused,
+		CursorCaptureBlockReadon_CursorIsOutside,
 
 		CursorCaptureBlockReason_Count
 	};
@@ -313,6 +314,10 @@ class Mouse : public SubsystemInterface
 	virtual void loseFocus(); ///< called when window has lost focus
 	virtual void regainFocus(); ///< called when window has regained focus
 
+	void onCursorMovedOutside(); ///< called when cursor has left game window
+	void onCursorMovedInside(); ///< called when cursor has entered game window
+	Bool isCursorInside() const; ///< true if the mouse is located inside the game window
+
 	void onResolutionChanged(void);
 	void onGameModeChanged(GameMode prev, GameMode next);
 	void onGamePaused(Bool paused);

GeneralsMD/Code/GameEngine/Source/GameClient/Input/Mouse.cpp

@@ -64,6 +64,7 @@ const char *const Mouse::CursorCaptureBlockReasonNames[] = {
 	"CursorCaptureBlockReason_NoInit",
 	"CursorCaptureBlockReason_Paused",
 	"CursorCaptureBlockReason_Unfocused",
+	"CursorCaptureBlockReason_CursorIsOutside",
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1034,6 +1035,24 @@ void Mouse::regainFocus()
 	unblockCapture(CursorCaptureBlockReason_Unfocused);
 }
 
+// ------------------------------------------------------------------------------------------------
+void Mouse::onCursorMovedOutside()
+{
+	blockCapture(CursorCaptureBlockReadon_CursorIsOutside);
+}
+
+// ------------------------------------------------------------------------------------------------
+void Mouse::onCursorMovedInside()
+{
+	unblockCapture(CursorCaptureBlockReadon_CursorIsOutside);
+}
+
+// ------------------------------------------------------------------------------------------------
+Bool Mouse::isCursorInside() const
+{
+	return (m_captureBlockReasonBits & (1 << CursorCaptureBlockReadon_CursorIsOutside)) == 0;
+}
+
 // ------------------------------------------------------------------------------------------------
 void Mouse::initCapture()
 {

GeneralsMD/Code/Main/WinMain.cpp

@@ -436,8 +436,15 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 					TheKeyboard->resetKeys();
 
 				if (TheMouse)
+				{
 					TheMouse->loseFocus();
 
+					if (TheMouse->isCursorInside())
+					{
+						TheMouse->onCursorMovedOutside();
+					}
+				}
+
 				break;
 			}
 
@@ -550,15 +557,29 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 				if( TheWin32Mouse == NULL )
 					return 0;
 
+				// ignore when window is not active
+				if( !isWinMainActive )
+					return 0;
+
 				Int x = (Int)LOWORD( lParam );
 				Int y = (Int)HIWORD( lParam );
 				RECT rect;
 
 				// ignore when outside of client area
 				GetClientRect( ApplicationHWnd, &rect );
 				if( x < rect.left || x > rect.right || y < rect.top || y > rect.bottom )
+				{
+					if ( TheMouse->isCursorInside() )
+					{
+						TheMouse->onCursorMovedOutside();
+					}
 					return 0;
+				}
 
+				if( !TheMouse->isCursorInside() )
+				{
+					TheMouse->onCursorMovedInside();
+				}
 
 				TheWin32Mouse->addWin32Event( message, wParam, lParam, TheMessageTime );
 				return 0;