mirror of
https://github.com/libretro/RetroArch
synced 2024-07-08 12:15:49 +00:00
commit
6d1655a5c3
|
@ -220,6 +220,7 @@ static const struct cmd_map map[] = {
|
||||||
{ "SCREENSHOT", RARCH_SCREENSHOT },
|
{ "SCREENSHOT", RARCH_SCREENSHOT },
|
||||||
{ "MUTE", RARCH_MUTE },
|
{ "MUTE", RARCH_MUTE },
|
||||||
{ "OSK", RARCH_OSK },
|
{ "OSK", RARCH_OSK },
|
||||||
|
{ "FPS_TOGGLE", RARCH_FPS_TOGGLE },
|
||||||
{ "NETPLAY_GAME_WATCH", RARCH_NETPLAY_GAME_WATCH },
|
{ "NETPLAY_GAME_WATCH", RARCH_NETPLAY_GAME_WATCH },
|
||||||
{ "VOLUME_UP", RARCH_VOLUME_UP },
|
{ "VOLUME_UP", RARCH_VOLUME_UP },
|
||||||
{ "VOLUME_DOWN", RARCH_VOLUME_DOWN },
|
{ "VOLUME_DOWN", RARCH_VOLUME_DOWN },
|
||||||
|
@ -2187,6 +2188,12 @@ TODO: Add a setting for these tweaks */
|
||||||
RARCH_LOG("%s\n", msg);
|
RARCH_LOG("%s\n", msg);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case CMD_EVENT_FPS_TOGGLE:
|
||||||
|
{
|
||||||
|
settings_t *settings = config_get_ptr();
|
||||||
|
settings->bools.video_fps_show = !(settings->bools.video_fps_show);
|
||||||
|
}
|
||||||
|
break;
|
||||||
case CMD_EVENT_OVERLAY_DEINIT:
|
case CMD_EVENT_OVERLAY_DEINIT:
|
||||||
#ifdef HAVE_OVERLAY
|
#ifdef HAVE_OVERLAY
|
||||||
input_overlay_free(overlay_ptr);
|
input_overlay_free(overlay_ptr);
|
||||||
|
|
|
@ -85,6 +85,8 @@ enum event_command
|
||||||
CMD_EVENT_AUDIO_START,
|
CMD_EVENT_AUDIO_START,
|
||||||
/* Mutes audio. */
|
/* Mutes audio. */
|
||||||
CMD_EVENT_AUDIO_MUTE_TOGGLE,
|
CMD_EVENT_AUDIO_MUTE_TOGGLE,
|
||||||
|
/* Toggles FPS counter. */
|
||||||
|
CMD_EVENT_FPS_TOGGLE,
|
||||||
/* Initializes overlay. */
|
/* Initializes overlay. */
|
||||||
CMD_EVENT_OVERLAY_INIT,
|
CMD_EVENT_OVERLAY_INIT,
|
||||||
/* Deinitializes overlay. */
|
/* Deinitializes overlay. */
|
||||||
|
|
|
@ -87,6 +87,7 @@ static const struct retro_keybind retro_keybinds_1[] = {
|
||||||
{ true, RARCH_SCREENSHOT, MENU_ENUM_LABEL_VALUE_INPUT_META_SCREENSHOT, RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
|
{ true, RARCH_SCREENSHOT, MENU_ENUM_LABEL_VALUE_INPUT_META_SCREENSHOT, RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
|
||||||
{ true, RARCH_MUTE, MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE, RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
|
{ true, RARCH_MUTE, MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE, RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
|
||||||
{ true, RARCH_OSK, MENU_ENUM_LABEL_VALUE_INPUT_META_OSK, RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
|
{ true, RARCH_OSK, MENU_ENUM_LABEL_VALUE_INPUT_META_OSK, RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
|
||||||
|
{ true, RARCH_FPS_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_FPS_TOGGLE, RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
|
||||||
{ true, RARCH_NETPLAY_GAME_WATCH, MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_GAME_WATCH, RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
|
{ true, RARCH_NETPLAY_GAME_WATCH, MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_GAME_WATCH, RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
|
||||||
{ true, RARCH_ENABLE_HOTKEY, MENU_ENUM_LABEL_VALUE_INPUT_META_ENABLE_HOTKEY, RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
|
{ true, RARCH_ENABLE_HOTKEY, MENU_ENUM_LABEL_VALUE_INPUT_META_ENABLE_HOTKEY, RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
|
||||||
{ true, RARCH_VOLUME_UP, MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_UP, RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
|
{ true, RARCH_VOLUME_UP, MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_UP, RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
|
||||||
|
@ -165,6 +166,7 @@ static const struct retro_keybind retro_keybinds_1[] = {
|
||||||
{ true, RARCH_SCREENSHOT, MENU_ENUM_LABEL_VALUE_INPUT_META_SCREENSHOT, RETROK_F8, NO_BTN, NO_BTN, 0, AXIS_NONE },
|
{ true, RARCH_SCREENSHOT, MENU_ENUM_LABEL_VALUE_INPUT_META_SCREENSHOT, RETROK_F8, NO_BTN, NO_BTN, 0, AXIS_NONE },
|
||||||
{ true, RARCH_MUTE, MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE, RETROK_F9, NO_BTN, NO_BTN, 0, AXIS_NONE },
|
{ true, RARCH_MUTE, MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE, RETROK_F9, NO_BTN, NO_BTN, 0, AXIS_NONE },
|
||||||
{ true, RARCH_OSK, MENU_ENUM_LABEL_VALUE_INPUT_META_OSK, RETROK_F12, NO_BTN, NO_BTN, 0, AXIS_NONE },
|
{ true, RARCH_OSK, MENU_ENUM_LABEL_VALUE_INPUT_META_OSK, RETROK_F12, NO_BTN, NO_BTN, 0, AXIS_NONE },
|
||||||
|
{ true, RARCH_FPS_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_FPS_TOGGLE, RETROK_F3, NO_BTN, NO_BTN, 0, AXIS_NONE },
|
||||||
{ true, RARCH_NETPLAY_GAME_WATCH, MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_GAME_WATCH, RETROK_i, NO_BTN, NO_BTN, 0, AXIS_NONE },
|
{ true, RARCH_NETPLAY_GAME_WATCH, MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_GAME_WATCH, RETROK_i, NO_BTN, NO_BTN, 0, AXIS_NONE },
|
||||||
{ true, RARCH_ENABLE_HOTKEY, MENU_ENUM_LABEL_VALUE_INPUT_META_ENABLE_HOTKEY, RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
|
{ true, RARCH_ENABLE_HOTKEY, MENU_ENUM_LABEL_VALUE_INPUT_META_ENABLE_HOTKEY, RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
|
||||||
{ true, RARCH_VOLUME_UP, MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_UP, RETROK_KP_PLUS, NO_BTN, NO_BTN, 0, AXIS_NONE },
|
{ true, RARCH_VOLUME_UP, MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_UP, RETROK_KP_PLUS, NO_BTN, NO_BTN, 0, AXIS_NONE },
|
||||||
|
|
|
@ -97,6 +97,7 @@ enum
|
||||||
RARCH_SCREENSHOT,
|
RARCH_SCREENSHOT,
|
||||||
RARCH_MUTE,
|
RARCH_MUTE,
|
||||||
RARCH_OSK,
|
RARCH_OSK,
|
||||||
|
RARCH_FPS_TOGGLE,
|
||||||
RARCH_NETPLAY_GAME_WATCH,
|
RARCH_NETPLAY_GAME_WATCH,
|
||||||
RARCH_ENABLE_HOTKEY,
|
RARCH_ENABLE_HOTKEY,
|
||||||
RARCH_VOLUME_UP,
|
RARCH_VOLUME_UP,
|
||||||
|
|
|
@ -343,6 +343,7 @@ const struct input_bind_map input_config_bind_map[RARCH_BIND_LIST_END_NULL] = {
|
||||||
DECLARE_META_BIND(2, screenshot, RARCH_SCREENSHOT, MENU_ENUM_LABEL_VALUE_INPUT_META_SCREENSHOT),
|
DECLARE_META_BIND(2, screenshot, RARCH_SCREENSHOT, MENU_ENUM_LABEL_VALUE_INPUT_META_SCREENSHOT),
|
||||||
DECLARE_META_BIND(2, audio_mute, RARCH_MUTE, MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE),
|
DECLARE_META_BIND(2, audio_mute, RARCH_MUTE, MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE),
|
||||||
DECLARE_META_BIND(2, osk_toggle, RARCH_OSK, MENU_ENUM_LABEL_VALUE_INPUT_META_OSK),
|
DECLARE_META_BIND(2, osk_toggle, RARCH_OSK, MENU_ENUM_LABEL_VALUE_INPUT_META_OSK),
|
||||||
|
DECLARE_META_BIND(2, fps_toggle, RARCH_FPS_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_FPS_TOGGLE),
|
||||||
DECLARE_META_BIND(2, netplay_game_watch, RARCH_NETPLAY_GAME_WATCH, MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_GAME_WATCH),
|
DECLARE_META_BIND(2, netplay_game_watch, RARCH_NETPLAY_GAME_WATCH, MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_GAME_WATCH),
|
||||||
DECLARE_META_BIND(2, enable_hotkey, RARCH_ENABLE_HOTKEY, MENU_ENUM_LABEL_VALUE_INPUT_META_ENABLE_HOTKEY),
|
DECLARE_META_BIND(2, enable_hotkey, RARCH_ENABLE_HOTKEY, MENU_ENUM_LABEL_VALUE_INPUT_META_ENABLE_HOTKEY),
|
||||||
DECLARE_META_BIND(2, volume_up, RARCH_VOLUME_UP, MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_UP),
|
DECLARE_META_BIND(2, volume_up, RARCH_VOLUME_UP, MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_UP),
|
||||||
|
|
|
@ -104,6 +104,10 @@ int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len)
|
||||||
snprintf(s, len,
|
snprintf(s, len,
|
||||||
"Toggles onscreen keyboard.");
|
"Toggles onscreen keyboard.");
|
||||||
break;
|
break;
|
||||||
|
case RARCH_FPS_TOGGLE:
|
||||||
|
snprintf(s, len,
|
||||||
|
"Toggles frames per second counter.");
|
||||||
|
break;
|
||||||
case RARCH_NETPLAY_GAME_WATCH:
|
case RARCH_NETPLAY_GAME_WATCH:
|
||||||
snprintf(s, len,
|
snprintf(s, len,
|
||||||
"Netplay toggle play/spectate mode.");
|
"Netplay toggle play/spectate mode.");
|
||||||
|
|
|
@ -1251,6 +1251,10 @@ MSG_HASH(
|
||||||
MENU_ENUM_LABEL_VALUE_INPUT_META_FRAMEADVANCE,
|
MENU_ENUM_LABEL_VALUE_INPUT_META_FRAMEADVANCE,
|
||||||
"Frameadvance"
|
"Frameadvance"
|
||||||
)
|
)
|
||||||
|
MSG_HASH(
|
||||||
|
MENU_ENUM_LABEL_VALUE_INPUT_META_FPS_TOGGLE,
|
||||||
|
"FPS toggle"
|
||||||
|
)
|
||||||
MSG_HASH(
|
MSG_HASH(
|
||||||
MENU_ENUM_LABEL_VALUE_INPUT_META_FULLSCREEN_TOGGLE_KEY,
|
MENU_ENUM_LABEL_VALUE_INPUT_META_FULLSCREEN_TOGGLE_KEY,
|
||||||
"Fullscreen toggle"
|
"Fullscreen toggle"
|
||||||
|
|
|
@ -671,6 +671,7 @@ enum msg_hash_enums
|
||||||
MENU_ENUM_LABEL_VALUE_INPUT_META_SCREENSHOT,
|
MENU_ENUM_LABEL_VALUE_INPUT_META_SCREENSHOT,
|
||||||
MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE,
|
MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE,
|
||||||
MENU_ENUM_LABEL_VALUE_INPUT_META_OSK,
|
MENU_ENUM_LABEL_VALUE_INPUT_META_OSK,
|
||||||
|
MENU_ENUM_LABEL_VALUE_INPUT_META_FPS_TOGGLE,
|
||||||
MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_GAME_WATCH,
|
MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_GAME_WATCH,
|
||||||
MENU_ENUM_LABEL_VALUE_INPUT_META_ENABLE_HOTKEY,
|
MENU_ENUM_LABEL_VALUE_INPUT_META_ENABLE_HOTKEY,
|
||||||
MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_UP,
|
MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_UP,
|
||||||
|
|
12
retroarch.c
12
retroarch.c
|
@ -2930,6 +2930,18 @@ static enum runloop_state runloop_check_state(
|
||||||
old_pressed = pressed;
|
old_pressed = pressed;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Check FPS toggle */
|
||||||
|
{
|
||||||
|
static bool old_pressed = false;
|
||||||
|
bool pressed = BIT256_GET(
|
||||||
|
current_input, RARCH_FPS_TOGGLE);
|
||||||
|
|
||||||
|
if (pressed && !old_pressed)
|
||||||
|
command_event(CMD_EVENT_FPS_TOGGLE, NULL);
|
||||||
|
|
||||||
|
old_pressed = pressed;
|
||||||
|
}
|
||||||
|
|
||||||
/* Check recording toggle */
|
/* Check recording toggle */
|
||||||
{
|
{
|
||||||
static bool old_pressed = false;
|
static bool old_pressed = false;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user