rnd-20140104-2-src

[rocksndiamonds.git] / src / events.c

diff --git a/src/events.c b/src/events.c
index d017a6343f9dc205540bd37ec277bbfb28a12542..6fc55ea5d32433f31304c3ac969b94452ea07a81 100644 (file)
--- 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;
@@ -409,11 +413,13 @@ void HandleFingerEvent(FingerEvent *event)
        event->pressure);
 #endif
 
+#if 0
   int x = (int)(event->x * video.width);
   int y = (int)(event->y * video.height);
   int button = MB_LEFTBUTTON;
 
   Error(ERR_DEBUG, "=> screen x/y %d/%d", x, y);
+#endif
 
 #if 0
   if (++num_events >= max_events)
@@ -421,6 +427,7 @@ void HandleFingerEvent(FingerEvent *event)
 #endif
 
 #if 1
+#if 0
   if (event->type == EVENT_FINGERPRESS ||
       event->type == EVENT_FINGERMOTION)
     button_status = button;
@@ -429,17 +436,30 @@ void HandleFingerEvent(FingerEvent *event)
 
   int max_x = SX + SXSIZE;
   int max_y = SY + SYSIZE;
+#endif
 
+#if 1
+  if (game_status == GAME_MODE_PLAYING)
+#else
   if (game_status == GAME_MODE_PLAYING &&
       x < max_x)
+#endif
   {
     int key_status = (event->type == EVENT_FINGERRELEASE ? KEY_RELEASED :
                      KEY_PRESSED);
+#if 1
+    Key key = (event->y < 1.0 / 3.0 ? setup.input[0].key.up :
+              event->y > 2.0 / 3.0 ? setup.input[0].key.down :
+              event->x < 1.0 / 3.0 ? setup.input[0].key.left :
+              event->x > 2.0 / 3.0 ? setup.input[0].key.right :
+              setup.input[0].key.drop);
+#else
     Key key = (y <     max_y / 3 ? setup.input[0].key.up :
               y > 2 * max_y / 3 ? setup.input[0].key.down :
               x <     max_x / 3 ? setup.input[0].key.left :
               x > 2 * max_x / 3 ? setup.input[0].key.right :
               setup.input[0].key.drop);
+#endif
 
     Error(ERR_DEBUG, "=> key == %d, key_status == %d", key, key_status);
 
@@ -447,17 +467,50 @@ void HandleFingerEvent(FingerEvent *event)
   }
   else
   {
-#if 1
+#if 0
     Error(ERR_DEBUG, "::: button_status == %d, button == %d\n",
          button_status, button);
-#endif
 
-#if 1
     HandleButton(x, y, button_status, button);
 #endif
   }
 #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)
@@ -468,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
 
@@ -490,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)