X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fevents.c;h=8d1fb9749eb0364fc6872aeac23abeed12124b69;hb=ee7fcac2432fb3514501711605c5f01a1bf1a13f;hp=0fd37032ba306f436f8be3ebcc0a4edb79a8f00c;hpb=70357bcc12a82ce34b9a597cf2ebdb176724a222;p=rocksndiamonds.git

diff --git a/src/events.c b/src/events.c
index 0fd37032..8d1fb974 100644
--- a/src/events.c
+++ b/src/events.c
@@ -676,7 +676,10 @@ void HandleFingerEvent(FingerEvent *event)
   if (game_status != GAME_MODE_PLAYING)
     return;
 
-  if (strEqual(setup.touch.control_type, TOUCH_CONTROL_FOLLOW_FINGER))
+  if (level.game_engine_type == GAME_ENGINE_TYPE_MM)
+    return;
+
+  if (strEqual(setup.touch.control_type, TOUCH_CONTROL_OFF))
     return;
 
   if (strEqual(setup.touch.control_type, TOUCH_CONTROL_VIRTUAL_BUTTONS))
@@ -824,6 +827,9 @@ void HandleFingerEvent(FingerEvent *event)
     return;
   }
 
+  if (!strEqual(setup.touch.control_type, TOUCH_CONTROL_WIPE_GESTURES))
+    return;
+
   // use touch direction control
 
   if (event->type == EVENT_FINGERPRESS)
@@ -959,24 +965,131 @@ void HandleFingerEvent(FingerEvent *event)
   }
 }
 
-static void HandleFollowFinger(int mx, int my, int button)
+#endif
+
+static void HandleButtonOrFinger_MM(int mx, int my, int button)
+{
+  static int old_mx = 0, old_my = 0;
+  static int last_button = MB_LEFTBUTTON;
+  static boolean touched = FALSE;
+  static boolean tapped = FALSE;
+
+  if (strEqual(setup.touch.control_type, TOUCH_CONTROL_WIPE_GESTURES))
+  {
+    // screen tile was tapped (but finger not touching the screen anymore)
+    // (this point will also be reached without receiving a touch event)
+    if (tapped && !touched)
+    {
+      SetPlayerMouseAction(old_mx, old_my, MB_RELEASED);
+
+      tapped = FALSE;
+    }
+
+    // stop here if this function was not triggered by a touch event
+    if (button == -1)
+      return;
+
+    if (button == MB_PRESSED && IN_GFX_FIELD_PLAY(mx, my))
+    {
+      // finger started touching the screen
+
+      touched = TRUE;
+      tapped = TRUE;
+
+      if (!motion_status)
+      {
+	old_mx = mx;
+	old_my = my;
+
+	ClearPlayerMouseAction();
+
+	Error(ERR_DEBUG, "---------- TOUCH ACTION STARTED ----------");
+      }
+    }
+    else if (button == MB_RELEASED && touched)
+    {
+      // finger stopped touching the screen
+
+      touched = FALSE;
+
+      if (tapped)
+	SetPlayerMouseAction(old_mx, old_my, last_button);
+      else
+	SetPlayerMouseAction(old_mx, old_my, MB_RELEASED);
+
+      Error(ERR_DEBUG, "---------- TOUCH ACTION STOPPED ----------");
+    }
+
+    if (touched)
+    {
+      // finger moved while touching the screen
+
+      int old_x = getLevelFromScreenX(old_mx);
+      int old_y = getLevelFromScreenY(old_my);
+      int new_x = getLevelFromScreenX(mx);
+      int new_y = getLevelFromScreenY(my);
+
+      if (new_x != old_x || new_y != old_y)
+	tapped = FALSE;
+
+      if (new_x != old_x)
+      {
+	// finger moved left or right from (horizontal) starting position
+
+	int button_nr = (new_x < old_x ? MB_LEFTBUTTON : MB_RIGHTBUTTON);
+
+	SetPlayerMouseAction(old_mx, old_my, button_nr);
+
+	last_button = button_nr;
+
+	Error(ERR_DEBUG, "---------- TOUCH ACTION: ROTATING ----------");
+      }
+      else
+      {
+	// finger stays at or returned to (horizontal) starting position
+
+	SetPlayerMouseAction(old_mx, old_my, MB_RELEASED);
+
+	Error(ERR_DEBUG, "---------- TOUCH ACTION PAUSED ----------");
+      }
+    }
+  }
+  else if (strEqual(setup.touch.control_type, TOUCH_CONTROL_FOLLOW_FINGER))
+  {
+  }
+}
+
+static void HandleButtonOrFinger(int mx, int my, int button)
 {
   static int old_mx = 0, old_my = 0;
   static Key motion_key_x = KSYM_UNDEFINED;
   static Key motion_key_y = KSYM_UNDEFINED;
+  static boolean touched = FALSE;
   static boolean started_on_player = FALSE;
   static boolean player_is_dropping = FALSE;
   static int player_drop_count = 0;
   static int last_player_x = -1;
   static int last_player_y = -1;
 
+  if (game_status != GAME_MODE_PLAYING)
+    return;
+
+  if (strEqual(setup.touch.control_type, TOUCH_CONTROL_OFF))
+    return;
+
+  if (level.game_engine_type == GAME_ENGINE_TYPE_MM)
+  {
+    HandleButtonOrFinger_MM(mx, my, button);
+
+    return;
+  }
+
   if (!strEqual(setup.touch.control_type, TOUCH_CONTROL_FOLLOW_FINGER))
     return;
 
   if (button == MB_PRESSED && IN_GFX_FIELD_PLAY(mx, my))
   {
-    touch_info[0].touched = TRUE;
-    touch_info[0].key = 0;
+    touched = TRUE;
 
     old_mx = mx;
     old_my = my;
@@ -995,10 +1108,9 @@ static void HandleFollowFinger(int mx, int my, int button)
       Error(ERR_DEBUG, "---------- TOUCH ACTION STARTED ----------");
     }
   }
