Events: Don't set keyboard.character for unprintable characters

gemrb · Jun 12, 2017 · 7d1d440 · 7d1d440
1 parent 57fb4f8
commit 7d1d440
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/gemrb/core/GUI/EventMgr.cpp b/gemrb/core/GUI/EventMgr.cpp
@@ -184,7 +184,7 @@ Event EventMgr::CreateKeyEvent(KeyboardKey key, bool down, int mod)
 	e.isScreen = false;
 
 	KeyboardKey character = 0;
-	if (key >= 0x20) {
+	if (key >= ' ' && key < GEM_LEFT) { // if printable
 		// FIXME: need to translate the keycode for e.keyboard.character
 		// probably need to lookup what encoding we are currently using
 		character = key;

diff --git a/gemrb/plugins/SDLVideo/SDLVideo.cpp b/gemrb/plugins/SDLVideo/SDLVideo.cpp
@@ -218,7 +218,9 @@ int SDLVideoDriver::ProcessEvent(const SDL_Event & event)
 				default: break;
 			}
 			e = EvntManager->CreateKeyEvent(key, true, modstate);
-			e.keyboard.character = event.key.keysym.unicode; // FIXME: invalid in SDL2
+			if (e.keyboard.character) {
+				e.keyboard.character = event.key.keysym.unicode; // FIXME: invalid in SDL2
+			}
 			EvntManager->DispatchEvent(e);
 			break;
 		case SDL_MOUSEMOTION: