X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fevents.c;h=b94e57c5cbfbce47c600abc665a2ac96c09f3439;hp=31d45abff4cc3946e05589270ad869d05765e3d4;hb=85019a08c195ac31e548b0549053fbc9f71b427f;hpb=ac173e23840c40f57ca10fc76e5267064faeda55 diff --git a/src/events.c b/src/events.c index 31d45abf..b94e57c5 100644 --- a/src/events.c +++ b/src/events.c @@ -268,14 +268,12 @@ void HandleOtherEvents(Event *event) HandleJoystickEvent(event); break; -#if defined(USE_DRAG_AND_DROP) case SDL_DROPBEGIN: case SDL_DROPCOMPLETE: case SDL_DROPFILE: case SDL_DROPTEXT: HandleDropEvent(event); break; -#endif default: break; @@ -405,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(); @@ -683,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) @@ -811,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); } @@ -828,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 { @@ -843,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; } } } @@ -1009,6 +1016,8 @@ void HandleFingerEvent(FingerEvent *event) event->pressure); #endif + runtime.uses_touch_device = TRUE; + if (game_status != GAME_MODE_PLAYING) return; @@ -1527,8 +1536,7 @@ void HandleClientMessageEvent(ClientMessageEvent *event) CloseAllAndExit(0); } -#if defined(USE_DRAG_AND_DROP) -static boolean HandleDropFileEvent(char *filename) +static int HandleDropFileEvent(char *filename) { Error(ERR_DEBUG, "DROP FILE EVENT: '%s'", filename); @@ -1537,7 +1545,7 @@ static boolean HandleDropFileEvent(char *filename) { Error(ERR_WARN, "file '%s' not supported", filename); - return FALSE; + return TREE_TYPE_UNDEFINED; } TreeInfo *tree_node = NULL; @@ -1548,7 +1556,7 @@ static boolean HandleDropFileEvent(char *filename) { Error(ERR_WARN, "zip file '%s' has invalid content!", filename); - return FALSE; + return TREE_TYPE_UNDEFINED; } if (tree_type == TREE_TYPE_LEVEL_DIR && @@ -1574,7 +1582,7 @@ static boolean HandleDropFileEvent(char *filename) { // error message already issued by "ExtractZipFileIntoDirectory()" - return FALSE; + return TREE_TYPE_UNDEFINED; } // add extracted level or artwork set to tree info structure @@ -1583,7 +1591,7 @@ static boolean HandleDropFileEvent(char *filename) // update menu screen (and possibly change current level set) DrawScreenAfterAddingSet(top_dir, tree_type); - return TRUE; + return tree_type; } static void HandleDropTextEvent(char *text) @@ -1591,29 +1599,93 @@ static void HandleDropTextEvent(char *text) Error(ERR_DEBUG, "DROP TEXT EVENT: '%s'", text); } +static void HandleDropCompleteEvent(int num_level_sets_succeeded, + int num_artwork_sets_succeeded, + int num_files_failed) +{ + // only show request dialog if no other request dialog already active + if (game.request_active) + return; + + // this case can happen with drag-and-drop with older SDL versions + if (num_level_sets_succeeded == 0 && + num_artwork_sets_succeeded == 0 && + num_files_failed == 0) + return; + + char message[100]; + + if (num_level_sets_succeeded > 0 || num_artwork_sets_succeeded > 0) + { + char message_part1[50]; + + sprintf(message_part1, "New %s set%s added", + (num_artwork_sets_succeeded == 0 ? "level" : + num_level_sets_succeeded == 0 ? "artwork" : "level and artwork"), + (num_level_sets_succeeded + + num_artwork_sets_succeeded > 1 ? "s" : "")); + + if (num_files_failed > 0) + sprintf(message, "%s, but %d dropped file%s failed!", + message_part1, num_files_failed, num_files_failed > 1 ? "s" : ""); + else + sprintf(message, "%s!", message_part1); + } + else if (num_files_failed > 0) + { + sprintf(message, "Failed to process dropped file%s!", + num_files_failed > 1 ? "s" : ""); + } + + Request(message, REQ_CONFIRM); +} + void HandleDropEvent(Event *event) { - static int files_succeeded = 0; - static int files_failed = 0; + static boolean confirm_on_drop_complete = FALSE; + static int num_level_sets_succeeded = 0; + static int num_artwork_sets_succeeded = 0; + static int num_files_failed = 0; switch (event->type) { case SDL_DROPBEGIN: { - files_succeeded = 0; - files_failed = 0; + confirm_on_drop_complete = TRUE; + num_level_sets_succeeded = 0; + num_artwork_sets_succeeded = 0; + num_files_failed = 0; break; } case SDL_DROPFILE: { - boolean success = HandleDropFileEvent(event->drop.file); - - if (success) - files_succeeded++; + int tree_type = HandleDropFileEvent(event->drop.file); + + if (tree_type == TREE_TYPE_LEVEL_DIR) + num_level_sets_succeeded++; + else if (tree_type == TREE_TYPE_GRAPHICS_DIR || + tree_type == TREE_TYPE_SOUNDS_DIR || + tree_type == TREE_TYPE_MUSIC_DIR) + num_artwork_sets_succeeded++; else - files_failed++; + num_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(num_level_sets_succeeded, + num_artwork_sets_succeeded, + num_files_failed); + + num_level_sets_succeeded = 0; + num_artwork_sets_succeeded = 0; + num_files_failed = 0; + } break; } @@ -1627,17 +1699,9 @@ 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(num_level_sets_succeeded, + num_artwork_sets_succeeded, + num_files_failed); break; } @@ -1646,7 +1710,6 @@ void HandleDropEvent(Event *event) if (event->drop.file != NULL) SDL_free(event->drop.file); } -#endif void HandleButton(int mx, int my, int button, int button_nr) {