mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-26 15:39:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

More hotkey cleanups (#14657)

Browse Source
This commit is contained in:
sonninnos 2022-11-22 15:45:30 +02:00 committed by GitHub
parent aeaf5561bd
commit 9bc7bebf51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 373 additions and 313 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
command.h
View File

@ -74,7 +74,6 @@ enum event_command
CMD_EVENT_RESET, CMD_EVENT_RESET,
CMD_EVENT_SET_PER_GAME_RESOLUTION, CMD_EVENT_SET_PER_GAME_RESOLUTION,
CMD_EVENT_SET_FRAME_LIMIT, CMD_EVENT_SET_FRAME_LIMIT,
CMD_EVENT_VRR_RUNLOOP_TOGGLE,
/* Loads core. */ /* Loads core. */
CMD_EVENT_LOAD_CORE, CMD_EVENT_LOAD_CORE,
CMD_EVENT_LOAD_CORE_PERSIST, CMD_EVENT_LOAD_CORE_PERSIST,
@ -82,17 +81,20 @@ enum event_command
CMD_EVENT_LOAD_SECOND_CORE, CMD_EVENT_LOAD_SECOND_CORE,
#endif #endif
CMD_EVENT_UNLOAD_CORE, CMD_EVENT_UNLOAD_CORE,
/* Closes content. */
CMD_EVENT_CLOSE_CONTENT, CMD_EVENT_CLOSE_CONTENT,
CMD_EVENT_LOAD_STATE, /* Swaps the current state with what's on the undo load buffer. */
CMD_EVENT_LOAD_STATE_FROM_RAM,
/* Swaps the current state with what's on the undo load buffer */
CMD_EVENT_UNDO_LOAD_STATE, CMD_EVENT_UNDO_LOAD_STATE,
/* Rewrites a savestate on disk */ /* Rewrites a savestate on disk. */
CMD_EVENT_UNDO_SAVE_STATE, CMD_EVENT_UNDO_SAVE_STATE,
/* Save state hotkeys. */
CMD_EVENT_LOAD_STATE,
CMD_EVENT_SAVE_STATE, CMD_EVENT_SAVE_STATE,
CMD_EVENT_SAVE_STATE_TO_RAM,
CMD_EVENT_SAVE_STATE_DECREMENT, CMD_EVENT_SAVE_STATE_DECREMENT,
CMD_EVENT_SAVE_STATE_INCREMENT, CMD_EVENT_SAVE_STATE_INCREMENT,
/* Save state actions. */
CMD_EVENT_SAVE_STATE_TO_RAM,
CMD_EVENT_LOAD_STATE_FROM_RAM,
CMD_EVENT_RAM_STATE_TO_FILE, CMD_EVENT_RAM_STATE_TO_FILE,
/* Takes screenshot. */ /* Takes screenshot. */
CMD_EVENT_TAKE_SCREENSHOT, CMD_EVENT_TAKE_SCREENSHOT,
@ -118,16 +120,15 @@ 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,
/* Volume adjustments. */
CMD_EVENT_VOLUME_UP,
CMD_EVENT_VOLUME_DOWN,
CMD_EVENT_MIXER_VOLUME_UP,
CMD_EVENT_MIXER_VOLUME_DOWN,
/* Toggles FPS counter. */ /* Toggles FPS counter. */
CMD_EVENT_FPS_TOGGLE, CMD_EVENT_FPS_TOGGLE,
/* Toggles statistics display. */ /* Toggles statistics display. */
CMD_EVENT_STATISTICS_TOGGLE, CMD_EVENT_STATISTICS_TOGGLE,
/* Toggle ping counter. */
CMD_EVENT_NETPLAY_PING_TOGGLE,
/* Gathers diagnostic info about the system and RetroArch configuration, then sends it to our servers. */
CMD_EVENT_SEND_DEBUG_INFO,
/* Toggles netplay hosting. */
CMD_EVENT_NETPLAY_HOST_TOGGLE,
/* Initializes overlay. */ /* Initializes overlay. */
CMD_EVENT_OVERLAY_INIT, CMD_EVENT_OVERLAY_INIT,
/* Deinitializes overlay. */ /* Deinitializes overlay. */
@ -138,8 +139,6 @@ enum event_command
CMD_EVENT_OVERLAY_SET_ALPHA_MOD, CMD_EVENT_OVERLAY_SET_ALPHA_MOD,
/* Sets diagonal sensitivities of overlay eightway areas. */ /* Sets diagonal sensitivities of overlay eightway areas. */
CMD_EVENT_OVERLAY_SET_EIGHTWAY_DIAGONAL_SENSITIVITY, CMD_EVENT_OVERLAY_SET_EIGHTWAY_DIAGONAL_SENSITIVITY,
/* Cycle to next overlay. */
CMD_EVENT_OVERLAY_NEXT,
/* Deinitializes overlay. */ /* Deinitializes overlay. */
CMD_EVENT_DSP_FILTER_INIT, CMD_EVENT_DSP_FILTER_INIT,
/* Initializes recording system. */ /* Initializes recording system. */
@ -179,24 +178,33 @@ enum event_command
/* Toggles pause. */ /* Toggles pause. */
CMD_EVENT_PAUSE_TOGGLE, CMD_EVENT_PAUSE_TOGGLE,
/* Pauses RetroArch. */ /* Pauses RetroArch. */
CMD_EVENT_UNPAUSE, CMD_EVENT_MENU_PAUSE_LIBRETRO,
/* Unpauses retroArch. */
CMD_EVENT_PAUSE, CMD_EVENT_PAUSE,
/* Unpauses RetroArch. */
CMD_EVENT_UNPAUSE,
/* Toggles menu on/off. */
CMD_EVENT_MENU_TOGGLE,
/* Configuration saving. */
CMD_EVENT_MENU_RESET_TO_DEFAULT_CONFIG, CMD_EVENT_MENU_RESET_TO_DEFAULT_CONFIG,
CMD_EVENT_MENU_SAVE_CURRENT_CONFIG, CMD_EVENT_MENU_SAVE_CURRENT_CONFIG,
CMD_EVENT_MENU_SAVE_CURRENT_CONFIG_OVERRIDE_CORE, CMD_EVENT_MENU_SAVE_CURRENT_CONFIG_OVERRIDE_CORE,
CMD_EVENT_MENU_SAVE_CURRENT_CONFIG_OVERRIDE_CONTENT_DIR, CMD_EVENT_MENU_SAVE_CURRENT_CONFIG_OVERRIDE_CONTENT_DIR,
CMD_EVENT_MENU_SAVE_CURRENT_CONFIG_OVERRIDE_GAME, CMD_EVENT_MENU_SAVE_CURRENT_CONFIG_OVERRIDE_GAME,
CMD_EVENT_MENU_SAVE_CONFIG, CMD_EVENT_MENU_SAVE_CONFIG,
CMD_EVENT_MENU_PAUSE_LIBRETRO,
/* Toggles menu on/off. */
CMD_EVENT_MENU_TOGGLE,
/* Applies shader changes. */ /* Applies shader changes. */
CMD_EVENT_SHADERS_APPLY_CHANGES, CMD_EVENT_SHADERS_APPLY_CHANGES,
/* A new shader preset has been loaded */ /* A new shader preset has been loaded */
CMD_EVENT_SHADER_PRESET_LOADED, CMD_EVENT_SHADER_PRESET_LOADED,
/* Shader hotkeys. */
CMD_EVENT_SHADER_NEXT,
CMD_EVENT_SHADER_PREV,
CMD_EVENT_SHADER_TOGGLE,
/* Apply cheats. */ /* Apply cheats. */
CMD_EVENT_CHEATS_APPLY, CMD_EVENT_CHEATS_APPLY,
/* Cheat hotkeys. */
CMD_EVENT_CHEAT_TOGGLE,
CMD_EVENT_CHEAT_INDEX_PLUS,
CMD_EVENT_CHEAT_INDEX_MINUS,
/* Initializes network system. */ /* Initializes network system. */
CMD_EVENT_NETWORK_INIT, CMD_EVENT_NETWORK_INIT,
/* Initializes netplay system with a string or no host specified. */ /* Initializes netplay system with a string or no host specified. */
@ -217,6 +225,10 @@ enum event_command
CMD_EVENT_NETPLAY_ENABLE_HOST, CMD_EVENT_NETPLAY_ENABLE_HOST,
/* Disconnect from the netplay host. */ /* Disconnect from the netplay host. */
CMD_EVENT_NETPLAY_DISCONNECT, CMD_EVENT_NETPLAY_DISCONNECT,
/* Toggle ping counter. */
CMD_EVENT_NETPLAY_PING_TOGGLE,
/* Toggles netplay hosting. */
CMD_EVENT_NETPLAY_HOST_TOGGLE,
/* Reinitializes audio driver. */ /* Reinitializes audio driver. */
CMD_EVENT_AUDIO_REINIT, CMD_EVENT_AUDIO_REINIT,
/* Resizes windowed scale. Will reinitialize video driver. */ /* Resizes windowed scale. Will reinitialize video driver. */
@ -241,27 +253,29 @@ enum event_command
CMD_EVENT_UI_COMPANION_TOGGLE, CMD_EVENT_UI_COMPANION_TOGGLE,
/* Toggles fullscreen mode. */ /* Toggles fullscreen mode. */
CMD_EVENT_FULLSCREEN_TOGGLE, CMD_EVENT_FULLSCREEN_TOGGLE,
CMD_EVENT_VOLUME_UP, /* Toggle recording. */
CMD_EVENT_VOLUME_DOWN, CMD_EVENT_RECORDING_TOGGLE,
CMD_EVENT_MIXER_VOLUME_UP, /* Toggle streaming. */
CMD_EVENT_MIXER_VOLUME_DOWN, CMD_EVENT_STREAMING_TOGGLE,
/* Toggle BSV recording. */
CMD_EVENT_BSV_RECORDING_TOGGLE,
/* Toggle Run-Ahead. */
CMD_EVENT_RUNAHEAD_TOGGLE,
/* Toggle VRR runloop. */
CMD_EVENT_VRR_RUNLOOP_TOGGLE,
/* AI service. */
CMD_EVENT_AI_SERVICE_TOGGLE,
CMD_EVENT_AI_SERVICE_CALL,
/* Misc. */
CMD_EVENT_SAVE_FILES,
CMD_EVENT_CONTROLLER_INIT,
CMD_EVENT_DISCORD_INIT, CMD_EVENT_DISCORD_INIT,
CMD_EVENT_PRESENCE_UPDATE, CMD_EVENT_PRESENCE_UPDATE,
CMD_EVENT_OVERLAY_NEXT,
CMD_EVENT_OSK_TOGGLE, CMD_EVENT_OSK_TOGGLE,
CMD_EVENT_RECORDING_TOGGLE,
CMD_EVENT_STREAMING_TOGGLE, /* Deprecated */
CMD_EVENT_RUNAHEAD_TOGGLE, CMD_EVENT_SEND_DEBUG_INFO
CMD_EVENT_AI_SERVICE_TOGGLE,
CMD_EVENT_BSV_RECORDING_TOGGLE,
CMD_EVENT_SHADER_NEXT,
CMD_EVENT_SHADER_PREV,
CMD_EVENT_SHADER_TOGGLE,
CMD_EVENT_CHEAT_INDEX_PLUS,
CMD_EVENT_CHEAT_INDEX_MINUS,
CMD_EVENT_CHEAT_TOGGLE,
CMD_EVENT_AI_SERVICE_CALL,
CMD_EVENT_SAVE_FILES,
CMD_EVENT_CONTROLLER_INIT
}; };
typedef struct command_handle typedef struct command_handle
@ -449,6 +463,7 @@ static const struct cmd_map map[] = {
{ "QUIT", RARCH_QUIT_KEY }, { "QUIT", RARCH_QUIT_KEY },
{ "CLOSE_CONTENT", RARCH_CLOSE_CONTENT_KEY }, { "CLOSE_CONTENT", RARCH_CLOSE_CONTENT_KEY },
{ "RESET", RARCH_RESET }, { "RESET", RARCH_RESET },
{ "FAST_FORWARD", RARCH_FAST_FORWARD_KEY }, { "FAST_FORWARD", RARCH_FAST_FORWARD_KEY },
{ "FAST_FORWARD_HOLD", RARCH_FAST_FORWARD_HOLD_KEY }, { "FAST_FORWARD_HOLD", RARCH_FAST_FORWARD_HOLD_KEY },
{ "SLOWMOTION", RARCH_SLOWMOTION_KEY }, { "SLOWMOTION", RARCH_SLOWMOTION_KEY },
@ -490,11 +505,8 @@ static const struct cmd_map map[] = {
{ "VRR_RUNLOOP_TOGGLE", RARCH_VRR_RUNLOOP_TOGGLE }, { "VRR_RUNLOOP_TOGGLE", RARCH_VRR_RUNLOOP_TOGGLE },
{ "RUNAHEAD_TOGGLE", RARCH_RUNAHEAD_TOGGLE }, { "RUNAHEAD_TOGGLE", RARCH_RUNAHEAD_TOGGLE },
{ "FPS_TOGGLE", RARCH_FPS_TOGGLE }, { "FPS_TOGGLE", RARCH_FPS_TOGGLE },
{ "STATISTICS_TOGGLE", RARCH_STATISTICS_TOGGLE }, { "STATISTICS_TOGGLE", RARCH_STATISTICS_TOGGLE },
{ "OVERLAY_NEXT", RARCH_OVERLAY_NEXT },
{ "OSK", RARCH_OSK },
{ "AI_SERVICE", RARCH_AI_SERVICE }, { "AI_SERVICE", RARCH_AI_SERVICE },
{ "NETPLAY_PING_TOGGLE", RARCH_NETPLAY_PING_TOGGLE }, { "NETPLAY_PING_TOGGLE", RARCH_NETPLAY_PING_TOGGLE },
@ -503,14 +515,20 @@ static const struct cmd_map map[] = {
{ "NETPLAY_PLAYER_CHAT", RARCH_NETPLAY_PLAYER_CHAT }, { "NETPLAY_PLAYER_CHAT", RARCH_NETPLAY_PLAYER_CHAT },
{ "NETPLAY_FADE_CHAT_TOGGLE", RARCH_NETPLAY_FADE_CHAT_TOGGLE }, { "NETPLAY_FADE_CHAT_TOGGLE", RARCH_NETPLAY_FADE_CHAT_TOGGLE },
{ "SEND_DEBUG_INFO", RARCH_SEND_DEBUG_INFO },
{ "MENU_UP", RETRO_DEVICE_ID_JOYPAD_UP }, { "MENU_UP", RETRO_DEVICE_ID_JOYPAD_UP },
{ "MENU_DOWN", RETRO_DEVICE_ID_JOYPAD_DOWN }, { "MENU_DOWN", RETRO_DEVICE_ID_JOYPAD_DOWN },
{ "MENU_LEFT", RETRO_DEVICE_ID_JOYPAD_LEFT }, { "MENU_LEFT", RETRO_DEVICE_ID_JOYPAD_LEFT },
{ "MENU_RIGHT", RETRO_DEVICE_ID_JOYPAD_RIGHT }, { "MENU_RIGHT", RETRO_DEVICE_ID_JOYPAD_RIGHT },
{ "MENU_A", RETRO_DEVICE_ID_JOYPAD_A }, { "MENU_A", RETRO_DEVICE_ID_JOYPAD_A },
{ "MENU_B", RETRO_DEVICE_ID_JOYPAD_B }, { "MENU_B", RETRO_DEVICE_ID_JOYPAD_B },
{ "OVERLAY_NEXT", RARCH_OVERLAY_NEXT },
{ "OSK", RARCH_OSK },
#if 0
/* Deprecated */
{ "SEND_DEBUG_INFO", RARCH_SEND_DEBUG_INFO },
#endif
}; };
#endif #endif

93
config.def.keybinds.h
View File

@ -557,20 +557,6 @@ static const struct retro_keybind retro_keybinds_1[] = {
RARCH_STATISTICS_TOGGLE, NO_BTN, NO_BTN, 0, RARCH_STATISTICS_TOGGLE, NO_BTN, NO_BTN, 0,
true true
}, },
{
NULL, NULL,
AXIS_NONE, AXIS_NONE, AXIS_NONE,
MENU_ENUM_LABEL_VALUE_INPUT_META_OVERLAY_NEXT, RETROK_UNKNOWN,
RARCH_OVERLAY_NEXT, NO_BTN, NO_BTN, 0,
true
},
{
NULL, NULL,
AXIS_NONE, AXIS_NONE, AXIS_NONE,
MENU_ENUM_LABEL_VALUE_INPUT_META_OSK, RETROK_UNKNOWN,
RARCH_OSK, NO_BTN, NO_BTN, 0,
true
},
{ {
NULL, NULL, NULL, NULL,
AXIS_NONE, AXIS_NONE, AXIS_NONE, AXIS_NONE, AXIS_NONE, AXIS_NONE,
@ -613,6 +599,22 @@ static const struct retro_keybind retro_keybinds_1[] = {
RARCH_NETPLAY_FADE_CHAT_TOGGLE, NO_BTN, NO_BTN, 0, RARCH_NETPLAY_FADE_CHAT_TOGGLE, NO_BTN, NO_BTN, 0,
true true
}, },
{
NULL, NULL,
AXIS_NONE, AXIS_NONE, AXIS_NONE,
MENU_ENUM_LABEL_VALUE_INPUT_META_OVERLAY_NEXT, RETROK_UNKNOWN,
RARCH_OVERLAY_NEXT, NO_BTN, NO_BTN, 0,
true
},
{
NULL, NULL,
AXIS_NONE, AXIS_NONE, AXIS_NONE,
MENU_ENUM_LABEL_VALUE_INPUT_META_OSK, RETROK_UNKNOWN,
RARCH_OSK, NO_BTN, NO_BTN, 0,
true
},
#if 0
/* Deprecated */
{ {
NULL, NULL, NULL, NULL,
AXIS_NONE, AXIS_NONE, AXIS_NONE, AXIS_NONE, AXIS_NONE, AXIS_NONE,
@ -620,6 +622,7 @@ static const struct retro_keybind retro_keybinds_1[] = {
RARCH_SEND_DEBUG_INFO, NO_BTN, NO_BTN, 0, RARCH_SEND_DEBUG_INFO, NO_BTN, NO_BTN, 0,
true true
}, },
#endif
#elif defined(DINGUX) #elif defined(DINGUX)
{ {
NULL, NULL, NULL, NULL,
@ -1154,20 +1157,6 @@ static const struct retro_keybind retro_keybinds_1[] = {
RARCH_STATISTICS_TOGGLE, NO_BTN, NO_BTN, 0, RARCH_STATISTICS_TOGGLE, NO_BTN, NO_BTN, 0,
true true
}, },
{
NULL, NULL,
AXIS_NONE, AXIS_NONE, AXIS_NONE,
MENU_ENUM_LABEL_VALUE_INPUT_META_OVERLAY_NEXT, RETROK_UNKNOWN,
RARCH_OVERLAY_NEXT, NO_BTN, NO_BTN, 0,
true
},
{
NULL, NULL,
AXIS_NONE, AXIS_NONE, AXIS_NONE,
MENU_ENUM_LABEL_VALUE_INPUT_META_OSK, RETROK_UNKNOWN,
RARCH_OSK, NO_BTN, NO_BTN, 0,
true
},
{ {
NULL, NULL, NULL, NULL,
AXIS_NONE, AXIS_NONE, AXIS_NONE, AXIS_NONE, AXIS_NONE, AXIS_NONE,
@ -1210,6 +1199,22 @@ static const struct retro_keybind retro_keybinds_1[] = {
RARCH_NETPLAY_FADE_CHAT_TOGGLE, NO_BTN, NO_BTN, 0, RARCH_NETPLAY_FADE_CHAT_TOGGLE, NO_BTN, NO_BTN, 0,
true true
}, },
{
NULL, NULL,
AXIS_NONE, AXIS_NONE, AXIS_NONE,
MENU_ENUM_LABEL_VALUE_INPUT_META_OVERLAY_NEXT, RETROK_UNKNOWN,
RARCH_OVERLAY_NEXT, NO_BTN, NO_BTN, 0,
true
},
{
NULL, NULL,
AXIS_NONE, AXIS_NONE, AXIS_NONE,
MENU_ENUM_LABEL_VALUE_INPUT_META_OSK, RETROK_UNKNOWN,
RARCH_OSK, NO_BTN, NO_BTN, 0,
true
},
#if 0
/* Deprecated */
{ {
NULL, NULL, NULL, NULL,
AXIS_NONE, AXIS_NONE, AXIS_NONE, AXIS_NONE, AXIS_NONE, AXIS_NONE,
@ -1217,6 +1222,7 @@ static const struct retro_keybind retro_keybinds_1[] = {
RARCH_SEND_DEBUG_INFO, NO_BTN, NO_BTN, 0, RARCH_SEND_DEBUG_INFO, NO_BTN, NO_BTN, 0,
true true
}, },
#endif
#else #else
{ {
NULL, NULL, NULL, NULL,
@ -1761,20 +1767,6 @@ static const struct retro_keybind retro_keybinds_1[] = {
RARCH_STATISTICS_TOGGLE, NO_BTN, NO_BTN, 0, RARCH_STATISTICS_TOGGLE, NO_BTN, NO_BTN, 0,
true true
}, },
{
NULL, NULL,
AXIS_NONE, AXIS_NONE, AXIS_NONE,
MENU_ENUM_LABEL_VALUE_INPUT_META_OVERLAY_NEXT, RETROK_UNKNOWN,
RARCH_OVERLAY_NEXT, NO_BTN, NO_BTN, 0,
true
},
{
NULL, NULL,
AXIS_NONE, AXIS_NONE, AXIS_NONE,
MENU_ENUM_LABEL_VALUE_INPUT_META_OSK, RETROK_F12,
RARCH_OSK, NO_BTN, NO_BTN, 0,
true
},
{ {
NULL, NULL, NULL, NULL,
AXIS_NONE, AXIS_NONE, AXIS_NONE, AXIS_NONE, AXIS_NONE, AXIS_NONE,
@ -1817,6 +1809,22 @@ static const struct retro_keybind retro_keybinds_1[] = {
RARCH_NETPLAY_FADE_CHAT_TOGGLE, NO_BTN, NO_BTN, 0, RARCH_NETPLAY_FADE_CHAT_TOGGLE, NO_BTN, NO_BTN, 0,
true true
}, },
{
NULL, NULL,
AXIS_NONE, AXIS_NONE, AXIS_NONE,
MENU_ENUM_LABEL_VALUE_INPUT_META_OVERLAY_NEXT, RETROK_UNKNOWN,
RARCH_OVERLAY_NEXT, NO_BTN, NO_BTN, 0,
true
},
{
NULL, NULL,
AXIS_NONE, AXIS_NONE, AXIS_NONE,
MENU_ENUM_LABEL_VALUE_INPUT_META_OSK, RETROK_UNKNOWN,
RARCH_OSK, NO_BTN, NO_BTN, 0,
true
},
#if 0
/* Deprecated */
{ {
NULL, NULL, NULL, NULL,
AXIS_NONE, AXIS_NONE, AXIS_NONE, AXIS_NONE, AXIS_NONE, AXIS_NONE,
@ -1825,6 +1833,7 @@ static const struct retro_keybind retro_keybinds_1[] = {
true true
}, },
#endif #endif
#endif
}; };
/* Users 2 to MAX_USERS */ /* Users 2 to MAX_USERS */

10
configuration.c
View File

@ -358,11 +358,8 @@ const struct input_bind_map input_config_bind_map[RARCH_BIND_LIST_END_NULL] = {
DECLARE_META_BIND(2, toggle_vrr_runloop, RARCH_VRR_RUNLOOP_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_VRR_RUNLOOP_TOGGLE), DECLARE_META_BIND(2, toggle_vrr_runloop, RARCH_VRR_RUNLOOP_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_VRR_RUNLOOP_TOGGLE),
DECLARE_META_BIND(2, runahead_toggle, RARCH_RUNAHEAD_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_RUNAHEAD_TOGGLE), DECLARE_META_BIND(2, runahead_toggle, RARCH_RUNAHEAD_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_RUNAHEAD_TOGGLE),
DECLARE_META_BIND(2, fps_toggle, RARCH_FPS_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_FPS_TOGGLE), DECLARE_META_BIND(2, fps_toggle, RARCH_FPS_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_FPS_TOGGLE),
DECLARE_META_BIND(2, toggle_statistics, RARCH_STATISTICS_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_STATISTICS_TOGGLE), DECLARE_META_BIND(2, toggle_statistics, RARCH_STATISTICS_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_STATISTICS_TOGGLE),
DECLARE_META_BIND(2, overlay_next, RARCH_OVERLAY_NEXT, MENU_ENUM_LABEL_VALUE_INPUT_META_OVERLAY_NEXT),
DECLARE_META_BIND(2, osk_toggle, RARCH_OSK, MENU_ENUM_LABEL_VALUE_INPUT_META_OSK),
DECLARE_META_BIND(2, ai_service, RARCH_AI_SERVICE, MENU_ENUM_LABEL_VALUE_INPUT_META_AI_SERVICE), DECLARE_META_BIND(2, ai_service, RARCH_AI_SERVICE, MENU_ENUM_LABEL_VALUE_INPUT_META_AI_SERVICE),
DECLARE_META_BIND(2, netplay_ping_toggle, RARCH_NETPLAY_PING_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_PING_TOGGLE), DECLARE_META_BIND(2, netplay_ping_toggle, RARCH_NETPLAY_PING_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_PING_TOGGLE),
@ -371,8 +368,13 @@ const struct input_bind_map input_config_bind_map[RARCH_BIND_LIST_END_NULL] = {
DECLARE_META_BIND(2, netplay_player_chat, RARCH_NETPLAY_PLAYER_CHAT, MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_PLAYER_CHAT), DECLARE_META_BIND(2, netplay_player_chat, RARCH_NETPLAY_PLAYER_CHAT, MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_PLAYER_CHAT),
DECLARE_META_BIND(2, netplay_fade_chat_toggle, RARCH_NETPLAY_FADE_CHAT_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_FADE_CHAT_TOGGLE), DECLARE_META_BIND(2, netplay_fade_chat_toggle, RARCH_NETPLAY_FADE_CHAT_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_FADE_CHAT_TOGGLE),
/* Hidden in displaylist */
DECLARE_META_BIND(2, overlay_next, RARCH_OVERLAY_NEXT, MENU_ENUM_LABEL_VALUE_INPUT_META_OVERLAY_NEXT),
DECLARE_META_BIND(2, osk_toggle, RARCH_OSK, MENU_ENUM_LABEL_VALUE_INPUT_META_OSK),
#if 0
/* Deprecated */
DECLARE_META_BIND(2, send_debug_info, RARCH_SEND_DEBUG_INFO, MENU_ENUM_LABEL_VALUE_INPUT_META_SEND_DEBUG_INFO), DECLARE_META_BIND(2, send_debug_info, RARCH_SEND_DEBUG_INFO, MENU_ENUM_LABEL_VALUE_INPUT_META_SEND_DEBUG_INFO),
#endif
}; };
#if defined(HAVE_METAL) #if defined(HAVE_METAL)

10
input/input_defines.h
View File

@ -120,11 +120,8 @@ enum
RARCH_VRR_RUNLOOP_TOGGLE, RARCH_VRR_RUNLOOP_TOGGLE,
RARCH_RUNAHEAD_TOGGLE, RARCH_RUNAHEAD_TOGGLE,
RARCH_FPS_TOGGLE, RARCH_FPS_TOGGLE,
RARCH_STATISTICS_TOGGLE, RARCH_STATISTICS_TOGGLE,
RARCH_OVERLAY_NEXT,
RARCH_OSK,
RARCH_AI_SERVICE, RARCH_AI_SERVICE,
RARCH_NETPLAY_PING_TOGGLE, RARCH_NETPLAY_PING_TOGGLE,
@ -133,9 +130,14 @@ enum
RARCH_NETPLAY_PLAYER_CHAT, RARCH_NETPLAY_PLAYER_CHAT,
RARCH_NETPLAY_FADE_CHAT_TOGGLE, RARCH_NETPLAY_FADE_CHAT_TOGGLE,
RARCH_SEND_DEBUG_INFO, RARCH_OVERLAY_NEXT,
RARCH_OSK,
RARCH_BIND_LIST_END, RARCH_BIND_LIST_END,
/* Deprecated */
RARCH_SEND_DEBUG_INFO,
RARCH_BIND_LIST_END_NULL RARCH_BIND_LIST_END_NULL
}; };

6
input/input_driver.c
View File

@ -5723,7 +5723,6 @@ void input_driver_collect_system_input(input_driver_state_t *input_st,
{RETROK_DELETE, RETRO_DEVICE_ID_JOYPAD_Y }, {RETROK_DELETE, RETRO_DEVICE_ID_JOYPAD_Y },
{0, RARCH_UI_COMPANION_TOGGLE }, {0, RARCH_UI_COMPANION_TOGGLE },
{0, RARCH_FPS_TOGGLE }, {0, RARCH_FPS_TOGGLE },
{0, RARCH_SEND_DEBUG_INFO },
{0, RARCH_NETPLAY_HOST_TOGGLE }, {0, RARCH_NETPLAY_HOST_TOGGLE },
{0, RARCH_MENU_TOGGLE }, {0, RARCH_MENU_TOGGLE },
}; };
@ -5732,9 +5731,8 @@ void input_driver_collect_system_input(input_driver_state_t *input_st,
ids[10][0] = input_config_binds[0][RARCH_FULLSCREEN_TOGGLE_KEY].key; ids[10][0] = input_config_binds[0][RARCH_FULLSCREEN_TOGGLE_KEY].key;
ids[14][0] = input_config_binds[0][RARCH_UI_COMPANION_TOGGLE].key; ids[14][0] = input_config_binds[0][RARCH_UI_COMPANION_TOGGLE].key;
ids[15][0] = input_config_binds[0][RARCH_FPS_TOGGLE].key; ids[15][0] = input_config_binds[0][RARCH_FPS_TOGGLE].key;
ids[16][0] = input_config_binds[0][RARCH_SEND_DEBUG_INFO].key; ids[16][0] = input_config_binds[0][RARCH_NETPLAY_HOST_TOGGLE].key;
ids[17][0] = input_config_binds[0][RARCH_NETPLAY_HOST_TOGGLE].key; ids[17][0] = input_config_binds[0][RARCH_MENU_TOGGLE].key;
ids[18][0] = input_config_binds[0][RARCH_MENU_TOGGLE].key;
if (settings->bools.input_menu_swap_ok_cancel_buttons) if (settings->bools.input_menu_swap_ok_cancel_buttons)
{ {

8
menu/cbs/menu_cbs_ok.c
View File

@ -7027,13 +7027,6 @@ static int action_ok_load_archive_detect_core(const char *path,
return ret; return ret;
} }
static int action_ok_help_send_debug_info(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx)
{
command_event(CMD_EVENT_SEND_DEBUG_INFO, NULL);
return 0;
}
DEFAULT_ACTION_OK_HELP(action_ok_help_audio_video_troubleshooting, MENU_ENUM_LABEL_HELP_AUDIO_VIDEO_TROUBLESHOOTING, MENU_DIALOG_HELP_AUDIO_VIDEO_TROUBLESHOOTING) DEFAULT_ACTION_OK_HELP(action_ok_help_audio_video_troubleshooting, MENU_ENUM_LABEL_HELP_AUDIO_VIDEO_TROUBLESHOOTING, MENU_DIALOG_HELP_AUDIO_VIDEO_TROUBLESHOOTING)
DEFAULT_ACTION_OK_HELP(action_ok_help, MENU_ENUM_LABEL_HELP, MENU_DIALOG_WELCOME) DEFAULT_ACTION_OK_HELP(action_ok_help, MENU_ENUM_LABEL_HELP, MENU_DIALOG_WELCOME)
DEFAULT_ACTION_OK_HELP(action_ok_help_controls, MENU_ENUM_LABEL_HELP_CONTROLS, MENU_DIALOG_HELP_CONTROLS) DEFAULT_ACTION_OK_HELP(action_ok_help_controls, MENU_ENUM_LABEL_HELP_CONTROLS, MENU_DIALOG_HELP_CONTROLS)
@ -8159,7 +8152,6 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs,
{MENU_ENUM_LABEL_HELP_WHAT_IS_A_CORE, action_ok_help_what_is_a_core}, {MENU_ENUM_LABEL_HELP_WHAT_IS_A_CORE, action_ok_help_what_is_a_core},
{MENU_ENUM_LABEL_HELP_CHANGE_VIRTUAL_GAMEPAD, action_ok_help_change_virtual_gamepad}, {MENU_ENUM_LABEL_HELP_CHANGE_VIRTUAL_GAMEPAD, action_ok_help_change_virtual_gamepad},
{MENU_ENUM_LABEL_HELP_AUDIO_VIDEO_TROUBLESHOOTING, action_ok_help_audio_video_troubleshooting}, {MENU_ENUM_LABEL_HELP_AUDIO_VIDEO_TROUBLESHOOTING, action_ok_help_audio_video_troubleshooting},
{MENU_ENUM_LABEL_HELP_SEND_DEBUG_INFO, action_ok_help_send_debug_info},
{MENU_ENUM_LABEL_HELP_SCANNING_CONTENT, action_ok_help_scanning_content}, {MENU_ENUM_LABEL_HELP_SCANNING_CONTENT, action_ok_help_scanning_content},
{MENU_ENUM_LABEL_HELP_LOADING_CONTENT, action_ok_help_load_content}, {MENU_ENUM_LABEL_HELP_LOADING_CONTENT, action_ok_help_load_content},
#ifdef HAVE_CHEATS #ifdef HAVE_CHEATS

265
menu/cbs/menu_cbs_sublabel.c
View File

@ -368,61 +368,74 @@ DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_netplay_ping_show, MENU_
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_netplay_settings, MENU_ENUM_SUBLABEL_NETPLAY) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_netplay_settings, MENU_ENUM_SUBLABEL_NETPLAY)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_user_bind_settings, MENU_ENUM_SUBLABEL_INPUT_USER_BINDS) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_user_bind_settings, MENU_ENUM_SUBLABEL_INPUT_USER_BINDS)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_hotkey_settings, MENU_ENUM_SUBLABEL_INPUT_HOTKEY_BINDS) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_hotkey_settings, MENU_ENUM_SUBLABEL_INPUT_HOTKEY_BINDS)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_fast_forward_key, MENU_ENUM_SUBLABEL_INPUT_META_FAST_FORWARD_KEY)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_fast_forward_hold_key, MENU_ENUM_SUBLABEL_INPUT_META_FAST_FORWARD_HOLD_KEY) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_enable_hotkey, MENU_ENUM_SUBLABEL_INPUT_META_ENABLE_HOTKEY)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_slowmotion_key, MENU_ENUM_SUBLABEL_INPUT_META_SLOWMOTION_KEY) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_menu_toggle, MENU_ENUM_SUBLABEL_INPUT_META_MENU_TOGGLE)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_slowmotion_hold_key, MENU_ENUM_SUBLABEL_INPUT_META_SLOWMOTION_HOLD_KEY)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_vrr_runloop_toggle, MENU_ENUM_SUBLABEL_INPUT_META_VRR_RUNLOOP_TOGGLE)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_load_state_key, MENU_ENUM_SUBLABEL_INPUT_META_LOAD_STATE_KEY)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_save_state_key, MENU_ENUM_SUBLABEL_INPUT_META_SAVE_STATE_KEY)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_fullscreen_toggle_key, MENU_ENUM_SUBLABEL_INPUT_META_FULLSCREEN_TOGGLE_KEY)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_close_content_key, MENU_ENUM_SUBLABEL_INPUT_META_CLOSE_CONTENT_KEY)
#ifdef HAVE_LAKKA #ifdef HAVE_LAKKA
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_restart_key, MENU_ENUM_SUBLABEL_INPUT_META_RESTART_KEY) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_restart_key, MENU_ENUM_SUBLABEL_INPUT_META_RESTART_KEY)
#else #else
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_quit_key, MENU_ENUM_SUBLABEL_INPUT_META_QUIT_KEY) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_quit_key, MENU_ENUM_SUBLABEL_INPUT_META_QUIT_KEY)
#endif #endif
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_state_slot_plus, MENU_ENUM_SUBLABEL_INPUT_META_STATE_SLOT_PLUS) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_close_content_key, MENU_ENUM_SUBLABEL_INPUT_META_CLOSE_CONTENT_KEY)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_state_slot_minus, MENU_ENUM_SUBLABEL_INPUT_META_STATE_SLOT_MINUS) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_reset, MENU_ENUM_SUBLABEL_INPUT_META_RESET)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_fast_forward_key, MENU_ENUM_SUBLABEL_INPUT_META_FAST_FORWARD_KEY)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_fast_forward_hold_key, MENU_ENUM_SUBLABEL_INPUT_META_FAST_FORWARD_HOLD_KEY)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_slowmotion_key, MENU_ENUM_SUBLABEL_INPUT_META_SLOWMOTION_KEY)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_slowmotion_hold_key, MENU_ENUM_SUBLABEL_INPUT_META_SLOWMOTION_HOLD_KEY)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_rewind_hotkey, MENU_ENUM_SUBLABEL_INPUT_META_REWIND_HOTKEY) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_rewind_hotkey, MENU_ENUM_SUBLABEL_INPUT_META_REWIND_HOTKEY)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_bsv_record_toggle, MENU_ENUM_SUBLABEL_INPUT_META_BSV_RECORD_TOGGLE)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_pause_toggle, MENU_ENUM_SUBLABEL_INPUT_META_PAUSE_TOGGLE) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_pause_toggle, MENU_ENUM_SUBLABEL_INPUT_META_PAUSE_TOGGLE)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_frameadvance, MENU_ENUM_SUBLABEL_INPUT_META_FRAMEADVANCE) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_frameadvance, MENU_ENUM_SUBLABEL_INPUT_META_FRAMEADVANCE)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_reset, MENU_ENUM_SUBLABEL_INPUT_META_RESET)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_mute, MENU_ENUM_SUBLABEL_INPUT_META_MUTE)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_volume_up, MENU_ENUM_SUBLABEL_INPUT_META_VOLUME_UP)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_volume_down, MENU_ENUM_SUBLABEL_INPUT_META_VOLUME_DOWN)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_load_state_key, MENU_ENUM_SUBLABEL_INPUT_META_LOAD_STATE_KEY)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_save_state_key, MENU_ENUM_SUBLABEL_INPUT_META_SAVE_STATE_KEY)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_state_slot_plus, MENU_ENUM_SUBLABEL_INPUT_META_STATE_SLOT_PLUS)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_state_slot_minus, MENU_ENUM_SUBLABEL_INPUT_META_STATE_SLOT_MINUS)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_disk_eject_toggle, MENU_ENUM_SUBLABEL_INPUT_META_DISK_EJECT_TOGGLE)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_disk_next, MENU_ENUM_SUBLABEL_INPUT_META_DISK_NEXT)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_disk_prev, MENU_ENUM_SUBLABEL_INPUT_META_DISK_PREV)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_shader_toggle, MENU_ENUM_SUBLABEL_INPUT_META_SHADER_TOGGLE)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_shader_next, MENU_ENUM_SUBLABEL_INPUT_META_SHADER_NEXT) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_shader_next, MENU_ENUM_SUBLABEL_INPUT_META_SHADER_NEXT)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_shader_prev, MENU_ENUM_SUBLABEL_INPUT_META_SHADER_PREV) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_shader_prev, MENU_ENUM_SUBLABEL_INPUT_META_SHADER_PREV)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_shader_toggle, MENU_ENUM_SUBLABEL_INPUT_META_SHADER_TOGGLE)
#ifdef HAVE_CHEATS #ifdef HAVE_CHEATS
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_cheat_toggle, MENU_ENUM_SUBLABEL_INPUT_META_CHEAT_TOGGLE)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_cheat_index_plus, MENU_ENUM_SUBLABEL_INPUT_META_CHEAT_INDEX_PLUS) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_cheat_index_plus, MENU_ENUM_SUBLABEL_INPUT_META_CHEAT_INDEX_PLUS)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_cheat_index_minus, MENU_ENUM_SUBLABEL_INPUT_META_CHEAT_INDEX_MINUS) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_cheat_index_minus, MENU_ENUM_SUBLABEL_INPUT_META_CHEAT_INDEX_MINUS)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_cheat_toggle, MENU_ENUM_SUBLABEL_INPUT_META_CHEAT_TOGGLE)
#endif #endif
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_screenshot, MENU_ENUM_SUBLABEL_INPUT_META_SCREENSHOT) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_screenshot, MENU_ENUM_SUBLABEL_INPUT_META_SCREENSHOT)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_mute, MENU_ENUM_SUBLABEL_INPUT_META_MUTE) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_recording_toggle, MENU_ENUM_SUBLABEL_INPUT_META_RECORDING_TOGGLE)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_osk, MENU_ENUM_SUBLABEL_INPUT_META_OSK) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_streaming_toggle, MENU_ENUM_SUBLABEL_INPUT_META_STREAMING_TOGGLE)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_bsv_record_toggle, MENU_ENUM_SUBLABEL_INPUT_META_BSV_RECORD_TOGGLE)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_grab_mouse_toggle, MENU_ENUM_SUBLABEL_INPUT_META_GRAB_MOUSE_TOGGLE)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_game_focus_toggle, MENU_ENUM_SUBLABEL_INPUT_META_GAME_FOCUS_TOGGLE)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_fullscreen_toggle_key, MENU_ENUM_SUBLABEL_INPUT_META_FULLSCREEN_TOGGLE_KEY)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_ui_companion_toggle, MENU_ENUM_SUBLABEL_INPUT_META_UI_COMPANION_TOGGLE)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_vrr_runloop_toggle, MENU_ENUM_SUBLABEL_INPUT_META_VRR_RUNLOOP_TOGGLE)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_runahead_toggle, MENU_ENUM_SUBLABEL_INPUT_META_RUNAHEAD_TOGGLE)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_fps_toggle, MENU_ENUM_SUBLABEL_INPUT_META_FPS_TOGGLE) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_fps_toggle, MENU_ENUM_SUBLABEL_INPUT_META_FPS_TOGGLE)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_statistics_toggle, MENU_ENUM_SUBLABEL_INPUT_META_STATISTICS_TOGGLE) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_statistics_toggle, MENU_ENUM_SUBLABEL_INPUT_META_STATISTICS_TOGGLE)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_ai_service, MENU_ENUM_SUBLABEL_INPUT_META_AI_SERVICE)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_netplay_ping_toggle, MENU_ENUM_SUBLABEL_INPUT_META_NETPLAY_PING_TOGGLE) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_netplay_ping_toggle, MENU_ENUM_SUBLABEL_INPUT_META_NETPLAY_PING_TOGGLE)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_send_debug_info, MENU_ENUM_SUBLABEL_INPUT_META_SEND_DEBUG_INFO)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_netplay_host_toggle, MENU_ENUM_SUBLABEL_INPUT_META_NETPLAY_HOST_TOGGLE) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_netplay_host_toggle, MENU_ENUM_SUBLABEL_INPUT_META_NETPLAY_HOST_TOGGLE)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_netplay_game_watch, MENU_ENUM_SUBLABEL_INPUT_META_NETPLAY_GAME_WATCH) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_netplay_game_watch, MENU_ENUM_SUBLABEL_INPUT_META_NETPLAY_GAME_WATCH)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_netplay_player_chat, MENU_ENUM_SUBLABEL_INPUT_META_NETPLAY_PLAYER_CHAT) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_netplay_player_chat, MENU_ENUM_SUBLABEL_INPUT_META_NETPLAY_PLAYER_CHAT)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_netplay_fade_chat_toggle, MENU_ENUM_SUBLABEL_INPUT_META_NETPLAY_FADE_CHAT_TOGGLE) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_netplay_fade_chat_toggle, MENU_ENUM_SUBLABEL_INPUT_META_NETPLAY_FADE_CHAT_TOGGLE)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_enable_hotkey, MENU_ENUM_SUBLABEL_INPUT_META_ENABLE_HOTKEY)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_volume_up, MENU_ENUM_SUBLABEL_INPUT_META_VOLUME_UP) #if 0
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_volume_down, MENU_ENUM_SUBLABEL_INPUT_META_VOLUME_DOWN) /* Hidden in displaylist */
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_osk, MENU_ENUM_SUBLABEL_INPUT_META_OSK)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_overlay_next, MENU_ENUM_SUBLABEL_INPUT_META_OVERLAY_NEXT) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_overlay_next, MENU_ENUM_SUBLABEL_INPUT_META_OVERLAY_NEXT)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_disk_eject_toggle, MENU_ENUM_SUBLABEL_INPUT_META_DISK_EJECT_TOGGLE) #endif
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_disk_next, MENU_ENUM_SUBLABEL_INPUT_META_DISK_NEXT)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_disk_prev, MENU_ENUM_SUBLABEL_INPUT_META_DISK_PREV)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_grab_mouse_toggle, MENU_ENUM_SUBLABEL_INPUT_META_GRAB_MOUSE_TOGGLE)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_game_focus_toggle, MENU_ENUM_SUBLABEL_INPUT_META_GAME_FOCUS_TOGGLE)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_ui_companion_toggle, MENU_ENUM_SUBLABEL_INPUT_META_UI_COMPANION_TOGGLE)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_recording_toggle, MENU_ENUM_SUBLABEL_INPUT_META_RECORDING_TOGGLE)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_streaming_toggle, MENU_ENUM_SUBLABEL_INPUT_META_STREAMING_TOGGLE)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_runahead_toggle, MENU_ENUM_SUBLABEL_INPUT_META_RUNAHEAD_TOGGLE)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_ai_service, MENU_ENUM_SUBLABEL_INPUT_META_AI_SERVICE)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_meta_menu_toggle, MENU_ENUM_SUBLABEL_INPUT_META_MENU_TOGGLE)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_hotkey_block_delay, MENU_ENUM_SUBLABEL_INPUT_HOTKEY_BLOCK_DELAY) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_hotkey_block_delay, MENU_ENUM_SUBLABEL_INPUT_HOTKEY_BLOCK_DELAY)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_adc_type, MENU_ENUM_SUBLABEL_INPUT_ADC_TYPE) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_input_adc_type, MENU_ENUM_SUBLABEL_INPUT_ADC_TYPE)
#ifdef HAVE_MATERIALUI #ifdef HAVE_MATERIALUI
@ -1184,7 +1197,6 @@ DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_thumbnails_updater_list,
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_pl_thumbnails_updater_list, MENU_ENUM_SUBLABEL_PL_THUMBNAILS_UPDATER_LIST) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_pl_thumbnails_updater_list, MENU_ENUM_SUBLABEL_PL_THUMBNAILS_UPDATER_LIST)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_download_core_system_files, MENU_ENUM_SUBLABEL_DOWNLOAD_CORE_SYSTEM_FILES) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_download_core_system_files, MENU_ENUM_SUBLABEL_DOWNLOAD_CORE_SYSTEM_FILES)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_download_core_content, MENU_ENUM_SUBLABEL_DOWNLOAD_CORE_CONTENT) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_download_core_content, MENU_ENUM_SUBLABEL_DOWNLOAD_CORE_CONTENT)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_help_send_debug_info, MENU_ENUM_SUBLABEL_HELP_SEND_DEBUG_INFO)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_rdb_entry_detail, MENU_ENUM_SUBLABEL_RDB_ENTRY_DETAIL) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_rdb_entry_detail, MENU_ENUM_SUBLABEL_RDB_ENTRY_DETAIL)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_manual_content_scan_list, MENU_ENUM_SUBLABEL_MANUAL_CONTENT_SCAN_LIST) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_manual_content_scan_list, MENU_ENUM_SUBLABEL_MANUAL_CONTENT_SCAN_LIST)
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_manual_content_scan_dir, MENU_ENUM_SUBLABEL_MANUAL_CONTENT_SCAN_DIR) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_manual_content_scan_dir, MENU_ENUM_SUBLABEL_MANUAL_CONTENT_SCAN_DIR)
@ -2063,6 +2075,26 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
{ {
switch (input_config_bind_map_get_retro_key(bind_index)) switch (input_config_bind_map_get_retro_key(bind_index))
{ {
case RARCH_ENABLE_HOTKEY:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_enable_hotkey);
return 0;
case RARCH_MENU_TOGGLE:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_menu_toggle);
return 0;
case RARCH_QUIT_KEY:
#ifdef HAVE_LAKKA
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_restart_key);
#else
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_quit_key);
#endif
return 0;
case RARCH_CLOSE_CONTENT_KEY:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_close_content_key);
return 0;
case RARCH_RESET:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_reset);
return 0;
case RARCH_FAST_FORWARD_KEY: case RARCH_FAST_FORWARD_KEY:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_fast_forward_key); BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_fast_forward_key);
return 0; return 0;
@ -2075,49 +2107,49 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
case RARCH_SLOWMOTION_HOLD_KEY: case RARCH_SLOWMOTION_HOLD_KEY:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_slowmotion_hold_key); BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_slowmotion_hold_key);
return 0; return 0;
case RARCH_VRR_RUNLOOP_TOGGLE:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_vrr_runloop_toggle);
return 0;
case RARCH_LOAD_STATE_KEY:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_load_state_key);
return 0;
case RARCH_SAVE_STATE_KEY:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_save_state_key);
return 0;
case RARCH_FULLSCREEN_TOGGLE_KEY:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_fullscreen_toggle_key);
return 0;
case RARCH_CLOSE_CONTENT_KEY:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_close_content_key);
return 0;
case RARCH_QUIT_KEY:
#ifdef HAVE_LAKKA
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_restart_key);
#else
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_quit_key);
#endif
return 0;
case RARCH_STATE_SLOT_PLUS:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_state_slot_plus);
return 0;
case RARCH_STATE_SLOT_MINUS:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_state_slot_minus);
return 0;
case RARCH_REWIND: case RARCH_REWIND:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_rewind_hotkey); BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_rewind_hotkey);
return 0; return 0;
case RARCH_BSV_RECORD_TOGGLE:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_bsv_record_toggle);
return 0;
case RARCH_PAUSE_TOGGLE: case RARCH_PAUSE_TOGGLE:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_pause_toggle); BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_pause_toggle);
return 0; return 0;
case RARCH_FRAMEADVANCE: case RARCH_FRAMEADVANCE:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_frameadvance); BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_frameadvance);
return 0; return 0;
case RARCH_RESET:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_reset); case RARCH_MUTE:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_mute);
return 0; return 0;
case RARCH_VOLUME_UP:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_volume_up);
return 0;
case RARCH_VOLUME_DOWN:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_volume_down);
return 0;
case RARCH_LOAD_STATE_KEY:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_load_state_key);
return 0;
case RARCH_SAVE_STATE_KEY:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_save_state_key);
return 0;
case RARCH_STATE_SLOT_PLUS:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_state_slot_plus);
return 0;
case RARCH_STATE_SLOT_MINUS:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_state_slot_minus);
return 0;
case RARCH_DISK_EJECT_TOGGLE:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_disk_eject_toggle);
return 0;
case RARCH_DISK_NEXT:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_disk_next);
return 0;
case RARCH_DISK_PREV:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_disk_prev);
return 0;
case RARCH_SHADER_NEXT: case RARCH_SHADER_NEXT:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_shader_next); BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_shader_next);
return 0; return 0;
@ -2127,6 +2159,12 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
case RARCH_SHADER_TOGGLE: case RARCH_SHADER_TOGGLE:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_shader_toggle); BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_shader_toggle);
return 0; return 0;
case RARCH_CHEAT_TOGGLE:
#ifdef HAVE_CHEATS
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_cheat_toggle);
#endif
return 0;
case RARCH_CHEAT_INDEX_PLUS: case RARCH_CHEAT_INDEX_PLUS:
#ifdef HAVE_CHEATS #ifdef HAVE_CHEATS
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_cheat_index_plus); BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_cheat_index_plus);
@ -2137,19 +2175,38 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_cheat_index_minus); BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_cheat_index_minus);
#endif #endif
return 0; return 0;
case RARCH_CHEAT_TOGGLE:
#ifdef HAVE_CHEATS
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_cheat_toggle);
#endif
return 0;
case RARCH_SCREENSHOT: case RARCH_SCREENSHOT:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_screenshot); BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_screenshot);
return 0; return 0;
case RARCH_MUTE: case RARCH_RECORDING_TOGGLE:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_mute); BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_recording_toggle);
return 0; return 0;
case RARCH_OSK: case RARCH_STREAMING_TOGGLE:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_osk); BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_streaming_toggle);
return 0;
case RARCH_BSV_RECORD_TOGGLE:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_bsv_record_toggle);
return 0;
case RARCH_GRAB_MOUSE_TOGGLE:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_grab_mouse_toggle);
return 0;
case RARCH_GAME_FOCUS_TOGGLE:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_game_focus_toggle);
return 0;
case RARCH_FULLSCREEN_TOGGLE_KEY:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_fullscreen_toggle_key);
return 0;
case RARCH_UI_COMPANION_TOGGLE:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_ui_companion_toggle);
return 0;
case RARCH_VRR_RUNLOOP_TOGGLE:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_vrr_runloop_toggle);
return 0;
case RARCH_RUNAHEAD_TOGGLE:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_runahead_toggle);
return 0; return 0;
case RARCH_FPS_TOGGLE: case RARCH_FPS_TOGGLE:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_fps_toggle); BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_fps_toggle);
@ -2157,12 +2214,13 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
case RARCH_STATISTICS_TOGGLE: case RARCH_STATISTICS_TOGGLE:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_statistics_toggle); BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_statistics_toggle);
return 0; return 0;
case RARCH_AI_SERVICE:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_ai_service);
return 0;
case RARCH_NETPLAY_PING_TOGGLE: case RARCH_NETPLAY_PING_TOGGLE:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_netplay_ping_toggle); BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_netplay_ping_toggle);
return 0; return 0;
case RARCH_SEND_DEBUG_INFO:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_send_debug_info);
return 0;
case RARCH_NETPLAY_HOST_TOGGLE: case RARCH_NETPLAY_HOST_TOGGLE:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_netplay_host_toggle); BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_netplay_host_toggle);
return 0; return 0;
@ -2175,51 +2233,17 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
case RARCH_NETPLAY_FADE_CHAT_TOGGLE: case RARCH_NETPLAY_FADE_CHAT_TOGGLE:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_netplay_fade_chat_toggle); BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_netplay_fade_chat_toggle);
return 0; return 0;
case RARCH_ENABLE_HOTKEY:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_enable_hotkey); #if 0
return 0; /* Hidden in displaylist */
case RARCH_VOLUME_UP: case RARCH_OSK:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_volume_up); BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_osk);
return 0;
case RARCH_VOLUME_DOWN:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_volume_down);
return 0; return 0;
case RARCH_OVERLAY_NEXT: case RARCH_OVERLAY_NEXT:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_overlay_next); BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_overlay_next);
return 0; return 0;
case RARCH_DISK_EJECT_TOGGLE: #endif
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_disk_eject_toggle);
return 0;
case RARCH_DISK_NEXT:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_disk_next);
return 0;
case RARCH_DISK_PREV:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_disk_prev);
return 0;
case RARCH_GRAB_MOUSE_TOGGLE:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_grab_mouse_toggle);
return 0;
case RARCH_GAME_FOCUS_TOGGLE:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_game_focus_toggle);
return 0;
case RARCH_UI_COMPANION_TOGGLE:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_ui_companion_toggle);
return 0;
case RARCH_MENU_TOGGLE:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_menu_toggle);
return 0;
case RARCH_RECORDING_TOGGLE:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_recording_toggle);
return 0;
case RARCH_STREAMING_TOGGLE:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_streaming_toggle);
return 0;
case RARCH_RUNAHEAD_TOGGLE:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_runahead_toggle);
return 0;
case RARCH_AI_SERVICE:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_ai_service);
return 0;
default: default:
break; break;
} }
@ -4944,9 +4968,6 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
case MENU_ENUM_LABEL_DOWNLOAD_CORE_CONTENT_DIRS: case MENU_ENUM_LABEL_DOWNLOAD_CORE_CONTENT_DIRS:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_download_core_content); BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_download_core_content);
break; break;
case MENU_ENUM_LABEL_HELP_SEND_DEBUG_INFO:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_help_send_debug_info);
break;
case MENU_ENUM_LABEL_RDB_ENTRY_DETAIL: case MENU_ENUM_LABEL_RDB_ENTRY_DETAIL:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_rdb_entry_detail); BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_rdb_entry_detail);
break; break;

