X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Ftools.c;h=a766c2d668f459149e2d87726a007fbe4b7708e0;hp=6c990cbc2cb956ff1cf009e92bfef32a56f4493d;hb=6746a99c1d7348748c06d457f8496b4253bb7c84;hpb=ff84e204dde10499c64dace35dc5c4a017b70765

diff --git a/src/tools.c b/src/tools.c
index 6c990cbc..a766c2d6 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -3886,6 +3886,19 @@ static int RequestHandleEvents(unsigned int req_state)
 	    break;
 	  }
 
+#if defined(TARGET_SDL2)
+	  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;
+#endif
+
 	  case EVENT_KEYPRESS:
 	  {
 	    Key key = GetEventKey((KeyEvent *)&event, TRUE);
@@ -3900,6 +3913,9 @@ static int RequestHandleEvents(unsigned int req_state)
 	      case KSYM_Return:
 #if defined(TARGET_SDL2)
 	      case KSYM_Menu:
+#if defined(KSYM_Rewind)
+	      case KSYM_Rewind:		/* for Amazon Fire TV remote */
+#endif
 #endif
 		result = 1;
 		break;
@@ -3907,6 +3923,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;
@@ -3926,6 +3945,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;
@@ -8534,6 +8582,8 @@ void SetAnimStatus(int anim_status_new)
 {
   if (anim_status_new == GAME_MODE_MAIN)
     anim_status_new = GAME_MODE_PSEUDO_MAINONLY;
+  else if (anim_status_new == GAME_MODE_SCORES)
+    anim_status_new = GAME_MODE_PSEUDO_SCORESOLD;
 
   global.anim_status_next = anim_status_new;