X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=inline;f=src%2Fevents.c;h=6fc55ea5d32433f31304c3ac969b94452ea07a81;hb=cf0ff8143f99393006fc7ebdafd9616becf0ccc6;hp=0be6815b798acfd855e5644d1e745e3c721efcc9;hpb=d6a1a6cb31174ac804f9ad54a919d65478da588f;p=rocksndiamonds.git

diff --git a/src/events.c b/src/events.c
index 0be6815b..6fc55ea5 100644
--- a/src/events.c
+++ b/src/events.c
@@ -167,13 +167,17 @@ void EventLoop(void)
   	  case EVENT_FINGERMOTION:
   	    HandleFingerEvent((FingerEvent *) &event);
   	    break;
+
+	  case EVENT_TEXTINPUT:
+  	    HandleTextEvent((TextEvent *) &event);
+  	    break;
 #endif
 
   	  case EVENT_KEYPRESS:
   	  case EVENT_KEYRELEASE:
   	    HandleKeyEvent((KeyEvent *) &event);
   	    break;
-  
+
   	  default:
   	    HandleOtherEvents(&event);
   	    break;
@@ -472,6 +476,41 @@ void HandleFingerEvent(FingerEvent *event)
   }
 #endif
 }
+
+static boolean checkTextInputKeyModState()
+{
+  // when playing, only handle raw key events and ignore text input
+  if (game_status == GAME_MODE_PLAYING)
+    return FALSE;
+
+  return ((GetKeyModState() & KMOD_TextInput) != KMOD_None);
+}
+
+void HandleTextEvent(TextEvent *event)
+{
+  char *text = event->text;
+  Key key = getKeyFromKeyName(text);
+
+#if DEBUG_EVENTS
+  Error(ERR_DEBUG, "TEXT EVENT: text == '%s' [%d byte(s), '%c'/%d], resulting key == %d (%s)",
+	text,
+	strlen(text),
+	text[0], (int)(text[0]),
+	key,
+	getKeyNameFromKey(key));
+#endif
+
+  // if (game_status != GAME_MODE_PLAYING && GetKeyModState() != KMOD_None)
+  /*
+  if (game_status != GAME_MODE_PLAYING &&
+      (GetKeyModState() & KMOD_TextInput) != KMOD_None)
+  */
+  if (checkTextInputKeyModState())
+  {
+    HandleKey(key, KEY_PRESSED);
+    HandleKey(key, KEY_RELEASED);
+  }
+}
 #endif
 
 void HandleKeyEvent(KeyEvent *event)
@@ -482,11 +521,13 @@ void HandleKeyEvent(KeyEvent *event)
   Key keymod = (with_modifiers ? GetEventKey(event, FALSE) : key);
 
 #if DEBUG_EVENTS
-  Error(ERR_DEBUG, "KEY EVENT: key was %s, keysym.scancode == %d, keysym.sym == %d, resulting key == %d (%s)",
+  Error(ERR_DEBUG, "KEY EVENT: key was %s, keysym.scancode == %d, keysym.sym == %d, keymod = %d, GetKeyModState() = 0x%04x, resulting key == %d (%s)",
 	event->type == EVENT_KEYPRESS ? "pressed" : "released",
 	event->keysym.scancode,
 	event->keysym.sym,
-	GetEventKey(event, TRUE),
+	keymod,
+	GetKeyModState(),
+	key,
 	getKeyNameFromKey(key));
 #endif
 
@@ -504,7 +545,19 @@ void HandleKeyEvent(KeyEvent *event)
 #endif
 
   HandleKeyModState(keymod, key_status);
+
+#if defined(TARGET_SDL2)
+
+  // if (game_status == GAME_MODE_PLAYING || GetKeyModState() == KMOD_None)
+  /*
+  if (game_status == GAME_MODE_PLAYING ||
+      (GetKeyModState() & KMOD_TextInput) == KMOD_None)
+  */
+  if (!checkTextInputKeyModState())
+    HandleKey(key, key_status);
+#else
   HandleKey(key, key_status);
+#endif
 }
 
 void HandleFocusEvent(FocusChangeEvent *event)