1
menu/drivers/ozone.c
View File

@ -1875,7 +1875,6 @@ static uintptr_t ozone_entries_icon_get_texture(
case MENU_ENUM_LABEL_HELP_WHAT_IS_A_CORE: case MENU_ENUM_LABEL_HELP_WHAT_IS_A_CORE:
case MENU_ENUM_LABEL_HELP_CHANGE_VIRTUAL_GAMEPAD: case MENU_ENUM_LABEL_HELP_CHANGE_VIRTUAL_GAMEPAD:
case MENU_ENUM_LABEL_HELP_AUDIO_VIDEO_TROUBLESHOOTING: case MENU_ENUM_LABEL_HELP_AUDIO_VIDEO_TROUBLESHOOTING:
case MENU_ENUM_LABEL_HELP_SEND_DEBUG_INFO:
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_HELP]; return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_HELP];
case MENU_ENUM_LABEL_QUIT_RETROARCH: case MENU_ENUM_LABEL_QUIT_RETROARCH:
case MENU_ENUM_LABEL_BLOCK_SRAM_OVERWRITE: case MENU_ENUM_LABEL_BLOCK_SRAM_OVERWRITE:

1
menu/drivers/xmb.c
View File

@ -3025,7 +3025,6 @@ static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb,
case MENU_ENUM_LABEL_HELP_WHAT_IS_A_CORE: case MENU_ENUM_LABEL_HELP_WHAT_IS_A_CORE:
case MENU_ENUM_LABEL_HELP_CHANGE_VIRTUAL_GAMEPAD: case MENU_ENUM_LABEL_HELP_CHANGE_VIRTUAL_GAMEPAD:
case MENU_ENUM_LABEL_HELP_AUDIO_VIDEO_TROUBLESHOOTING: case MENU_ENUM_LABEL_HELP_AUDIO_VIDEO_TROUBLESHOOTING:
case MENU_ENUM_LABEL_HELP_SEND_DEBUG_INFO:
return xmb->textures.list[XMB_TEXTURE_HELP]; return xmb->textures.list[XMB_TEXTURE_HELP];
case MENU_ENUM_LABEL_QUIT_RETROARCH: case MENU_ENUM_LABEL_QUIT_RETROARCH:
case MENU_ENUM_LABEL_BLOCK_SRAM_OVERWRITE: case MENU_ENUM_LABEL_BLOCK_SRAM_OVERWRITE:

