refactor(mouse): Apply minor refactoring and whitespace tweaks in WinMain, Mouse

Author: xezon

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

@@ -310,10 +310,10 @@ class Mouse : public SubsystemInterface
 	Int getCursorIndex( const AsciiString& name );
 	void resetTooltipDelay( void );
 
-	virtual void loseFocus();
-	virtual void regainFocus();
+	virtual void loseFocus(); ///< called when window has lost focus
+	virtual void regainFocus(); ///< called when window has regained focus
 
-	void mouseNotifyResolutionChange(void);
+	void onResolutionChanged(void);
 	void onGameModeChanged(GameMode prev, GameMode next);
 	void onGamePaused(Bool paused);
 

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp

@@ -746,7 +746,7 @@ void DeclineResolution()
 		TheWritableGlobalData->m_yResolution = newDispSettings.yRes;
 
 		TheHeaderTemplateManager->headerNotifyResolutionChange();
-		TheMouse->mouseNotifyResolutionChange();
+		TheMouse->onResolutionChanged();
 
 		AsciiString prefString;
 		prefString.format("%d %d", newDispSettings.xRes, newDispSettings.yRes);

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp

@@ -1601,7 +1601,7 @@ static void saveOptions( void )
 				TheWritableGlobalData->m_yResolution = yres;
 
 				TheHeaderTemplateManager->headerNotifyResolutionChange();
-				TheMouse->mouseNotifyResolutionChange();
+				TheMouse->onResolutionChanged();
 
 				//Save new settings for a dialog box confirmation after options are accepted
 				newDispSettings.xRes = xres;

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

@@ -575,7 +575,7 @@ void Mouse::init( void )
 	m_numButtons = 2;  // by default just have 2 buttons
 	m_numAxes = 2;  // by default a normal mouse moves in a 2d plane
 	m_forceFeedback = FALSE;
-	mouseNotifyResolutionChange();
+	onResolutionChanged();
 	m_tooltipString.clear();	// redundant
 	m_displayTooltip = FALSE;
 
@@ -607,7 +607,7 @@ void Mouse::init( void )
 //-------------------------------------------------------------------------------------------------
 /** Tell mouse system display resolution changed. */
 //-------------------------------------------------------------------------------------------------
