fixed drag-and-drop support for SDL older than version 2.0.5

[rocksndiamonds.git] / src / events.c

diff --git a/src/events.c b/src/events.c
index 0d1f6baf371a34982db7915ebd947e531bc96ca7..5d95f6a95cf8acbcdea682bd40c91e0dd794ac97 100644 (file)
--- a/src/events.c
+++ b/src/events.c
@@ -403,7 +403,10 @@ void ClearPlayerAction(void)
   // simulate key release events for still pressed keys
   key_joystick_mapping = 0;
   for (i = 0; i < MAX_PLAYERS; i++)
+  {
     stored_player[i].action = 0;
+    stored_player[i].snap_action = 0;
+  }
 
   ClearJoystickState();
   ClearPlayerMouseAction();
@@ -681,6 +684,7 @@ static struct
   SDL_FingerID finger_id;
   int counter;
   Key key;
+  byte action;
 } touch_info[NUM_TOUCH_FINGERS];
 
 static void HandleFingerEvent_VirtualButtons(FingerEvent *event)
@@ -809,6 +813,9 @@ static void HandleFingerEvent_VirtualButtons(FingerEvent *event)
        {
          HandleKey(touch_info[i].key, KEY_RELEASED);
 
+         // undraw previous grid button when moving finger away
+         overlay.grid_button_action &= ~touch_info[i].action;
+
          Error(ERR_DEBUG, "=> key == '%s', key_status == '%s' [slot %d] [2]",
                getKeyNameFromKey(touch_info[i].key), "KEY_RELEASED", i);
        }
@@ -826,6 +833,7 @@ static void HandleFingerEvent_VirtualButtons(FingerEvent *event)
       touch_info[i].finger_id = event->fingerId;
       touch_info[i].counter = Counter();
       touch_info[i].key = key;
+      touch_info[i].action = grid_button_action;
     }
     else
     {
@@ -841,6 +849,7 @@ static void HandleFingerEvent_VirtualButtons(FingerEvent *event)
       touch_info[i].finger_id = 0;
       touch_info[i].counter = 0;
       touch_info[i].key = 0;
+      touch_info[i].action = JOY_NO_ACTION;
     }
   }
 }
@@ -1588,8 +1597,24 @@ static void HandleDropTextEvent(char *text)
   Error(ERR_DEBUG, "DROP TEXT EVENT: '%s'", text);
 }
 
+static void HandleDropCompleteEvent(int files_succeeded, int files_failed)
+{
+  // only show request dialog if no other request dialog already active
+  if (game.request_active)
+    return;
+
+  if (files_succeeded > 0 && files_failed > 0)
+    Request("New level or artwork set(s) added, "
+           "but some dropped file(s) failed!", REQ_CONFIRM);
+  else if (files_succeeded > 0)
+    Request("New level or artwork set(s) added!", REQ_CONFIRM);
+  else if (files_failed > 0)
+    Request("Failed to process dropped file(s)!", REQ_CONFIRM);
+}
+
 void HandleDropEvent(Event *event)
 {
+  static boolean confirm_on_drop_complete = FALSE;
   static int files_succeeded = 0;
   static int files_failed = 0;
 
@@ -1597,6 +1622,7 @@ void HandleDropEvent(Event *event)
   {
     case SDL_DROPBEGIN:
     {
+      confirm_on_drop_complete = TRUE;
       files_succeeded = 0;
       files_failed = 0;
 
@@ -1612,6 +1638,18 @@ void HandleDropEvent(Event *event)
       else
        files_failed++;
 
+      // SDL_DROPBEGIN / SDL_DROPCOMPLETE did not exist in older SDL versions
+      if (!confirm_on_drop_complete)
+      {
+       // process all remaining events, including further SDL_DROPFILE events
+       ClearEventQueue();
+
+       HandleDropCompleteEvent(files_succeeded, files_failed);
+
+       files_succeeded = 0;
+       files_failed = 0;
+      }
+
       break;
     }
 
@@ -1624,17 +1662,7 @@ void HandleDropEvent(Event *event)
 
     case SDL_DROPCOMPLETE:
     {
-      // only show request dialog if no other request dialog already active
-      if (!game.request_active)
-      {
-       if (files_succeeded > 0 && files_failed > 0)
-         Request("New level or artwork set(s) added, "
-                 "but some dropped file(s) failed!", REQ_CONFIRM);
-       else if (files_succeeded > 0)
-         Request("New level or artwork set(s) added!", REQ_CONFIRM);
-       else if (files_failed > 0)
-         Request("Failed to process dropped file(s)!", REQ_CONFIRM);
-      }
+      HandleDropCompleteEvent(files_succeeded, files_failed);
 
       break;
     }
@@ -1934,13 +1962,13 @@ boolean HandleKeysDebug(Key key, int key_status)
        SetVideoFrameDelay(GameFrameDelay);
 
        if (GameFrameDelay > ONE_SECOND_DELAY)
-         Error(ERR_DEBUG, "frame delay == %d ms", GameFrameDelay);
+         Error(ERR_INFO, "frame delay == %d ms", GameFrameDelay);
        else if (GameFrameDelay != 0)
-         Error(ERR_DEBUG, "frame delay == %d ms (max. %d fps / %d %%)",
+         Error(ERR_INFO, "frame delay == %d ms (max. %d fps / %d %%)",
                GameFrameDelay, ONE_SECOND_DELAY / GameFrameDelay,
                GAME_FRAME_DELAY * 100 / GameFrameDelay);
        else
-         Error(ERR_DEBUG, "frame delay == 0 ms (maximum speed)");
+         Error(ERR_INFO, "frame delay == 0 ms (maximum speed)");
 
        return TRUE;
       }
@@ -1953,14 +1981,14 @@ boolean HandleKeysDebug(Key key, int key_status)
     {
       options.debug = !options.debug;
 
-      Error(ERR_DEBUG, "debug mode %s",
+      Error(ERR_INFO, "debug mode %s",
            (options.debug ? "enabled" : "disabled"));
 
       return TRUE;
     }
     else if (key == KSYM_v)
     {
-      Error(ERR_DEBUG, "currently using game engine version %d",
+      Error(ERR_INFO, "currently using game engine version %d",
            game.engine_version);
 
       return TRUE;