improved shifting up video display when activating screen keyboard (Android)

[rocksndiamonds.git] / src / events.c

diff --git a/src/events.c b/src/events.c
index 2d1e0659a3dc2fb73449d40f9b4462c25aae9601..5bcdd5fb22c723e4aaba848b844e2b4d937f1b03 100644 (file)
--- a/src/events.c
+++ b/src/events.c
@@ -412,6 +412,11 @@ void HandleButtonEvent(ButtonEvent *event)
        event->x, event->y);
 #endif
 
+#if defined(HAS_SCREEN_KEYBOARD)
+  if (video.shifted_up)
+    event->y += video.shifted_up_pos;
+#endif
+
   motion_status = FALSE;
 
   if (event->type == EVENT_BUTTONPRESS)
@@ -867,21 +872,16 @@ void HandleTextEvent(TextEvent *event)
        GetKeyModState());
 #endif
 
-#if defined(PLATFORM_ANDROID)
-  if (game_status == GAME_MODE_PSEUDO_TYPENAME)
-  {
-    HandleTypeName(0, key);
-
+#if !defined(HAS_SCREEN_KEYBOARD)
+  // non-mobile devices: only handle key input with modifier keys pressed here
+  // (every other key input is handled directly as physical key input event)
+  if (!checkTextInputKeyModState())
     return;
-  }
 #endif
 
-  // only handle key input with text modifier keys pressed
-  if (checkTextInputKeyModState())
-  {
-    HandleKey(key, KEY_PRESSED);
-    HandleKey(key, KEY_RELEASED);
-  }
+  // process text input as "classic" (with uppercase etc.) key input event
+  HandleKey(key, KEY_PRESSED);
+  HandleKey(key, KEY_RELEASED);
 }
 
 void HandlePauseResumeEvent(PauseResumeEvent *event)