Game does not capture cursor in windowed mode

[xezon]

Game does not capture cursor in windowed mode. This makes native window mode (-win command line) unusable.

GenTool fixes this by using Windows ClipCursor function.

https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-clipcursor

Note that ClipCursor must be lifted when minimizing game out of full screen when using 2 monitors, otherwise cursor will remain captured on main screen. This can be done by calling ClipCursor(0) on Direct3DDevice8::Reset.

[ShizCalev]

looks like the game already has the proper logic for releasing capture when minimizing. ClipCursor() is only getting called when there's specifically a directinput mouse though, which might be the actual issue

GeneralsGameCode/Generals/Code/Main/WinMain.cpp

Lines 443 to 469 in 0a05454

	//-------------------------------------------------------------------------
	case WM_ACTIVATE:
	{
	Int active = LOWORD( wParam );
	//
	// when window is becoming deactivated we must release mouse cursor
	// locks on our region, otherwise set the mouse limit region again
	// which will clip the cursor to our window
	//
	if( active == WA_INACTIVE )
	{
	ClipCursor( NULL );
	if (TheAudio)
	TheAudio->loseFocus();
	} // end if
	else
	{
	if( TheMouse )
	TheMouse->setMouseLimits();
	if (TheAudio)
	TheAudio->regainFocus();
	} // end else
	break;

GeneralsGameCode/Generals/Code/GameEngineDevice/Source/Win32Device/GameClient/Win32DIMouse.cpp

Lines 407 to 433 in 0a05454

	void DirectInputMouse::setMouseLimits( void )
	{
	//
	// extending functionality, although we may overwrite the limits set
	// from the base class
	//
	Mouse::setMouseLimits();
	//
	// when runing windowed we want to keep the mouse within the game
	// window cause it's annoying to mouse out of the window and click
	// on a background window.
	//
	if( TheDisplay && TheDisplay->getWindowed() == TRUE )
	{
	RECT windowRect;
	// get the window rect
	GetWindowRect( ApplicationHWnd, &windowRect );
	// keep the cursor clipped to these coords when running windowed
	ClipCursor( &windowRect );
	} // end if
	} // end setMouseLimits

GeneralsGameCode/Generals/Code/GameEngine/Source/GameClient/Input/Mouse.cpp

Lines 945 to 958 in 0a05454

	void Mouse::setMouseLimits( void )
	{
	m_minX = 0;
	m_minY = 0;
	if( TheDisplay )
	{
	m_maxX = TheDisplay->getWidth();
	m_maxY = TheDisplay->getHeight();
	} // end if
	} // end setMouseLimits