X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fevents.c;h=5bcdd5fb22c723e4aaba848b844e2b4d937f1b03;hp=041c49b4e13b54d0314a111cf00773e817b95800;hb=97d0f78c43d16fbf73ea0438148a4da781c75600;hpb=d2457f732e2efb77ba786691efbd3cee6a9a69b9 diff --git a/src/events.c b/src/events.c index 041c49b4..5bcdd5fb 100644 --- a/src/events.c +++ b/src/events.c @@ -19,6 +19,7 @@ #include "editor.h" #include "files.h" #include "tape.h" +#include "anim.h" #include "network.h" @@ -26,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) @@ -66,7 +68,7 @@ static int FilterEventsExt(const Event *event) /* do no reset mouse cursor before all pending events have been processed */ if (gfx.cursor_mode == cursor_mode_last && - ((effectiveGameStatus() == GAME_MODE_TITLE && + ((game_status == GAME_MODE_TITLE && gfx.cursor_mode == CURSOR_NONE) || (game_status == GAME_MODE_PLAYING && gfx.cursor_mode == CURSOR_PLAYFIELD))) @@ -151,114 +153,67 @@ boolean NextValidEvent(Event *event) return FALSE; } -void EventLoop(void) +void HandleEvents() { - while (1) + Event event; + unsigned int event_frame_delay = 0; + unsigned int event_frame_delay_value = GAME_FRAME_DELAY; + + ResetDelayCounter(&event_frame_delay); + + while (NextValidEvent(&event)) { - if (PendingEvent()) /* got event */ + switch (event.type) { - Event event; + case EVENT_BUTTONPRESS: + case EVENT_BUTTONRELEASE: + HandleButtonEvent((ButtonEvent *) &event); + break; - while (NextValidEvent(&event)) - { - switch (event.type) - { - case EVENT_BUTTONPRESS: - case EVENT_BUTTONRELEASE: - HandleButtonEvent((ButtonEvent *) &event); - break; - - case EVENT_MOTIONNOTIFY: - HandleMotionEvent((MotionEvent *) &event); - break; + case EVENT_MOTIONNOTIFY: + HandleMotionEvent((MotionEvent *) &event); + break; #if defined(TARGET_SDL2) - case SDL_WINDOWEVENT: - HandleWindowEvent((WindowEvent *) &event); - break; - - case EVENT_FINGERPRESS: - case EVENT_FINGERRELEASE: - case EVENT_FINGERMOTION: - HandleFingerEvent((FingerEvent *) &event); - break; - - 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: - case EVENT_KEYRELEASE: - HandleKeyEvent((KeyEvent *) &event); - break; - - default: - HandleOtherEvents(&event); - break; - } - } - } - else - { - if (effectiveGameStatus() == GAME_MODE_TITLE) - { - /* when showing title screens, hide mouse pointer (if not moved) */ + case EVENT_WHEELMOTION: + HandleWheelEvent((WheelEvent *) &event); + break; - if (gfx.cursor_mode != CURSOR_NONE && - DelayReached(&special_cursor_delay, special_cursor_delay_value)) - { - SetMouseCursor(CURSOR_NONE); - } - } - else if (game_status == GAME_MODE_PLAYING && !tape.pausing) - { - /* when playing, display a special mouse pointer inside the playfield */ + case SDL_WINDOWEVENT: + HandleWindowEvent((WindowEvent *) &event); + break; - if (gfx.cursor_mode != CURSOR_PLAYFIELD && - cursor_inside_playfield && - DelayReached(&special_cursor_delay, special_cursor_delay_value)) - { - SetMouseCursor(CURSOR_PLAYFIELD); - } - } - else if (gfx.cursor_mode != CURSOR_DEFAULT) - { - SetMouseCursor(CURSOR_DEFAULT); - } + case EVENT_FINGERPRESS: + case EVENT_FINGERRELEASE: + case EVENT_FINGERMOTION: + HandleFingerEvent((FingerEvent *) &event); + break; - /* this is set after all pending events have been processed */ - cursor_mode_last = gfx.cursor_mode; - } + case EVENT_TEXTINPUT: + HandleTextEvent((TextEvent *) &event); + break; - /* also execute after pending events have been processed before */ - HandleNoEvent(); + case SDL_APP_WILLENTERBACKGROUND: + case SDL_APP_DIDENTERBACKGROUND: + case SDL_APP_WILLENTERFOREGROUND: + case SDL_APP_DIDENTERFOREGROUND: + HandlePauseResumeEvent((PauseResumeEvent *) &event); + break; +#endif - /* don't use all CPU time when idle; the main loop while playing - has its own synchronization and is CPU friendly, too */ + case EVENT_KEYPRESS: + case EVENT_KEYRELEASE: + HandleKeyEvent((KeyEvent *) &event); + break; - if (game_status == GAME_MODE_PLAYING) - { - HandleGameActions(); - } - else - { - if (!PendingEvent()) /* delay only if no pending events */ - Delay(10); + default: + HandleOtherEvents(&event); + break; } - /* refresh window contents from drawing buffer, if needed */ - BackToFront(); - - if (game_status == GAME_MODE_QUIT) - return; + // do not handle events for longer than standard frame delay period + if (DelayReached(&event_frame_delay, event_frame_delay_value)) + break; } } @@ -304,6 +259,68 @@ void HandleOtherEvents(Event *event) } } +void HandleMouseCursor() +{ + if (game_status == GAME_MODE_TITLE) + { + /* when showing title screens, hide mouse pointer (if not moved) */ + + if (gfx.cursor_mode != CURSOR_NONE && + DelayReached(&special_cursor_delay, special_cursor_delay_value)) + { + SetMouseCursor(CURSOR_NONE); + } + } + else if (game_status == GAME_MODE_PLAYING && (!tape.pausing || + tape.single_step)) + { + /* when playing, display a special mouse pointer inside the playfield */ + + if (gfx.cursor_mode != CURSOR_PLAYFIELD && + cursor_inside_playfield && + DelayReached(&special_cursor_delay, special_cursor_delay_value)) + { + SetMouseCursor(CURSOR_PLAYFIELD); + } + } + else if (gfx.cursor_mode != CURSOR_DEFAULT) + { + SetMouseCursor(CURSOR_DEFAULT); + } + + /* this is set after all pending events have been processed */ + cursor_mode_last = gfx.cursor_mode; +} + +void EventLoop(void) +{ + while (1) + { + if (PendingEvent()) + HandleEvents(); + else + HandleMouseCursor(); + + /* also execute after pending events have been processed before */ + HandleNoEvent(); + + /* don't use all CPU time when idle; the main loop while playing + has its own synchronization and is CPU friendly, too */ + + if (game_status == GAME_MODE_PLAYING) + HandleGameActions(); + + /* always copy backbuffer to visible screen for every video frame */ + BackToFront(); + + /* reset video frame delay to default (may change again while playing) */ + SetVideoFrameDelay(MenuFrameDelay); + + if (game_status == GAME_MODE_QUIT) + return; + } +} + void ClearEventQueue() { while (PendingEvent()) @@ -395,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) @@ -422,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 @@ -448,10 +509,13 @@ void HandleWindowEvent(WindowEvent *event) event_name, event->data1, event->data2); #endif +#if 0 + // (not needed, as the screen gets redrawn every 20 ms anyway) if (event->event == SDL_WINDOWEVENT_SIZE_CHANGED || event->event == SDL_WINDOWEVENT_RESIZED || event->event == SDL_WINDOWEVENT_EXPOSED) SDLRedrawWindow(); +#endif if (event->event == SDL_WINDOWEVENT_RESIZED && !video.fullscreen_enabled) { @@ -465,8 +529,10 @@ void HandleWindowEvent(WindowEvent *event) int new_xpercent = (100 * new_window_width / video.width); int new_ypercent = (100 * new_window_height / video.height); - setup.window_scaling_percent = video.window_scaling_percent = - MIN(MAX(MIN_WINDOW_SCALING_PERCENT, MIN(new_xpercent, new_ypercent)), + // (extreme window scaling allowed, but cannot be saved permanently) + video.window_scaling_percent = MIN(new_xpercent, new_ypercent); + setup.window_scaling_percent = + MIN(MAX(MIN_WINDOW_SCALING_PERCENT, video.window_scaling_percent), MAX_WINDOW_SCALING_PERCENT); video.window_width = new_window_width; @@ -806,21 +872,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) @@ -931,11 +992,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 @@ -1141,9 +1202,64 @@ 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(); + static boolean ignore_repeated_key = FALSE; static struct SetupKeyboardInfo ski; static struct SetupShortcutInfo ssi; static struct @@ -1311,12 +1427,18 @@ void HandleKey(Key key, int key_status) key_joystick_mapping = 0; if (key_status == KEY_RELEASED) + { + // reset flag to ignore repeated "key pressed" events after key release + ignore_repeated_key = FALSE; + return; + } if ((key == KSYM_F11 || ((key == KSYM_Return || key == KSYM_KP_Enter) && (GetKeyModState() & KMOD_Alt))) && - video.fullscreen_available) + video.fullscreen_available && + !ignore_repeated_key) { setup.fullscreen = !setup.fullscreen; @@ -1325,22 +1447,26 @@ void HandleKey(Key key, int key_status) if (game_status == GAME_MODE_SETUP) RedrawSetupScreenAfterFullscreenToggle(); + // set flag to ignore repeated "key pressed" events + ignore_repeated_key = TRUE; + return; } - if ((key == KSYM_minus || - key == KSYM_plus || - key == KSYM_0) && - ((GetKeyModState() & KMOD_Control) || - (GetKeyModState() & KMOD_Alt)) && + 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; @@ -1378,7 +1504,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); @@ -1493,18 +1619,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; } @@ -1523,40 +1637,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; } @@ -1566,12 +1646,15 @@ void HandleKey(Key key, int key_status) default: if (key == KSYM_Escape) { - game_status = GAME_MODE_MAIN; + SetGameStatus(GAME_MODE_MAIN); + DrawMainMenu(); return; } } + + HandleKeysDebug(key); } void HandleNoEvent() @@ -1579,7 +1662,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 { @@ -1595,15 +1678,6 @@ void HandleNoEvent() { case GAME_MODE_MAIN: DrawPreviewLevelAnimation(); - DoAnimation(); - break; - - case GAME_MODE_LEVELS: - case GAME_MODE_LEVELNR: - case GAME_MODE_SETUP: - case GAME_MODE_INFO: - case GAME_MODE_SCORES: - DoAnimation(); break; case GAME_MODE_EDITOR: