X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=31ae317a3104eb985dbc59e773b0a819acdbda25;hb=eeabc02e8cd3fd84a407cb34d5fc03c846da4d1c;hp=f907d5dd2bf39816a2bc8ef2a8bbb78eef83147f;hpb=b59d111d850aa928e2a839ba026adde64927d5a5;p=rocksndiamonds.git

diff --git a/src/tools.c b/src/tools.c
index f907d5dd..31ae317a 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -3759,6 +3759,10 @@ void WaitForEventToContinue()
       {
 	case EVENT_BUTTONPRESS:
 	case EVENT_KEYPRESS:
+#if defined(TARGET_SDL2)
+        case SDL_CONTROLLERBUTTONDOWN:
+#endif
+        case SDL_JOYBUTTONDOWN:
 	  still_wait = FALSE;
 	  break;
 
@@ -3887,16 +3891,16 @@ static int RequestHandleEvents(unsigned int req_state)
 	  }
 
 #if defined(TARGET_SDL2)
-      case SDL_WINDOWEVENT:
-	HandleWindowEvent((WindowEvent *) &event);
-	break;
+	  case SDL_WINDOWEVENT:
+	    HandleWindowEvent((WindowEvent *) &event);
+	    break;
 
-      case SDL_APP_WILLENTERBACKGROUND:
-      case SDL_APP_DIDENTERBACKGROUND:
-      case SDL_APP_WILLENTERFOREGROUND:
-      case SDL_APP_DIDENTERFOREGROUND:
-	HandlePauseResumeEvent((PauseResumeEvent *) &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:
@@ -3912,7 +3916,11 @@ static int RequestHandleEvents(unsigned int req_state)
 
 	      case KSYM_Return:
 #if defined(TARGET_SDL2)
+	      case KSYM_Select:
 	      case KSYM_Menu:
+#if defined(KSYM_Rewind)
+	      case KSYM_Rewind:		/* for Amazon Fire TV remote */
+#endif
 #endif
 		result = 1;
 		break;
@@ -3920,6 +3928,9 @@ static int RequestHandleEvents(unsigned int req_state)
 	      case KSYM_Escape:
 #if defined(TARGET_SDL2)
 	      case KSYM_Back:
+#if defined(KSYM_FastForward)
+	      case KSYM_FastForward:	/* for Amazon Fire TV remote */
+#endif
 #endif
 		result = 0;
 		break;
@@ -3939,6 +3950,35 @@ static int RequestHandleEvents(unsigned int req_state)
 	    ClearPlayerAction();
 	    break;
 
+#if defined(TARGET_SDL2)
+	  case SDL_CONTROLLERBUTTONDOWN:
+	    switch (event.cbutton.button)
+	    {
+	      case SDL_CONTROLLER_BUTTON_A:
+	      case SDL_CONTROLLER_BUTTON_X:
+	      case SDL_CONTROLLER_BUTTON_LEFTSHOULDER:
+		result = 1;
+		break;
+
+	      case SDL_CONTROLLER_BUTTON_B:
+	      case SDL_CONTROLLER_BUTTON_Y:
+	      case SDL_CONTROLLER_BUTTON_RIGHTSHOULDER:
+	      case SDL_CONTROLLER_BUTTON_BACK:
+		result = 0;
+		break;
+	    }
+
+	    if (req_state & REQ_PLAYER)
+	      result = 0;
+
+	    break;
+
+	  case SDL_CONTROLLERBUTTONUP:
+	    HandleJoystickEvent(&event);
+	    ClearPlayerAction();
+	    break;
+#endif
+
 	  default:
 	    HandleOtherEvents(&event);
 	    break;