X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=inline;f=src%2Fevents.c;h=f1d9ad1125046821b51c8e390a320825be948b80;hb=520b554dfeb3a72b6b3af91903642b158169407c;hp=37d078cf5497074e45f8dc6e55b500550abc7cad;hpb=eb6f957a5666e96d9d9d428bb6e91a5e44ef8601;p=rocksndiamonds.git

diff --git a/src/events.c b/src/events.c
index 37d078cf..f1d9ad11 100644
--- a/src/events.c
+++ b/src/events.c
@@ -465,9 +465,11 @@ void HandleWindowEvent(WindowEvent *event)
       int new_xpercent = (100 * new_window_width  / video.width);
       int new_ypercent = (100 * new_window_height / video.height);
 
+#if 0
       printf("::: RESIZED from %d, %d to %d, %d\n",
 	     video.window_width, video.window_height,
 	     new_window_width, new_window_height);
+#endif
 
       setup.window_scaling_percent = video.window_scaling_percent =
 	MIN(MAX(MIN_WINDOW_SCALING_PERCENT, MIN(new_xpercent, new_ypercent)),
@@ -476,11 +478,15 @@ void HandleWindowEvent(WindowEvent *event)
       video.window_width  = new_window_width;
       video.window_height = new_window_height;
 
+#if 0
       printf("::: setup.window_scaling_percent set to %d\n",
 	     setup.window_scaling_percent);
+#endif
 
       if (game_status == GAME_MODE_SETUP)
 	RedrawSetupScreenAfterFullscreenToggle();
+
+      SetWindowTitle();
     }
 #else
     // prevent slightly wrong scaling factor due to rounding differences
@@ -520,6 +526,7 @@ void HandleWindowEvent(WindowEvent *event)
 
 static struct
 {
+  boolean touched;
   SDL_FingerID finger_id;
   int counter;
   Key key;
@@ -569,6 +576,16 @@ void HandleFingerEvent(FingerEvent *event)
 		event->x < 5.0 / 6.0 ? setup.input[0].key.left :
 		setup.input[0].key.right) :
 	       KSYM_UNDEFINED);
+#if 0
+    char *key_name = (key == setup.input[0].key.snap  ? "SNAP" :
+		      key == setup.input[0].key.drop  ? "DROP" :
+		      key == setup.input[0].key.up    ? "UP" :
+		      key == setup.input[0].key.down  ? "DOWN" :
+		      key == setup.input[0].key.left  ? "LEFT" :
+		      key == setup.input[0].key.right ? "RIGHT" : "(unknown)");
+#endif
+    char *key_status_name = (key_status == KEY_RELEASED ? "KEY_RELEASED" :
+			     "KEY_PRESSED");
 #else
     Key key = (event->y < 1.0 / 3.0 ? setup.input[0].key.up :
 	       event->y > 2.0 / 3.0 ? setup.input[0].key.down :
@@ -578,11 +595,19 @@ void HandleFingerEvent(FingerEvent *event)
 #endif
     int i;
 
+    Error(ERR_DEBUG, "::: key '%s' was '%s' [fingerId: %lld]",
+	  getKeyNameFromKey(key), key_status_name, event->fingerId);
+
     // check if we already know this touch event's finger id
     for (i = 0; i < NUM_TOUCH_FINGERS; i++)
     {
-      if (touch_info[i].finger_id == event->fingerId)
+      if (touch_info[i].touched &&
+	  touch_info[i].finger_id == event->fingerId)
+      {
+	// Error(ERR_DEBUG, "MARK 1: %d", i);
+
 	break;
+      }
     }
 
     if (i >= NUM_TOUCH_FINGERS)
@@ -598,16 +623,24 @@ void HandleFingerEvent(FingerEvent *event)
 	  {
 	    oldest_pos = i;
 	    oldest_counter = touch_info[i].counter;
+
+	    // Error(ERR_DEBUG, "MARK 2: %d", i);
 	  }
 
-	  if (touch_info[i].finger_id == 0)
+	  if (!touch_info[i].touched)
+	  {
+	    // Error(ERR_DEBUG, "MARK 3: %d", i);
+
 	    break;
+	  }
 	}
 
 	if (i >= NUM_TOUCH_FINGERS)
 	{
 	  // all slots allocated -- use oldest slot
 	  i = oldest_pos;
+
+	  // Error(ERR_DEBUG, "MARK 4: %d", i);
 	}
       }
       else
@@ -615,7 +648,12 @@ void HandleFingerEvent(FingerEvent *event)
 	// release of previously unknown key (should not happen)
 
 	if (key != KSYM_UNDEFINED)
+	{
 	  HandleKey(key, KEY_RELEASED);
+
+	  Error(ERR_DEBUG, "=> key == '%s', key_status == '%s' [slot %d] [1]",
+		getKeyNameFromKey(key), "KEY_RELEASED", i);
+	}
       }
     }
 
