1
0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-06-28 07:28:30 +02:00
VVVVVV/desktop_version/src
Misa d7040b23d0 Axe manual state trackers and use SDL_IsTextInputActive()
After looking at pull request #446, I got a bit annoyed that we have TWO
variables, key.textentrymode and ed.textentry, that we rolled ourselves
to track the state of something SDL already provides us a function to
easily query: SDL_IsTextInputActive(). We don't need to have either of
these two variables, and we shouldn't.

So that's what I do in this patch. Both variables have been axed in
favor of using this function, and I just made a wrapper out of it, named
key.textentry().

For bonus points, this gets rid of the ugly NO_CUSTOM_LEVELS and
NO_EDITOR ifdef in main.cpp, since text entry is enabled when entering
the script list and disabled when exiting it. This makes the code there
easier to read, too.

Furthermore, apparently key.textentrymode was initialized to *true*
instead of false... for whatever reason. But that's gone now, too.

Now, you'd think there wouldn't be any downside to using
SDL_IsTextInputActive(). After all, it's a function that SDL itself
provides, right?

Wrong. For whatever reason, it seems like text input is active *from the
start of the program*, meaning that what would happen is I would go into
the editor, and find that I can't move around nor place tiles nor
anything else. Then I would press Esc, and then suddenly become able to
do those things I wanted to do before.