-void Mouse::mouseNotifyResolutionChange( void )
+void Mouse::onResolutionChanged( void )
 {
 	if(m_tooltipDisplayString)
 		TheDisplayStringManager->freeDisplayString(m_tooltipDisplayString);

GeneralsMD/Code/Main/WinMain.cpp

@@ -72,7 +72,7 @@
 // GLOBALS ////////////////////////////////////////////////////////////////////
 HINSTANCE ApplicationHInstance = NULL;  ///< our application instance
 HWND ApplicationHWnd = NULL;  ///< our application window handle
-Win32Mouse *TheWin32Mouse= NULL;  ///< for the WndProc() only
+Win32Mouse *TheWin32Mouse = NULL;  ///< for the WndProc() only
 DWORD TheMessageTime = 0;	///< For getting the time that a message was posted from Windows.
 
 const Char *g_strFile = "data\\Generals.str";
@@ -319,50 +319,50 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 			//-------------------------------------------------------------------------
 			case WM_NCHITTEST:
 			// Prevent the user from selecting the menu in fullscreen mode
-            if( !TheGlobalData->m_windowed )
-                return HTCLIENT;
-            break;
+				if( !TheGlobalData->m_windowed )
+					return HTCLIENT;
+				break;
 
 			//-------------------------------------------------------------------------
 			case WM_POWERBROADCAST:
-            switch( wParam )
-            {
-                #ifndef PBT_APMQUERYSUSPEND
-                    #define PBT_APMQUERYSUSPEND 0x0000
-                #endif
-                case PBT_APMQUERYSUSPEND:
-                    // At this point, the app should save any data for open
-                    // network connections, files, etc., and prepare to go into
-                    // a suspended mode.
-                    return TRUE;
-
-                #ifndef PBT_APMRESUMESUSPEND
-                    #define PBT_APMRESUMESUSPEND 0x0007
-                #endif
-                case PBT_APMRESUMESUSPEND:
-                    // At this point, the app should recover any data, network
-                    // connections, files, etc., and resume running from when
-                    // the app was suspended.
-                    return TRUE;
-            }
-            break;
+				switch( wParam )
+				{
+					#ifndef PBT_APMQUERYSUSPEND
+						#define PBT_APMQUERYSUSPEND 0x0000
+					#endif
+					case PBT_APMQUERYSUSPEND:
+						// At this point, the app should save any data for open
+						// network connections, files, etc., and prepare to go into
+						// a suspended mode.
+						return TRUE;
+
+					#ifndef PBT_APMRESUMESUSPEND
+						#define PBT_APMRESUMESUSPEND 0x0007
+					#endif
+					case PBT_APMRESUMESUSPEND:
+						// At this point, the app should recover any data, network
+						// connections, files, etc., and resume running from when
+						// the app was suspended.
+						return TRUE;
+				}
+				break;
 			//-------------------------------------------------------------------------
 			case WM_SYSCOMMAND:
-            // Prevent moving/sizing and power loss in fullscreen mode
-            switch( wParam )
-            {
-                case SC_KEYMENU:
-                    // TheSuperHackers @bugfix Mauller 10/05/2025 Always handle this command to prevent halting the game when left Alt is pressed.
-                    return 1;
-                case SC_MOVE:
-                case SC_SIZE:
-                case SC_MAXIMIZE:
-                case SC_MONITORPOWER:
-                    if( !TheGlobalData->m_windowed )
-                        return 1;
-                    break;
-            }
-            break;
+				// Prevent moving/sizing and power loss in fullscreen mode
+				switch( wParam )
+				{
+					case SC_KEYMENU:
+						// TheSuperHackers @bugfix Mauller 10/05/2025 Always handle this command to prevent halting the game when left Alt is pressed.
+						return 1;
+					case SC_MOVE:
+					case SC_SIZE:
+					case SC_MAXIMIZE:
+					case SC_MONITORPOWER:
+						if( !TheGlobalData->m_windowed )
+							return 1;
+						break;
+				}
+				break;
 
 			case WM_QUERYENDSESSION:
 			{
@@ -372,42 +372,24 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 
 			// ------------------------------------------------------------------------
 			case WM_CLOSE:
-			if (!TheGameEngine->getQuitting())
-			{
-				//user is exiting without using the menus
+				if (!TheGameEngine->getQuitting())
+				{
+					//user is exiting without using the menus
 
-				//This method didn't work in cinematics because we don't process messages.
-				//But it's the cleanest way to exit that's similar to using menus.
-				TheMessageStream->appendMessage(GameMessage::MSG_META_DEMO_INSTANT_QUIT);
+					//This method didn't work in cinematics because we don't process messages.
+					//But it's the cleanest way to exit that's similar to using menus.
+					TheMessageStream->appendMessage(GameMessage::MSG_META_DEMO_INSTANT_QUIT);
 
-				//This method used to disable quitting.  We just put up the options screen instead.
-				//TheMessageStream->appendMessage(GameMessage::MSG_META_OPTIONS);
+					//This method used to disable quitting.  We just put up the options screen instead.
+					//TheMessageStream->appendMessage(GameMessage::MSG_META_OPTIONS);
 
-				//This method works everywhere but isn't as clean at shutting down.
-				//TheGameEngine->checkAbnormalQuitting();	//old way to log disconnections for ALT-F4
-				//TheGameEngine->reset();
-				//TheGameEngine->setQuitting(TRUE);
-				//_exit(EXIT_SUCCESS);
+					//This method works everywhere but isn't as clean at shutting down.
+					//TheGameEngine->checkAbnormalQuitting();	//old way to log disconnections for ALT-F4
+					//TheGameEngine->reset();
+					//TheGameEngine->setQuitting(TRUE);
+					//_exit(EXIT_SUCCESS);
+				}
 				return 0;
-			}
-
-			// ------------------------------------------------------------------------
-			case WM_SETFOCUS:
-			{
-
-				//
-				// reset the state of our keyboard cause we haven't been paying
-				// attention to the keys while focus was away
-				//
-				if( TheKeyboard )
-					TheKeyboard->resetKeys();
-
-				if (TheMouse)
-					TheMouse->regainFocus();
-
-				break;
-
-			}
 
 			//-------------------------------------------------------------------------
 			case WM_MOVE:
@@ -431,6 +413,22 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 				break;
 			}
 
+			// ------------------------------------------------------------------------
+			case WM_SETFOCUS:
+			{
+				//
+				// reset the state of our keyboard cause we haven't been paying
+				// attention to the keys while focus was away
+				//
+				if( TheKeyboard )
+					TheKeyboard->resetKeys();
+
+				if (TheMouse)
+					TheMouse->regainFocus();
+
+				break;
+			}
+
 			//-------------------------------------------------------------------------
 			case WM_KILLFOCUS:
 			{
@@ -461,13 +459,15 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 						TheGameEngine->setIsActive(isWinMainActive);
 
 					if (isWinMainActive)
-					{	//restore mouse cursor to our custom version.
+					{
+						//restore mouse cursor to our custom version.
 						if (TheWin32Mouse)
 							TheWin32Mouse->setCursor(TheWin32Mouse->getMouseCursor());
 					}
 				}
 				return 0;
 			}
+
 			//-------------------------------------------------------------------------
 			case WM_ACTIVATE:
 			{
@@ -488,7 +488,6 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 						TheMouse->refreshCursorCapture();
 				}
 				break;
-
 			}
 
 			//-------------------------------------------------------------------------
