X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fevents.c;h=79821e98825ac7bc4b1bfa933d49b97952fd6b8e;hp=ab6dc8ca9e30e06ab5e6e8a26ddb8443b4753fe0;hb=5e4083a987541a748724ea21569758d512e0e770;hpb=b3965d5e36b4388795d646d6bca1764429defc88 diff --git a/src/events.c b/src/events.c index ab6dc8ca..79821e98 100644 --- a/src/events.c +++ b/src/events.c @@ -27,6 +27,7 @@ #define DEBUG_EVENTS_BUTTON (DEBUG_EVENTS * 0) #define DEBUG_EVENTS_MOTION (DEBUG_EVENTS * 0) +#define DEBUG_EVENTS_WHEEL (DEBUG_EVENTS * 1) #define DEBUG_EVENTS_WINDOW (DEBUG_EVENTS * 0) #define DEBUG_EVENTS_FINGER (DEBUG_EVENTS * 0) #define DEBUG_EVENTS_TEXT (DEBUG_EVENTS * 1) @@ -174,6 +175,10 @@ void HandleEvents() break; #if defined(TARGET_SDL2) + case EVENT_WHEELMOTION: + HandleWheelEvent((WheelEvent *) &event); + break; + case SDL_WINDOWEVENT: HandleWindowEvent((WindowEvent *) &event); break; @@ -309,7 +314,7 @@ void EventLoop(void) BackToFront(); /* reset video frame delay to default (may change again while playing) */ - SetVideoFrameDelay(GAME_FRAME_DELAY); + SetVideoFrameDelay(MenuFrameDelay); if (game_status == GAME_MODE_QUIT) return; @@ -407,6 +412,11 @@ void HandleButtonEvent(ButtonEvent *event) event->x, event->y); #endif +#if defined(HAS_SCREEN_KEYBOARD) + if (video.shifted_up) + event->y += video.shifted_up_pos; +#endif + motion_status = FALSE; if (event->type == EVENT_BUTTONPRESS) @@ -434,6 +444,45 @@ void HandleMotionEvent(MotionEvent *event) #if defined(TARGET_SDL2) +void HandleWheelEvent(WheelEvent *event) +{ + int button_nr; + +#if DEBUG_EVENTS_WHEEL +#if 1 + Error(ERR_DEBUG, "WHEEL EVENT: mouse == %d, x/y == %d/%d\n", + event->which, event->x, event->y); +#else + // (SDL_MOUSEWHEEL_NORMAL/SDL_MOUSEWHEEL_FLIPPED needs SDL 2.0.4 or newer) + Error(ERR_DEBUG, "WHEEL EVENT: mouse == %d, x/y == %d/%d, direction == %s\n", + event->which, event->x, event->y, + (event->direction == SDL_MOUSEWHEEL_NORMAL ? "SDL_MOUSEWHEEL_NORMAL" : + "SDL_MOUSEWHEEL_FLIPPED")); +#endif +#endif + + button_nr = (event->x < 0 ? MB_WHEEL_LEFT : + event->x > 0 ? MB_WHEEL_RIGHT : + event->y < 0 ? MB_WHEEL_DOWN : + event->y > 0 ? MB_WHEEL_UP : 0); + +#if defined(PLATFORM_WIN32) || defined(PLATFORM_MACOSX) + // accelerated mouse wheel available on Mac and Windows + wheel_steps = (event->x ? ABS(event->x) : ABS(event->y)); +#else + // no accelerated mouse wheel available on Unix/Linux + wheel_steps = DEFAULT_WHEEL_STEPS; +#endif + + motion_status = FALSE; + + button_status = button_nr; + HandleButton(0, 0, button_status, -button_nr); + + button_status = MB_RELEASED; + HandleButton(0, 0, button_status, -button_nr); +} + void HandleWindowEvent(WindowEvent *event) { #if DEBUG_EVENTS_WINDOW @@ -516,8 +565,8 @@ void HandleFingerEvent(FingerEvent *event) static float button_x1, button_y1; 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 + int move_trigger_distance_percent = setup.touch.move_distance; + int drop_trigger_distance_percent = setup.touch.drop_distance; 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; @@ -537,6 +586,9 @@ void HandleFingerEvent(FingerEvent *event) if (game_status != GAME_MODE_PLAYING) return; + if (strEqual(setup.touch.control_type, TOUCH_CONTROL_FOLLOW_FINGER)) + return; + if (strEqual(setup.touch.control_type, TOUCH_CONTROL_VIRTUAL_BUTTONS)) { int key_status = (event->type == EVENT_FINGERRELEASE ? KEY_RELEASED : @@ -799,6 +851,172 @@ void HandleFingerEvent(FingerEvent *event) } } +static void HandleFollowFinger(int mx, int my, int button) +{ + static int old_mx = 0, old_my = 0; + static Key motion_key_x = KSYM_UNDEFINED; + static Key motion_key_y = KSYM_UNDEFINED; + static boolean started_on_player = FALSE; + static boolean player_is_dropping = FALSE; + static int player_drop_count = 0; + static int last_player_x = -1; + static int last_player_y = -1; + + if (!strEqual(setup.touch.control_type, TOUCH_CONTROL_FOLLOW_FINGER)) + return; + + if (button == MB_PRESSED && IN_GFX_FIELD_PLAY(mx, my)) + { + touch_info[0].touched = TRUE; + touch_info[0].key = 0; + + old_mx = mx; + old_my = my; + + if (!motion_status) + { + started_on_player = FALSE; + player_is_dropping = FALSE; + player_drop_count = 0; + last_player_x = -1; + last_player_y = -1; + + motion_key_x = KSYM_UNDEFINED; + motion_key_y = KSYM_UNDEFINED; + + Error(ERR_DEBUG, "---------- TOUCH ACTION STARTED ----------"); + } + } + else if (button == MB_RELEASED && touch_info[0].touched) + { + touch_info[0].touched = FALSE; + touch_info[0].key = 0; + + old_mx = 0; + old_my = 0; + + if (motion_key_x != KSYM_UNDEFINED) + HandleKey(motion_key_x, KEY_RELEASED); + if (motion_key_y != KSYM_UNDEFINED) + HandleKey(motion_key_y, KEY_RELEASED); + + if (started_on_player) + { + if (player_is_dropping) + { + Error(ERR_DEBUG, "---------- DROP STOPPED ----------"); + + HandleKey(setup.input[0].key.drop, KEY_RELEASED); + } + else + { + Error(ERR_DEBUG, "---------- SNAP STOPPED ----------"); + + HandleKey(setup.input[0].key.snap, KEY_RELEASED); + } + } + + motion_key_x = KSYM_UNDEFINED; + motion_key_y = KSYM_UNDEFINED; + + Error(ERR_DEBUG, "---------- TOUCH ACTION STOPPED ----------"); + } + + if (touch_info[0].touched) + { + int src_x = local_player->jx; + int src_y = local_player->jy; + int dst_x = getLevelFromScreenX(old_mx); + int dst_y = getLevelFromScreenY(old_my); + int dx = dst_x - src_x; + int dy = dst_y - src_y; + Key new_motion_key_x = (dx < 0 ? setup.input[0].key.left : + dx > 0 ? setup.input[0].key.right : + KSYM_UNDEFINED); + Key new_motion_key_y = (dy < 0 ? setup.input[0].key.up : + dy > 0 ? setup.input[0].key.down : + KSYM_UNDEFINED); + + if (dx != 0 && dy != 0 && ABS(dx) != ABS(dy) && + (last_player_x != local_player->jx || + last_player_y != local_player->jy)) + { + // in case of asymmetric diagonal movement, use "preferred" direction + + int last_move_dir = (ABS(dx) > ABS(dy) ? MV_VERTICAL : MV_HORIZONTAL); + + if (level.game_engine_type == GAME_ENGINE_TYPE_EM) + level.native_em_level->ply[0]->last_move_dir = last_move_dir; + else + local_player->last_move_dir = last_move_dir; + + // (required to prevent accidentally forcing direction for next movement) + last_player_x = local_player->jx; + last_player_y = local_player->jy; + } + + if (button == MB_PRESSED && !motion_status && dx == 0 && dy == 0) + { + started_on_player = TRUE; + player_drop_count = getPlayerInventorySize(0); + player_is_dropping = (player_drop_count > 0); + + if (player_is_dropping) + { + Error(ERR_DEBUG, "---------- DROP STARTED ----------"); + + HandleKey(setup.input[0].key.drop, KEY_PRESSED); + } + else + { + Error(ERR_DEBUG, "---------- SNAP STARTED ----------"); + + HandleKey(setup.input[0].key.snap, KEY_PRESSED); + } + } + else if (dx != 0 || dy != 0) + { + if (player_is_dropping && + player_drop_count == getPlayerInventorySize(0)) + { + Error(ERR_DEBUG, "---------- DROP -> SNAP ----------"); + + HandleKey(setup.input[0].key.drop, KEY_RELEASED); + HandleKey(setup.input[0].key.snap, KEY_PRESSED); + + player_is_dropping = FALSE; + } + } + + if (new_motion_key_x != motion_key_x) + { + Error(ERR_DEBUG, "---------- %s %s ----------", + started_on_player && !player_is_dropping ? "SNAPPING" : "MOVING", + dx < 0 ? "LEFT" : dx > 0 ? "RIGHT" : "PAUSED"); + + if (motion_key_x != KSYM_UNDEFINED) + HandleKey(motion_key_x, KEY_RELEASED); + if (new_motion_key_x != KSYM_UNDEFINED) + HandleKey(new_motion_key_x, KEY_PRESSED); + } + + if (new_motion_key_y != motion_key_y) + { + Error(ERR_DEBUG, "---------- %s %s ----------", + started_on_player && !player_is_dropping ? "SNAPPING" : "MOVING", + dy < 0 ? "UP" : dy > 0 ? "DOWN" : "PAUSED"); + + if (motion_key_y != KSYM_UNDEFINED) + HandleKey(motion_key_y, KEY_RELEASED); + if (new_motion_key_y != KSYM_UNDEFINED) + HandleKey(new_motion_key_y, KEY_PRESSED); + } + + motion_key_x = new_motion_key_x; + motion_key_y = new_motion_key_y; + } +} + static boolean checkTextInputKeyModState() { // when playing, only handle raw key events and ignore text input @@ -823,21 +1041,16 @@ void HandleTextEvent(TextEvent *event) GetKeyModState()); #endif -#if defined(PLATFORM_ANDROID) - if (game_status == GAME_MODE_PSEUDO_TYPENAME) - { - HandleTypeName(0, key); - +#if !defined(HAS_SCREEN_KEYBOARD) + // non-mobile devices: only handle key input with modifier keys pressed here + // (every other key input is handled directly as physical key input event) + if (!checkTextInputKeyModState()) return; - } #endif - // only handle key input with text modifier keys pressed - if (checkTextInputKeyModState()) - { - HandleKey(key, KEY_PRESSED); - HandleKey(key, KEY_RELEASED); - } + // process text input as "classic" (with uppercase etc.) key input event + HandleKey(key, KEY_PRESSED); + HandleKey(key, KEY_RELEASED); } void HandlePauseResumeEvent(PauseResumeEvent *event) @@ -948,11 +1161,11 @@ void HandleButton(int mx, int my, int button, int button_nr) static int old_mx = 0, old_my = 0; boolean button_hold = FALSE; - if (button < 0) + if (button_nr < 0) { mx = old_mx; my = old_my; - button = -button; + button_nr = -button_nr; button_hold = TRUE; } else @@ -962,8 +1175,12 @@ void HandleButton(int mx, int my, int button, int button_nr) } #if defined(PLATFORM_ANDROID) - // !!! for now, do not handle gadgets when playing -- maybe fix this !!! - if (game_status != GAME_MODE_PLAYING && + // when playing, only handle gadgets when using "follow finger" controls + boolean handle_gadgets = + (game_status != GAME_MODE_PLAYING || + strEqual(setup.touch.control_type, TOUCH_CONTROL_FOLLOW_FINGER)); + + if (handle_gadgets && HandleGadgets(mx, my, button)) { /* do not handle this button event anymore */ @@ -1023,12 +1240,14 @@ void HandleButton(int mx, int my, int button, int button_nr) break; case GAME_MODE_PLAYING: + HandleFollowFinger(mx, my, button); + #ifdef DEBUG - 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)); + if (button == MB_PRESSED && !motion_status && IN_GFX_FIELD_PLAY(mx, my) && + GetKeyModState() & KMOD_Control) + DumpTileFromScreen(mx, my); #endif + break; default: @@ -1158,6 +1377,60 @@ static void HandleKeysSpecial(Key key) } } +void HandleKeysDebug(Key key) +{ +#ifdef DEBUG + int i; + + if (game_status == GAME_MODE_PLAYING || !setup.debug.frame_delay_game_only) + { + boolean mod_key_pressed = (GetKeyModState() != KMOD_None); + + for (i = 0; i < NUM_DEBUG_FRAME_DELAY_KEYS; i++) + { + if (key == setup.debug.frame_delay_key[i] && + (mod_key_pressed == setup.debug.frame_delay_use_mod_key)) + { + GameFrameDelay = (GameFrameDelay != setup.debug.frame_delay[i] ? + setup.debug.frame_delay[i] : GAME_FRAME_DELAY); + + if (!setup.debug.frame_delay_game_only) + MenuFrameDelay = GameFrameDelay; + + SetVideoFrameDelay(GameFrameDelay); + + if (GameFrameDelay > ONE_SECOND_DELAY) + Error(ERR_DEBUG, "frame delay == %d ms", GameFrameDelay); + else if (GameFrameDelay != 0) + Error(ERR_DEBUG, "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)"); + + break; + } + } + } + + if (game_status == GAME_MODE_PLAYING) + { + if (key == KSYM_d) + { + options.debug = !options.debug; + + Error(ERR_DEBUG, "debug mode %s", + (options.debug ? "enabled" : "disabled")); + } + else if (key == KSYM_v) + { + Error(ERR_DEBUG, "currently using game engine version %d", + game.engine_version); + } + } +#endif +} + void HandleKey(Key key, int key_status) { boolean anyTextGadgetActiveOrJustFinished = anyTextGadgetActive(); @@ -1355,21 +1628,20 @@ void HandleKey(Key key, int key_status) return; } - if ((key == KSYM_minus || - key == KSYM_plus || - key == KSYM_equal || // ("Shift-=" is "+" on US keyboards) - key == KSYM_0) && - ((GetKeyModState() & KMOD_Control) || - (GetKeyModState() & KMOD_Alt) || - (GetKeyModState() & KMOD_Meta)) && + if ((key == KSYM_0 || key == KSYM_KP_0 || + key == KSYM_minus || key == KSYM_KP_Subtract || + key == KSYM_plus || key == KSYM_KP_Add || + key == KSYM_equal) && // ("Shift-=" is "+" on US keyboards) + (GetKeyModState() & (KMOD_Control | KMOD_Meta)) && video.window_scaling_available && !video.fullscreen_enabled) { - if (key == KSYM_0) + if (key == KSYM_0 || key == KSYM_KP_0) setup.window_scaling_percent = STD_WINDOW_SCALING_PERCENT; + else if (key == KSYM_minus || key == KSYM_KP_Subtract) + setup.window_scaling_percent -= STEP_WINDOW_SCALING_PERCENT; else - setup.window_scaling_percent += - (key == KSYM_minus ? -1 : +1) * STEP_WINDOW_SCALING_PERCENT; + setup.window_scaling_percent += STEP_WINDOW_SCALING_PERCENT; if (setup.window_scaling_percent < MIN_WINDOW_SCALING_PERCENT) setup.window_scaling_percent = MIN_WINDOW_SCALING_PERCENT; @@ -1407,7 +1679,7 @@ void HandleKey(Key key, int key_status) else if (key == setup.shortcut.load_game) TapeQuickLoad(); else if (key == setup.shortcut.toggle_pause) - TapeTogglePause(TAPE_TOGGLE_MANUAL); + TapeTogglePause(TAPE_TOGGLE_MANUAL | TAPE_TOGGLE_PLAY_PAUSE); HandleTapeButtonKeys(key); HandleSoundButtonKeys(key); @@ -1522,18 +1794,6 @@ void HandleKey(Key key, int key_status) HandleHallOfFame(0, 0, 0, +1 * SCROLL_PAGE, MB_MENU_MARK); break; -#ifdef DEBUG - case KSYM_0: - GameFrameDelay = (GameFrameDelay == 500 ? GAME_FRAME_DELAY : 500); - break; - - case KSYM_b: - setup.sp_show_border_elements = !setup.sp_show_border_elements; - printf("Supaplex border elements %s\n", - setup.sp_show_border_elements ? "enabled" : "disabled"); - break; -#endif - default: break; } @@ -1552,40 +1812,6 @@ void HandleKey(Key key, int key_status) RequestQuitGame(setup.ask_on_escape); break; -#ifdef DEBUG - case KSYM_0: - if (key == KSYM_0) - { - if (GameFrameDelay == 500) - GameFrameDelay = GAME_FRAME_DELAY; - else - GameFrameDelay = 500; - } - else - GameFrameDelay = (key - KSYM_0) * 10; - printf("Game speed == %d%% (%d ms delay between two frames)\n", - GAME_FRAME_DELAY * 100 / GameFrameDelay, GameFrameDelay); - break; - - case KSYM_d: - if (options.debug) - { - options.debug = FALSE; - printf("debug mode disabled\n"); - } - else - { - options.debug = TRUE; - printf("debug mode enabled\n"); - } - break; - - case KSYM_v: - printf("::: currently using game engine version %d\n", - game.engine_version); - break; -#endif - default: break; } @@ -1602,6 +1828,8 @@ void HandleKey(Key key, int key_status) return; } } + + HandleKeysDebug(key); } void HandleNoEvent() @@ -1609,7 +1837,7 @@ void HandleNoEvent() // if (button_status && game_status != GAME_MODE_PLAYING) if (button_status && (game_status != GAME_MODE_PLAYING || tape.pausing)) { - HandleButton(0, 0, -button_status, button_status); + HandleButton(0, 0, button_status, -button_status); } else { @@ -1631,6 +1859,10 @@ void HandleNoEvent() HandleLevelEditorIdle(); break; + case GAME_MODE_PLAYING: + HandleFollowFinger(-1, -1, -1); + break; + default: break; }