I have no idea why the above happens, but all I can do is to just insert
an SDL_StopTextInput() immediately after the SDL_Init() in main.cpp. Of
course, I have to surround it with an SDL_IsTextInputActive() check to
make sure I don't do anything extraneous by stopping input when it's
already stopped.
2020-08-13 17:51:38 -04:00
..
BinaryBlob.cpp Separate includes into sections and alphabetize them 2020-07-19 21:37:40 -04:00
BinaryBlob.h Add binaryBlob::getExtra() 2020-06-30 21:07:05 -04:00
BlockV.cpp Remove unnecessary string initializations from constructors 2020-07-08 19:14:21 -04:00
BlockV.h Consistently use angle brackets for SDL.h includes 2020-07-19 21:37:40 -04:00
Credits.h Adding myself as a contributor. 2020-08-12 23:07:13 -04:00
editor.cpp Axe manual state trackers and use SDL_IsTextInputActive() 2020-08-13 17:51:38 -04:00
editor.h Axe manual state trackers and use SDL_IsTextInputActive() 2020-08-13 17:51:38 -04:00
Ent.cpp Remove unnecessary includes from header files 2020-07-19 21:37:40 -04:00
Ent.h Remove unnecessary includes from header files 2020-07-19 21:37:40 -04:00
Entity.cpp Move tele/activity/trophytext conds to collision detection 2020-08-03 00:12:15 -04:00
Entity.h Separate includes into sections and alphabetize them 2020-07-19 21:37:40 -04:00
Enums.h Hello WWWWWWorld! 2020-01-08 10:37:50 -05:00
FileSystemUtils.cpp Fix other array decay too 2020-08-09 13:39:12 -04:00
FileSystemUtils.h Only re-color one-ways if assets are not mounted 2020-06-30 18:06:14 -04:00
Finalclass.cpp Separate includes into sections and alphabetize them 2020-07-19 21:37:40 -04:00
Finalclass.h Remove unnecessary includes from header files 2020-07-19 21:37:40 -04:00
Game.cpp Missed adding the option to the createmenu method. 2020-08-08 19:10:31 -04:00
Game.h Added ability to bind restart to a controller. 2020-08-08 19:02:14 -04:00
GOGNetwork.c Ifdef out network code for M&P 2020-08-02 23:43:55 -04:00
Graphics.cpp Remove allowspecial, replace with opaqueness check 2020-08-06 22:12:15 -04:00
Graphics.h Remove allowspecial, replace with opaqueness check 2020-08-06 22:12:15 -04:00
GraphicsResources.cpp Separate includes into sections and alphabetize them 2020-07-19 21:37:40 -04:00
GraphicsResources.h Consistently use angle brackets for SDL.h includes 2020-07-19 21:37:40 -04:00
GraphicsUtil.cpp Remove -1,-1 offset from ScaleSurface() 2020-08-06 22:10:47 -04:00
GraphicsUtil.h Ax ScaleSurfaceSlow() in favor of ScaleSurface() 2020-08-06 22:10:47 -04:00
Input.cpp Don't fade music out when returning to the menu if it's Presenting VVVVVV 2020-08-13 10:08:20 -04:00
Input.h Remove unnecessary includes from header files 2020-07-19 21:37:40 -04:00
KeyPoll.cpp Axe manual state trackers and use SDL_IsTextInputActive() 2020-08-13 17:51:38 -04:00
KeyPoll.h Axe manual state trackers and use SDL_IsTextInputActive() 2020-08-13 17:51:38 -04:00
Labclass.cpp Separate includes into sections and alphabetize them 2020-07-19 21:37:40 -04:00
Labclass.h Remove unnecessary includes from header files 2020-07-19 21:37:40 -04:00
Logic.cpp Move tele/activity/trophytext conds to collision detection 2020-08-03 00:12:15 -04:00
Logic.h Remove unnecessary includes from header files 2020-07-19 21:37:40 -04:00
main.cpp Axe manual state trackers and use SDL_IsTextInputActive() 2020-08-13 17:51:38 -04:00
MakeAndPlay.h Re-comment out #define MAKEANDPLAY 2020-02-09 10:42:03 -05:00
Map.cpp Fix bounding logic for enemies 2020-08-02 23:57:55 -04:00
Map.h Separate includes into sections and alphabetize them 2020-07-19 21:37:40 -04:00
Maths.h Hello WWWWWWorld! 2020-01-08 10:37:50 -05:00
Music.cpp Fix #400 2020-08-01 16:09:24 -04:00
Music.h Separate includes into sections and alphabetize them 2020-07-19 21:37:40 -04:00
Network.c Remove unnecessary externs from network func forward decls 2020-08-02 23:43:55 -04:00
Network.h Add support for multiple Network backends, stub in GOGNetwork 2020-01-13 11:15:22 -05:00
Otherlevel.cpp Change back the order of entity creation 2020-07-29 10:04:27 -04:00
Otherlevel.h Remove unnecessary includes from header files 2020-07-19 21:37:40 -04:00
preloader.cpp Separate includes into sections and alphabetize them 2020-07-19 21:37:40 -04:00
preloader.h Remove unnecessary includes from header files 2020-07-19 21:37:40 -04:00
Render.cpp Added ability to bind restart to a controller. 2020-08-08 19:02:14 -04:00
Render.h Remove unnecessary includes from header files 2020-07-19 21:37:40 -04:00
Screen.cpp Separate includes into sections and alphabetize them 2020-07-19 21:37:40 -04:00
Screen.h Refactor startup to load config before calling Screen::init 2020-07-08 14:30:57 -04:00
Script.cpp Replace all usages of atoi() with help.Int() 2020-08-07 01:00:49 -04:00
Script.h Remove unnecessary includes from header files 2020-07-19 21:37:40 -04:00
Scripts.cpp Separate includes into sections and alphabetize them 2020-07-19 21:37:40 -04:00
SoundSystem.cpp Separate includes into sections and alphabetize them 2020-07-19 21:37:40 -04:00
SoundSystem.h Revert "Add destructor for SoundTrack/MusicTrack (and explicitly define move constructor to prevent double-free)" 2020-06-07 22:40:03 -04:00
Spacestation2.cpp Separate includes into sections and alphabetize them 2020-07-19 21:37:40 -04:00
Spacestation2.h Remove unnecessary includes from header files 2020-07-19 21:37:40 -04:00
SteamNetwork.c Ifdef out network code for M&P 2020-08-02 23:43:55 -04:00
TerminalScripts.cpp Separate includes into sections and alphabetize them 2020-07-19 21:37:40 -04:00
Textbox.cpp Remove allowspecial, replace with opaqueness check 2020-08-06 22:12:15 -04:00
Textbox.h Remove allowspecial, replace with opaqueness check 2020-08-06 22:12:15 -04:00
Tower.cpp Remove zeroed arrays from tower functions in M&P 2020-08-03 00:29:15 -04:00
Tower.h Change all tilemaps to be short[1200] instead of int[1200] 2020-07-19 16:25:53 -04:00
UtilityClass.cpp Add fallback parameter to UtilityClass::Int() 2020-08-07 01:00:49 -04:00
UtilityClass.h Add fallback parameter to UtilityClass::Int() 2020-08-07 01:00:49 -04:00
WarpClass.cpp Separate includes into sections and alphabetize them 2020-07-19 21:37:40 -04:00
WarpClass.h Remove unnecessary includes from header files 2020-07-19 21:37:40 -04:00