X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fevents.c;h=88fc321444e1a3dac81b763688b9079e3af516b6;hp=bb6628964d216db9fb65949b80c36fe00bfb4c4a;hb=a7c06161253796a30a0237a7f5a044f459c8cf35;hpb=f857fec3082c785b0dd271b6ad1b7642a2ed4e65 diff --git a/src/events.c b/src/events.c index bb662896..88fc3214 100644 --- a/src/events.c +++ b/src/events.c @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2002 Artsoft Entertainment * +* (c) 1995-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * @@ -23,25 +23,34 @@ #include "tape.h" #include "network.h" -/* values for key_status */ -#define KEY_NOT_PRESSED FALSE -#define KEY_RELEASED FALSE -#define KEY_PRESSED TRUE + +#define DEBUG_EVENTS 0 static boolean cursor_inside_playfield = FALSE; static boolean playfield_cursor_set = FALSE; -static unsigned long playfield_cursor_delay = 0; +static unsigned int playfield_cursor_delay = 0; /* event filter especially needed for SDL event filtering due to delay problems with lots of mouse motion events when mouse button not pressed (X11 can handle this with 'PointerMotionHintMask') */ -int FilterMouseMotionEvents(const Event *event) +/* event filter addition for SDL2: as SDL2 does not have a function to enable + or disable keyboard auto-repeat, filter repeated keyboard events instead */ + +static int FilterEventsExt(const Event *event) { MotionEvent *motion; +#if defined(TARGET_SDL2) + /* skip repeated key press events if keyboard auto-repeat is disabled */ + if (event->type == EVENT_KEYPRESS && + event->key.repeat && + !keyrepeat_status) + return 0; +#endif + /* non-motion events are directly passed to event handler functions */ if (event->type != EVENT_MOTIONNOTIFY) return 1; @@ -58,10 +67,52 @@ int FilterMouseMotionEvents(const Event *event) } /* skip mouse motion events without pressed button outside level editor */ - if (button_status == MB_RELEASED && game_status != GAME_MODE_EDITOR) + if (button_status == MB_RELEASED && + game_status != GAME_MODE_EDITOR && game_status != GAME_MODE_PLAYING) return 0; - else - return 1; + + return 1; +} + +#if defined(TARGET_SDL2) +int FilterEvents(void *userdata, Event *event) +{ + return FilterEventsExt(event); +} +#else +int FilterEvents(const Event *event) +{ + return FilterEventsExt(event); +} +#endif + +/* to prevent delay problems, skip mouse motion events if the very next + event is also a mouse motion event (and therefore effectively only + handling the last of a row of mouse motion events in the event queue) */ + +boolean SkipPressedMouseMotionEvent(const Event *event) +{ + /* nothing to do if the current event is not a mouse motion event */ + if (event->type != EVENT_MOTIONNOTIFY) + return FALSE; + + /* only skip motion events with pressed button outside level editor */ + if (button_status == MB_RELEASED || + game_status == GAME_MODE_EDITOR || game_status == GAME_MODE_PLAYING) + return FALSE; + + if (PendingEvent()) + { + Event next_event; + + PeekEvent(&next_event); + + /* if next event is also a mouse motion event, skip the current one */ + if (next_event.type == EVENT_MOTIONNOTIFY) + return TRUE; + } + + return FALSE; } /* this is only really needed for non-SDL targets to filter unwanted events; @@ -72,9 +123,17 @@ static boolean NextValidEvent(Event *event) { while (PendingEvent()) { + boolean handle_this_event = FALSE; + NextEvent(event); - if (FilterMouseMotionEvents(event)) + if (FilterEventsExt(event)) + handle_this_event = TRUE; + + if (SkipPressedMouseMotionEvent(event)) + handle_this_event = FALSE; + + if (handle_this_event) return TRUE; } @@ -83,15 +142,15 @@ static boolean NextValidEvent(Event *event) void EventLoop(void) { - while(1) + while (1) { if (PendingEvent()) /* got event */ { Event event; - if (NextValidEvent(&event)) + while (NextValidEvent(&event)) { - switch(event.type) + switch (event.type) { case EVENT_BUTTONPRESS: case EVENT_BUTTONRELEASE: @@ -101,22 +160,45 @@ void EventLoop(void) 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; +#endif + case EVENT_KEYPRESS: case EVENT_KEYRELEASE: HandleKeyEvent((KeyEvent *) &event); break; - + default: HandleOtherEvents(&event); break; } } } + + // !!! CHECK THIS: + // !!! this may result in "HandleNoEvent()" never being called + // !!! (especially due to continuously processed tocuh events) + // !!! and therefore toon animations being stopped while events + // !!! are being processed (even if they are all thrown away) + else { /* when playing, display a special mouse pointer inside the playfield */ - if (game_status == GAME_MODE_PLAYING) + if (game_status == GAME_MODE_PLAYING && !tape.pausing) { if (!playfield_cursor_set && cursor_inside_playfield && DelayReached(&playfield_cursor_delay, 1000)) @@ -138,7 +220,9 @@ void EventLoop(void) has its own synchronization and is CPU friendly, too */ if (game_status == GAME_MODE_PLAYING) + { HandleGameActions(); + } else { SyncDisplay(); @@ -156,7 +240,7 @@ void EventLoop(void) void HandleOtherEvents(Event *event) { - switch(event->type) + switch (event->type) { case EVENT_EXPOSE: HandleExposeEvent((ExposeEvent *) event); @@ -185,6 +269,10 @@ void HandleOtherEvents(Event *event) case SDL_JOYBUTTONUP: HandleJoystickEvent(event); break; + + case SDL_SYSWMEVENT: + HandleWindowManagerEvent(event); + break; #endif default: @@ -200,14 +288,18 @@ void ClearEventQueue() NextEvent(&event); - switch(event.type) + switch (event.type) { case EVENT_BUTTONRELEASE: button_status = MB_RELEASED; break; case EVENT_KEYRELEASE: +#if 1 + ClearPlayerAction(); +#else key_joystick_mapping = 0; +#endif break; default: @@ -223,7 +315,7 @@ void ClearPlayerAction() /* simulate key release events for still pressed keys */ key_joystick_mapping = 0; - for (i=0; ix, event->y, event->width, event->height); FlushDisplay(); #endif @@ -280,6 +372,13 @@ void HandleExposeEvent(ExposeEvent *event) void HandleButtonEvent(ButtonEvent *event) { +#if DEBUG_EVENTS + Error(ERR_DEBUG, "BUTTON EVENT: button %d %s, x/y %d/%d\n", + event->button, + event->type == EVENT_BUTTONPRESS ? "pressed" : "released", + event->x, event->y); +#endif + motion_status = FALSE; if (event->type == EVENT_BUTTONPRESS) @@ -287,7 +386,7 @@ void HandleButtonEvent(ButtonEvent *event) else button_status = MB_RELEASED; - HandleButton(event->x, event->y, button_status); + HandleButton(event->x, event->y, button_status, event->button); } void HandleMotionEvent(MotionEvent *event) @@ -295,23 +394,293 @@ void HandleMotionEvent(MotionEvent *event) if (!PointerInWindow(window)) return; /* window and pointer are on different screens */ -#if 1 if (button_status == MB_RELEASED && game_status != GAME_MODE_EDITOR) return; -#endif motion_status = TRUE; - HandleButton(event->x, event->y, button_status); +#if DEBUG_EVENTS + Error(ERR_DEBUG, "MOTION EVENT: button %d moved, x/y %d/%d\n", + button_status, event->x, event->y); +#endif + + HandleButton(event->x, event->y, button_status, button_status); +} + +#if defined(TARGET_SDL2) +void HandleWindowEvent(WindowEvent *event) +{ +#if DEBUG_EVENTS + int subtype = event->event; + + char *event_name = + (subtype == SDL_WINDOWEVENT_SHOWN ? "SDL_WINDOWEVENT_SHOWN" : + subtype == SDL_WINDOWEVENT_HIDDEN ? "SDL_WINDOWEVENT_HIDDEN" : + subtype == SDL_WINDOWEVENT_EXPOSED ? "SDL_WINDOWEVENT_EXPOSED" : + subtype == SDL_WINDOWEVENT_MOVED ? "SDL_WINDOWEVENT_MOVED" : + subtype == SDL_WINDOWEVENT_SIZE_CHANGED ? "SDL_WINDOWEVENT_SIZE_CHANGED" : + subtype == SDL_WINDOWEVENT_RESIZED ? "SDL_WINDOWEVENT_RESIZED" : + subtype == SDL_WINDOWEVENT_MINIMIZED ? "SDL_WINDOWEVENT_MINIMIZED" : + subtype == SDL_WINDOWEVENT_MAXIMIZED ? "SDL_WINDOWEVENT_MAXIMIZED" : + subtype == SDL_WINDOWEVENT_RESTORED ? "SDL_WINDOWEVENT_RESTORED" : + subtype == SDL_WINDOWEVENT_ENTER ? "SDL_WINDOWEVENT_ENTER" : + subtype == SDL_WINDOWEVENT_LEAVE ? "SDL_WINDOWEVENT_LEAVE" : + subtype == SDL_WINDOWEVENT_FOCUS_GAINED ? "SDL_WINDOWEVENT_FOCUS_GAINED" : + subtype == SDL_WINDOWEVENT_FOCUS_LOST ? "SDL_WINDOWEVENT_FOCUS_LOST" : + subtype == SDL_WINDOWEVENT_CLOSE ? "SDL_WINDOWEVENT_CLOSE" : + "(UNKNOWN)"); + + Error(ERR_DEBUG, "WINDOW EVENT: '%s', %ld, %ld", + event_name, event->data1, event->data2); +#endif + + if (event->event == SDL_WINDOWEVENT_SIZE_CHANGED || + event->event == SDL_WINDOWEVENT_RESIZED || + 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; + + printf("::: RESIZED from %d, %d to %d, %d\n", + video.window_width, video.window_height, + new_window_width, new_window_height); + + // if window size has changed after resizing, calculate new scaling factor + if (new_window_width != video.window_width || + new_window_height != video.window_height) + { + 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)), + MAX_WINDOW_SCALING_PERCENT); + + 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); + } +#endif + } +} + +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 } +static boolean checkTextInputKeyModState() +{ + // when playing, only handle raw key events and ignore text input + if (game_status == GAME_MODE_PLAYING) + return FALSE; + + return ((GetKeyModState() & KMOD_TextInput) != KMOD_None); +} + +void HandleTextEvent(TextEvent *event) +{ + char *text = event->text; + Key key = getKeyFromKeyName(text); + +#if DEBUG_EVENTS + Error(ERR_DEBUG, "TEXT EVENT: text == '%s' [%d byte(s), '%c'/%d], resulting key == %d (%s) [%04x]", + text, + strlen(text), + text[0], (int)(text[0]), + key, + getKeyNameFromKey(key), + GetKeyModState()); +#endif + + // 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_PRESSED); + HandleKey(key, KEY_RELEASED); + } +} +#endif + void HandleKeyEvent(KeyEvent *event) { - int key_status = (event->type==EVENT_KEYPRESS ? KEY_PRESSED : KEY_RELEASED); + int key_status = (event->type == EVENT_KEYPRESS ? KEY_PRESSED : KEY_RELEASED); boolean with_modifiers = (game_status == GAME_MODE_PLAYING ? FALSE : TRUE); Key key = GetEventKey(event, with_modifiers); + Key keymod = (with_modifiers ? GetEventKey(event, FALSE) : key); + +#if DEBUG_EVENTS + Error(ERR_DEBUG, "KEY EVENT: key was %s, keysym.scancode == %d, keysym.sym == %d, keymod = %d, GetKeyModState() = 0x%04x, resulting key == %d (%s)", + event->type == EVENT_KEYPRESS ? "pressed" : "released", + event->keysym.scancode, + event->keysym.sym, + keymod, + GetKeyModState(), + key, + 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) + key = KSYM_Escape; +#endif + + 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 HandleKey(key, key_status); +#endif } void HandleFocusEvent(FocusChangeEvent *event) @@ -349,6 +718,7 @@ void HandleFocusEvent(FocusChangeEvent *event) Delay(100); KeyboardAutoRepeatOffUnlessAutoplay(); } + if (old_joystick_status != -1) joystick.status = old_joystick_status; } @@ -360,7 +730,14 @@ void HandleClientMessageEvent(ClientMessageEvent *event) CloseAllAndExit(0); } -void HandleButton(int mx, int my, int button) +void HandleWindowManagerEvent(Event *event) +{ +#if defined(TARGET_SDL) + SDLHandleWindowManagerEvent(event); +#endif +} + +void HandleButton(int mx, int my, int button, int button_nr) { static int old_mx = 0, old_my = 0; @@ -376,12 +753,28 @@ void HandleButton(int mx, int my, int button) old_my = my; } - HandleGadgets(mx, my, button); + if (HandleGadgets(mx, my, button)) + { + /* do not handle this button event anymore */ + mx = my = -32; /* force mouse event to be outside screen tiles */ + } + + /* 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) + switch (game_status) { + case GAME_MODE_TITLE: + HandleTitleScreen(mx, my, 0, 0, button); + break; + case GAME_MODE_MAIN: - HandleMainMenu(mx,my, 0,0, button); + HandleMainMenu(mx, my, 0, 0, button); break; case GAME_MODE_PSEUDO_TYPENAME: @@ -389,52 +782,33 @@ void HandleButton(int mx, int my, int button) break; case GAME_MODE_LEVELS: - HandleChooseLevel(mx,my, 0,0, button); + HandleChooseLevelSet(mx, my, 0, 0, button); + break; + + case GAME_MODE_LEVELNR: + HandleChooseLevelNr(mx, my, 0, 0, button); break; case GAME_MODE_SCORES: - HandleHallOfFame(0,0, 0,0, button); + HandleHallOfFame(0, 0, 0, 0, button); break; case GAME_MODE_EDITOR: + HandleLevelEditorIdle(); break; case GAME_MODE_INFO: - HandleHelpScreen(button); + HandleInfoScreen(mx, my, 0, 0, button); break; case GAME_MODE_SETUP: - HandleSetupScreen(mx,my, 0,0, button); + HandleSetupScreen(mx, my, 0, 0, button); break; case GAME_MODE_PLAYING: #ifdef DEBUG - if (button == MB_RELEASED) - { - int sx = (mx - SX) / TILEX; - int sy = (my - SY) / TILEY; - - if (IN_VIS_FIELD(sx,sy)) - { - int x = LEVELX(sx); - int y = LEVELY(sy); - - printf("INFO: SCREEN(%d, %d), LEVEL(%d, %d)\n", sx, sy, x, y); - - if (!IN_LEV_FIELD(x, y)) - break; - - printf(" Feld[%d][%d] == %d\n", x,y, Feld[x][y]); - printf(" Store[%d][%d] == %d\n", x,y, Store[x][y]); - printf(" Store2[%d][%d] == %d\n", x,y, Store2[x][y]); - printf(" StorePlayer[%d][%d] == %d\n", x,y, StorePlayer[x][y]); - printf(" MovPos[%d][%d] == %d\n", x,y, MovPos[x][y]); - printf(" MovDir[%d][%d] == %d\n", x,y, MovDir[x][y]); - printf(" MovDelay[%d][%d] == %d\n", x,y, MovDelay[x][y]); - printf(" GfxElement[%d][%d] == %d\n", x,y, GfxElement[x][y]); - printf("\n"); - } - } + if (button == MB_PRESSED && !motion_status && IN_GFX_SCREEN(mx, my)) + DumpTile(LEVELX((mx - SX) / TILEX), LEVELY((my - SY) / TILEY)); #endif break; @@ -443,51 +817,183 @@ void HandleButton(int mx, int my, int button) } } +static boolean is_string_suffix(char *string, char *suffix) +{ + int string_len = strlen(string); + int suffix_len = strlen(suffix); + + if (suffix_len > string_len) + return FALSE; + + return (strEqual(&string[string_len - suffix_len], suffix)); +} + +#define MAX_CHEAT_INPUT_LEN 32 + +static void HandleKeysSpecial(Key key) +{ + static char cheat_input[2 * MAX_CHEAT_INPUT_LEN + 1] = ""; + char letter = getCharFromKey(key); + int cheat_input_len = strlen(cheat_input); + int i; + + if (letter == 0) + return; + + if (cheat_input_len >= 2 * MAX_CHEAT_INPUT_LEN) + { + for (i = 0; i < MAX_CHEAT_INPUT_LEN + 1; i++) + cheat_input[i] = cheat_input[MAX_CHEAT_INPUT_LEN + i]; + + cheat_input_len = MAX_CHEAT_INPUT_LEN; + } + + cheat_input[cheat_input_len++] = letter; + cheat_input[cheat_input_len] = '\0'; + +#if DEBUG_EVENTS + Error(ERR_DEBUG, "SPECIAL KEY '%s' [%d]\n", cheat_input, cheat_input_len); +#endif + + if (game_status == GAME_MODE_MAIN) + { + if (is_string_suffix(cheat_input, ":insert-solution-tape") || + is_string_suffix(cheat_input, ":ist")) + { + InsertSolutionTape(); + } + else if (is_string_suffix(cheat_input, ":reload-graphics") || + is_string_suffix(cheat_input, ":rg")) + { + ReloadCustomArtwork(1 << ARTWORK_TYPE_GRAPHICS); + DrawMainMenu(); + } + else if (is_string_suffix(cheat_input, ":reload-sounds") || + is_string_suffix(cheat_input, ":rs")) + { + ReloadCustomArtwork(1 << ARTWORK_TYPE_SOUNDS); + DrawMainMenu(); + } + else if (is_string_suffix(cheat_input, ":reload-music") || + is_string_suffix(cheat_input, ":rm")) + { + ReloadCustomArtwork(1 << ARTWORK_TYPE_MUSIC); + DrawMainMenu(); + } + else if (is_string_suffix(cheat_input, ":reload-artwork") || + is_string_suffix(cheat_input, ":ra")) + { + ReloadCustomArtwork(1 << ARTWORK_TYPE_GRAPHICS | + 1 << ARTWORK_TYPE_SOUNDS | + 1 << ARTWORK_TYPE_MUSIC); + DrawMainMenu(); + } + else if (is_string_suffix(cheat_input, ":dump-level") || + is_string_suffix(cheat_input, ":dl")) + { + DumpLevel(&level); + } + else if (is_string_suffix(cheat_input, ":dump-tape") || + is_string_suffix(cheat_input, ":dt")) + { + DumpTape(&tape); + } + else if (is_string_suffix(cheat_input, ":save-native-level") || + is_string_suffix(cheat_input, ":snl")) + { + SaveNativeLevel(&level); + } + } + else if (game_status == GAME_MODE_PLAYING) + { +#ifdef DEBUG + if (is_string_suffix(cheat_input, ".q")) + DEBUG_SetMaximumDynamite(); +#endif + } + else if (game_status == GAME_MODE_EDITOR) + { + if (is_string_suffix(cheat_input, ":dump-brush") || + is_string_suffix(cheat_input, ":DB")) + { + DumpBrush(); + } + else if (is_string_suffix(cheat_input, ":DDB")) + { + DumpBrush_Small(); + } + } +} + void HandleKey(Key key, int key_status) { - int joy = 0; boolean anyTextGadgetActiveOrJustFinished = anyTextGadgetActive(); - static struct SetupKeyboardInfo custom_key; + static struct SetupKeyboardInfo ski; + static struct SetupShortcutInfo ssi; static struct { Key *key_custom; + Key *key_snap; Key key_default; byte action; } key_info[] = { - { &custom_key.left, DEFAULT_KEY_LEFT, JOY_LEFT }, - { &custom_key.right, DEFAULT_KEY_RIGHT, JOY_RIGHT }, - { &custom_key.up, DEFAULT_KEY_UP, JOY_UP }, - { &custom_key.down, DEFAULT_KEY_DOWN, JOY_DOWN }, - { &custom_key.snap, DEFAULT_KEY_SNAP, JOY_BUTTON_1 }, - { &custom_key.bomb, DEFAULT_KEY_BOMB, JOY_BUTTON_2 } + { &ski.left, &ssi.snap_left, DEFAULT_KEY_LEFT, JOY_LEFT }, + { &ski.right, &ssi.snap_right, DEFAULT_KEY_RIGHT, JOY_RIGHT }, + { &ski.up, &ssi.snap_up, DEFAULT_KEY_UP, JOY_UP }, + { &ski.down, &ssi.snap_down, DEFAULT_KEY_DOWN, JOY_DOWN }, + { &ski.snap, NULL, DEFAULT_KEY_SNAP, JOY_BUTTON_SNAP }, + { &ski.drop, NULL, DEFAULT_KEY_DROP, JOY_BUTTON_DROP } }; + int joy = 0; + int i; if (game_status == GAME_MODE_PLAYING) { /* only needed for single-step tape recording mode */ - static boolean clear_button_2[MAX_PLAYERS] = { FALSE,FALSE,FALSE,FALSE }; - static boolean bomb_placed[MAX_PLAYERS] = { FALSE,FALSE,FALSE,FALSE }; + static boolean clear_snap_button[MAX_PLAYERS] = { FALSE,FALSE,FALSE,FALSE }; + static boolean clear_drop_button[MAX_PLAYERS] = { FALSE,FALSE,FALSE,FALSE }; + static boolean element_snapped[MAX_PLAYERS] = { FALSE,FALSE,FALSE,FALSE }; + static boolean element_dropped[MAX_PLAYERS] = { FALSE,FALSE,FALSE,FALSE }; int pnr; - for (pnr=0; pnr MAX_WINDOW_SCALING_PERCENT) + setup.window_scaling_percent = MAX_WINDOW_SCALING_PERCENT; + + ToggleFullscreenIfNeeded(); + + if (game_status == GAME_MODE_SETUP) + RedrawSetupScreenAfterFullscreenToggle(); + + 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(); + + return; + } + + if (game_status == GAME_MODE_MAIN && + (key == setup.shortcut.toggle_pause || key == KSYM_space)) + { + StartGameActions(options.network, setup.autorecord, level.random_seed); + return; } - /* special key shortcuts */ if (game_status == GAME_MODE_MAIN || game_status == GAME_MODE_PLAYING) { if (key == setup.shortcut.save_game) @@ -582,92 +1173,131 @@ void HandleKey(Key key, int key_status) TapeQuickLoad(); else if (key == setup.shortcut.toggle_pause) TapeTogglePause(TAPE_TOGGLE_MANUAL); + + HandleTapeButtonKeys(key); + HandleSoundButtonKeys(key); } -#if 0 -#ifndef DEBUG + if (game_status == GAME_MODE_PLAYING && !network_playing) + { + int centered_player_nr_next = -999; - if (game_status == GAME_MODE_PLAYING && (tape.playing || tape.pausing)) - return; + if (key == setup.shortcut.focus_player_all) + centered_player_nr_next = -1; + else + for (i = 0; i < MAX_PLAYERS; i++) + if (key == setup.shortcut.focus_player[i]) + centered_player_nr_next = i; -#endif -#endif + if (centered_player_nr_next != -999) + { + game.centered_player_nr_next = centered_player_nr_next; + game.set_centered_player = TRUE; + if (tape.recording) + { + tape.centered_player_nr_next = game.centered_player_nr_next; + tape.set_centered_player = TRUE; + } + } + } - HandleGadgetsKeyInput(key); + HandleKeysSpecial(key); - switch(game_status) + if (HandleGadgetsKeyInput(key)) + { + if (key != KSYM_Escape) /* always allow ESC key to be handled */ + key = KSYM_UNDEFINED; + } + + switch (game_status) { case GAME_MODE_PSEUDO_TYPENAME: HandleTypeName(0, key); break; + case GAME_MODE_TITLE: case GAME_MODE_MAIN: case GAME_MODE_LEVELS: + case GAME_MODE_LEVELNR: case GAME_MODE_SETUP: - switch(key) + case GAME_MODE_INFO: + case GAME_MODE_SCORES: + switch (key) { + case KSYM_space: case KSYM_Return: - if (game_status == GAME_MODE_MAIN) - HandleMainMenu(0,0, 0,0, MB_MENU_CHOICE); + if (game_status == GAME_MODE_TITLE) + HandleTitleScreen(0, 0, 0, 0, MB_MENU_CHOICE); + else if (game_status == GAME_MODE_MAIN) + HandleMainMenu(0, 0, 0, 0, MB_MENU_CHOICE); else if (game_status == GAME_MODE_LEVELS) - HandleChooseLevel(0,0, 0,0, MB_MENU_CHOICE); + HandleChooseLevelSet(0, 0, 0, 0, MB_MENU_CHOICE); + else if (game_status == GAME_MODE_LEVELNR) + HandleChooseLevelNr(0, 0, 0, 0, MB_MENU_CHOICE); else if (game_status == GAME_MODE_SETUP) - HandleSetupScreen(0,0, 0,0, MB_MENU_CHOICE); + HandleSetupScreen(0, 0, 0, 0, MB_MENU_CHOICE); + else if (game_status == GAME_MODE_INFO) + HandleInfoScreen(0, 0, 0, 0, MB_MENU_CHOICE); + else if (game_status == GAME_MODE_SCORES) + HandleHallOfFame(0, 0, 0, 0, MB_MENU_CHOICE); break; case KSYM_Escape: - if (game_status == GAME_MODE_LEVELS) - HandleChooseLevel(0,0, 0,0, MB_MENU_LEAVE); + if (game_status != GAME_MODE_MAIN) + FadeSkipNextFadeIn(); + + if (game_status == GAME_MODE_TITLE) + HandleTitleScreen(0, 0, 0, 0, MB_MENU_LEAVE); + else if (game_status == GAME_MODE_LEVELS) + HandleChooseLevelSet(0, 0, 0, 0, MB_MENU_LEAVE); + else if (game_status == GAME_MODE_LEVELNR) + HandleChooseLevelNr(0, 0, 0, 0, MB_MENU_LEAVE); else if (game_status == GAME_MODE_SETUP) - HandleSetupScreen(0,0, 0,0, MB_MENU_LEAVE); + HandleSetupScreen(0, 0, 0, 0, MB_MENU_LEAVE); + else if (game_status == GAME_MODE_INFO) + HandleInfoScreen(0, 0, 0, 0, MB_MENU_LEAVE); + else if (game_status == GAME_MODE_SCORES) + HandleHallOfFame(0, 0, 0, 0, MB_MENU_LEAVE); break; case KSYM_Page_Up: if (game_status == GAME_MODE_LEVELS) - HandleChooseLevel(0,0, 0,-SCR_FIELDY, MB_MENU_MARK); + HandleChooseLevelSet(0, 0, 0, -1 * SCROLL_PAGE, MB_MENU_MARK); + else if (game_status == GAME_MODE_LEVELNR) + HandleChooseLevelNr(0, 0, 0, -1 * SCROLL_PAGE, MB_MENU_MARK); else if (game_status == GAME_MODE_SETUP) - HandleSetupScreen(0,0, 0,-SCR_FIELDY, MB_MENU_MARK); + HandleSetupScreen(0, 0, 0, -1 * SCROLL_PAGE, MB_MENU_MARK); + else if (game_status == GAME_MODE_INFO) + HandleInfoScreen(0, 0, 0, -1 * SCROLL_PAGE, MB_MENU_MARK); + else if (game_status == GAME_MODE_SCORES) + HandleHallOfFame(0, 0, 0, -1 * SCROLL_PAGE, MB_MENU_MARK); break; case KSYM_Page_Down: if (game_status == GAME_MODE_LEVELS) - HandleChooseLevel(0,0, 0,SCR_FIELDY, MB_MENU_MARK); + HandleChooseLevelSet(0, 0, 0, +1 * SCROLL_PAGE, MB_MENU_MARK); + else if (game_status == GAME_MODE_LEVELNR) + HandleChooseLevelNr(0, 0, 0, +1 * SCROLL_PAGE, MB_MENU_MARK); else if (game_status == GAME_MODE_SETUP) - HandleSetupScreen(0,0, 0,SCR_FIELDY, MB_MENU_MARK); + HandleSetupScreen(0, 0, 0, +1 * SCROLL_PAGE, MB_MENU_MARK); + else if (game_status == GAME_MODE_INFO) + HandleInfoScreen(0, 0, 0, +1 * SCROLL_PAGE, MB_MENU_MARK); + else if (game_status == GAME_MODE_SCORES) + HandleHallOfFame(0, 0, 0, +1 * SCROLL_PAGE, MB_MENU_MARK); break; #ifdef DEBUG - case KSYM_t: - DumpTape(&tape); - break; -#endif - - default: - break; - } - break; - - case GAME_MODE_INFO: - HandleHelpScreen(MB_RELEASED); - break; - - case GAME_MODE_SCORES: - switch(key) - { - case KSYM_Return: - game_status = GAME_MODE_MAIN; - DrawMainMenu(); - BackToFront(); - break; - - case KSYM_Page_Up: - HandleHallOfFame(0,0, 0,-SCR_FIELDY, MB_MENU_MARK); + case KSYM_0: + GameFrameDelay = (GameFrameDelay == 500 ? GAME_FRAME_DELAY : 500); break; - case KSYM_Page_Down: - HandleHallOfFame(0,0, 0,SCR_FIELDY, MB_MENU_MARK); + 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; @@ -681,7 +1311,7 @@ void HandleKey(Key key, int key_status) case GAME_MODE_PLAYING: { - switch(key) + switch (key) { case KSYM_Escape: RequestQuitGame(setup.ask_on_escape); @@ -689,6 +1319,7 @@ void HandleKey(Key key, int key_status) #ifdef DEBUG case KSYM_0: +#if 0 case KSYM_1: case KSYM_2: case KSYM_3: @@ -698,6 +1329,7 @@ void HandleKey(Key key, int key_status) case KSYM_7: case KSYM_8: case KSYM_9: +#endif if (key == KSYM_0) { if (GameFrameDelay == 500) @@ -744,44 +1376,18 @@ void HandleKey(Key key, int key_status) } break; -#if 0 - case KSYM_a: - if (ScrollStepSize == TILEX/8) - ScrollStepSize = TILEX/4; - else - ScrollStepSize = TILEX/8; - printf("ScrollStepSize == %d\n", ScrollStepSize); - break; -#endif - -#if 0 - case KSYM_m: - if (MoveSpeed == 8) - { - MoveSpeed = 4; - ScrollStepSize = TILEX/4; - } - else - { - MoveSpeed = 8; - ScrollStepSize = TILEX/8; - } - printf("MoveSpeed == %d\n", MoveSpeed); - break; -#endif - case KSYM_f: - ScrollStepSize = TILEX/8; + ScrollStepSize = TILEX / 8; printf("ScrollStepSize == %d (1/8)\n", ScrollStepSize); break; case KSYM_g: - ScrollStepSize = TILEX/4; + ScrollStepSize = TILEX / 4; printf("ScrollStepSize == %d (1/4)\n", ScrollStepSize); break; case KSYM_h: - ScrollStepSize = TILEX/2; + ScrollStepSize = TILEX / 2; printf("ScrollStepSize == %d (1/2)\n", ScrollStepSize); break; @@ -790,32 +1396,10 @@ void HandleKey(Key key, int key_status) printf("ScrollStepSize == %d (1/1)\n", ScrollStepSize); break; - case KSYM_Q: - case KSYM_q: - local_player->dynamite = 1000; - break; - - - -#if 0 - - case KSYM_z: - { - int i; - - for(i=0; iLevelSolved_GameEnd && newbutton) +#else if (AllPlayersGone && newbutton) +#endif { - CloseDoor(DOOR_CLOSE_1); - game_status = GAME_MODE_MAIN; - DrawMainMenu(); + GameEnd(); + return; }