// forward declarations for internal use
+static void ClearTouchInfo(void);
static void HandleNoEvent(void);
static void HandleEventActions(void);
stored_player[i].snap_action = 0;
}
+ // simulate finger release events for still pressed virtual buttons
+ overlay.grid_button_action = JOY_NO_ACTION;
+
+ ClearTouchInfo();
ClearJoystickState();
ClearPlayerMouseAction();
}
void HandleButtonEvent(ButtonEvent *event)
{
#if DEBUG_EVENTS_BUTTON
- Error(ERR_DEBUG, "BUTTON EVENT: button %d %s, x/y %d/%d\n",
+ Debug("event:button", "button %d %s, x/y %d/%d\n",
event->button,
event->type == EVENT_BUTTONPRESS ? "pressed" : "released",
event->x, event->y);
motion_status = TRUE;
#if DEBUG_EVENTS_MOTION
- Error(ERR_DEBUG, "MOTION EVENT: button %d moved, x/y %d/%d\n",
+ Debug("event:motion", "button %d moved, x/y %d/%d\n",
button_status, event->x, event->y);
#endif
#if DEBUG_EVENTS_WHEEL
#if 1
- Error(ERR_DEBUG, "WHEEL EVENT: mouse == %d, x/y == %d/%d\n",
+ Debug("event:wheel", "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",
+ Debug("event:wheel", "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"));
subtype == SDL_WINDOWEVENT_CLOSE ? "SDL_WINDOWEVENT_CLOSE" :
"(UNKNOWN)");
- Error(ERR_DEBUG, "WINDOW EVENT: '%s', %ld, %ld",
+ Debug("event:window", "name: '%s', data1: %ld, data2: %ld",
event_name, event->data1, event->data2);
#endif
byte action;
} touch_info[NUM_TOUCH_FINGERS];
+static void SetTouchInfo(int pos, SDL_FingerID finger_id, int counter,
+ Key key, byte action)
+{
+ touch_info[pos].touched = (action != JOY_NO_ACTION);
+ touch_info[pos].finger_id = finger_id;
+ touch_info[pos].counter = counter;
+ touch_info[pos].key = key;
+ touch_info[pos].action = action;
+}
+
+static void ClearTouchInfo(void)
+{
+ int i;
+
+ for (i = 0; i < NUM_TOUCH_FINGERS; i++)
+ SetTouchInfo(i, 0, 0, 0, JOY_NO_ACTION);
+}
+
static void HandleFingerEvent_VirtualButtons(FingerEvent *event)
{
int x = event->x * overlay.grid_xsize;
// for any touch input event, enable overlay buttons (if activated)
SetOverlayEnabled(TRUE);
- Error(ERR_DEBUG, "::: key '%s' was '%s' [fingerId: %lld]",
+ Debug("event:finger", "key '%s' was '%s' [fingerId: %lld]",
getKeyNameFromKey(key), key_status_name, event->fingerId);
if (key_status == KEY_PRESSED)
if (touch_info[i].touched &&
touch_info[i].finger_id == event->fingerId)
{
- // Error(ERR_DEBUG, "MARK 1: %d", i);
+ // Debug("event:finger", "MARK 1: %d", i);
break;
}
oldest_pos = i;
oldest_counter = touch_info[i].counter;
- // Error(ERR_DEBUG, "MARK 2: %d", i);
+ // Debug("event:finger", "MARK 2: %d", i);
}
if (!touch_info[i].touched)
{
- // Error(ERR_DEBUG, "MARK 3: %d", i);
+ // Debug("event:finger", "MARK 3: %d", i);
break;
}
// all slots allocated -- use oldest slot
i = oldest_pos;
- // Error(ERR_DEBUG, "MARK 4: %d", i);
+ // Debug("event:finger", "MARK 4: %d", i);
}
}
else
{
HandleKey(key, KEY_RELEASED);
- Error(ERR_DEBUG, "=> key == '%s', key_status == '%s' [slot %d] [1]",
+ Debug("event:finger", "key == '%s', key_status == '%s' [slot %d] [1]",
getKeyNameFromKey(key), "KEY_RELEASED", i);
}
}
// undraw previous grid button when moving finger away
overlay.grid_button_action &= ~touch_info[i].action;
- Error(ERR_DEBUG, "=> key == '%s', key_status == '%s' [slot %d] [2]",
+ Debug("event:finger", "key == '%s', key_status == '%s' [slot %d] [2]",
getKeyNameFromKey(touch_info[i].key), "KEY_RELEASED", i);
}
{
HandleKey(key, KEY_PRESSED);
- Error(ERR_DEBUG, "=> key == '%s', key_status == '%s' [slot %d] [3]",
+ Debug("event:finger", "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;
- touch_info[i].action = grid_button_action;
+ SetTouchInfo(i, event->fingerId, Counter(), key, grid_button_action);
}
else
{
{
HandleKey(touch_info[i].key, KEY_RELEASED);
- Error(ERR_DEBUG, "=> key == '%s', key_status == '%s' [slot %d] [4]",
+ Debug("event:finger", "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;
- touch_info[i].action = JOY_NO_ACTION;
+ SetTouchInfo(i, 0, 0, 0, JOY_NO_ACTION);
}
}
}
motion_key_x = KSYM_UNDEFINED;
motion_key_y = KSYM_UNDEFINED;
- Error(ERR_DEBUG, "---------- MOVE STARTED (WAIT) ----------");
+ Debug("event:finger", "---------- MOVE STARTED (WAIT) ----------");
}
else
{
HandleKey(button_key, KEY_PRESSED);
- Error(ERR_DEBUG, "---------- SNAP STARTED ----------");
+ Debug("event:finger", "---------- SNAP STARTED ----------");
}
}
else if (event->type == EVENT_FINGERRELEASE)
motion_key_x = KSYM_UNDEFINED;
motion_key_y = KSYM_UNDEFINED;
- Error(ERR_DEBUG, "---------- MOVE STOPPED ----------");
+ Debug("event:finger", "---------- MOVE STOPPED ----------");
}
else if (event->fingerId == button_id)
{
button_key = KSYM_UNDEFINED;
- Error(ERR_DEBUG, "---------- SNAP STOPPED ----------");
+ Debug("event:finger", "---------- SNAP STOPPED ----------");
}
}
else if (event->type == EVENT_FINGERMOTION)
motion_key_x = new_motion_key_x;
motion_key_y = new_motion_key_y;
- Error(ERR_DEBUG, "---------- MOVE STARTED (MOVE) ----------");
+ Debug("event:finger", "---------- MOVE STARTED (MOVE) ----------");
}
}
else if (event->fingerId == button_id)
HandleKey(button_key, KEY_PRESSED);
- Error(ERR_DEBUG, "---------- DROP STARTED ----------");
+ Debug("event:finger", "---------- DROP STARTED ----------");
}
}
}
void HandleFingerEvent(FingerEvent *event)
{
#if DEBUG_EVENTS_FINGER
- Error(ERR_DEBUG, "FINGER EVENT: finger was %s, touch ID %lld, finger ID %lld, x/y %f/%f, dx/dy %f/%f, pressure %f",
+ Debug("event:finger", "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,
ClearPlayerMouseAction();
- Error(ERR_DEBUG, "---------- TOUCH ACTION STARTED ----------");
+ Debug("event:finger", "---------- TOUCH ACTION STARTED ----------");
}
}
else if (button == MB_RELEASED && touched)
else
SetPlayerMouseAction(old_mx, old_my, MB_RELEASED);
- Error(ERR_DEBUG, "---------- TOUCH ACTION STOPPED ----------");
+ Debug("event:finger", "---------- TOUCH ACTION STOPPED ----------");
}
if (touched)
last_button = button_nr;
- Error(ERR_DEBUG, "---------- TOUCH ACTION: ROTATING ----------");
+ Debug("event:finger", "---------- TOUCH ACTION: ROTATING ----------");
}
else
{
SetPlayerMouseAction(old_mx, old_my, MB_RELEASED);
- Error(ERR_DEBUG, "---------- TOUCH ACTION PAUSED ----------");
+ Debug("event:finger", "---------- TOUCH ACTION PAUSED ----------");
}
}
}
ClearPlayerMouseAction();
- Error(ERR_DEBUG, "---------- TOUCH ACTION STARTED ----------");
+ Debug("event:finger", "---------- TOUCH ACTION STARTED ----------");
}
}
else if (button == MB_RELEASED && touched)
else
SetPlayerMouseAction(old_mx, old_my, MB_RELEASED);
- Error(ERR_DEBUG, "---------- TOUCH ACTION STOPPED ----------");
+ Debug("event:finger", "---------- TOUCH ACTION STOPPED ----------");
}
if (touched)
tapped = FALSE;
- Error(ERR_DEBUG, "---------- TOUCH ACTION: ROTATING ----------");
+ Debug("event:finger", "---------- TOUCH ACTION: ROTATING ----------");
}
else
{
SetPlayerMouseAction(old_mx, old_my, MB_RELEASED);
- Error(ERR_DEBUG, "---------- TOUCH ACTION PAUSED ----------");
+ Debug("event:finger", "---------- TOUCH ACTION PAUSED ----------");
}
}
}
motion_key_x = KSYM_UNDEFINED;
motion_key_y = KSYM_UNDEFINED;
- Error(ERR_DEBUG, "---------- TOUCH ACTION STARTED ----------");
+ Debug("event:finger", "---------- TOUCH ACTION STARTED ----------");
}
}
else if (button == MB_RELEASED && touched)
{
if (player_is_dropping)
{
- Error(ERR_DEBUG, "---------- DROP STOPPED ----------");
+ Debug("event:finger", "---------- DROP STOPPED ----------");
HandleKey(setup.input[0].key.drop, KEY_RELEASED);
}
else
{
- Error(ERR_DEBUG, "---------- SNAP STOPPED ----------");
+ Debug("event:finger", "---------- 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 ----------");
+ Debug("event:finger", "---------- TOUCH ACTION STOPPED ----------");
}
if (touched)
if (player_is_dropping)
{
- Error(ERR_DEBUG, "---------- DROP STARTED ----------");
+ Debug("event:finger", "---------- DROP STARTED ----------");
HandleKey(setup.input[0].key.drop, KEY_PRESSED);
}
else
{
- Error(ERR_DEBUG, "---------- SNAP STARTED ----------");
+ Debug("event:finger", "---------- SNAP STARTED ----------");
HandleKey(setup.input[0].key.snap, KEY_PRESSED);
}
if (player_is_dropping &&
player_drop_count == getPlayerInventorySize(0))
{
- Error(ERR_DEBUG, "---------- DROP -> SNAP ----------");
+ Debug("event:finger", "---------- DROP -> SNAP ----------");
HandleKey(setup.input[0].key.drop, KEY_RELEASED);
HandleKey(setup.input[0].key.snap, KEY_PRESSED);
if (new_motion_key_x != motion_key_x)
{
- Error(ERR_DEBUG, "---------- %s %s ----------",
+ Debug("event:finger", "---------- %s %s ----------",
started_on_player && !player_is_dropping ? "SNAPPING" : "MOVING",
dx < 0 ? "LEFT" : dx > 0 ? "RIGHT" : "PAUSED");
if (new_motion_key_y != motion_key_y)
{
- Error(ERR_DEBUG, "---------- %s %s ----------",
+ Debug("event:finger", "---------- %s %s ----------",
started_on_player && !player_is_dropping ? "SNAPPING" : "MOVING",
dy < 0 ? "UP" : dy > 0 ? "DOWN" : "PAUSED");
if (game_status == GAME_MODE_PLAYING)
return FALSE;
+ // if Shift or right Alt key is pressed, handle key as text input
+ if ((GetKeyModState() & KMOD_TextInput) != KMOD_None)
+ return TRUE;
+
+ // ignore raw keys as text input when not in text input mode
+ if (KSYM_RAW(key) && !textinput_status)
+ return FALSE;
+
// else handle all printable keys as text input
return KSYM_PRINTABLE(key);
}
Key key = getKeyFromKeyName(text);
#if DEBUG_EVENTS_TEXT
- Error(ERR_DEBUG, "TEXT EVENT: text == '%s' [%d byte(s), '%c'/%d], resulting key == %d (%s) [%04x]",
+ Debug("event:text", "text == '%s' [%d byte(s), '%c'/%d], resulting key == %d (%s) [%04x]",
text,
strlen(text),
text[0], (int)(text[0]),
Key keymod = (with_modifiers ? GetEventKey(event, FALSE) : key);
#if DEBUG_EVENTS_KEY
- Error(ERR_DEBUG, "KEY EVENT: key was %s, keysym.scancode == %d, keysym.sym == %d, keymod = %d, GetKeyModState() = 0x%04x, resulting key == %d (%s)",
+ Debug("event:key", "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,
static int HandleDropFileEvent(char *filename)
{
- Error(ERR_DEBUG, "DROP FILE EVENT: '%s'", filename);
+ Debug("event:dropfile", "filename == '%s'", filename);
// check and extract dropped zip files into correct user data directory
if (!strSuffixLower(filename, ".zip"))
{
- Error(ERR_WARN, "file '%s' not supported", filename);
+ Warn("file '%s' not supported", filename);
return TREE_TYPE_UNDEFINED;
}
if (directory == NULL)
{
- Error(ERR_WARN, "zip file '%s' has invalid content!", filename);
+ Warn("zip file '%s' has invalid content!", filename);
return TREE_TYPE_UNDEFINED;
}
static void HandleDropTextEvent(char *text)
{
- Error(ERR_DEBUG, "DROP TEXT EVENT: '%s'", text);
+ Debug("event:droptext", "text == '%s'", text);
}
static void HandleDropCompleteEvent(int num_level_sets_succeeded,
}
}
-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)
cheat_input[cheat_input_len] = '\0';
#if DEBUG_EVENTS_KEY
- Error(ERR_DEBUG, "SPECIAL KEY '%s' [%d]\n", cheat_input, cheat_input_len);
+ Debug("event:key:special", "'%s' [%d]", 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"))
+ 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, ":undo-tape") ||
+ strSuffix(cheat_input, ":ut"))
{
- /* 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;
+ UndoTape();
+ }
+ else if (strSuffix(cheat_input, ":fix-tape") ||
+ strSuffix(cheat_input, ":ft"))
+ {
+ 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();
SetVideoFrameDelay(GameFrameDelay);
if (GameFrameDelay > ONE_SECOND_DELAY)
- Error(ERR_INFO, "frame delay == %d ms", GameFrameDelay);
+ Debug("event:key:debug", "frame delay == %d ms", GameFrameDelay);
else if (GameFrameDelay != 0)
- Error(ERR_INFO, "frame delay == %d ms (max. %d fps / %d %%)",
+ Debug("event:key:debug", "frame delay == %d ms (max. %d fps / %d %%)",
GameFrameDelay, ONE_SECOND_DELAY / GameFrameDelay,
GAME_FRAME_DELAY * 100 / GameFrameDelay);
else
- Error(ERR_INFO, "frame delay == 0 ms (maximum speed)");
+ Debug("event:key:debug", "frame delay == 0 ms (maximum speed)");
return TRUE;
}
{
options.debug = !options.debug;
- Error(ERR_INFO, "debug mode %s",
+ Debug("event:key:debug", "debug mode %s",
(options.debug ? "enabled" : "disabled"));
return TRUE;
}
else if (key == KSYM_v)
{
- Error(ERR_INFO, "currently using game engine version %d",
+ Debug("event:key:debug", "currently using game engine version %d",
game.engine_version);
return TRUE;
projects / rocksndiamonds.git / blobdiff