X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fevents.c;h=d91a7c46d8d3ce9c5e70a47a207a43be7ec70fa8;hb=6a8e3d4379f0a7421e046ca86168ce1581862a1f;hp=f9e74a763b82d5c3ad7565332cc8520615d791b0;hpb=04822a800bb5479087613b0730fdf7e765ba012c;p=rocksndiamonds.git

diff --git a/src/events.c b/src/events.c
index f9e74a76..d91a7c46 100644
--- a/src/events.c
+++ b/src/events.c
@@ -175,6 +175,13 @@ void EventLoop(void)
 	  case EVENT_TEXTINPUT:
   	    HandleTextEvent((TextEvent *) &event);
   	    break;
+
+	  case SDL_APP_WILLENTERBACKGROUND:
+	  case SDL_APP_DIDENTERBACKGROUND:
+	  case SDL_APP_WILLENTERFOREGROUND:
+	  case SDL_APP_DIDENTERFOREGROUND:
+  	    HandlePauseResumeEvent((PauseResumeEvent *) &event);
+  	    break;
 #endif
 
   	  case EVENT_KEYPRESS:
@@ -363,10 +370,6 @@ void SleepWhileUnmapped()
 
 void HandleExposeEvent(ExposeEvent *event)
 {
-#if !defined(TARGET_SDL)
-  RedrawPlayfield(FALSE, event->x, event->y, event->width, event->height);
-  FlushDisplay();
-#endif
 }
 
 void HandleButtonEvent(ButtonEvent *event)
@@ -465,9 +468,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 +481,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
@@ -533,10 +542,12 @@ void HandleFingerEvent(FingerEvent *event)
   static Key button_key = KSYM_UNDEFINED;
   static float motion_x1, motion_y1;
   static float button_x1, button_y1;
-  static SDL_FingerID motion_id = 0;
-  static SDL_FingerID button_id = 0;
-  int trigger_distance_percent = 1;	// percent of touchpad width/height
-  float trigger_distance = (float)trigger_distance_percent / 100;
+  static SDL_FingerID motion_id = -1;
+  static SDL_FingerID button_id = -1;
+  int move_trigger_distance_percent = 2;   // percent of touchpad width/height
+  int drop_trigger_distance_percent = 5;   // percent of touchpad width/height
+  float move_trigger_distance = (float)move_trigger_distance_percent / 100;
+  float drop_trigger_distance = (float)drop_trigger_distance_percent / 100;
   float event_x = event->x;
   float event_y = event->y;
 
@@ -556,7 +567,13 @@ void HandleFingerEvent(FingerEvent *event)
   if (game_status != GAME_MODE_PLAYING)
     return;
 
-  if (1)
+#if 1
+  if (strEqual(setup.touch.control_type, TOUCH_CONTROL_VIRTUAL_BUTTONS))
+#else
+  boolean use_virtual_button_control = FALSE;
+
+  if (use_virtual_button_control)
+#endif
   {
     int key_status = (event->type == EVENT_FINGERRELEASE ? KEY_RELEASED :
 		      KEY_PRESSED);
@@ -708,6 +725,8 @@ void HandleFingerEvent(FingerEvent *event)
     return;
   }
 
+  // use touch direction control
+
   if (event->type == EVENT_FINGERPRESS)
   {
     if (event_x > 1.0 / 3.0)
@@ -744,7 +763,7 @@ void HandleFingerEvent(FingerEvent *event)
   {
     if (event->fingerId == motion_id)
     {
-      motion_id = 0;
+      motion_id = -1;
 
       if (motion_key_x != KSYM_UNDEFINED)
 	HandleKey(motion_key_x, KEY_RELEASED);
@@ -758,7 +777,7 @@ void HandleFingerEvent(FingerEvent *event)
     }
     else if (event->fingerId == button_id)
     {
-      button_id = 0;
+      button_id = -1;
 
       if (button_key != KSYM_UNDEFINED)
 	HandleKey(button_key, KEY_RELEASED);
@@ -781,16 +800,16 @@ void HandleFingerEvent(FingerEvent *event)
 			      event_y > motion_y1 ? setup.input[0].key.down :
 			      KSYM_UNDEFINED);
 
-      if (distance_x < trigger_distance / 2 ||
+      if (distance_x < move_trigger_distance / 2 ||
 	  distance_x < distance_y)
 	new_motion_key_x = KSYM_UNDEFINED;
 
-      if (distance_y < trigger_distance / 2 ||
+      if (distance_y < move_trigger_distance / 2 ||
 	  distance_y < distance_x)
 	new_motion_key_y = KSYM_UNDEFINED;
 
-      if (distance_x > trigger_distance ||
-	  distance_y > trigger_distance)
+      if (distance_x > move_trigger_distance ||
+	  distance_y > move_trigger_distance)
       {
 	if (new_motion_key_x != motion_key_x)
 	{
@@ -822,8 +841,8 @@ void HandleFingerEvent(FingerEvent *event)
       float distance_x = ABS(event_x - button_x1);
       float distance_y = ABS(event_y - button_y1);
 
-      if (distance_x < trigger_distance / 2 &&
-	  distance_y > trigger_distance)
+      if (distance_x < drop_trigger_distance / 2 &&
+	  distance_y > drop_trigger_distance)
       {
 	if (button_key == setup.input[0].key.snap)
 	  HandleKey(button_key, KEY_RELEASED);
@@ -964,6 +983,19 @@ void HandleTextEvent(TextEvent *event)
     HandleKey(key, KEY_RELEASED);
   }
 }
+
+void HandlePauseResumeEvent(PauseResumeEvent *event)
+{
+  if (event->type == SDL_APP_WILLENTERBACKGROUND)
+  {
+    Mix_PauseMusic();
+  }
+  else if (event->type == SDL_APP_DIDENTERFOREGROUND)
+  {
+    Mix_ResumeMusic();
+  }
+}
+
 #endif
 
 void HandleKeyEvent(KeyEvent *event)
@@ -1146,8 +1178,10 @@ 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_FIELD(mx, my))
-	DumpTile(LEVELX((mx - SX) / TILEX), LEVELY((my - SY) / TILEY));
+      if (button == MB_PRESSED && !motion_status && IN_GFX_FIELD_PLAY(mx, my))
+	DumpTile(LEVELX((mx - SX) / TILESIZE_VAR),
+		 LEVELY((my - SY) / TILESIZE_VAR));
+        // DumpTile(LEVELX((mx - SX) / TILEX), LEVELY((my - SY) / TILEY));
 #endif
       break;
 
@@ -1237,6 +1271,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"))
     {
@@ -1695,6 +1743,7 @@ void HandleKey(Key key, int key_status)
 	  }
 	  break;
 
+#if 0
 	case KSYM_s:
 	  if (!global.fps_slowdown)
 	  {
@@ -1714,7 +1763,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);
@@ -1734,6 +1785,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",