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

Make reset and close content follow quit confirm logic (#18118)

This commit is contained in:
sonninnos 2025-07-23 05:03:54 +03:00 committed by GitHub
parent 312550f499
commit a86c031410
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 89 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
intl/msg_hash_us.h
View File

@ -3636,11 +3636,11 @@ MSG_HASH(
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_QUIT_PRESS_TWICE,
"Confirm Quit"
"Confirm Quit/Close/Reset"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_QUIT_PRESS_TWICE,
"Require the Quit hotkey to be pressed twice to quit RetroArch."
"Require the Quit/Close/Reset hotkey to be pressed twice."
)
/* Settings > Input > Haptic Feedback/Vibration */
@ -15297,6 +15297,14 @@ MSG_HASH(
MSG_PRESS_AGAIN_TO_QUIT,
"Press again to quit..."
)
MSG_HASH(
MSG_PRESS_AGAIN_TO_CLOSE_CONTENT,
"Press again to close content..."
)
MSG_HASH(
MSG_PRESS_AGAIN_TO_RESET,
"Press again to reset..."
)
MSG_HASH(
MSG_TO,
"to"

2
msg_hash.h
View File

@ -449,6 +449,8 @@ enum msg_hash_enums
MSG_NO_THUMBNAIL_AVAILABLE,
MSG_NO_THUMBNAIL_DOWNLOAD_POSSIBLE,
MSG_PRESS_AGAIN_TO_QUIT,
MSG_PRESS_AGAIN_TO_CLOSE_CONTENT,
MSG_PRESS_AGAIN_TO_RESET,
MSG_BLUETOOTH_PAIRING_REMOVED,
MSG_BLUETOOTH_SCAN_COMPLETE,
MSG_WIFI_SCAN_COMPLETE,

85
runloop.c
View File

@ -5744,14 +5744,89 @@ static enum runloop_state_enum runloop_check_state(
}
}
/* Check reset hotkey */
if (runloop_st->flags & RUNLOOP_FLAG_CORE_RUNNING)
{
bool trig_reset_key, reset_press_twice;
static bool reset_key = false;
static bool old_reset_key = false;
reset_key = BIT256_GET(current_bits, RARCH_RESET);
trig_reset_key = reset_key && !old_reset_key;
old_reset_key = reset_key;
reset_press_twice = settings->bools.quit_press_twice;
/* Check double press if enabled */
if ( trig_reset_key
&& reset_press_twice)
{
static retro_time_t reset_key_time = 0;
retro_time_t cur_time = current_time;
trig_reset_key = (cur_time - reset_key_time < QUIT_DELAY_USEC);
reset_key_time = cur_time;
if (!trig_reset_key)
{
const char *_msg = msg_hash_to_str(MSG_PRESS_AGAIN_TO_RESET);
float target_hz = 0.0;
runloop_environment_cb(
RETRO_ENVIRONMENT_GET_TARGET_REFRESH_RATE, &target_hz);
runloop_msg_queue_push(_msg, strlen(_msg), 1, QUIT_DELAY_USEC * target_hz / 1000000,
true, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_WARNING);
}
}
if (trig_reset_key)
command_event(CMD_EVENT_RESET, NULL);
}
/* Check close content hotkey */
if (runloop_st->flags & RUNLOOP_FLAG_CORE_RUNNING)
{
bool trig_close_key, close_press_twice;
static bool close_key = false;
static bool old_close_key = false;
close_key = BIT256_GET(current_bits, RARCH_CLOSE_CONTENT_KEY);
trig_close_key = close_key && !old_close_key;
old_close_key = close_key;
close_press_twice = settings->bools.quit_press_twice;
/* Check double press if enabled */
if ( trig_close_key
&& close_press_twice)
{
static retro_time_t close_key_time = 0;
retro_time_t cur_time = current_time;
trig_close_key = (cur_time - close_key_time < QUIT_DELAY_USEC);
close_key_time = cur_time;
if (!trig_close_key)
{
const char *_msg = msg_hash_to_str(MSG_PRESS_AGAIN_TO_CLOSE_CONTENT);
float target_hz = 0.0;
runloop_environment_cb(
RETRO_ENVIRONMENT_GET_TARGET_REFRESH_RATE, &target_hz);
runloop_msg_queue_push(_msg, strlen(_msg), 1, QUIT_DELAY_USEC * target_hz / 1000000,
true, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_WARNING);
}
}
if (trig_close_key)
command_event(CMD_EVENT_CLOSE_CONTENT, NULL);
}
/* Check quit hotkey */
{
bool trig_quit_key, quit_press_twice;
static bool quit_key = false;
static bool old_quit_key = false;
static bool runloop_exec = false;
quit_key = BIT256_GET(
current_bits, RARCH_QUIT_KEY);
quit_key = BIT256_GET(current_bits, RARCH_QUIT_KEY);
trig_quit_key = quit_key && !old_quit_key;
/* Check for quit gamepad combo */
if ( !trig_quit_key
@ -6137,9 +6212,6 @@ static enum runloop_state_enum runloop_check_state(
/* Check UI companion hotkey */
HOTKEY_CHECK(RARCH_UI_COMPANION_TOGGLE, CMD_EVENT_UI_COMPANION_TOGGLE, true, NULL);
/* Check close content hotkey */
HOTKEY_CHECK(RARCH_CLOSE_CONTENT_KEY, CMD_EVENT_CLOSE_CONTENT, true, NULL);
/* Check FPS hotkey */
HOTKEY_CHECK(RARCH_FPS_TOGGLE, CMD_EVENT_FPS_TOGGLE, true, NULL);
@ -6788,9 +6860,6 @@ static enum runloop_state_enum runloop_check_state(
HOTKEY_CHECK(RARCH_SAVE_STATE_KEY, CMD_EVENT_SAVE_STATE, true, NULL);
HOTKEY_CHECK(RARCH_LOAD_STATE_KEY, CMD_EVENT_LOAD_STATE, true, NULL);
/* Check reset hotkey */
HOTKEY_CHECK(RARCH_RESET, CMD_EVENT_RESET, true, NULL);
/* Check VRR runloop hotkey */
HOTKEY_CHECK(RARCH_VRR_RUNLOOP_TOGGLE, CMD_EVENT_VRR_RUNLOOP_TOGGLE, true, NULL);