X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fevents.c;h=2472fdf5f8978b048af638730299206544445255;hp=fc34d8981bc8dbc41583dd751573be706c60a330;hb=0d214d4e314f6f42df24be140bb433e980319767;hpb=cad3c0cde6926a8a379725b1ffc6fc657272a76d

diff --git a/src/events.c b/src/events.c
index fc34d898..2472fdf5 100644
--- a/src/events.c
+++ b/src/events.c
@@ -248,9 +248,13 @@ void HandleOtherEvents(Event *event)
 
 #if defined(TARGET_SDL)
 #if defined(TARGET_SDL2)
-    case SDL_CONTROLLERAXISMOTION:
     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:
@@ -348,6 +352,13 @@ void ClearEventQueue()
 	ClearPlayerAction();
 	break;
 
+#if defined(TARGET_SDL2)
+      case SDL_CONTROLLERBUTTONUP:
+	HandleJoystickEvent(&event);
+	ClearPlayerAction();
+	break;
+#endif
+
       default:
 	HandleOtherEvents(&event);
 	break;
@@ -387,6 +398,13 @@ void SleepWhileUnmapped()
 	key_joystick_mapping = 0;
 	break;
 
+#if defined(TARGET_SDL2)
+      case SDL_CONTROLLERBUTTONUP:
+	HandleJoystickEvent(&event);
+	key_joystick_mapping = 0;
+	break;
+#endif
+
       case EVENT_MAPNOTIFY:
 	window_unmapped = FALSE;
 	break;
@@ -1507,6 +1525,14 @@ void HandleKey(Key key, int key_status)
   int joy = 0;
   int i;
 
+#if defined(TARGET_SDL2)
+  /* map special "play/pause" media key to default key for play/pause actions */
+  if (key == KSYM_PlayPause)
+    key = KSYM_space;
+#endif
+
+  HandleSpecialGameControllerKeys(key, key_status);
+
   if (game_status == GAME_MODE_PLAYING)
   {
     /* only needed for single-step tape recording mode */
@@ -1994,10 +2020,23 @@ void HandleJoystick()
     case GAME_MODE_INFO:
     {
       static unsigned int joystickmove_delay = 0;
+      static unsigned int joystickmove_delay_value = GADGET_FRAME_DELAY;
+      static int joystick_last = 0;
 
       if (joystick && !button &&
-	  !DelayReached(&joystickmove_delay, GADGET_FRAME_DELAY))
+	  !DelayReached(&joystickmove_delay, joystickmove_delay_value))
+      {
+	/* delay joystick actions if buttons/axes continually pressed */
 	newbutton = dx = dy = 0;
+      }
+      else
+      {
+	/* start with longer delay, then continue with shorter delay */
+	if (joystick != joystick_last)
+	  joystickmove_delay_value = GADGET_FRAME_DELAY_FIRST;
+	else
+	  joystickmove_delay_value = GADGET_FRAME_DELAY;
+      }
 
       if (game_status == GAME_MODE_TITLE)
 	HandleTitleScreen(0,0,dx,dy, newbutton ? MB_MENU_CHOICE : MB_MENU_MARK);
@@ -2011,6 +2050,9 @@ void HandleJoystick()
 	HandleSetupScreen(0,0,dx,dy, newbutton ? MB_MENU_CHOICE : MB_MENU_MARK);
       else if (game_status == GAME_MODE_INFO)
 	HandleInfoScreen(0,0,dx,dy, newbutton ? MB_MENU_CHOICE : MB_MENU_MARK);
+
+      joystick_last = joystick;
+
       break;
     }
 
@@ -2029,9 +2071,69 @@ 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
+}
+
+void HandleSpecialGameControllerKeys(Key key, int key_status)
+{
+#if defined(TARGET_SDL2)
+#if defined(KSYM_Rewind) && defined(KSYM_FastForward)
+  int button = SDL_CONTROLLER_BUTTON_INVALID;
+
+  /* map keys to joystick buttons (special hack for Amazon Fire TV remote) */
+  if (key == KSYM_Rewind)
+    button = SDL_CONTROLLER_BUTTON_A;
+  else if (key == KSYM_FastForward || key == KSYM_Menu)
+    button = SDL_CONTROLLER_BUTTON_B;
+
+  if (button != SDL_CONTROLLER_BUTTON_INVALID)
+  {
+    Event event;
+
+    event.type = (key_status == KEY_PRESSED ? SDL_CONTROLLERBUTTONDOWN :
+		  SDL_CONTROLLERBUTTONUP);
+
+    event.cbutton.which = 0;	/* first joystick (Amazon Fire TV remote) */
+    event.cbutton.button = button;
+    event.cbutton.state = (key_status == KEY_PRESSED ? SDL_PRESSED :
+			   SDL_RELEASED);
+
+    HandleJoystickEvent(&event);
+  }
+#endif
+#endif
+}