1
menu/menu_dialog.h
View File

@ -38,7 +38,6 @@ enum menu_dialog_type
MENU_DIALOG_HELP_WHAT_IS_A_CORE, MENU_DIALOG_HELP_WHAT_IS_A_CORE,
MENU_DIALOG_HELP_CHANGE_VIRTUAL_GAMEPAD, MENU_DIALOG_HELP_CHANGE_VIRTUAL_GAMEPAD,
MENU_DIALOG_HELP_AUDIO_VIDEO_TROUBLESHOOTING, MENU_DIALOG_HELP_AUDIO_VIDEO_TROUBLESHOOTING,
MENU_DIALOG_HELP_SEND_DEBUG_INFO,
MENU_DIALOG_HELP_SCANNING_CONTENT, MENU_DIALOG_HELP_SCANNING_CONTENT,
MENU_DIALOG_QUIT_CONFIRM, MENU_DIALOG_QUIT_CONFIRM,
MENU_DIALOG_INFORMATION, MENU_DIALOG_INFORMATION,

4
menu/menu_displaylist.c
View File

@ -6281,6 +6281,10 @@ unsigned menu_displaylist_build_list(
/* Skip "Hotkey Enable" */ /* Skip "Hotkey Enable" */
if (i == RARCH_FIRST_META_KEY) if (i == RARCH_FIRST_META_KEY)
continue; continue;
/* Hidden items */
else if (input_config_bind_map_get_retro_key(i) == RARCH_OVERLAY_NEXT
|| input_config_bind_map_get_retro_key(i) == RARCH_OSK)
continue;
/* Show combo entries before normal binds */ /* Show combo entries before normal binds */
else if (input_config_bind_map_get_retro_key(i) == RARCH_MENU_TOGGLE) else if (input_config_bind_map_get_retro_key(i) == RARCH_MENU_TOGGLE)
{ {

9
menu/menu_driver.c
View File

@ -335,7 +335,6 @@ static bool menu_should_pop_stack(const char *label)
|| string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_HELP_SCANNING_CONTENT)) || string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_HELP_SCANNING_CONTENT))
|| string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_HELP_CHANGE_VIRTUAL_GAMEPAD)) || string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_HELP_CHANGE_VIRTUAL_GAMEPAD))
|| string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_HELP_AUDIO_VIDEO_TROUBLESHOOTING)) || string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_HELP_AUDIO_VIDEO_TROUBLESHOOTING))
|| string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_HELP_SEND_DEBUG_INFO))
|| string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_CHEEVOS_DESCRIPTION))) || string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_CHEEVOS_DESCRIPTION)))
return true; return true;
if ( if (
@ -3036,8 +3035,7 @@ enum action_iterate_type action_iterate_type(const char *label)
string_is_equal(label, "help_loading_content") || string_is_equal(label, "help_loading_content") ||
string_is_equal(label, "help_scanning_content") || string_is_equal(label, "help_scanning_content") ||
string_is_equal(label, "help_change_virtual_gamepad") || string_is_equal(label, "help_change_virtual_gamepad") ||
string_is_equal(label, "help_audio_video_troubleshooting") || string_is_equal(label, "help_audio_video_troubleshooting")
string_is_equal(label, "help_send_debug_info")
) )
return ITERATE_TYPE_HELP; return ITERATE_TYPE_HELP;
if (string_is_equal(label, "cheevos_description")) if (string_is_equal(label, "cheevos_description"))
@ -3347,11 +3345,6 @@ int menu_dialog_iterate(
MENU_ENUM_LABEL_VALUE_HELP_AUDIO_VIDEO_TROUBLESHOOTING_DESC, MENU_ENUM_LABEL_VALUE_HELP_AUDIO_VIDEO_TROUBLESHOOTING_DESC,
s, len); s, len);
break; break;
case MENU_DIALOG_HELP_SEND_DEBUG_INFO:
msg_hash_get_help_enum(
MENU_ENUM_LABEL_VALUE_HELP_SEND_DEBUG_INFO_DESC,
s, len);
break;
case MENU_DIALOG_HELP_SCANNING_CONTENT: case MENU_DIALOG_HELP_SCANNING_CONTENT:
msg_hash_get_help_enum(MENU_ENUM_LABEL_VALUE_HELP_SCANNING_CONTENT_DESC, msg_hash_get_help_enum(MENU_ENUM_LABEL_VALUE_HELP_SCANNING_CONTENT_DESC,
s, len); s, len);

