/* 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)
+static int FilterEvents(const Event *event)
{
MotionEvent *motion;
return 0;
#endif
+ if (event->type == EVENT_BUTTONPRESS ||
+ event->type == EVENT_BUTTONRELEASE)
+ {
+ ((ButtonEvent *)event)->x -= video.screen_xoffset;
+ ((ButtonEvent *)event)->y -= video.screen_yoffset;
+ }
+ else if (event->type == EVENT_MOTIONNOTIFY)
+ {
+ ((MotionEvent *)event)->x -= video.screen_xoffset;
+ ((MotionEvent *)event)->y -= video.screen_yoffset;
+ }
+
/* non-motion events are directly passed to event handler functions */
if (event->type != EVENT_MOTIONNOTIFY)
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)
+static 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;
}
-/* this is only really needed for non-SDL targets to filter unwanted events;
- when using SDL with properly installed event filter, this function can be
- replaced with a simple "NextEvent()" call, but it doesn't hurt either */
+/* this is especially needed for event modifications for the Android target:
+ if mouse coordinates should be modified in the event filter function,
+ using a properly installed SDL event filter does not work, because in
+ the event filter, mouse coordinates in the event structure are still
+ physical pixel positions, not logical (scaled) screen positions, so this
+ has to be handled at a later stage in the event processing functions
+ (when device pixel positions are already converted to screen positions) */
boolean NextValidEvent(Event *event)
{
NextEvent(event);
- if (FilterEventsExt(event))
+ if (FilterEvents(event))
handle_this_event = TRUE;
if (SkipPressedMouseMotionEvent(event))
break;
#if defined(TARGET_SDL)
+#if defined(TARGET_SDL2)
+ case SDL_CONTROLLERBUTTONDOWN:
+ case SDL_CONTROLLERBUTTONUP:
+ // for any game controller button event, disable overlay buttons
+ SetOverlayEnabled(FALSE);
+
+ HandleSpecialGameControllerButtons(event);
+
+ /* FALL THROUGH */
+ case SDL_CONTROLLERDEVICEADDED:
+ case SDL_CONTROLLERDEVICEREMOVED:
+ case SDL_CONTROLLERAXISMOTION:
+#endif
case SDL_JOYAXISMOTION:
case SDL_JOYBUTTONDOWN:
case SDL_JOYBUTTONUP:
ClearPlayerAction();
break;
+#if defined(TARGET_SDL2)
+ case SDL_CONTROLLERBUTTONUP:
+ HandleJoystickEvent(&event);
+ ClearPlayerAction();
+ break;
+#endif
+
default:
HandleOtherEvents(&event);
break;
key_joystick_mapping = 0;
for (i = 0; i < MAX_PLAYERS; i++)
stored_player[i].action = 0;
+
+ ClearJoystickState();
}
void SleepWhileUnmapped()
key_joystick_mapping = 0;
break;
+#if defined(TARGET_SDL2)
+ case SDL_CONTROLLERBUTTONUP:
+ HandleJoystickEvent(&event);
+ key_joystick_mapping = 0;
+ break;
+#endif
+
case EVENT_MAPNOTIFY:
window_unmapped = FALSE;
break;
SDLRedrawWindow();
#endif
- if (event->event == SDL_WINDOWEVENT_RESIZED && !video.fullscreen_enabled)
+ if (event->event == SDL_WINDOWEVENT_RESIZED)
{
- int new_window_width = event->data1;
- int new_window_height = event->data2;
-
- // if window size has changed after resizing, calculate new scaling factor
- if (new_window_width != video.window_width ||
- new_window_height != video.window_height)
+ if (!video.fullscreen_enabled)
{
- int new_xpercent = (100 * new_window_width / video.width);
- int new_ypercent = (100 * new_window_height / video.height);
+ int new_window_width = event->data1;
+ int new_window_height = event->data2;
- // (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);
+ // 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.0 * new_window_width / video.screen_width + .5;
+ int new_ypercent = 100.0 * new_window_height / video.screen_height + .5;
- video.window_width = new_window_width;
- video.window_height = new_window_height;
+ // (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);
- if (game_status == GAME_MODE_SETUP)
- RedrawSetupScreenAfterFullscreenToggle();
+ video.window_width = new_window_width;
+ video.window_height = new_window_height;
- SetWindowTitle();
+ if (game_status == GAME_MODE_SETUP)
+ RedrawSetupScreenAfterFullscreenToggle();
+
+ SetWindowTitle();
+ }
}
+#if defined(PLATFORM_ANDROID)
+ else
+ {
+ int new_display_width = event->data1;
+ int new_display_height = event->data2;
+
+ // if fullscreen display size has changed, device has been rotated
+ if (new_display_width != video.display_width ||
+ new_display_height != video.display_height)
+ {
+ video.display_width = new_display_width;
+ video.display_height = new_display_height;
+
+ SDLSetScreenProperties();
+ }
+ }
+#endif
}
}
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;
{
int key_status = (event->type == EVENT_FINGERRELEASE ? KEY_RELEASED :
KEY_PRESSED);
- Key key = (event->x < 1.0 / 3.0 ?
- (event->y < 1.0 / 2.0 ? setup.input[0].key.snap :
- setup.input[0].key.drop) :
- event->x > 2.0 / 3.0 ?
- (event->y < 1.0 / 3.0 ? setup.input[0].key.up :
- event->y > 2.0 / 3.0 ? setup.input[0].key.down :
- event->x < 5.0 / 6.0 ? setup.input[0].key.left :
- setup.input[0].key.right) :
+ float ypos = 1.0 - 1.0 / 3.0 * video.display_width / video.display_height;
+
+ event_y = (event_y - ypos) / (1 - ypos);
+
+ Key key = (event_x > 0 && event_x < 1.0 / 6.0 &&
+ event_y > 2.0 / 3.0 && event_y < 1 ?
+ setup.input[0].key.snap :
+ event_x > 1.0 / 6.0 && event_x < 1.0 / 3.0 &&
+ event_y > 2.0 / 3.0 && event_y < 1 ?
+ setup.input[0].key.drop :
+ event_x > 7.0 / 9.0 && event_x < 8.0 / 9.0 &&
+ event_y > 0 && event_y < 1.0 / 3.0 ?
+ setup.input[0].key.up :
+ event_x > 6.0 / 9.0 && event_x < 7.0 / 9.0 &&
+ event_y > 1.0 / 3.0 && event_y < 2.0 / 3.0 ?
+ setup.input[0].key.left :
+ event_x > 8.0 / 9.0 && event_x < 1 &&
+ event_y > 1.0 / 3.0 && event_y < 2.0 / 3.0 ?
+ setup.input[0].key.right :
+ event_x > 7.0 / 9.0 && event_x < 8.0 / 9.0 &&
+ event_y > 2.0 / 3.0 && event_y < 1 ?
+ setup.input[0].key.down :
KSYM_UNDEFINED);
+
char *key_status_name = (key_status == KEY_RELEASED ? "KEY_RELEASED" :
"KEY_PRESSED");
int i;
+ // for any touch input event, enable overlay buttons (if activated)
+ SetOverlayEnabled(TRUE);
+
Error(ERR_DEBUG, "::: key '%s' was '%s' [fingerId: %lld]",
getKeyNameFromKey(key), key_status_name, event->fingerId);
#endif
#if defined(PLATFORM_ANDROID)
- // always map the "back" button to the "escape" key on Android devices
if (key == KSYM_Back)
+ {
+ // always map the "back" button to the "escape" key on Android devices
key = KSYM_Escape;
+ }
+ else
+ {
+ // for any key event other than "back" button, disable overlay buttons
+ SetOverlayEnabled(FALSE);
+ }
#endif
HandleKeyModState(keymod, key_status);
}
#endif
+ if (HandleGlobalAnimClicks(mx, my, button))
+ {
+ /* do not handle this button event anymore */
+ mx = my = -32; /* force mouse event to be outside screen tiles */
+ }
+
if (button_hold && game_status == GAME_MODE_PLAYING && tape.pausing)
return;
HandleSetupScreen(mx, my, 0, 0, button);
break;
+#if defined(TARGET_SDL2)
case GAME_MODE_PLAYING:
HandleFollowFinger(mx, my, button);
+#endif
#ifdef DEBUG
if (button == MB_PRESSED && !motion_status && IN_GFX_FIELD_PLAY(mx, my) &&
(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);
+ setup.debug.frame_delay[i] : setup.game_frame_delay);
if (!setup.debug.frame_delay_game_only)
MenuFrameDelay = GameFrameDelay;
int joy = 0;
int i;
+#if defined(TARGET_SDL2)
+ /* map special keys (media keys / remote control buttons) to default keys */
+ if (key == KSYM_PlayPause)
+ key = KSYM_space;
+ else if (key == KSYM_Select)
+ key = KSYM_Return;
+#endif
+
+ HandleSpecialGameControllerKeys(key, key_status);
+
if (game_status == GAME_MODE_PLAYING)
{
/* only needed for single-step tape recording mode */
static boolean element_dropped[MAX_PLAYERS] = { FALSE,FALSE,FALSE,FALSE };
int pnr;
+ /* initialize unifying snap and drop buttons (EM engine) */
+ game_em.use_single_button = game_em.use_single_button_initial;
+
for (pnr = 0; pnr < MAX_PLAYERS; pnr++)
{
byte key_action = 0;
if (tape.single_step && tape.recording && tape.pausing)
{
+ /* do not unify snap and drop buttons in single-step mode (EM engine) */
+ game_em.use_single_button = FALSE;
+
if (key_status == KEY_PRESSED && key_action & KEY_MOTION)
{
TapeTogglePause(TAPE_TOGGLE_AUTOMATIC);
if (level.game_engine_type == GAME_ENGINE_TYPE_EM ||
level.game_engine_type == GAME_ENGINE_TYPE_SP)
{
-
if (level.game_engine_type == GAME_ENGINE_TYPE_SP &&
getRedDiskReleaseFlag_SP() == 0)
stored_player[pnr].action &= ~KEY_BUTTON_DROP;
return;
}
+ if (HandleGlobalAnimClicks(-1, -1, (key == KSYM_space ||
+ key == KSYM_Return ||
+ key == KSYM_Escape)))
+ {
+ /* do not handle this key event anymore */
+ if (key != KSYM_Escape) /* always allow ESC key to be handled */
+ return;
+ }
+
if (game_status == GAME_MODE_PLAYING && AllPlayersGone &&
(key == KSYM_Return || key == setup.shortcut.toggle_pause))
{
HandleLevelEditorIdle();
break;
+#if defined(TARGET_SDL2)
case GAME_MODE_PLAYING:
HandleFollowFinger(-1, -1, -1);
break;
+#endif
default:
break;
{
int i;
int result = 0;
+ boolean no_joysticks_configured = TRUE;
+ boolean use_as_joystick_nr = (game_status != GAME_MODE_PLAYING);
+ static byte joy_action_last[MAX_PLAYERS];
+
+ for (i = 0; i < MAX_PLAYERS; i++)
+ if (setup.input[i].use_joystick)
+ no_joysticks_configured = FALSE;
+
+ /* if no joysticks configured, map connected joysticks to players */
+ if (no_joysticks_configured)
+ use_as_joystick_nr = TRUE;
for (i = 0; i < MAX_PLAYERS; i++)
{
byte joy_action = 0;
- /*
- if (!setup.input[i].use_joystick)
- continue;
- */
-
- joy_action = Joystick(i);
+ joy_action = JoystickExt(i, use_as_joystick_nr);
result |= joy_action;
- if (!setup.input[i].use_joystick)
- continue;
+ if ((setup.input[i].use_joystick || no_joysticks_configured) &&
+ joy_action != joy_action_last[i])
+ stored_player[i].action = joy_action;
- stored_player[i].action = joy_action;
+ joy_action_last[i] = joy_action;
}
return result;
int dx = (left ? -1 : right ? 1 : 0);
int dy = (up ? -1 : down ? 1 : 0);
+ if (HandleGlobalAnimClicks(-1, -1, newbutton))
+ {
+ /* do not handle this button event anymore */
+ return;
+ }
+
switch (game_status)
{
case GAME_MODE_TITLE:
case GAME_MODE_INFO:
{
static unsigned int joystickmove_delay = 0;
+ static unsigned int joystickmove_delay_value = GADGET_FRAME_DELAY;
+ static int joystick_last = 0;
if (joystick && !button &&
- !DelayReached(&joystickmove_delay, GADGET_FRAME_DELAY))
+ !DelayReached(&joystickmove_delay, joystickmove_delay_value))
+ {
+ /* delay joystick actions if buttons/axes continually pressed */
newbutton = dx = dy = 0;
+ }
+ else
+ {
+ /* start with longer delay, then continue with shorter delay */
+ if (joystick != joystick_last)
+ joystickmove_delay_value = GADGET_FRAME_DELAY_FIRST;
+ else
+ joystickmove_delay_value = GADGET_FRAME_DELAY;
+ }
if (game_status == GAME_MODE_TITLE)
HandleTitleScreen(0,0,dx,dy, newbutton ? MB_MENU_CHOICE : MB_MENU_MARK);
HandleSetupScreen(0,0,dx,dy, newbutton ? MB_MENU_CHOICE : MB_MENU_MARK);
else if (game_status == GAME_MODE_INFO)
HandleInfoScreen(0,0,dx,dy, newbutton ? MB_MENU_CHOICE : MB_MENU_MARK);
+
+ joystick_last = joystick;
+
break;
}
return;
}
+ if (tape.recording && tape.pausing)
+ {
+ if (joystick & JOY_ACTION)
+ TapeTogglePause(TAPE_TOGGLE_MANUAL);
+ }
+
break;
default:
break;
}
}
+
+void HandleSpecialGameControllerButtons(Event *event)
+{
+#if defined(TARGET_SDL2)
+ switch (event->type)
+ {
+ case SDL_CONTROLLERBUTTONDOWN:
+ if (event->cbutton.button == SDL_CONTROLLER_BUTTON_START)
+ HandleKey(KSYM_space, KEY_PRESSED);
+ else if (event->cbutton.button == SDL_CONTROLLER_BUTTON_BACK)
+ HandleKey(KSYM_Escape, KEY_PRESSED);
+
+ break;
+
+ case SDL_CONTROLLERBUTTONUP:
+ if (event->cbutton.button == SDL_CONTROLLER_BUTTON_START)
+ HandleKey(KSYM_space, KEY_RELEASED);
+ else if (event->cbutton.button == SDL_CONTROLLER_BUTTON_BACK)
+ HandleKey(KSYM_Escape, KEY_RELEASED);
+
+ break;
+ }
+#endif
+}
+
+void HandleSpecialGameControllerKeys(Key key, int key_status)
+{
+#if defined(TARGET_SDL2)
+#if defined(KSYM_Rewind) && defined(KSYM_FastForward)
+ int button = SDL_CONTROLLER_BUTTON_INVALID;
+
+ /* map keys to joystick buttons (special hack for Amazon Fire TV remote) */
+ if (key == KSYM_Rewind)
+ button = SDL_CONTROLLER_BUTTON_A;
+ else if (key == KSYM_FastForward || key == KSYM_Menu)
+ button = SDL_CONTROLLER_BUTTON_B;
+
+ if (button != SDL_CONTROLLER_BUTTON_INVALID)
+ {
+ Event event;
+
+ event.type = (key_status == KEY_PRESSED ? SDL_CONTROLLERBUTTONDOWN :
+ SDL_CONTROLLERBUTTONUP);
+
+ event.cbutton.which = 0; /* first joystick (Amazon Fire TV remote) */
+ event.cbutton.button = button;
+ event.cbutton.state = (key_status == KEY_PRESSED ? SDL_PRESSED :
+ SDL_RELEASED);
+
+ HandleJoystickEvent(&event);
+ }
+#endif
+#endif
+}
projects / rocksndiamonds.git / blobdiff