zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 11:10:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make sure we clear the keyboard buffer when beginning text input.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6665 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2018-02-16 08:33:32 +00:00
parent 451bdb4601
commit aa4c8f75f5
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
source/duke3d/src/menus.cpp
View file

@ -47,8 +47,10 @@ extern int32_t voting;
#define USERMAPENTRYLENGTH 25 #define USERMAPENTRYLENGTH 25
static FORCE_INLINE void WithSDL2_StartTextInput() static FORCE_INLINE void Menu_StartTextInput()
{ {
KB_FlushKeyboardQueue();
KB_ClearKeysDown();
#if defined EDUKE32_TOUCH_DEVICES && defined SDL_MAJOR_VERSION && SDL_MAJOR_VERSION > 1 #if defined EDUKE32_TOUCH_DEVICES && defined SDL_MAJOR_VERSION && SDL_MAJOR_VERSION > 1
# if defined __ANDROID__ # if defined __ANDROID__
AndroidShowKeyboard(1); AndroidShowKeyboard(1);
@ -58,7 +60,7 @@ static FORCE_INLINE void WithSDL2_StartTextInput()
#endif #endif
} }
static FORCE_INLINE void WithSDL2_StopTextInput() static FORCE_INLINE void Menu_StopTextInput()
{ {
#if defined EDUKE32_TOUCH_DEVICES && defined SDL_MAJOR_VERSION && SDL_MAJOR_VERSION > 1 #if defined EDUKE32_TOUCH_DEVICES && defined SDL_MAJOR_VERSION && SDL_MAJOR_VERSION > 1
# if defined __ANDROID__ # if defined __ANDROID__
@ -3934,7 +3936,7 @@ static void Menu_ChangingTo(Menu_t * m)
switch (m->type) switch (m->type)
{ {
case TextForm: case TextForm:
WithSDL2_StartTextInput(); Menu_StartTextInput();
break; break;
default: default:
break; break;
@ -5864,7 +5866,7 @@ static void Menu_RunInput_EntryString_Activate(MenuEntry_t *entry)
object->bufsize = TYPEBUFSIZE; object->bufsize = TYPEBUFSIZE;
Menu_EntryStringActivate(/*entry*/); Menu_EntryStringActivate(/*entry*/);
WithSDL2_StartTextInput(); Menu_StartTextInput();
} }
static void Menu_RunInput_EntryString_Submit(/*MenuEntry_t *entry, */MenuString_t *object) static void Menu_RunInput_EntryString_Submit(/*MenuEntry_t *entry, */MenuString_t *object)
@ -5876,7 +5878,7 @@ static void Menu_RunInput_EntryString_Submit(/*MenuEntry_t *entry, */MenuString_
} }
object->editfield = NULL; object->editfield = NULL;
WithSDL2_StopTextInput(); Menu_StopTextInput();
} }
static void Menu_RunInput_EntryString_Cancel(/*MenuEntry_t *entry, */MenuString_t *object) static void Menu_RunInput_EntryString_Cancel(/*MenuEntry_t *entry, */MenuString_t *object)
@ -5884,7 +5886,7 @@ static void Menu_RunInput_EntryString_Cancel(/*MenuEntry_t *entry, */MenuString_
Menu_EntryStringCancel(/*entry*/); Menu_EntryStringCancel(/*entry*/);
object->editfield = NULL; object->editfield = NULL;
WithSDL2_StopTextInput(); Menu_StopTextInput();
} }
static void Menu_RunInput_FileSelect_MovementVerify(MenuFileSelect_t *object) static void Menu_RunInput_FileSelect_MovementVerify(MenuFileSelect_t *object)
@ -6010,7 +6012,7 @@ static void Menu_RunInput(Menu_t *cm)
object->input = NULL; object->input = NULL;
Menu_AnimateChange(cm->parentID, cm->parentAnimation); Menu_AnimateChange(cm->parentID, cm->parentAnimation);
WithSDL2_StopTextInput(); Menu_StopTextInput();
} }
else if (hitstate == 1 || Menu_RunInput_MouseAdvance()) else if (hitstate == 1 || Menu_RunInput_MouseAdvance())
{ {
@ -6019,7 +6021,7 @@ static void Menu_RunInput(Menu_t *cm)
Menu_TextFormSubmit(object->input); Menu_TextFormSubmit(object->input);
object->input = NULL; object->input = NULL;
WithSDL2_StopTextInput(); Menu_StopTextInput();
} }
break; break;
} }