X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fevents.c;h=50a39762865d8b0e6e1c5ee3714f998ec164d49a;hb=307f92e3ee14cdab72466e5998eef66c0ef3ae38;hp=0be6815b798acfd855e5644d1e745e3c721efcc9;hpb=faad97c450f035fb84748e8ca72048e53c92de78;p=rocksndiamonds.git

diff --git a/src/events.c b/src/events.c
index 0be6815b..50a39762 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,25 @@ void HandleFingerEvent(FingerEvent *event)
   }
 #endif
 }
+
+void HandleTextEvent(TextEvent *event)
+{
+  char *text = event->text;
+  Key key = getKeyFromKeyName(text);
+
+#if DEBUG_EVENTS
+  Error(ERR_DEBUG, "TEXT EVENT: text == '%s', resulting key == %d (%s)",
+	text,
+	key,
+	getKeyNameFromKey(key));
+#endif
+
+  if (game_status != GAME_MODE_PLAYING && GetKeyModState() != KMOD_None)
+  {
+    HandleKey(key, KEY_PRESSED);
+    HandleKey(key, KEY_RELEASED);
+  }
+}
 #endif
 
 void HandleKeyEvent(KeyEvent *event)
@@ -482,11 +505,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
 
@@ -503,8 +528,15 @@ void HandleKeyEvent(KeyEvent *event)
     key = KSYM_Escape;
 #endif
 
+#if defined(TARGET_SDL2)
+  HandleKeyModState(keymod, key_status);
+
+  if (game_status == GAME_MODE_PLAYING || GetKeyModState() == KMOD_None)
+    HandleKey(key, key_status);
+#else
   HandleKeyModState(keymod, key_status);
   HandleKey(key, key_status);
+#endif
 }
 
 void HandleFocusEvent(FocusChangeEvent *event)