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

diff --git a/src/tools.c b/src/tools.c
index f907d5dd..626cb897 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -3887,16 +3887,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:
@@ -3939,6 +3939,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;