@@ -498,21 +497,13 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 
 				switch( key )
 				{
-
-					//---------------------------------------------------------------------
 					case VK_ESCAPE:
 					{
-
 						PostQuitMessage( 0 );
 						break;
-
 					}
-
-
 				}
-
 				return 0;
-
 			}
 
 			//-------------------------------------------------------------------------
@@ -528,17 +519,18 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 			case WM_RBUTTONUP:
 			case WM_RBUTTONDBLCLK:
 			{
-
 				if( TheWin32Mouse )
 					TheWin32Mouse->addWin32Event( message, wParam, lParam, TheMessageTime );
 
 				return 0;
-
 			}
 
 			//-------------------------------------------------------------------------
 			case 0x020A: // WM_MOUSEWHEEL
 			{
+				if( TheWin32Mouse == NULL )
+					return 0;
+
 				long x = (long) LOWORD(lParam);
 				long y = (long) HIWORD(lParam);
 				RECT rect;
@@ -548,32 +540,28 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 				if( x < rect.left || x > rect.right || y < rect.top || y > rect.bottom )
 					return 0;
 
-				if( TheWin32Mouse )
-					TheWin32Mouse->addWin32Event( message, wParam, lParam, TheMessageTime );
-
+				TheWin32Mouse->addWin32Event( message, wParam, lParam, TheMessageTime );
 				return 0;
-
 			}
 
-
 			//-------------------------------------------------------------------------
 			case WM_MOUSEMOVE:
 			{
+				if( TheWin32Mouse == NULL )
+					return 0;
+
 				Int x = (Int)LOWORD( lParam );
 				Int y = (Int)HIWORD( lParam );
 				RECT rect;
-//				Int keys = wParam;
 
 				// ignore when outside of client area
 				GetClientRect( ApplicationHWnd, &rect );
 				if( x < rect.left || x > rect.right || y < rect.top || y > rect.bottom )
 					return 0;
 
-				if( TheWin32Mouse )
-					TheWin32Mouse->addWin32Event( message, wParam, lParam, TheMessageTime );
 
+				TheWin32Mouse->addWin32Event( message, wParam, lParam, TheMessageTime );
 				return 0;
-
 			}
 
 			//-------------------------------------------------------------------------