X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fevents.c;h=a870bf7433f4156337d627d82632ecf2ebf53a14;hp=d19ff88098cefc0979dbfa8c357e3e91b0805a6a;hb=b62e4322b0b7d01aac9340adaddba753e04c9c51;hpb=a1fabab3e5db1baab46a95a318b27fdf33d470cc

diff --git a/src/events.c b/src/events.c
index d19ff880..a870bf74 100644
--- a/src/events.c
+++ b/src/events.c
@@ -58,6 +58,18 @@ static int FilterEvents(const Event *event)
     return 0;
 #endif
 
+  if (event->type == EVENT_BUTTONPRESS ||
+      event->type == EVENT_BUTTONRELEASE)
+  {
+    ((ButtonEvent *)event)->x -= video.screen_xoffset;
+    ((ButtonEvent *)event)->y -= video.screen_yoffset;
+  }
+  else if (event->type == EVENT_MOTIONNOTIFY)
+  {
+    ((MotionEvent *)event)->x -= video.screen_xoffset;
+    ((MotionEvent *)event)->y -= video.screen_yoffset;
+  }
+
   /* non-motion events are directly passed to event handler functions */
   if (event->type != EVENT_MOTIONNOTIFY)
     return 1;
@@ -235,6 +247,15 @@ void HandleOtherEvents(Event *event)
       break;
 
 #if defined(TARGET_SDL)
+#if defined(TARGET_SDL2)
+    case SDL_CONTROLLERBUTTONDOWN:
+    case SDL_CONTROLLERBUTTONUP:
+      HandleSpecialGameControllerButtons(event);
+      /* FALL THROUGH */
+    case SDL_CONTROLLERDEVICEADDED:
+    case SDL_CONTROLLERDEVICEREMOVED:
+    case SDL_CONTROLLERAXISMOTION:
+#endif
     case SDL_JOYAXISMOTION:
     case SDL_JOYBUTTONDOWN:
     case SDL_JOYBUTTONUP:
@@ -331,6 +352,12 @@ void ClearEventQueue()
 	ClearPlayerAction();
 	break;
 
+#if defined(TARGET_SDL2)
+      case SDL_CONTROLLERBUTTONUP:
+	ClearPlayerAction();
+	break;
+#endif
+
       default:
 	HandleOtherEvents(&event);
 	break;
@@ -370,6 +397,12 @@ void SleepWhileUnmapped()
 	key_joystick_mapping = 0;
 	break;
 
+#if defined(TARGET_SDL2)
+      case SDL_CONTROLLERBUTTONUP:
+	key_joystick_mapping = 0;
+	break;
+#endif
+
       case EVENT_MAPNOTIFY:
 	window_unmapped = FALSE;
 	break;
@@ -509,32 +542,52 @@ void HandleWindowEvent(WindowEvent *event)
     SDLRedrawWindow();
 #endif
 
-  if (event->event == SDL_WINDOWEVENT_RESIZED && !video.fullscreen_enabled)
+  if (event->event == SDL_WINDOWEVENT_RESIZED)
   {
-    int new_window_width  = event->data1;
-    int new_window_height = event->data2;
-
-    // if window size has changed after resizing, calculate new scaling factor
-    if (new_window_width  != video.window_width ||
-	new_window_height != video.window_height)
+    if (!video.fullscreen_enabled)
     {
-      int new_xpercent = (100 * new_window_width  / video.width);
-      int new_ypercent = (100 * new_window_height / video.height);
+      int new_window_width  = event->data1;
+      int new_window_height = event->data2;
 
-      // (extreme window scaling allowed, but cannot be saved permanently)
-      video.window_scaling_percent = MIN(new_xpercent, new_ypercent);
-      setup.window_scaling_percent =
-	MIN(MAX(MIN_WINDOW_SCALING_PERCENT, video.window_scaling_percent),
-	    MAX_WINDOW_SCALING_PERCENT);
+      // if window size has changed after resizing, calculate new scaling factor
+      if (new_window_width  != video.window_width ||
+	  new_window_height != video.window_height)
+      {
+	int new_xpercent = 100.0 * new_window_width  / video.screen_width  + .5;
+	int new_ypercent = 100.0 * new_window_height / video.screen_height + .5;
+
+	// (extreme window scaling allowed, but cannot be saved permanently)
+	video.window_scaling_percent = MIN(new_xpercent, new_ypercent);
+	setup.window_scaling_percent =
+	  MIN(MAX(MIN_WINDOW_SCALING_PERCENT, video.window_scaling_percent),
+	      MAX_WINDOW_SCALING_PERCENT);
+
+	video.window_width  = new_window_width;
+	video.window_height = new_window_height;
 
-      video.window_width  = new_window_width;
-      video.window_height = new_window_height;
+	if (game_status == GAME_MODE_SETUP)
+	  RedrawSetupScreenAfterFullscreenToggle();
+
+	SetWindowTitle();
+      }
+    }
+#if defined(PLATFORM_ANDROID)
+    else
+    {
+      int new_display_width  = event->data1;
+      int new_display_height = event->data2;
 
-      if (game_status == GAME_MODE_SETUP)
-	RedrawSetupScreenAfterFullscreenToggle();
+      // if fullscreen display size has changed, device has been rotated
+      if (new_display_width  != video.display_width ||
+	  new_display_height != video.display_height)
+      {
+	video.display_width  = new_display_width;
+	video.display_height = new_display_height;
 
-      SetWindowTitle();
+	SDLSetScreenProperties();
+      }
     }
+#endif
   }
 }
 
