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

diff --git a/src/events.c b/src/events.c
index 2472fdf5..b450c2b0 100644
--- a/src/events.c
+++ b/src/events.c
@@ -250,7 +250,11 @@ void HandleOtherEvents(Event *event)
 #if defined(TARGET_SDL2)
     case SDL_CONTROLLERBUTTONDOWN:
     case SDL_CONTROLLERBUTTONUP:
+      // for any game controller button event, disable overlay buttons
+      SetOverlayEnabled(FALSE);
+
       HandleSpecialGameControllerButtons(event);
+
       /* FALL THROUGH */
     case SDL_CONTROLLERDEVICEADDED:
     case SDL_CONTROLLERDEVICEREMOVED:
@@ -374,6 +378,8 @@ void ClearPlayerAction()
   key_joystick_mapping = 0;
   for (i = 0; i < MAX_PLAYERS; i++)
     stored_player[i].action = 0;
+
+  ClearJoystickState();
 }
 
 void SleepWhileUnmapped()
@@ -668,6 +674,9 @@ void HandleFingerEvent(FingerEvent *event)
 			     "KEY_PRESSED");
     int i;
 
+    // for any touch input event, enable overlay buttons (if activated)
+    SetOverlayEnabled(TRUE);
+
     Error(ERR_DEBUG, "::: key '%s' was '%s' [fingerId: %lld]",
 	  getKeyNameFromKey(key), key_status_name, event->fingerId);
 
@@ -1148,9 +1157,16 @@ void HandleKeyEvent(KeyEvent *event)
 #endif
 
 #if defined(PLATFORM_ANDROID)
-  // always map the "back" button to the "escape" key on Android devices
   if (key == KSYM_Back)
+  {
+    // always map the "back" button to the "escape" key on Android devices
     key = KSYM_Escape;
+  }
+  else
+  {
+    // for any key event other than "back" button, disable overlay buttons
+    SetOverlayEnabled(FALSE);
+  }
 #endif
 
   HandleKeyModState(keymod, key_status);
@@ -1526,9 +1542,11 @@ void HandleKey(Key key, int key_status)
   int i;
 
 #if defined(TARGET_SDL2)
-  /* map special "play/pause" media key to default key for play/pause actions */
+  /* map special keys (media keys / remote control buttons) to default keys */
   if (key == KSYM_PlayPause)
     key = KSYM_space;
+  else if (key == KSYM_Select)
+    key = KSYM_Return;
 #endif
 
   HandleSpecialGameControllerKeys(key, key_status);
@@ -1605,7 +1623,6 @@ void HandleKey(Key key, int key_status)
 	  if (level.game_engine_type == GAME_ENGINE_TYPE_EM ||
 	      level.game_engine_type == GAME_ENGINE_TYPE_SP)
 	  {
-
 	    if (level.game_engine_type == GAME_ENGINE_TYPE_SP &&
 		getRedDiskReleaseFlag_SP() == 0)
 	      stored_player[pnr].action &= ~KEY_BUTTON_DROP;