Separated logic into 'lost focus', 'regain focus' and 'on focus change'.

Author: Caball009

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

@@ -104,6 +104,9 @@ class Keyboard : public SubsystemInterface
 	virtual void createStreamMessages( void );  /**< given state of device, create
 																							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
 	// simplified versions where the caller doesn't care which key type was pressed.
 	Bool isShift();
 	Bool isCtrl();
@@ -119,6 +122,8 @@ 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 lost focus and 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

@@ -748,6 +748,37 @@ void Keyboard::update( void )
 void Keyboard::resetKeys( void )
 {
 
+	memset( m_keys, 0, sizeof( m_keys ) );
+	memset( m_keyStatus, 0, sizeof( m_keyStatus ) );
+	m_modifiers = KEY_STATE_NONE;
+	if( getCapsState() )
+	{
+		m_modifiers |= KEY_STATE_CAPSLOCK;
+	}
+
+}
+
+//-------------------------------------------------------------------------------------------------
+// called when window has lost focus
+//-------------------------------------------------------------------------------------------------
+void Keyboard::loseFocus()
+{
+	changeFocus();
+}
+
+//-------------------------------------------------------------------------------------------------
+// called when window has regained focus
+//-------------------------------------------------------------------------------------------------
+void Keyboard::regainFocus()
+{
+	changeFocus();
+}
+
+//-------------------------------------------------------------------------------------------------
+// called internally when window lost focus and regained focus
+//-------------------------------------------------------------------------------------------------
+void Keyboard::changeFocus()
+{
 	// 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.
 	if (BitIsSet(m_keyStatus[KEY_LALT].state, KEY_STATE_DOWN))
@@ -763,14 +794,7 @@ void Keyboard::resetKeys( void )
 		msg->appendIntegerArgument(KEY_STATE_UP);
 	}
 
-	memset( m_keys, 0, sizeof( m_keys ) );
-	memset( m_keyStatus, 0, sizeof( m_keyStatus ) );
-	m_modifiers = KEY_STATE_NONE;
-	if( getCapsState() )
-	{
-		m_modifiers |= KEY_STATE_CAPSLOCK;
-	}
-
+	resetKeys();
 }
 
 //-------------------------------------------------------------------------------------------------

GeneralsMD/Code/Main/WinMain.cpp

@@ -419,12 +419,8 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 			// ------------------------------------------------------------------------
 			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();
+					TheKeyboard->regainFocus();
 
 				if (TheMouse)
 					TheMouse->regainFocus();
@@ -436,7 +432,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 			case WM_KILLFOCUS:
 			{
 				if (TheKeyboard )
-					TheKeyboard->resetKeys();
+					TheKeyboard->loseFocus();
 
 				if (TheMouse)
 				{