@@ -585,15 +638,30 @@ void HandleFingerEvent(FingerEvent *event)
   {
     int key_status = (event->type == EVENT_FINGERRELEASE ? KEY_RELEASED :
 		      KEY_PRESSED);
-    Key key = (event->x < 1.0 / 3.0 ?
-	       (event->y < 1.0 / 2.0 ? setup.input[0].key.snap :
-		setup.input[0].key.drop) :
-	       event->x > 2.0 / 3.0 ?
-	       (event->y < 1.0 / 3.0 ? setup.input[0].key.up :
-		event->y > 2.0 / 3.0 ? setup.input[0].key.down :
-		event->x < 5.0 / 6.0 ? setup.input[0].key.left :
-		setup.input[0].key.right) :
+    float ypos = 1.0 - 1.0 / 3.0 * video.display_width / video.display_height;
+
+    event_y = (event_y - ypos) / (1 - ypos);
+
+    Key key = (event_x > 0         && event_x < 1.0 / 6.0 &&
+	       event_y > 2.0 / 3.0 && event_y < 1 ?
+	       setup.input[0].key.snap :
+	       event_x > 1.0 / 6.0 && event_x < 1.0 / 3.0 &&
+	       event_y > 2.0 / 3.0 && event_y < 1 ?
+	       setup.input[0].key.drop :
+	       event_x > 7.0 / 9.0 && event_x < 8.0 / 9.0 &&
+	       event_y > 0         && event_y < 1.0 / 3.0 ?
+	       setup.input[0].key.up :
+	       event_x > 6.0 / 9.0 && event_x < 7.0 / 9.0 &&
+	       event_y > 1.0 / 3.0 && event_y < 2.0 / 3.0 ?
+	       setup.input[0].key.left :
+	       event_x > 8.0 / 9.0 && event_x < 1 &&
+	       event_y > 1.0 / 3.0 && event_y < 2.0 / 3.0 ?
+	       setup.input[0].key.right :
+	       event_x > 7.0 / 9.0 && event_x < 8.0 / 9.0 &&
+	       event_y > 2.0 / 3.0 && event_y < 1 ?
+	       setup.input[0].key.down :
 	       KSYM_UNDEFINED);
+
     char *key_status_name = (key_status == KEY_RELEASED ? "KEY_RELEASED" :
 			     "KEY_PRESSED");
     int i;
@@ -1186,6 +1254,12 @@ void HandleButton(int mx, int my, int button, int button_nr)
   }
 #endif
 
+  if (HandleGlobalAnimClicks(mx, my, button))
+  {
+    /* do not handle this button event anymore */
+    mx = my = -32;	/* force mouse event to be outside screen tiles */
+  }
+
   if (button_hold && game_status == GAME_MODE_PLAYING && tape.pausing)
     return;
 
@@ -1231,8 +1305,10 @@ void HandleButton(int mx, int my, int button, int button_nr)
       HandleSetupScreen(mx, my, 0, 0, button);
       break;
 
+#if defined(TARGET_SDL2)
     case GAME_MODE_PLAYING:
       HandleFollowFinger(mx, my, button);
+#endif
 
 #ifdef DEBUG
       if (button == MB_PRESSED && !motion_status && IN_GFX_FIELD_PLAY(mx, my) &&
@@ -1384,7 +1460,7 @@ void HandleKeysDebug(Key key)
 	  (mod_key_pressed == setup.debug.frame_delay_use_mod_key))
       {
 	GameFrameDelay = (GameFrameDelay != setup.debug.frame_delay[i] ?
-			  setup.debug.frame_delay[i] : GAME_FRAME_DELAY);
+			  setup.debug.frame_delay[i] : setup.game_frame_delay);
 
 	if (!setup.debug.frame_delay_game_only)
 	  MenuFrameDelay = GameFrameDelay;
@@ -1648,6 +1724,15 @@ void HandleKey(Key key, int key_status)
     return;
   }
 