146
msg_hash.h
View File

@ -895,55 +895,66 @@ enum msg_hash_enums
MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_RIGHT, MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_RIGHT,
MENU_ENUM_LABEL_VALUE_INPUT_TURBO_ENABLE, MENU_ENUM_LABEL_VALUE_INPUT_TURBO_ENABLE,
MENU_ENUM_LABEL_VALUE_INPUT_META_ENABLE_HOTKEY,
MENU_ENUM_LABEL_VALUE_INPUT_META_MENU_TOGGLE,
MENU_ENUM_LABEL_VALUE_INPUT_META_QUIT_KEY,
MENU_ENUM_LABEL_VALUE_INPUT_META_RESTART_KEY,
MENU_ENUM_LABEL_VALUE_INPUT_META_CLOSE_CONTENT_KEY,
MENU_ENUM_LABEL_VALUE_INPUT_META_RESET,
MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_KEY, MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_KEY,
MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_HOLD_KEY, MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_HOLD_KEY,
MENU_ENUM_LABEL_VALUE_INPUT_META_SLOWMOTION_KEY, MENU_ENUM_LABEL_VALUE_INPUT_META_SLOWMOTION_KEY,
MENU_ENUM_LABEL_VALUE_INPUT_META_SLOWMOTION_HOLD_KEY, MENU_ENUM_LABEL_VALUE_INPUT_META_SLOWMOTION_HOLD_KEY,
MENU_ENUM_LABEL_VALUE_INPUT_META_VRR_RUNLOOP_TOGGLE,
MENU_ENUM_LABEL_VALUE_INPUT_META_LOAD_STATE_KEY,
MENU_ENUM_LABEL_VALUE_INPUT_META_SAVE_STATE_KEY,
MENU_ENUM_LABEL_VALUE_INPUT_META_FULLSCREEN_TOGGLE_KEY,
MENU_ENUM_LABEL_VALUE_INPUT_META_CLOSE_CONTENT_KEY,
MENU_ENUM_LABEL_VALUE_INPUT_META_QUIT_KEY,
MENU_ENUM_LABEL_VALUE_INPUT_META_RESTART_KEY,
MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_PLUS,
MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_MINUS,
MENU_ENUM_LABEL_VALUE_INPUT_META_BSV_RECORD_TOGGLE,
MENU_ENUM_LABEL_VALUE_INPUT_META_PAUSE_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_PAUSE_TOGGLE,
MENU_ENUM_LABEL_VALUE_INPUT_META_FRAMEADVANCE, MENU_ENUM_LABEL_VALUE_INPUT_META_FRAMEADVANCE,
MENU_ENUM_LABEL_VALUE_INPUT_META_RESET,
MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE,
MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_UP,
MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_DOWN,
MENU_ENUM_LABEL_VALUE_INPUT_META_LOAD_STATE_KEY,
MENU_ENUM_LABEL_VALUE_INPUT_META_SAVE_STATE_KEY,
MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_PLUS,
MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_MINUS,
MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_EJECT_TOGGLE,
MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_NEXT,
MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_PREV,
MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_TOGGLE,
MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_NEXT, MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_NEXT,
MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_PREV, MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_PREV,
MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_TOGGLE,
MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_TOGGLE,
MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_INDEX_PLUS, MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_INDEX_PLUS,
MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_INDEX_MINUS, MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_INDEX_MINUS,
MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_TOGGLE,
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_RECORDING_TOGGLE,
MENU_ENUM_LABEL_VALUE_INPUT_META_OSK, MENU_ENUM_LABEL_VALUE_INPUT_META_STREAMING_TOGGLE,
MENU_ENUM_LABEL_VALUE_INPUT_META_BSV_RECORD_TOGGLE,
MENU_ENUM_LABEL_VALUE_INPUT_META_GRAB_MOUSE_TOGGLE,
MENU_ENUM_LABEL_VALUE_INPUT_META_GAME_FOCUS_TOGGLE,
MENU_ENUM_LABEL_VALUE_INPUT_META_FULLSCREEN_TOGGLE_KEY,
MENU_ENUM_LABEL_VALUE_INPUT_META_UI_COMPANION_TOGGLE,
MENU_ENUM_LABEL_VALUE_INPUT_META_VRR_RUNLOOP_TOGGLE,
MENU_ENUM_LABEL_VALUE_INPUT_META_RUNAHEAD_TOGGLE,
MENU_ENUM_LABEL_VALUE_INPUT_META_FPS_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_FPS_TOGGLE,
MENU_ENUM_LABEL_VALUE_INPUT_META_STATISTICS_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_STATISTICS_TOGGLE,
MENU_ENUM_LABEL_VALUE_INPUT_META_AI_SERVICE,
MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_PING_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_PING_TOGGLE,
MENU_ENUM_LABEL_VALUE_INPUT_META_SEND_DEBUG_INFO,
MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_HOST_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_HOST_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_NETPLAY_PLAYER_CHAT, MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_PLAYER_CHAT,
MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_FADE_CHAT_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_FADE_CHAT_TOGGLE,
MENU_ENUM_LABEL_VALUE_INPUT_META_ENABLE_HOTKEY,
MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_UP, MENU_ENUM_LABEL_VALUE_INPUT_META_OVERLAY_NEXT, /* Hidden */
MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_DOWN, MENU_ENUM_LABEL_VALUE_INPUT_META_OSK, /* Hidden */
MENU_ENUM_LABEL_VALUE_INPUT_META_OVERLAY_NEXT, MENU_ENUM_LABEL_VALUE_INPUT_META_SEND_DEBUG_INFO, /* Deprecated */
MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_EJECT_TOGGLE,
MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_NEXT,
MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_PREV,
MENU_ENUM_LABEL_VALUE_INPUT_META_GRAB_MOUSE_TOGGLE,
MENU_ENUM_LABEL_VALUE_INPUT_META_GAME_FOCUS_TOGGLE,
MENU_ENUM_LABEL_VALUE_INPUT_META_UI_COMPANION_TOGGLE,
MENU_ENUM_LABEL_VALUE_INPUT_META_RECORDING_TOGGLE,
MENU_ENUM_LABEL_VALUE_INPUT_META_STREAMING_TOGGLE,
MENU_ENUM_LABEL_VALUE_INPUT_META_RUNAHEAD_TOGGLE,
MENU_ENUM_LABEL_VALUE_INPUT_META_AI_SERVICE,
MENU_ENUM_LABEL_VALUE_INPUT_META_MENU_TOGGLE,
MENU_ENUM_LABEL_VALUE_INPUT_DEVICE_INDEX, MENU_ENUM_LABEL_VALUE_INPUT_DEVICE_INDEX,
MENU_ENUM_LABEL_VALUE_INPUT_DEVICE_TYPE, MENU_ENUM_LABEL_VALUE_INPUT_DEVICE_TYPE,
@ -957,56 +968,67 @@ enum msg_hash_enums
MENU_ENUM_SUBLABEL_INPUT_ADC_TYPE, MENU_ENUM_SUBLABEL_INPUT_ADC_TYPE,
MENU_ENUM_SUBLABEL_INPUT_REMAP_PORT, MENU_ENUM_SUBLABEL_INPUT_REMAP_PORT,
MENU_ENUM_SUBLABEL_INPUT_META_ENABLE_HOTKEY,
MENU_ENUM_SUBLABEL_INPUT_META_MENU_TOGGLE,
MENU_ENUM_SUBLABEL_INPUT_META_QUIT_KEY,
MENU_ENUM_SUBLABEL_INPUT_META_RESTART_KEY,
MENU_ENUM_SUBLABEL_INPUT_META_CLOSE_CONTENT_KEY,
MENU_ENUM_SUBLABEL_INPUT_META_RESET,
MENU_ENUM_SUBLABEL_INPUT_META_FAST_FORWARD_KEY, MENU_ENUM_SUBLABEL_INPUT_META_FAST_FORWARD_KEY,
MENU_ENUM_SUBLABEL_INPUT_META_FAST_FORWARD_HOLD_KEY, MENU_ENUM_SUBLABEL_INPUT_META_FAST_FORWARD_HOLD_KEY,
MENU_ENUM_SUBLABEL_INPUT_META_SLOWMOTION_KEY, MENU_ENUM_SUBLABEL_INPUT_META_SLOWMOTION_KEY,
MENU_ENUM_SUBLABEL_INPUT_META_SLOWMOTION_HOLD_KEY, MENU_ENUM_SUBLABEL_INPUT_META_SLOWMOTION_HOLD_KEY,
MENU_ENUM_SUBLABEL_INPUT_META_VRR_RUNLOOP_TOGGLE,
MENU_ENUM_SUBLABEL_INPUT_META_LOAD_STATE_KEY,
MENU_ENUM_SUBLABEL_INPUT_META_SAVE_STATE_KEY,
MENU_ENUM_SUBLABEL_INPUT_META_FULLSCREEN_TOGGLE_KEY,
MENU_ENUM_SUBLABEL_INPUT_META_CLOSE_CONTENT_KEY,
MENU_ENUM_SUBLABEL_INPUT_META_QUIT_KEY,
MENU_ENUM_SUBLABEL_INPUT_META_RESTART_KEY,
MENU_ENUM_SUBLABEL_INPUT_META_STATE_SLOT_PLUS,
MENU_ENUM_SUBLABEL_INPUT_META_STATE_SLOT_MINUS,
MENU_ENUM_SUBLABEL_INPUT_META_REWIND_HOTKEY, MENU_ENUM_SUBLABEL_INPUT_META_REWIND_HOTKEY,
MENU_ENUM_SUBLABEL_INPUT_META_BSV_RECORD_TOGGLE,
MENU_ENUM_SUBLABEL_INPUT_META_PAUSE_TOGGLE, MENU_ENUM_SUBLABEL_INPUT_META_PAUSE_TOGGLE,
MENU_ENUM_SUBLABEL_INPUT_META_FRAMEADVANCE, MENU_ENUM_SUBLABEL_INPUT_META_FRAMEADVANCE,
MENU_ENUM_SUBLABEL_INPUT_META_RESET,
MENU_ENUM_SUBLABEL_INPUT_META_MUTE,
MENU_ENUM_SUBLABEL_INPUT_META_VOLUME_UP,
MENU_ENUM_SUBLABEL_INPUT_META_VOLUME_DOWN,
MENU_ENUM_SUBLABEL_INPUT_META_LOAD_STATE_KEY,
MENU_ENUM_SUBLABEL_INPUT_META_SAVE_STATE_KEY,
MENU_ENUM_SUBLABEL_INPUT_META_STATE_SLOT_PLUS,
MENU_ENUM_SUBLABEL_INPUT_META_STATE_SLOT_MINUS,
MENU_ENUM_SUBLABEL_INPUT_META_DISK_EJECT_TOGGLE,
MENU_ENUM_SUBLABEL_INPUT_META_DISK_NEXT,
MENU_ENUM_SUBLABEL_INPUT_META_DISK_PREV,
MENU_ENUM_SUBLABEL_INPUT_META_SHADER_TOGGLE,
MENU_ENUM_SUBLABEL_INPUT_META_SHADER_NEXT, MENU_ENUM_SUBLABEL_INPUT_META_SHADER_NEXT,
MENU_ENUM_SUBLABEL_INPUT_META_SHADER_PREV, MENU_ENUM_SUBLABEL_INPUT_META_SHADER_PREV,
MENU_ENUM_SUBLABEL_INPUT_META_SHADER_TOGGLE,
MENU_ENUM_SUBLABEL_INPUT_META_CHEAT_TOGGLE,
MENU_ENUM_SUBLABEL_INPUT_META_CHEAT_INDEX_PLUS, MENU_ENUM_SUBLABEL_INPUT_META_CHEAT_INDEX_PLUS,
MENU_ENUM_SUBLABEL_INPUT_META_CHEAT_INDEX_MINUS, MENU_ENUM_SUBLABEL_INPUT_META_CHEAT_INDEX_MINUS,
MENU_ENUM_SUBLABEL_INPUT_META_CHEAT_TOGGLE,
MENU_ENUM_SUBLABEL_INPUT_META_SCREENSHOT, MENU_ENUM_SUBLABEL_INPUT_META_SCREENSHOT,
MENU_ENUM_SUBLABEL_INPUT_META_MUTE, MENU_ENUM_SUBLABEL_INPUT_META_RECORDING_TOGGLE,
MENU_ENUM_SUBLABEL_INPUT_META_OSK, MENU_ENUM_SUBLABEL_INPUT_META_STREAMING_TOGGLE,
MENU_ENUM_SUBLABEL_INPUT_META_BSV_RECORD_TOGGLE,
MENU_ENUM_SUBLABEL_INPUT_META_GRAB_MOUSE_TOGGLE,
MENU_ENUM_SUBLABEL_INPUT_META_GAME_FOCUS_TOGGLE,
MENU_ENUM_SUBLABEL_INPUT_META_FULLSCREEN_TOGGLE_KEY,
MENU_ENUM_SUBLABEL_INPUT_META_UI_COMPANION_TOGGLE,
MENU_ENUM_SUBLABEL_INPUT_META_VRR_RUNLOOP_TOGGLE,
MENU_ENUM_SUBLABEL_INPUT_META_RUNAHEAD_TOGGLE,
MENU_ENUM_SUBLABEL_INPUT_META_FPS_TOGGLE, MENU_ENUM_SUBLABEL_INPUT_META_FPS_TOGGLE,
MENU_ENUM_SUBLABEL_INPUT_META_STATISTICS_TOGGLE, MENU_ENUM_SUBLABEL_INPUT_META_STATISTICS_TOGGLE,
MENU_ENUM_SUBLABEL_INPUT_META_AI_SERVICE,
MENU_ENUM_SUBLABEL_INPUT_META_NETPLAY_PING_TOGGLE, MENU_ENUM_SUBLABEL_INPUT_META_NETPLAY_PING_TOGGLE,
MENU_ENUM_SUBLABEL_INPUT_META_SEND_DEBUG_INFO,
MENU_ENUM_SUBLABEL_INPUT_META_NETPLAY_HOST_TOGGLE, MENU_ENUM_SUBLABEL_INPUT_META_NETPLAY_HOST_TOGGLE,
MENU_ENUM_SUBLABEL_INPUT_META_NETPLAY_GAME_WATCH, MENU_ENUM_SUBLABEL_INPUT_META_NETPLAY_GAME_WATCH,
MENU_ENUM_SUBLABEL_INPUT_META_NETPLAY_PLAYER_CHAT, MENU_ENUM_SUBLABEL_INPUT_META_NETPLAY_PLAYER_CHAT,
MENU_ENUM_SUBLABEL_INPUT_META_NETPLAY_FADE_CHAT_TOGGLE, MENU_ENUM_SUBLABEL_INPUT_META_NETPLAY_FADE_CHAT_TOGGLE,
MENU_ENUM_SUBLABEL_INPUT_META_ENABLE_HOTKEY,
MENU_ENUM_SUBLABEL_INPUT_META_VOLUME_UP, MENU_ENUM_SUBLABEL_INPUT_META_OVERLAY_NEXT, /* Hidden */
MENU_ENUM_SUBLABEL_INPUT_META_VOLUME_DOWN, MENU_ENUM_SUBLABEL_INPUT_META_OSK, /* Hidden */
MENU_ENUM_SUBLABEL_INPUT_META_OVERLAY_NEXT, MENU_ENUM_SUBLABEL_INPUT_META_SEND_DEBUG_INFO, /* Deprecated */
MENU_ENUM_SUBLABEL_INPUT_META_DISK_EJECT_TOGGLE,
MENU_ENUM_SUBLABEL_INPUT_META_DISK_NEXT,
MENU_ENUM_SUBLABEL_INPUT_META_DISK_PREV,
MENU_ENUM_SUBLABEL_INPUT_META_GRAB_MOUSE_TOGGLE,
MENU_ENUM_SUBLABEL_INPUT_META_GAME_FOCUS_TOGGLE,
MENU_ENUM_SUBLABEL_INPUT_META_UI_COMPANION_TOGGLE,
MENU_ENUM_SUBLABEL_INPUT_META_RECORDING_TOGGLE,
MENU_ENUM_SUBLABEL_INPUT_META_STREAMING_TOGGLE,
MENU_ENUM_SUBLABEL_INPUT_META_RUNAHEAD_TOGGLE,
MENU_ENUM_SUBLABEL_INPUT_META_AI_SERVICE,
MENU_ENUM_SUBLABEL_INPUT_META_MENU_TOGGLE,
MENU_ENUM_LABEL_INPUT_DESCRIPTION, MENU_ENUM_LABEL_INPUT_DESCRIPTION,
MENU_ENUM_LABEL_INPUT_DESCRIPTION_KBD, MENU_ENUM_LABEL_INPUT_DESCRIPTION_KBD,

