Skip to content

Add nextRepeatTime and fix key repeat logic and backspace burst deleting characters #352

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MrS-ibra wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add nextRepeatTime and fix key repeat logic and backspace burst deleting characters #352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions GeneralsMD/Code/GameEngine/Include/GameClient/Keyboard.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ struct KeyboardIO
UnsignedByte status; // StatusType, above
UnsignedShort state; // KEY_STATE_* in KeyDefs.h
UnsignedInt keyDownTimeMsec; // real-time in milliseconds when key went down
UnsignedInt nextRepeatTimeMsec; // real-time in milliseconds when key should next repeat

};

Expand All @@ -88,8 +89,8 @@ class Keyboard : public SubsystemInterface

enum
{
KEY_REPEAT_DELAY_MSEC = 333, // 10 frames at 30 FPS
KEY_REPEAT_INTERVAL_MSEC = 67 // ~2 frames at 30 FPS
KEY_REPEAT_DELAY_MSEC = 333,
KEY_REPEAT_INTERVAL_MSEC = 33
};

public:
Expand Down
28 changes: 16 additions & 12 deletions GeneralsMD/Code/GameEngine/Source/GameClient/Input/Keyboard.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,10 @@ void Keyboard::updateKeys( void )
// Update key down time for new key presses
if( BitIsSet( m_keys[ index ].state, KEY_STATE_DOWN ) )
{
m_keyStatus[ m_keys[ index ].key ].keyDownTimeMsec = m_keys[ index ].keyDownTimeMsec;
const UnsignedInt downTime = m_keys[index].keyDownTimeMsec;
m_keyStatus[m_keys[index].key].keyDownTimeMsec = downTime;
m_keyStatus[m_keys[index].key].nextRepeatTimeMsec = downTime + Keyboard::KEY_REPEAT_DELAY_MSEC;

}

// prevent ALT-TAB from causing a TAB event
Expand Down Expand Up @@ -225,26 +228,27 @@ Bool Keyboard::checkKeyRepeat( void )
if( BitIsSet( m_keyStatus[ key ].state, KEY_STATE_DOWN ) )
{

const UnsignedInt now = timeGetTime();
const UnsignedInt keyDownTime = m_keyStatus[ key ].keyDownTimeMsec;
const UnsignedInt elapsedMsec = now - keyDownTime;
UnsignedInt now = timeGetTime();
UnsignedInt &nextRepeatTime = m_keyStatus[ key ].nextRepeatTimeMsec;

if( elapsedMsec > Keyboard::KEY_REPEAT_DELAY_MSEC )
if(now >= nextRepeatTime)
{
// Add key to this frame
m_keys[ index ].key = (UnsignedByte)key;
m_keys[ index ].state = KEY_STATE_DOWN | KEY_STATE_AUTOREPEAT; // note: not a bitset; this is an assignment
m_keys[ index ].state = KEY_STATE_DOWN;
m_keys[ index ].status = KeyboardIO::STATUS_UNUSED;

// Set End Flag
m_keys[ ++index ].key = KEY_NONE;

// Set all keys as new to prevent multiple keys repeating
for( index = 0; index< NUM_KEYS; index++ )
m_keyStatus[ index ].keyDownTimeMsec = now;
for( index = 0; index < NUM_KEYS; ++index )
{
if (index != key)
{
m_keyStatus[index].nextRepeatTimeMsec = now + Keyboard::KEY_REPEAT_DELAY_MSEC;
}
}

// Set repeated key so it will repeat again after the interval
m_keyStatus[ key ].keyDownTimeMsec = now - (Keyboard::KEY_REPEAT_DELAY_MSEC + Keyboard::KEY_REPEAT_INTERVAL_MSEC);
nextRepeatTime = now + Keyboard::KEY_REPEAT_INTERVAL_MSEC;

retVal = TRUE;
break; // exit for key
Expand Down
Loading