Fix keyboard repeat delay to use real-time instead of frames

Author: bobtista

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

@@ -75,6 +75,7 @@ struct KeyboardIO
 	UnsignedByte	status;									// StatusType, above
 	UnsignedShort	state;									// KEY_STATE_* in KeyDefs.h
 	UnsignedInt		sequence;								// sequence info from DirectX used for order
+	UnsignedInt		keyDownTimeMS;					// real-time in milliseconds when key went down
 
 };
 
@@ -84,7 +85,7 @@ struct KeyboardIO
 class Keyboard : public SubsystemInterface
 {
 
-	enum { KEY_REPEAT_DELAY = 10 };
+	enum { KEY_REPEAT_DELAY_MS = 333 };
 
 public:
 

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

@@ -141,6 +141,12 @@ void Keyboard::updateKeys( void )
 		m_keyStatus[ m_keys[ index ].key ].status = m_keys[ index ].status;
 		m_keyStatus[ m_keys[ index ].key ].sequence = m_inputFrame;
 
+		// Update key down time for new key presses
+		if( BitIsSet( m_keys[ index ].state, KEY_STATE_DOWN ) )
+		{
+			m_keyStatus[ m_keys[ index ].key ].keyDownTimeMS = timeGetTime();
+		}
+
 		// prevent ALT-TAB from causing a TAB event
 		if( m_keys[ index ].key == KEY_TAB )
 		{
@@ -213,13 +219,14 @@ Bool Keyboard::checkKeyRepeat( void )
 
 	// Scan Keyboard status array for first key down
 	// long enough to repeat
+	UnsignedInt now = timeGetTime();
 	for( key = 0; key < 256; key++ )
 	{
 
 		if( BitIsSet( m_keyStatus[ key ].state, KEY_STATE_DOWN ) )
 		{
 
-			if( (m_inputFrame - m_keyStatus[ key ].sequence) > Keyboard::KEY_REPEAT_DELAY )
+			if( now - m_keyStatus[ key ].keyDownTimeMS > Keyboard::KEY_REPEAT_DELAY_MS )
 			{
 				// Add key to this frame
 				m_keys[ index ].key = (UnsignedByte)key;
@@ -233,8 +240,9 @@ Bool Keyboard::checkKeyRepeat( void )
 				for( index = 0; index< NUM_KEYS; index++ )
 					m_keyStatus[ index ].sequence = m_inputFrame;
 
-				// Set repeated key so it will repeat again in two frames
-				m_keyStatus[ key ].sequence = m_inputFrame - (Keyboard::KEY_REPEAT_DELAY + 2);
+				// Set repeated key so it will repeat again after a short interval
+				const UnsignedInt KEY_REPEAT_INTERVAL_MS = 67; // ~2 frames at 30 FPS
+				m_keyStatus[ key ].keyDownTimeMS = now - (Keyboard::KEY_REPEAT_DELAY_MS - KEY_REPEAT_INTERVAL_MS);
 
 				retVal = TRUE;
 				break;  // exit for key

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

@@ -75,6 +75,7 @@ struct KeyboardIO
 	UnsignedByte	status;									// StatusType, above
 	UnsignedShort	state;									// KEY_STATE_* in KeyDefs.h
 	UnsignedInt		sequence;								// sequence info from DirectX used for order
+	UnsignedInt		keyDownTimeMS;					// real-time in milliseconds when key went down
 
 };
 
@@ -84,7 +85,7 @@ struct KeyboardIO
 class Keyboard : public SubsystemInterface
 {
 
-	enum { KEY_REPEAT_DELAY = 10 };
+	enum { KEY_REPEAT_DELAY_MS = 333 };
 
 public:
 

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

@@ -141,6 +141,12 @@ void Keyboard::updateKeys( void )
 		m_keyStatus[ m_keys[ index ].key ].status = m_keys[ index ].status;
 		m_keyStatus[ m_keys[ index ].key ].sequence = m_inputFrame;
 
+		// Update key down time for new key presses
+		if( BitIsSet( m_keys[ index ].state, KEY_STATE_DOWN ) )
+		{
+			m_keyStatus[ m_keys[ index ].key ].keyDownTimeMS = timeGetTime();
+		}
+
 		// prevent ALT-TAB from causing a TAB event
 		if( m_keys[ index ].key == KEY_TAB )
 		{
@@ -213,13 +219,14 @@ Bool Keyboard::checkKeyRepeat( void )
 
 	// Scan Keyboard status array for first key down
 	// long enough to repeat
+	UnsignedInt now = timeGetTime();
 	for( key = 0; key < 256; key++ )
 	{
 
 		if( BitIsSet( m_keyStatus[ key ].state, KEY_STATE_DOWN ) )
 		{
 
-			if( (m_inputFrame - m_keyStatus[ key ].sequence) > Keyboard::KEY_REPEAT_DELAY )
+			if( now - m_keyStatus[ key ].keyDownTimeMS > Keyboard::KEY_REPEAT_DELAY_MS )
 			{
 				// Add key to this frame
 				m_keys[ index ].key = (UnsignedByte)key;
@@ -233,8 +240,9 @@ Bool Keyboard::checkKeyRepeat( void )
 				for( index = 0; index< NUM_KEYS; index++ )
 					m_keyStatus[ index ].sequence = m_inputFrame;
 
-				// Set repeated key so it will repeat again in two frames
-				m_keyStatus[ key ].sequence = m_inputFrame - (Keyboard::KEY_REPEAT_DELAY + 2);
+				// Set repeated key so it will repeat again after a short interval
+				const UnsignedInt KEY_REPEAT_INTERVAL_MS = 67; // ~2 frames at 30 FPS
+				m_keyStatus[ key ].keyDownTimeMS = now - (Keyboard::KEY_REPEAT_DELAY_MS - KEY_REPEAT_INTERVAL_MS);
 
 				retVal = TRUE;
 				break;  // exit for key