24
retroarch.c
View File

@ -1666,15 +1666,6 @@ bool command_event(enum event_command cmd, void *data)
else else
command_event(CMD_EVENT_RECORD_INIT, NULL); command_event(CMD_EVENT_RECORD_INIT, NULL);
break; break;
case CMD_EVENT_OSK_TOGGLE:
{
input_driver_state_t *input_st = input_state_get_ptr();
if (input_st->flags & INP_FLAG_KB_LINEFEED_ENABLE)
input_st->flags &= ~INP_FLAG_KB_LINEFEED_ENABLE;
else
input_st->flags |= INP_FLAG_KB_LINEFEED_ENABLE;
}
break;
case CMD_EVENT_SET_PER_GAME_RESOLUTION: case CMD_EVENT_SET_PER_GAME_RESOLUTION:
#if defined(GEKKO) #if defined(GEKKO)
{ {
@ -2117,8 +2108,6 @@ bool command_event(enum event_command cmd, void *data)
MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO); MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
} }
break; break;
case CMD_EVENT_SEND_DEBUG_INFO:
break;
case CMD_EVENT_FPS_TOGGLE: case CMD_EVENT_FPS_TOGGLE:
settings->bools.video_fps_show = !(settings->bools.video_fps_show); settings->bools.video_fps_show = !(settings->bools.video_fps_show);
break; break;
@ -2160,6 +2149,15 @@ bool command_event(enum event_command cmd, void *data)
} }
#endif #endif
break; break;
case CMD_EVENT_OSK_TOGGLE:
{
input_driver_state_t *input_st = input_state_get_ptr();
if (input_st->flags & INP_FLAG_KB_LINEFEED_ENABLE)
input_st->flags &= ~INP_FLAG_KB_LINEFEED_ENABLE;
else
input_st->flags |= INP_FLAG_KB_LINEFEED_ENABLE;
}
break;
case CMD_EVENT_DSP_FILTER_INIT: case CMD_EVENT_DSP_FILTER_INIT:
#ifdef HAVE_DSP_FILTER #ifdef HAVE_DSP_FILTER
{ {
@ -3433,6 +3431,10 @@ bool command_event(enum event_command cmd, void *data)
break; break;
case CMD_EVENT_NONE: case CMD_EVENT_NONE:
return false; return false;
/* Deprecated */
case CMD_EVENT_SEND_DEBUG_INFO:
break;
} }
return true; return true;

