Unified keyboard focus change into a single public function.

Author: Caball009

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

@@ -105,8 +105,7 @@ class Keyboard : public SubsystemInterface
 																							messages and put them on the
 																							stream for the raw state. */
 
-	virtual void loseFocus();										///< called when window has lost focus
-	virtual void regainFocus();									///< called when window has regained focus
+	virtual void toggleFocus();									///< called when window has lost focus and has regained focus
 	// simplified versions where the caller doesn't care which key type was pressed.
 	Bool isShift();
 	Bool isCtrl();
@@ -122,8 +121,6 @@ class Keyboard : public SubsystemInterface
 	WideChar translateKey( WideChar keyCode );		///< translate key code to printable UNICODE char
 	WideChar getPrintableKey( KeyDefType key, Int state );
 	enum { MAX_KEY_STATES = 3};
-private:
-	void changeFocus();													///< called internally when window has lost focus and has regained focus
 protected:
 
 	/** get the key data for a single key, KEY_NONE should be returned when

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

@@ -759,25 +759,9 @@ void Keyboard::resetKeys( void )
 }
 
 //-------------------------------------------------------------------------------------------------
-// called when window has lost focus
+// called when window has lost focus and has regained focus
 //-------------------------------------------------------------------------------------------------
-void Keyboard::loseFocus()
-{
-	changeFocus();
-}
-
-//-------------------------------------------------------------------------------------------------
-// called when window has regained focus
-//-------------------------------------------------------------------------------------------------
-void Keyboard::regainFocus()
-{
-	changeFocus();
-}
-
-//-------------------------------------------------------------------------------------------------
-// called internally when window has lost focus and has regained focus
-//-------------------------------------------------------------------------------------------------
-void Keyboard::changeFocus()
+void Keyboard::toggleFocus()
 {
 	// TheSuperHackers @fix Caball009 13/12/2025 Fix bug where game remains in waypoint mode
 	// because the key up state for the alt key is not detected after alt tab.

GeneralsMD/Code/Main/WinMain.cpp

@@ -420,7 +420,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 			case WM_SETFOCUS:
 			{
 				if (TheKeyboard)
-					TheKeyboard->regainFocus();
+					TheKeyboard->toggleFocus();
 
 				if (TheMouse)
 					TheMouse->regainFocus();
@@ -432,7 +432,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 			case WM_KILLFOCUS:
 			{
 				if (TheKeyboard)
-					TheKeyboard->loseFocus();
+					TheKeyboard->toggleFocus();
 
 				if (TheMouse)
 				{