ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rewrite RARCH_PAUSE_TOGGLE

This commit is contained in:
twinaphex 2017-05-21 12:59:36 +02:00
parent f847548178
commit 66b1ad99d4
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
retroarch.c
View File

@ -2256,7 +2256,6 @@ static enum runloop_state runloop_check_state(
bool is_alive = false; bool is_alive = false;
uint64_t frame_count = 0; uint64_t frame_count = 0;
bool focused = true; bool focused = true;
bool pause_pressed = runloop_cmd_triggered(trigger_input, RARCH_PAUSE_TOGGLE);
bool pause_nonactive = settings->bools.pause_nonactive; bool pause_nonactive = settings->bools.pause_nonactive;
video_driver_get_status(&frame_count, &is_alive, &is_focused); video_driver_get_status(&frame_count, &is_alive, &is_focused);
@ -2448,21 +2447,28 @@ static enum runloop_state runloop_check_state(
} }
#endif #endif
/* Check if libretro pause key was pressed. If so, pause or {
* unpause the libretro core. */ static bool old_pause_pressed = false;
bool pause_pressed = runloop_cmd_press(
current_input, RARCH_PAUSE_TOGGLE);
/* FRAMEADVANCE will set us into pause mode. */ /* Check if libretro pause key was pressed. If so, pause or
pause_pressed |= !runloop_paused * unpause the libretro core. */
&& runloop_cmd_triggered(trigger_input, RARCH_FRAMEADVANCE);
if (focused && pause_pressed) /* FRAMEADVANCE will set us into pause mode. */
command_event(CMD_EVENT_PAUSE_TOGGLE, NULL); pause_pressed |= !runloop_paused
else if (focused && !old_focus) && runloop_cmd_triggered(trigger_input, RARCH_FRAMEADVANCE);
command_event(CMD_EVENT_UNPAUSE, NULL);
else if (!focused && old_focus)
command_event(CMD_EVENT_PAUSE, NULL);
old_focus = focused; if (focused && pause_pressed && !old_pause_pressed)
command_event(CMD_EVENT_PAUSE_TOGGLE, NULL);
else if (focused && !old_focus)
command_event(CMD_EVENT_UNPAUSE, NULL);
else if (!focused && old_focus)
command_event(CMD_EVENT_PAUSE, NULL);
old_focus = focused;
old_pause_pressed = pause_pressed;
}
if (!focused) if (!focused)
return RUNLOOP_STATE_SLEEP; return RUNLOOP_STATE_SLEEP;