@@ -626,12 +664,23 @@ void HandleFingerEvent(FingerEvent *event)
 	if (touch_info[i].key != key)
 	{
 	  if (touch_info[i].key != KSYM_UNDEFINED)
+	  {
 	    HandleKey(touch_info[i].key, KEY_RELEASED);
 
+	    Error(ERR_DEBUG, "=> key == '%s', key_status == '%s' [slot %d] [2]",
+		  getKeyNameFromKey(touch_info[i].key), "KEY_RELEASED", i);
+	  }
+
 	  if (key != KSYM_UNDEFINED)
+	  {
 	    HandleKey(key, KEY_PRESSED);
+
+	    Error(ERR_DEBUG, "=> key == '%s', key_status == '%s' [slot %d] [3]",
+		  getKeyNameFromKey(key), "KEY_PRESSED", i);
+	  }
 	}
 
+	touch_info[i].touched = TRUE;
 	touch_info[i].finger_id = event->fingerId;
 	touch_info[i].counter = Counter();
 	touch_info[i].key = key;
@@ -639,15 +688,28 @@ void HandleFingerEvent(FingerEvent *event)
       else
       {
 	if (touch_info[i].key != KSYM_UNDEFINED)
+	{
 	  HandleKey(touch_info[i].key, KEY_RELEASED);
 
+	  Error(ERR_DEBUG, "=> key == '%s', key_status == '%s' [slot %d] [4]",
+		getKeyNameFromKey(touch_info[i].key), "KEY_RELEASED", i);
+	}
+
+	touch_info[i].touched = FALSE;
 	touch_info[i].finger_id = 0;
 	touch_info[i].counter = 0;
 	touch_info[i].key = 0;
       }
     }
 
-    Error(ERR_DEBUG, "=> key == %d, key_status == %d", key, key_status);
+#if 0
+#if 1
+    Error(ERR_DEBUG, "=> key == '%s', key_status == '%s' [slot %d]",
+	  key_name, key_status_name, i);
+#else
+    Error(ERR_DEBUG, "=> key == %d, key_status == %d [%d]", key, key_status, i);
+#endif
+#endif
 
     return;
   }
@@ -1027,11 +1089,20 @@ void HandleButton(int mx, int my, int button, int button_nr)
     old_my = my;
   }
 
+#if defined(PLATFORM_ANDROID)
+  if (game_status != GAME_MODE_PLAYING &&
+      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
 
   /* do not use scroll wheel button events for anything other than gadgets */
   if (IS_WHEEL_BUTTON(button_nr))
@@ -1081,7 +1152,7 @@ void HandleButton(int mx, int my, int button, int button_nr)
 
     case GAME_MODE_PLAYING:
 #ifdef DEBUG
-      if (button == MB_PRESSED && !motion_status && IN_GFX_SCREEN(mx, my))
+      if (button == MB_PRESSED && !motion_status && IN_GFX_FIELD_PLAY(mx, my))
 	DumpTile(LEVELX((mx - SX) / TILEX), LEVELY((my - SY) / TILEY));
 #endif
       break;
@@ -1172,6 +1243,20 @@ static void HandleKeysSpecial(Key key)
     {
       DumpTape(&tape);
     }
+    else if (is_string_suffix(cheat_input, ":fix-tape") ||
+	     is_string_suffix(cheat_input, ":ft"))
+    {
+      /* fix single-player tapes that contain player input for more than one
+	 player (due to a bug in 3.3.1.2 and earlier versions), which results
+	 in playing levels with more than one player in multi-player mode,
+	 even though the tape was originally recorded in single-player mode */
+
+      /* remove player input actions for all players but the first one */
+      for (i = 1; i < MAX_PLAYERS; i++)
+	tape.player_participates[i] = FALSE;
+
+      tape.changed = TRUE;
+    }
     else if (is_string_suffix(cheat_input, ":save-native-level") ||
 	     is_string_suffix(cheat_input, ":snl"))
     {
@@ -1630,6 +1715,7 @@ void HandleKey(Key key, int key_status)
 	  }
 	  break;
 
+#if 0
 	case KSYM_s:
 	  if (!global.fps_slowdown)
 	  {
@@ -1649,7 +1735,9 @@ void HandleKey(Key key, int key_status)
 	    printf("fps slowdown disabled\n");
 	  }
 	  break;
+#endif
 
+#if 0
 	case KSYM_f:
 	  ScrollStepSize = TILEX / 8;
 	  printf("ScrollStepSize == %d (1/8)\n", ScrollStepSize);
@@ -1669,6 +1757,7 @@ void HandleKey(Key key, int key_status)
 	  ScrollStepSize = TILEX;
 	  printf("ScrollStepSize == %d (1/1)\n", ScrollStepSize);
 	  break;
+#endif
 
 	case KSYM_v:
 	  printf("::: currently using game engine version %d\n",