+  if (HandleGlobalAnimClicks(-1, -1, (key == KSYM_space ||
+				      key == KSYM_Return ||
+				      key == KSYM_Escape)))
+  {
+    /* do not handle this key event anymore */
+    if (key != KSYM_Escape)	/* always allow ESC key to be handled */
+      return;
+  }
+
   if (game_status == GAME_MODE_PLAYING && AllPlayersGone &&
       (key == KSYM_Return || key == setup.shortcut.toggle_pause))
   {
@@ -1851,9 +1936,11 @@ void HandleNoEvent()
       HandleLevelEditorIdle();
       break;
 
+#if defined(TARGET_SDL2)
     case GAME_MODE_PLAYING:
       HandleFollowFinger(-1, -1, -1);
       break;
+#endif
 
     default:
       break;
@@ -1864,23 +1951,30 @@ static int HandleJoystickForAllPlayers()
 {
   int i;
   int result = 0;
+  boolean no_joysticks_configured = TRUE;
+  boolean use_as_joystick_nr = (game_status != GAME_MODE_PLAYING);
+  static byte joy_action_last[MAX_PLAYERS];
+
+  for (i = 0; i < MAX_PLAYERS; i++)
+    if (setup.input[i].use_joystick)
+      no_joysticks_configured = FALSE;
+
+  /* if no joysticks configured, map connected joysticks to players */
+  if (no_joysticks_configured)
+    use_as_joystick_nr = TRUE;
 
   for (i = 0; i < MAX_PLAYERS; i++)
   {
     byte joy_action = 0;
 
-    /*
-    if (!setup.input[i].use_joystick)
-      continue;
-      */
-
-    joy_action = Joystick(i);
+    joy_action = JoystickExt(i, use_as_joystick_nr);
     result |= joy_action;
 
-    if (!setup.input[i].use_joystick)
-      continue;
+    if ((setup.input[i].use_joystick || no_joysticks_configured) &&
+	joy_action != joy_action_last[i])
+      stored_player[i].action = joy_action;
 
-    stored_player[i].action = joy_action;
+    joy_action_last[i] = joy_action;
   }
 
   return result;
@@ -1900,6 +1994,12 @@ void HandleJoystick()
   int dx	= (left ? -1	: right ? 1	: 0);
   int dy	= (up   ? -1	: down  ? 1	: 0);
 
+  if (HandleGlobalAnimClicks(-1, -1, newbutton))
+  {
+    /* do not handle this button event anymore */
+    return;
+  }
+
   switch (game_status)
   {
     case GAME_MODE_TITLE:
@@ -1945,9 +2045,39 @@ void HandleJoystick()
 	return;
       }
 
+      if (tape.recording && tape.pausing)
+      {
+	if (joystick & JOY_ACTION)
+	  TapeTogglePause(TAPE_TOGGLE_MANUAL);
+      }
+
       break;
 
     default:
       break;
   }
 }
+
+void HandleSpecialGameControllerButtons(Event *event)
+{
+#if defined(TARGET_SDL2)
+  switch (event->type)
+  {
+    case SDL_CONTROLLERBUTTONDOWN:
+      if (event->cbutton.button == SDL_CONTROLLER_BUTTON_START)
+	HandleKey(KSYM_space, KEY_PRESSED);
+      else if (event->cbutton.button == SDL_CONTROLLER_BUTTON_BACK)
+	HandleKey(KSYM_Escape, KEY_PRESSED);
+
+      break;
+
+    case SDL_CONTROLLERBUTTONUP:
+      if (event->cbutton.button == SDL_CONTROLLER_BUTTON_START)
+	HandleKey(KSYM_space, KEY_RELEASED);
+      else if (event->cbutton.button == SDL_CONTROLLER_BUTTON_BACK)
+	HandleKey(KSYM_Escape, KEY_RELEASED);
+
+      break;
+  }
+#endif
+}