// (c) 1995-2014 by Artsoft Entertainment
// Holger Schemel
// info@artsoft.org
-// http://www.artsoft.org/
+// https://www.artsoft.org/
// ----------------------------------------------------------------------------
// events.c
// ============================================================================
local_player->mouse_action.ly = ly;
local_player->mouse_action.button = button;
- if (tape.recording && tape.pausing && tape.use_mouse)
+ if (tape.recording && tape.pausing && tape.use_mouse_actions)
{
// un-pause a paused game only if mouse button was newly pressed down
if (new_button)
{
if (strEqual(setup.touch.control_type, TOUCH_CONTROL_FOLLOW_FINGER))
HandleButtonOrFinger_FollowFinger(mx, my, button);
- else if (game.use_mouse_events && valid_mouse_event)
+ else if (game.use_mouse_actions && valid_mouse_event)
SetPlayerMouseAction(mx, my, button);
}
}
-static boolean checkTextInputKeyModState(void)
+static boolean checkTextInputKey(Key key)
{
// 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);
+ // else handle all printable keys as text input
+ return KSYM_PRINTABLE(key);
}
void HandleTextEvent(TextEvent *event)
GetKeyModState());
#endif
-#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
-
- // process text input as "classic" (with uppercase etc.) key input event
- HandleKey(key, KEY_PRESSED);
- HandleKey(key, KEY_RELEASED);
+ if (checkTextInputKey(key))
+ {
+ // process printable keys (with uppercase etc.) in text input mode
+ HandleKey(key, KEY_PRESSED);
+ HandleKey(key, KEY_RELEASED);
+ }
}
void HandlePauseResumeEvent(PauseResumeEvent *event)
HandleKeyModState(keymod, key_status);
- // only handle raw key input without text modifier keys pressed
- if (!checkTextInputKeyModState())
+ // process all keys if not in text input mode or if non-printable keys
+ if (!checkTextInputKey(key))
HandleKey(key, key_status);
}
}
}
-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)
if (game_status == GAME_MODE_MAIN)
{
- if (is_string_suffix(cheat_input, ":insert-solution-tape") ||
- is_string_suffix(cheat_input, ":ist"))
+ if (strSuffix(cheat_input, ":insert-solution-tape") ||
+ strSuffix(cheat_input, ":ist"))
{
InsertSolutionTape();
}
- else if (is_string_suffix(cheat_input, ":play-solution-tape") ||
- is_string_suffix(cheat_input, ":pst"))
+ else if (strSuffix(cheat_input, ":play-solution-tape") ||
+ strSuffix(cheat_input, ":pst"))
{
PlaySolutionTape();
}
- else if (is_string_suffix(cheat_input, ":reload-graphics") ||
- is_string_suffix(cheat_input, ":rg"))
+ else if (strSuffix(cheat_input, ":reload-graphics") ||
+ strSuffix(cheat_input, ":rg"))
{
ReloadCustomArtwork(1 << ARTWORK_TYPE_GRAPHICS);
DrawMainMenu();
}
- else if (is_string_suffix(cheat_input, ":reload-sounds") ||
- is_string_suffix(cheat_input, ":rs"))
+ else if (strSuffix(cheat_input, ":reload-sounds") ||
+ strSuffix(cheat_input, ":rs"))
{
ReloadCustomArtwork(1 << ARTWORK_TYPE_SOUNDS);
DrawMainMenu();
}
- else if (is_string_suffix(cheat_input, ":reload-music") ||
- is_string_suffix(cheat_input, ":rm"))
+ else if (strSuffix(cheat_input, ":reload-music") ||
+ strSuffix(cheat_input, ":rm"))
{
ReloadCustomArtwork(1 << ARTWORK_TYPE_MUSIC);
DrawMainMenu();
}
- else if (is_string_suffix(cheat_input, ":reload-artwork") ||
- is_string_suffix(cheat_input, ":ra"))
+ else if (strSuffix(cheat_input, ":reload-artwork") ||
+ strSuffix(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"))
+ else if (strSuffix(cheat_input, ":dump-level") ||
+ strSuffix(cheat_input, ":dl"))
{
DumpLevel(&level);
}
- else if (is_string_suffix(cheat_input, ":dump-tape") ||
- is_string_suffix(cheat_input, ":dt"))
+ else if (strSuffix(cheat_input, ":dump-tape") ||
+ strSuffix(cheat_input, ":dt"))
{
DumpTape(&tape);
}
- else if (is_string_suffix(cheat_input, ":fix-tape") ||
- is_string_suffix(cheat_input, ":ft"))
+ else if (strSuffix(cheat_input, ":fix-tape") ||
+ strSuffix(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;
+ FixTape_ForceSinglePlayer();
}
- else if (is_string_suffix(cheat_input, ":save-native-level") ||
- is_string_suffix(cheat_input, ":snl"))
+ else if (strSuffix(cheat_input, ":save-native-level") ||
+ strSuffix(cheat_input, ":snl"))
{
SaveNativeLevel(&level);
}
- else if (is_string_suffix(cheat_input, ":frames-per-second") ||
- is_string_suffix(cheat_input, ":fps"))
+ else if (strSuffix(cheat_input, ":frames-per-second") ||
+ strSuffix(cheat_input, ":fps"))
{
global.show_frames_per_second = !global.show_frames_per_second;
}
else if (game_status == GAME_MODE_PLAYING)
{
#ifdef DEBUG
- if (is_string_suffix(cheat_input, ".q"))
+ if (strSuffix(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"))
+ if (strSuffix(cheat_input, ":dump-brush") ||
+ strSuffix(cheat_input, ":DB"))
{
DumpBrush();
}
- else if (is_string_suffix(cheat_input, ":DDB"))
+ else if (strSuffix(cheat_input, ":DDB"))
{
DumpBrush_Small();
}
}
// special key shortcuts for all game modes
- if (is_string_suffix(cheat_input, ":dump-event-actions") ||
- is_string_suffix(cheat_input, ":dea") ||
- is_string_suffix(cheat_input, ":DEA"))
+ if (strSuffix(cheat_input, ":dump-event-actions") ||
+ strSuffix(cheat_input, ":dea") ||
+ strSuffix(cheat_input, ":DEA"))
{
DumpGadgetIdentifiers();
DumpScreenIdentifiers();
if (stored_player[pnr].snap_action)
stored_player[pnr].action |= JOY_BUTTON_SNAP;
- if (tape.recording && tape.pausing && !tape.use_mouse)
+ if (tape.recording && tape.pausing && tape.use_key_actions)
{
if (tape.single_step)
{
{
setup.fullscreen = !setup.fullscreen;
- ToggleFullscreenOrChangeWindowScalingIfNeeded();
+ ToggleFullscreenIfNeeded();
if (game_status == GAME_MODE_SETUP)
RedrawSetupScreenAfterFullscreenToggle();
else if (setup.window_scaling_percent > MAX_WINDOW_SCALING_PERCENT)
setup.window_scaling_percent = MAX_WINDOW_SCALING_PERCENT;
- ToggleFullscreenOrChangeWindowScalingIfNeeded();
+ ChangeWindowScalingIfNeeded();
if (game_status == GAME_MODE_SETUP)
RedrawSetupScreenAfterFullscreenToggle();
return;
}
- if (tape.recording && tape.pausing && !tape.use_mouse)
+ if (tape.recording && tape.pausing && tape.use_key_actions)
{
if (tape.single_step)
{
projects / rocksndiamonds.git / blobdiff