summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJonathan G Rennison <j.g.rennison@gmail.com>2019-11-04 18:16:34 +0000
committerCharles Pigott <charlespigott@googlemail.com>2019-11-10 17:58:42 +0000
commita15ace0f5b7efcc55717fa4f7ddfb0f50f5d0f6f (patch)
tree2e5dce72621828e6f7250f82ae9c1e5a8617192e /src
parent1dba06656d5dda3f8efc6a3dc2a8596428e17df5 (diff)
downloadopenttd-a15ace0f5b7efcc55717fa4f7ddfb0f50f5d0f6f.tar.xz
Fix #7783, Fix #7816: [SDL2] Fix input handling in edit context
In particular this fixes handling of the shift key
Diffstat (limited to 'src')
-rw-r--r--src/video/sdl2_v.cpp43
-rw-r--r--src/video/sdl2_v.h9
2 files changed, 46 insertions, 6 deletions
diff --git a/src/video/sdl2_v.cpp b/src/video/sdl2_v.cpp
index dca667834..24b060d6a 100644
--- a/src/video/sdl2_v.cpp
+++ b/src/video/sdl2_v.cpp
@@ -23,6 +23,7 @@
#include "../core/math_func.hpp"
#include "../fileio_func.h"
#include "../framerate_type.h"
+#include "../window_func.h"
#include "sdl2_v.h"
#include <SDL.h>
#include <mutex>
@@ -354,6 +355,29 @@ bool VideoDriver_SDL::ClaimMousePointer()
return true;
}
+/**
+ * This is called to indicate that an edit box has gained focus, text input mode should be enabled.
+ */
+void VideoDriver_SDL::EditBoxGainedFocus()
+{
+ if (!this->edit_box_focused) {
+ SDL_StartTextInput();
+ this->edit_box_focused = true;
+ }
+}
+
+/**
+ * This is called to indicate that an edit box has lost focus, text input mode should be disabled.
+ */
+void VideoDriver_SDL::EditBoxLostFocus()
+{
+ if (this->edit_box_focused) {
+ SDL_StopTextInput();
+ this->edit_box_focused = false;
+ }
+}
+
+
struct VkMapping {
SDL_Keycode vk_from;
byte vk_count;
@@ -444,7 +468,6 @@ static uint ConvertSdlKeyIntoMy(SDL_Keysym *sym, WChar *character)
/* The mod keys have no character. Prevent '?' */
if (sym->mod & KMOD_GUI ||
- sym->mod & KMOD_SHIFT ||
sym->mod & KMOD_CTRL ||
sym->mod & KMOD_ALT ||
unprintable) {
@@ -550,7 +573,8 @@ int VideoDriver_SDL::PollEvent()
uint keycode = ConvertSdlKeyIntoMy(&ev.key.keysym, &character);
// Only handle non-text keys here. Text is handled in
// SDL_TEXTINPUT below.
- if (keycode == WKC_DELETE ||
+ if (!this->edit_box_focused ||
+ keycode == WKC_DELETE ||
keycode == WKC_NUM_ENTER ||
keycode == WKC_LEFT ||
keycode == WKC_RIGHT ||
@@ -559,7 +583,6 @@ int VideoDriver_SDL::PollEvent()
keycode == WKC_HOME ||
keycode == WKC_END ||
keycode & WKC_META ||
- keycode & WKC_SHIFT ||
keycode & WKC_CTRL ||
keycode & WKC_ALT ||
(keycode >= WKC_F1 && keycode <= WKC_F12) ||
@@ -570,12 +593,17 @@ int VideoDriver_SDL::PollEvent()
break;
case SDL_TEXTINPUT: {
- WChar character;
+ if (!this->edit_box_focused) break;
SDL_Keycode kc = SDL_GetKeyFromName(ev.text.text);
uint keycode = ConvertSdlKeycodeIntoMy(kc);
- Utf8Decode(&character, ev.text.text);
- HandleKeypress(keycode, character);
+ if (keycode == WKC_BACKQUOTE && FocusedWindowIsConsole()) {
+ WChar character;
+ Utf8Decode(&character, ev.text.text);
+ HandleKeypress(keycode, character);
+ } else {
+ HandleTextInput(ev.text.text);
+ }
break;
}
case SDL_WINDOWEVENT: {
@@ -628,6 +656,9 @@ const char *VideoDriver_SDL::Start(const char * const *parm)
_draw_threaded = GetDriverParam(parm, "no_threads") == nullptr && GetDriverParam(parm, "no_thread") == nullptr;
+ SDL_StopTextInput();
+ this->edit_box_focused = false;
+
return nullptr;
}
diff --git a/src/video/sdl2_v.h b/src/video/sdl2_v.h
index ba7e322ed..ed8543ed4 100644
--- a/src/video/sdl2_v.h
+++ b/src/video/sdl2_v.h
@@ -37,10 +37,19 @@ public:
bool ClaimMousePointer() override;
+ void EditBoxGainedFocus() override;
+
+ void EditBoxLostFocus() override;
+
const char *GetName() const override { return "sdl"; }
private:
int PollEvent();
bool CreateMainSurface(uint w, uint h, bool resize);
+
+ /**
+ * This is true to indicate that keyboard input is in text input mode, and SDL_TEXTINPUT events are enabled.
+ */
+ bool edit_box_focused;
};
/** Factory for the SDL video driver. */