adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restrict SDL_Start/StopTextInput calls to the UI thread

Browse Source
This commit is contained in:
Michael Martin
2020-12-23 16:18:44 -08:00
parent 487ad9014d
commit d15087102f
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/libs/input/sdl/input.c
+19 -7
View File
@@ -39,7 +39,11 @@ static UniChar lastchar;
static unsigned int num_keys = 0; static unsigned int num_keys = 0;
static int *kbdstate = NULL; static int *kbdstate = NULL;
// Holds all SDL keys +1 for holding invalid values // Holds all SDL keys +1 for holding invalid values
#endif // Later versions of SDL use the text input API instead #else // Later versions of SDL use the text input API instead
static BOOLEAN set_character_mode = FALSE;
// Records whether the UI thread has caught up with game thread
// on this setting
#endif
static volatile int *menu_vec; static volatile int *menu_vec;
static int num_menu; static int num_menu;
@@ -304,17 +308,11 @@ EnterCharacterMode (void)
lastchar = 0; lastchar = 0;
in_character_mode = TRUE; in_character_mode = TRUE;
VControl_ResetInput (); VControl_ResetInput ();
#if SDL_MAJOR_VERSION > 1
SDL_StartTextInput ();
#endif
} }
void void
ExitCharacterMode (void) ExitCharacterMode (void)
{ {
#if SDL_MAJOR_VERSION > 1
SDL_StopTextInput ();
#endif
VControl_ResetInput (); VControl_ResetInput ();
in_character_mode = FALSE; in_character_mode = FALSE;
kbdhead = kbdtail = 0; kbdhead = kbdtail = 0;
@@ -377,6 +375,20 @@ ProcessInputEvent (const SDL_Event *Event)
ProcessMouseEvent (Event); ProcessMouseEvent (Event);
#if SDL_MAJOR_VERSION > 1
if (in_character_mode && !set_character_mode)
{
set_character_mode = TRUE;
SDL_StartTextInput ();
}
if (!in_character_mode && set_character_mode)
{
set_character_mode = FALSE;
SDL_StopTextInput ();
}
#endif
// In character mode with NumLock on, numpad chars bypass VControl // In character mode with NumLock on, numpad chars bypass VControl
// so that menu arrow events are not produced // so that menu arrow events are not produced
if (!is_numpad_char_event (Event)) if (!is_numpad_char_event (Event))