zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-26 03:30:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Menus: don't enable/disable SDL text input.

Browse source 
At program start, text input is enabled anyway and it does not seem to have any
adverse effects. However, disabling it after e.g. game save leads to the OSD
not working properly any more: normal keys are passed via handleevent_pollsdl's
SDL_TEXTINPUT case.

git-svn-id: https://svn.eduke32.com/eduke32@5326 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2015-08-09 09:58:47 +00:00
parent 9b68ee5693
commit 8fb903a83a
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
polymer/eduke32/source/menus.c
View file

@ -59,6 +59,7 @@ extern int32_t voting;
#define USERMAPENTRYLENGTH 25 #define USERMAPENTRYLENGTH 25
#if 0
static inline void WithSDL2_StartTextInput() static inline void WithSDL2_StartTextInput()
{ {
#if defined SDL_MAJOR_VERSION && SDL_MAJOR_VERSION > 1 #if defined SDL_MAJOR_VERSION && SDL_MAJOR_VERSION > 1
@ -72,6 +73,7 @@ static inline void WithSDL2_StopTextInput()
SDL_StopTextInput(); SDL_StopTextInput();
#endif #endif
} }
#endif
#define mgametext(x,y,t) G_ScreenText(STARTALPHANUM, x, y, 65536, 0, 0, t, 0, 0, 2|8|16|ROTATESPRITE_FULL16, 0, 5<<16, 8<<16, -1<<16, 0, 0, 0, 0, xdim-1, ydim-1) #define mgametext(x,y,t) G_ScreenText(STARTALPHANUM, x, y, 65536, 0, 0, t, 0, 0, 2|8|16|ROTATESPRITE_FULL16, 0, 5<<16, 8<<16, -1<<16, 0, 0, 0, 0, xdim-1, ydim-1)
#define mgametextcenter(x,y,t) G_ScreenText(STARTALPHANUM, (MENU_MARGIN_CENTER<<16) + (x), y, 65536, 0, 0, t, 0, 0, 2|8|16|ROTATESPRITE_FULL16, 0, 5<<16, 8<<16, -1<<16, 1<<16, TEXT_XCENTER, 0, 0, xdim-1, ydim-1) #define mgametextcenter(x,y,t) G_ScreenText(STARTALPHANUM, (MENU_MARGIN_CENTER<<16) + (x), y, 65536, 0, 0, t, 0, 0, 2|8|16|ROTATESPRITE_FULL16, 0, 5<<16, 8<<16, -1<<16, 1<<16, TEXT_XCENTER, 0, 0, xdim-1, ydim-1)
@ -3416,7 +3418,6 @@ void M_ChangeMenu(MenuID_t cm)
{ {
typebuf[0] = 0; typebuf[0] = 0;
((MenuTextForm_t*)m_currentMenu->object)->input = typebuf; ((MenuTextForm_t*)m_currentMenu->object)->input = typebuf;
WithSDL2_StartTextInput();
} }
else if (m_currentMenu->type == FileSelect) else if (m_currentMenu->type == FileSelect)
M_MenuFileSelectInit((MenuFileSelect_t*)m_currentMenu->object); M_MenuFileSelectInit((MenuFileSelect_t*)m_currentMenu->object);
@ -5179,7 +5180,6 @@ static void M_RunMenuInput_MenuEntryString_Activate(MenuEntry_t *entry)
object->maxlength = TYPEBUFSIZE; object->maxlength = TYPEBUFSIZE;
M_MenuEntryStringActivate(/*entry*/); M_MenuEntryStringActivate(/*entry*/);
WithSDL2_StartTextInput();
} }
static void M_RunMenuInput_MenuEntryString_Submit(MenuEntry_t *entry, MenuString_t *object) static void M_RunMenuInput_MenuEntryString_Submit(MenuEntry_t *entry, MenuString_t *object)
@ -5188,7 +5188,6 @@ static void M_RunMenuInput_MenuEntryString_Submit(MenuEntry_t *entry, MenuString
Bstrncpy(object->variable, object->editfield, object->maxlength); Bstrncpy(object->variable, object->editfield, object->maxlength);
object->editfield = NULL; object->editfield = NULL;
WithSDL2_StopTextInput();
} }
static void M_RunMenuInput_MenuEntryString_Cancel(/*MenuEntry_t *entry, */MenuString_t *object) static void M_RunMenuInput_MenuEntryString_Cancel(/*MenuEntry_t *entry, */MenuString_t *object)
@ -5196,7 +5195,6 @@ static void M_RunMenuInput_MenuEntryString_Cancel(/*MenuEntry_t *entry, */MenuSt
M_MenuEntryStringCancel(/*entry*/); M_MenuEntryStringCancel(/*entry*/);
object->editfield = NULL; object->editfield = NULL;
WithSDL2_StopTextInput();
} }
static void M_RunMenuInput_FileSelect_MovementVerify(MenuFileSelect_t *object) static void M_RunMenuInput_FileSelect_MovementVerify(MenuFileSelect_t *object)
@ -5320,7 +5318,6 @@ static void M_RunMenuInput(Menu_t *cm)
object->input = NULL; object->input = NULL;
M_ChangeMenuAnimate(cm->parentID, cm->parentAnimation); M_ChangeMenuAnimate(cm->parentID, cm->parentAnimation);
WithSDL2_StopTextInput();
} }
else if (hitstate == 1 || M_RunMenuInput_MouseAdvance()) else if (hitstate == 1 || M_RunMenuInput_MouseAdvance())
{ {
@ -5329,7 +5326,6 @@ static void M_RunMenuInput(Menu_t *cm)
M_MenuTextFormSubmit(object->input); M_MenuTextFormSubmit(object->input);
object->input = NULL; object->input = NULL;
WithSDL2_StopTextInput();
} }
break; break;
} }