-  else if (button == MB_RELEASED && touch_info[0].touched)
+  else if (button == MB_RELEASED && touched)
   {
-    touch_info[0].touched = FALSE;
-    touch_info[0].key = 0;
+    touched = FALSE;
 
     old_mx = 0;
     old_my = 0;
@@ -1030,7 +1142,7 @@ static void HandleFollowFinger(int mx, int my, int button)
     Error(ERR_DEBUG, "---------- TOUCH ACTION STOPPED ----------");
   }
 
-  if (touch_info[0].touched)
+  if (touched)
   {
     int src_x = local_player->jx;
     int src_y = local_player->jy;
@@ -1125,6 +1237,8 @@ static void HandleFollowFinger(int mx, int my, int button)
   }
 }
 
+#if defined(TARGET_SDL2)
+
 static boolean checkTextInputKeyModState()
 {
   // when playing, only handle raw key events and ignore text input
@@ -1275,6 +1389,7 @@ void HandleButton(int mx, int my, int button, int button_nr)
 {
   static int old_mx = 0, old_my = 0;
   boolean button_hold = FALSE;
+  boolean handle_gadgets = TRUE;
 
   if (button_nr < 0)
   {
@@ -1291,23 +1406,18 @@ void HandleButton(int mx, int my, int button, int button_nr)
 
 #if defined(PLATFORM_ANDROID)
   // when playing, only handle gadgets when using "follow finger" controls
-  boolean handle_gadgets =
+  // or when using touch controls in combination with the MM game engine
+  handle_gadgets =
     (game_status != GAME_MODE_PLAYING ||
+     level.game_engine_type == GAME_ENGINE_TYPE_MM ||
      strEqual(setup.touch.control_type, TOUCH_CONTROL_FOLLOW_FINGER));
+#endif
 
-  if (handle_gadgets &&
-      HandleGadgets(mx, my, button))
+  if (handle_gadgets && HandleGadgets(mx, my, button))
   {
     /* do not handle this button event anymore */
     mx = my = -32;	/* force mouse event to be outside screen tiles */
   }
-#else
-  if (HandleGadgets(mx, my, button))
-  {
-    /* do not handle this button event anymore */
-    mx = my = -32;	/* force mouse event to be outside screen tiles */
-  }
-#endif
 
   if (HandleGlobalAnimClicks(mx, my, button))
   {
@@ -1361,11 +1471,10 @@ void HandleButton(int mx, int my, int button, int button_nr)
       break;
 
     case GAME_MODE_PLAYING:
-      SetPlayerMouseAction(mx, my, button);
-
-#if defined(TARGET_SDL2)
-      HandleFollowFinger(mx, my, button);
-#endif
+      if (!strEqual(setup.touch.control_type, TOUCH_CONTROL_OFF))
+	HandleButtonOrFinger(mx, my, button);
+      else
+	SetPlayerMouseAction(mx, my, button);
 
 #ifdef DEBUG
       if (button == MB_PRESSED && !motion_status && !button_hold &&
@@ -1931,6 +2040,13 @@ void HandleKey(Key key, int key_status)
 void HandleNoEvent()
 {
   HandleMouseCursor();
+
+  switch (game_status)
+  {
+    case GAME_MODE_PLAYING:
+      HandleButtonOrFinger(-1, -1, -1);
+      break;
+  }
 }
 
 void HandleEventActions()
@@ -1962,12 +2078,6 @@ void HandleEventActions()
       HandleLevelEditorIdle();
       break;
 
-#if defined(TARGET_SDL2)
-    case GAME_MODE_PLAYING:
-      HandleFollowFinger(-1, -1, -1);
-      break;
-#endif
-
     default:
       break;
   }