X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fevents.c;h=14e7df862d68b129d81effc376322c081cf9aad4;hp=37d078cf5497074e45f8dc6e55b500550abc7cad;hb=3ff2e8a0b5c27b99a9920bdf5ed82bc41bf40181;hpb=eb6f957a5666e96d9d9d428bb6e91a5e44ef8601 diff --git a/src/events.c b/src/events.c index 37d078cf..14e7df86 100644 --- a/src/events.c +++ b/src/events.c @@ -1,15 +1,13 @@ -/*********************************************************** -* Rocks'n'Diamonds -- McDuffin Strikes Back! * -*----------------------------------------------------------* -* (c) 1995-2006 Artsoft Entertainment * -* Holger Schemel * -* Detmolder Strasse 189 * -* 33604 Bielefeld * -* Germany * -* e-mail: info@artsoft.org * -*----------------------------------------------------------* -* events.c * -***********************************************************/ +// ============================================================================ +// Rocks'n'Diamonds - McDuffin Strikes Back! +// ---------------------------------------------------------------------------- +// (c) 1995-2014 by Artsoft Entertainment +// Holger Schemel +// info@artsoft.org +// http://www.artsoft.org/ +// ---------------------------------------------------------------------------- +// events.c +// ============================================================================ #include "libgame/libgame.h" @@ -175,6 +173,13 @@ void EventLoop(void) case EVENT_TEXTINPUT: HandleTextEvent((TextEvent *) &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: @@ -205,15 +210,10 @@ void EventLoop(void) SetMouseCursor(CURSOR_DEFAULT); playfield_cursor_set = FALSE; } - -#if 0 - HandleNoEvent(); -#endif } -#if 1 + /* also execute after pending events have been processed before */ HandleNoEvent(); -#endif /* don't use all CPU time when idle; the main loop while playing has its own synchronization and is CPU friendly, too */ @@ -225,6 +225,7 @@ void EventLoop(void) else { SyncDisplay(); + if (!PendingEvent()) /* delay only if no pending events */ Delay(10); } @@ -294,11 +295,7 @@ void ClearEventQueue() break; case EVENT_KEYRELEASE: -#if 1 ClearPlayerAction(); -#else - key_joystick_mapping = 0; -#endif break; default: @@ -363,10 +360,6 @@ void SleepWhileUnmapped() void HandleExposeEvent(ExposeEvent *event) { -#if !defined(TARGET_SDL) - RedrawPlayfield(FALSE, event->x, event->y, event->width, event->height); - FlushDisplay(); -#endif } void HandleButtonEvent(ButtonEvent *event) @@ -407,6 +400,7 @@ void HandleMotionEvent(MotionEvent *event) } #if defined(TARGET_SDL2) + void HandleWindowEvent(WindowEvent *event) { #if DEBUG_EVENTS @@ -438,23 +432,8 @@ void HandleWindowEvent(WindowEvent *event) event->event == SDL_WINDOWEVENT_EXPOSED) SDLRedrawWindow(); -#if 0 - if (event->event == SDL_WINDOWEVENT_SIZE_CHANGED) - { - // if game started in fullscreen mode, window will also get fullscreen size - if (!video.fullscreen_enabled && video.fullscreen_initial) - { - SDLSetWindowScaling(setup.window_scaling_percent); - - // only do this correction once - video.fullscreen_initial = FALSE; - } - } -#endif - if (event->event == SDL_WINDOWEVENT_RESIZED && !video.fullscreen_enabled) { -#if 1 int new_window_width = event->data1; int new_window_height = event->data2; @@ -465,10 +444,6 @@ void HandleWindowEvent(WindowEvent *event) int new_xpercent = (100 * new_window_width / video.width); int new_ypercent = (100 * new_window_height / video.height); - printf("::: RESIZED from %d, %d to %d, %d\n", - video.window_width, video.window_height, - new_window_width, new_window_height); - setup.window_scaling_percent = video.window_scaling_percent = MIN(MAX(MIN_WINDOW_SCALING_PERCENT, MIN(new_xpercent, new_ypercent)), MAX_WINDOW_SCALING_PERCENT); @@ -476,50 +451,19 @@ void HandleWindowEvent(WindowEvent *event) video.window_width = new_window_width; video.window_height = new_window_height; - printf("::: setup.window_scaling_percent set to %d\n", - setup.window_scaling_percent); - if (game_status == GAME_MODE_SETUP) RedrawSetupScreenAfterFullscreenToggle(); - } -#else - // prevent slightly wrong scaling factor due to rounding differences - float scaling_factor = (float)setup.window_scaling_percent / 100; - int old_xsize = (int)(scaling_factor * video.width); - int old_ysize = (int)(scaling_factor * video.height); - int new_xsize = event->data1; - int new_ysize = event->data2; - - // window size is unchanged when going from fullscreen to window mode, - // but reverse calculation of scaling factor might result in a scaling - // factor that is slightly different due to rounding differences; - // therefore compare old/new window size and not old/new scaling factor - if (old_xsize != new_xsize || - old_ysize != new_ysize) - { - int new_xpercent = (100 * new_xsize / video.width); - int new_ypercent = (100 * new_ysize / video.height); - - setup.window_scaling_percent = MIN(new_xpercent, new_ypercent); - if (setup.window_scaling_percent < MIN_WINDOW_SCALING_PERCENT) - setup.window_scaling_percent = MIN_WINDOW_SCALING_PERCENT; - else if (setup.window_scaling_percent > MAX_WINDOW_SCALING_PERCENT) - setup.window_scaling_percent = MAX_WINDOW_SCALING_PERCENT; - - printf("::: setup.window_scaling_percent set to %d\n", - setup.window_scaling_percent); + SetWindowTitle(); } -#endif } } -#if 1 - #define NUM_TOUCH_FINGERS 3 static struct { + boolean touched; SDL_FingerID finger_id; int counter; Key key; @@ -532,14 +476,15 @@ void HandleFingerEvent(FingerEvent *event) static Key button_key = KSYM_UNDEFINED; static float motion_x1, motion_y1; static float button_x1, button_y1; - static SDL_FingerID motion_id = 0; - static SDL_FingerID button_id = 0; - int trigger_distance_percent = 1; // percent of touchpad width/height - float trigger_distance = (float)trigger_distance_percent / 100; + static SDL_FingerID motion_id = -1; + static SDL_FingerID button_id = -1; + int move_trigger_distance_percent = 2; // percent of touchpad width/height + int drop_trigger_distance_percent = 5; // percent of touchpad width/height + float move_trigger_distance = (float)move_trigger_distance_percent / 100; + float drop_trigger_distance = (float)drop_trigger_distance_percent / 100; float event_x = event->x; float event_y = event->y; -#if 1 #if DEBUG_EVENTS Error(ERR_DEBUG, "FINGER EVENT: finger was %s, touch ID %lld, finger ID %lld, x/y %f/%f, dx/dy %f/%f, pressure %f", event->type == EVENT_FINGERPRESS ? "pressed" : @@ -549,17 +494,15 @@ void HandleFingerEvent(FingerEvent *event) event->x, event->y, event->dx, event->dy, event->pressure); -#endif #endif if (game_status != GAME_MODE_PLAYING) return; - if (1) + if (strEqual(setup.touch.control_type, TOUCH_CONTROL_VIRTUAL_BUTTONS)) { int key_status = (event->type == EVENT_FINGERRELEASE ? KEY_RELEASED : KEY_PRESSED); -#if 1 Key key = (event->x < 1.0 / 3.0 ? (event->y < 1.0 / 2.0 ? setup.input[0].key.snap : setup.input[0].key.drop) : @@ -569,20 +512,23 @@ void HandleFingerEvent(FingerEvent *event) event->x < 5.0 / 6.0 ? setup.input[0].key.left : setup.input[0].key.right) : KSYM_UNDEFINED); -#else - Key key = (event->y < 1.0 / 3.0 ? setup.input[0].key.up : - event->y > 2.0 / 3.0 ? setup.input[0].key.down : - event->x < 1.0 / 3.0 ? setup.input[0].key.left : - event->x > 2.0 / 3.0 ? setup.input[0].key.right : - setup.input[0].key.snap); -#endif + char *key_status_name = (key_status == KEY_RELEASED ? "KEY_RELEASED" : + "KEY_PRESSED"); int i; + Error(ERR_DEBUG, "::: key '%s' was '%s' [fingerId: %lld]", + getKeyNameFromKey(key), key_status_name, event->fingerId); + // check if we already know this touch event's finger id for (i = 0; i < NUM_TOUCH_FINGERS; i++) { - if (touch_info[i].finger_id == event->fingerId) + if (touch_info[i].touched && + touch_info[i].finger_id == event->fingerId) + { + // Error(ERR_DEBUG, "MARK 1: %d", i); + break; + } } if (i >= NUM_TOUCH_FINGERS) @@ -598,16 +544,24 @@ void HandleFingerEvent(FingerEvent *event) { oldest_pos = i; oldest_counter = touch_info[i].counter; + + // Error(ERR_DEBUG, "MARK 2: %d", i); } - if (touch_info[i].finger_id == 0) + if (!touch_info[i].touched) + { + // Error(ERR_DEBUG, "MARK 3: %d", i); + break; + } } if (i >= NUM_TOUCH_FINGERS) { // all slots allocated -- use oldest slot i = oldest_pos; + + // Error(ERR_DEBUG, "MARK 4: %d", i); } } else @@ -615,7 +569,12 @@ void HandleFingerEvent(FingerEvent *event) // release of previously unknown key (should not happen) if (key != KSYM_UNDEFINED) + { HandleKey(key, KEY_RELEASED); + + Error(ERR_DEBUG, "=> key == '%s', key_status == '%s' [slot %d] [1]", + getKeyNameFromKey(key), "KEY_RELEASED", i); + } } } @@ -626,12 +585,23 @@ void HandleFingerEvent(FingerEvent *event) if (touch_info[i].key != key) { if (touch_info[i].key != KSYM_UNDEFINED) + { HandleKey(touch_info[i].key, KEY_RELEASED); + Error(ERR_DEBUG, "=> key == '%s', key_status == '%s' [slot %d] [2]", + getKeyNameFromKey(touch_info[i].key), "KEY_RELEASED", i); + } + if (key != KSYM_UNDEFINED) + { HandleKey(key, KEY_PRESSED); + + Error(ERR_DEBUG, "=> key == '%s', key_status == '%s' [slot %d] [3]", + getKeyNameFromKey(key), "KEY_PRESSED", i); + } } + touch_info[i].touched = TRUE; touch_info[i].finger_id = event->fingerId; touch_info[i].counter = Counter(); touch_info[i].key = key; @@ -639,19 +609,25 @@ void HandleFingerEvent(FingerEvent *event) else { if (touch_info[i].key != KSYM_UNDEFINED) + { HandleKey(touch_info[i].key, KEY_RELEASED); + Error(ERR_DEBUG, "=> key == '%s', key_status == '%s' [slot %d] [4]", + getKeyNameFromKey(touch_info[i].key), "KEY_RELEASED", i); + } + + touch_info[i].touched = FALSE; touch_info[i].finger_id = 0; touch_info[i].counter = 0; touch_info[i].key = 0; } } - Error(ERR_DEBUG, "=> key == %d, key_status == %d", key, key_status); - return; } + // use touch direction control + if (event->type == EVENT_FINGERPRESS) { if (event_x > 1.0 / 3.0) @@ -688,7 +664,7 @@ void HandleFingerEvent(FingerEvent *event) { if (event->fingerId == motion_id) { - motion_id = 0; + motion_id = -1; if (motion_key_x != KSYM_UNDEFINED) HandleKey(motion_key_x, KEY_RELEASED); @@ -702,7 +678,7 @@ void HandleFingerEvent(FingerEvent *event) } else if (event->fingerId == button_id) { - button_id = 0; + button_id = -1; if (button_key != KSYM_UNDEFINED) HandleKey(button_key, KEY_RELEASED); @@ -725,16 +701,16 @@ void HandleFingerEvent(FingerEvent *event) event_y > motion_y1 ? setup.input[0].key.down : KSYM_UNDEFINED); - if (distance_x < trigger_distance / 2 || + if (distance_x < move_trigger_distance / 2 || distance_x < distance_y) new_motion_key_x = KSYM_UNDEFINED; - if (distance_y < trigger_distance / 2 || + if (distance_y < move_trigger_distance / 2 || distance_y < distance_x) new_motion_key_y = KSYM_UNDEFINED; - if (distance_x > trigger_distance || - distance_y > trigger_distance) + if (distance_x > move_trigger_distance || + distance_y > move_trigger_distance) { if (new_motion_key_x != motion_key_x) { @@ -766,8 +742,8 @@ void HandleFingerEvent(FingerEvent *event) float distance_x = ABS(event_x - button_x1); float distance_y = ABS(event_y - button_y1); - if (distance_x < trigger_distance / 2 && - distance_y > trigger_distance) + if (distance_x < drop_trigger_distance / 2 && + distance_y > drop_trigger_distance) { if (button_key == setup.input[0].key.snap) HandleKey(button_key, KEY_RELEASED); @@ -785,94 +761,6 @@ void HandleFingerEvent(FingerEvent *event) } } -#else - -void HandleFingerEvent(FingerEvent *event) -{ -#if 0 - static int num_events = 0; - int max_events = 10; -#endif - -#if 0 -#if DEBUG_EVENTS - Error(ERR_DEBUG, "FINGER EVENT: finger was %s, touch ID %lld, finger ID %lld, x/y %f/%f, dx/dy %f/%f, pressure %f", - event->type == EVENT_FINGERPRESS ? "pressed" : - event->type == EVENT_FINGERRELEASE ? "released" : "moved", - event->touchId, - event->fingerId, - event->x, event->y, - event->dx, event->dy, - event->pressure); -#endif -#endif - -#if 0 - int x = (int)(event->x * video.width); - int y = (int)(event->y * video.height); - int button = MB_LEFTBUTTON; - - Error(ERR_DEBUG, "=> screen x/y %d/%d", x, y); -#endif - -#if 0 - if (++num_events >= max_events) - CloseAllAndExit(0); -#endif - -#if 1 -#if 0 - if (event->type == EVENT_FINGERPRESS || - event->type == EVENT_FINGERMOTION) - button_status = button; - else - button_status = MB_RELEASED; - - int max_x = SX + SXSIZE; - int max_y = SY + SYSIZE; -#endif - -#if 1 - if (game_status == GAME_MODE_PLAYING) -#else - if (game_status == GAME_MODE_PLAYING && - x < max_x) -#endif - { - int key_status = (event->type == EVENT_FINGERRELEASE ? KEY_RELEASED : - KEY_PRESSED); -#if 1 - Key key = (event->y < 1.0 / 3.0 ? setup.input[0].key.up : - event->y > 2.0 / 3.0 ? setup.input[0].key.down : - event->x < 1.0 / 3.0 ? setup.input[0].key.left : - event->x > 2.0 / 3.0 ? setup.input[0].key.right : - setup.input[0].key.drop); -#else - Key key = (y < max_y / 3 ? setup.input[0].key.up : - y > 2 * max_y / 3 ? setup.input[0].key.down : - x < max_x / 3 ? setup.input[0].key.left : - x > 2 * max_x / 3 ? setup.input[0].key.right : - setup.input[0].key.drop); -#endif - - Error(ERR_DEBUG, "=> key == %d, key_status == %d", key, key_status); - - HandleKey(key, key_status); - } - else - { -#if 0 - Error(ERR_DEBUG, "::: button_status == %d, button == %d\n", - button_status, button); - - HandleButton(x, y, button_status, button); -#endif - } -#endif -} - -#endif - static boolean checkTextInputKeyModState() { // when playing, only handle raw key events and ignore text input @@ -908,6 +796,19 @@ void HandleTextEvent(TextEvent *event) HandleKey(key, KEY_RELEASED); } } + +void HandlePauseResumeEvent(PauseResumeEvent *event) +{ + if (event->type == SDL_APP_WILLENTERBACKGROUND) + { + Mix_PauseMusic(); + } + else if (event->type == SDL_APP_DIDENTERFOREGROUND) + { + Mix_ResumeMusic(); + } +} + #endif void HandleKeyEvent(KeyEvent *event) @@ -928,13 +829,6 @@ void HandleKeyEvent(KeyEvent *event) getKeyNameFromKey(key)); #endif -#if 0 - if (key == KSYM_Menu) - Error(ERR_DEBUG, "menu key pressed"); - else if (key == KSYM_Back) - Error(ERR_DEBUG, "back key pressed"); -#endif - #if defined(PLATFORM_ANDROID) // always map the "back" button to the "escape" key on Android devices if (key == KSYM_Back) @@ -944,12 +838,6 @@ void HandleKeyEvent(KeyEvent *event) HandleKeyModState(keymod, key_status); #if defined(TARGET_SDL2) - - // if (game_status == GAME_MODE_PLAYING || GetKeyModState() == KMOD_None) - /* - if (game_status == GAME_MODE_PLAYING || - (GetKeyModState() & KMOD_TextInput) == KMOD_None) - */ if (!checkTextInputKeyModState()) HandleKey(key, key_status); #else @@ -1027,20 +915,25 @@ void HandleButton(int mx, int my, int button, int button_nr) old_my = my; } +#if defined(PLATFORM_ANDROID) + if (game_status != GAME_MODE_PLAYING && + HandleGadgets(mx, my, button)) + { + /* do not handle this button event anymore */ + mx = my = -32; /* force mouse event to be outside screen tiles */ + } +#else if (HandleGadgets(mx, my, button)) { /* do not handle this button event anymore */ mx = my = -32; /* force mouse event to be outside screen tiles */ } +#endif /* do not use scroll wheel button events for anything other than gadgets */ if (IS_WHEEL_BUTTON(button_nr)) return; -#if 0 - Error(ERR_DEBUG, "::: game_status == %d", game_status); -#endif - switch (game_status) { case GAME_MODE_TITLE: @@ -1081,8 +974,10 @@ void HandleButton(int mx, int my, int button, int button_nr) case GAME_MODE_PLAYING: #ifdef DEBUG - if (button == MB_PRESSED && !motion_status && IN_GFX_SCREEN(mx, my)) - DumpTile(LEVELX((mx - SX) / TILEX), LEVELY((my - SY) / TILEY)); + if (button == MB_PRESSED && !motion_status && IN_GFX_FIELD_PLAY(mx, my)) + DumpTile(LEVELX((mx - SX) / TILESIZE_VAR), + LEVELY((my - SY) / TILESIZE_VAR)); + // DumpTile(LEVELX((mx - SX) / TILEX), LEVELY((my - SY) / TILEY)); #endif break; @@ -1172,6 +1067,20 @@ static void HandleKeysSpecial(Key key) { DumpTape(&tape); } + else if (is_string_suffix(cheat_input, ":fix-tape") || + is_string_suffix(cheat_input, ":ft")) + { + /* fix single-player tapes that contain player input for more than one + player (due to a bug in 3.3.1.2 and earlier versions), which results + in playing levels with more than one player in multi-player mode, + even though the tape was originally recorded in single-player mode */ + + /* remove player input actions for all players but the first one */ + for (i = 1; i < MAX_PLAYERS; i++) + tape.player_participates[i] = FALSE; + + tape.changed = TRUE; + } else if (is_string_suffix(cheat_input, ":save-native-level") || is_string_suffix(cheat_input, ":snl")) { @@ -1289,15 +1198,11 @@ void HandleKey(Key key, int key_status) if (stored_player[pnr].action & KEY_BUTTON_DROP) element_dropped[pnr] = TRUE; } -#if 1 else if (key_status == KEY_PRESSED && key_action & KEY_BUTTON_DROP) { if (level.game_engine_type == GAME_ENGINE_TYPE_EM || level.game_engine_type == GAME_ENGINE_TYPE_SP) { -#if 0 - printf("::: drop key pressed\n"); -#endif if (level.game_engine_type == GAME_ENGINE_TYPE_SP && getRedDiskReleaseFlag_SP() == 0) @@ -1306,7 +1211,6 @@ void HandleKey(Key key, int key_status) TapeTogglePause(TAPE_TOGGLE_AUTOMATIC); } } -#endif else if (key_status == KEY_RELEASED && key_action & KEY_BUTTON) { if (key_action & KEY_BUTTON_SNAP) @@ -1325,7 +1229,6 @@ void HandleKey(Key key, int key_status) element_snapped[pnr] = FALSE; } -#if 1 if (key_action & KEY_BUTTON_DROP && level.game_engine_type == GAME_ENGINE_TYPE_RND) { @@ -1344,7 +1247,6 @@ void HandleKey(Key key, int key_status) element_dropped[pnr] = FALSE; } -#endif } } else if (tape.recording && tape.pausing) @@ -1378,15 +1280,13 @@ void HandleKey(Key key, int key_status) if (key_status == KEY_RELEASED) return; - if ((key == KSYM_Return || key == KSYM_KP_Enter) && - (GetKeyModState() & KMOD_Alt) && video.fullscreen_available) + if ((key == KSYM_F11 || + ((key == KSYM_Return || + key == KSYM_KP_Enter) && (GetKeyModState() & KMOD_Alt))) && + video.fullscreen_available) { setup.fullscreen = !setup.fullscreen; -#if 0 - printf("::: %d\n", setup.window_scaling_percent); -#endif - ToggleFullscreenOrChangeWindowScalingIfNeeded(); if (game_status == GAME_MODE_SETUP) @@ -1395,8 +1295,12 @@ void HandleKey(Key key, int key_status) return; } - if ((key == KSYM_minus || key == KSYM_plus || key == KSYM_0) && - (GetKeyModState() & KMOD_Alt) && video.window_scaling_available && + if ((key == KSYM_minus || + key == KSYM_plus || + key == KSYM_0) && + ((GetKeyModState() & KMOD_Control) || + (GetKeyModState() & KMOD_Alt)) && + video.window_scaling_available && !video.fullscreen_enabled) { if (key == KSYM_0) @@ -1418,13 +1322,8 @@ void HandleKey(Key key, int key_status) return; } -#if 0 - if (game_status == GAME_MODE_PLAYING && local_player->LevelSolved_GameEnd && - (key == KSYM_Return || key == setup.shortcut.toggle_pause)) -#else if (game_status == GAME_MODE_PLAYING && AllPlayersGone && (key == KSYM_Return || key == setup.shortcut.toggle_pause)) -#endif { GameEnd(); @@ -1593,17 +1492,6 @@ void HandleKey(Key key, int key_status) #ifdef DEBUG case KSYM_0: -#if 0 - case KSYM_1: - case KSYM_2: - case KSYM_3: - case KSYM_4: - case KSYM_5: - case KSYM_6: - case KSYM_7: - case KSYM_8: - case KSYM_9: -#endif if (key == KSYM_0) { if (GameFrameDelay == 500) @@ -1630,6 +1518,7 @@ void HandleKey(Key key, int key_status) } break; +#if 0 case KSYM_s: if (!global.fps_slowdown) { @@ -1649,26 +1538,7 @@ void HandleKey(Key key, int key_status) printf("fps slowdown disabled\n"); } break; - - case KSYM_f: - ScrollStepSize = TILEX / 8; - printf("ScrollStepSize == %d (1/8)\n", ScrollStepSize); - break; - - case KSYM_g: - ScrollStepSize = TILEX / 4; - printf("ScrollStepSize == %d (1/4)\n", ScrollStepSize); - break; - - case KSYM_h: - ScrollStepSize = TILEX / 2; - printf("ScrollStepSize == %d (1/2)\n", ScrollStepSize); - break; - - case KSYM_l: - ScrollStepSize = TILEX; - printf("ScrollStepSize == %d (1/1)\n", ScrollStepSize); - break; +#endif case KSYM_v: printf("::: currently using game engine version %d\n", @@ -1698,10 +1568,6 @@ void HandleNoEvent() if (button_status && game_status != GAME_MODE_PLAYING) { HandleButton(0, 0, -button_status, button_status); - -#if 0 - return; -#endif } else { @@ -1811,21 +1677,11 @@ void HandleJoystick() HandleHallOfFame(0, 0, dx, dy, !newbutton); break; -#if 0 - case GAME_MODE_EDITOR: - HandleLevelEditorIdle(); - break; -#endif - case GAME_MODE_PLAYING: if (tape.playing || keyboard) newbutton = ((joy & JOY_BUTTON) != 0); -#if 0 - if (newbutton && local_player->LevelSolved_GameEnd) -#else if (newbutton && AllPlayersGone) -#endif { GameEnd();