6
runloop.c
View File

@ -6637,6 +6637,9 @@ static enum runloop_state_enum runloop_check_state(
last_width = video_driver_width; last_width = video_driver_width;
last_height = video_driver_height; last_height = video_driver_height;
} }
/* Check if we have pressed the OSK toggle button */
HOTKEY_CHECK(RARCH_OSK, CMD_EVENT_OSK_TOGGLE, true, NULL);
} }
#endif #endif
@ -7150,9 +7153,6 @@ static enum runloop_state_enum runloop_check_state(
HOTKEY_CHECK(RARCH_SCREENSHOT, CMD_EVENT_TAKE_SCREENSHOT, true, NULL); HOTKEY_CHECK(RARCH_SCREENSHOT, CMD_EVENT_TAKE_SCREENSHOT, true, NULL);
#endif #endif
/* Check if we have pressed the OSK toggle button */
HOTKEY_CHECK(RARCH_OSK, CMD_EVENT_OSK_TOGGLE, true, NULL);
/* Check if we have pressed the recording toggle button */ /* Check if we have pressed the recording toggle button */
HOTKEY_CHECK(RARCH_RECORDING_TOGGLE, CMD_EVENT_RECORDING_TOGGLE, true, NULL); HOTKEY_CHECK(RARCH_RECORDING_TOGGLE, CMD_EVENT_RECORDING_TOGGLE, true, NULL);