mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 08:37:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Driver + hotkey list reorder (#14646)

Browse Source 
* Reorder driver menu and lists

* Reorder hotkey list
This commit is contained in:
sonninnos 2022-11-20 08:26:34 +02:00 committed by GitHub
parent 4e51ca6681
commit 3377fd55ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 1092 additions and 1015 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
audio/audio_driver.c
View File

@ -117,8 +117,8 @@ audio_driver_t *audio_drivers[] = {
#ifdef HAVE_JACK
&audio_jack,
#endif
#if defined(HAVE_SDL) || defined(HAVE_SDL2)
&audio_sdl,
#ifdef HAVE_WASAPI
&audio_wasapi,
#endif
#ifdef HAVE_XAUDIO
&audio_xa,
@ -126,8 +126,8 @@ audio_driver_t *audio_drivers[] = {
#ifdef HAVE_DSOUND
&audio_dsound,
#endif
#ifdef HAVE_WASAPI
&audio_wasapi,
#if defined(HAVE_SDL) || defined(HAVE_SDL2)
&audio_sdl,
#endif
#ifdef HAVE_PULSE
&audio_pulse,

73
command.h
View File

@ -445,57 +445,72 @@ static const struct cmd_action_map action_map[] = {
};
static const struct cmd_map map[] = {
{ "MENU_TOGGLE", RARCH_MENU_TOGGLE },
{ "QUIT", RARCH_QUIT_KEY },
{ "CLOSE_CONTENT", RARCH_CLOSE_CONTENT_KEY },
{ "RESET", RARCH_RESET },
{ "FAST_FORWARD", RARCH_FAST_FORWARD_KEY },
{ "FAST_FORWARD_HOLD", RARCH_FAST_FORWARD_HOLD_KEY },
{ "SLOWMOTION", RARCH_SLOWMOTION_KEY },
{ "SLOWMOTION_HOLD", RARCH_SLOWMOTION_HOLD_KEY },
{ "VRR_RUNLOOP_TOGGLE", RARCH_VRR_RUNLOOP_TOGGLE },
{ "LOAD_STATE", RARCH_LOAD_STATE_KEY },
{ "SAVE_STATE", RARCH_SAVE_STATE_KEY },
{ "FULLSCREEN_TOGGLE", RARCH_FULLSCREEN_TOGGLE_KEY },
{ "CLOSE_CONTENT", RARCH_CLOSE_CONTENT_KEY },
{ "QUIT", RARCH_QUIT_KEY },
{ "STATE_SLOT_PLUS", RARCH_STATE_SLOT_PLUS },
{ "STATE_SLOT_MINUS", RARCH_STATE_SLOT_MINUS },
{ "REWIND", RARCH_REWIND },
{ "BSV_RECORD_TOGGLE", RARCH_BSV_RECORD_TOGGLE },
{ "PAUSE_TOGGLE", RARCH_PAUSE_TOGGLE },
{ "FRAMEADVANCE", RARCH_FRAMEADVANCE },
{ "RESET", RARCH_RESET },
{ "SHADER_NEXT", RARCH_SHADER_NEXT },
{ "SHADER_PREV", RARCH_SHADER_PREV },
{ "SHADER_TOGGLE", RARCH_SHADER_TOGGLE },
{ "CHEAT_INDEX_PLUS", RARCH_CHEAT_INDEX_PLUS },
{ "CHEAT_INDEX_MINUS", RARCH_CHEAT_INDEX_MINUS },
{ "CHEAT_TOGGLE", RARCH_CHEAT_TOGGLE },
{ "SCREENSHOT", RARCH_SCREENSHOT },
{ "MUTE", RARCH_MUTE },
{ "OSK", RARCH_OSK },
{ "FPS_TOGGLE", RARCH_FPS_TOGGLE },
{ "STATISTICS_TOGGLE", RARCH_STATISTICS_TOGGLE },
{ "SEND_DEBUG_INFO", RARCH_SEND_DEBUG_INFO },
{ "NETPLAY_HOST_TOGGLE", RARCH_NETPLAY_HOST_TOGGLE },
{ "NETPLAY_GAME_WATCH", RARCH_NETPLAY_GAME_WATCH },
{ "VOLUME_UP", RARCH_VOLUME_UP },
{ "VOLUME_DOWN", RARCH_VOLUME_DOWN },
{ "OVERLAY_NEXT", RARCH_OVERLAY_NEXT },
{ "LOAD_STATE", RARCH_LOAD_STATE_KEY },
{ "SAVE_STATE", RARCH_SAVE_STATE_KEY },
{ "STATE_SLOT_PLUS", RARCH_STATE_SLOT_PLUS },
{ "STATE_SLOT_MINUS", RARCH_STATE_SLOT_MINUS },
{ "DISK_EJECT_TOGGLE", RARCH_DISK_EJECT_TOGGLE },
{ "DISK_NEXT", RARCH_DISK_NEXT },
{ "DISK_PREV", RARCH_DISK_PREV },
{ "GRAB_MOUSE_TOGGLE", RARCH_GRAB_MOUSE_TOGGLE },
{ "UI_COMPANION_TOGGLE", RARCH_UI_COMPANION_TOGGLE },
{ "GAME_FOCUS_TOGGLE", RARCH_GAME_FOCUS_TOGGLE },
{ "MENU_TOGGLE", RARCH_MENU_TOGGLE },
{ "SHADER_TOGGLE", RARCH_SHADER_TOGGLE },
{ "SHADER_NEXT", RARCH_SHADER_NEXT },
{ "SHADER_PREV", RARCH_SHADER_PREV },
{ "CHEAT_TOGGLE", RARCH_CHEAT_TOGGLE },
{ "CHEAT_INDEX_PLUS", RARCH_CHEAT_INDEX_PLUS },
{ "CHEAT_INDEX_MINUS", RARCH_CHEAT_INDEX_MINUS },
{ "SCREENSHOT", RARCH_SCREENSHOT },
{ "RECORDING_TOGGLE", RARCH_RECORDING_TOGGLE },
{ "STREAMING_TOGGLE", RARCH_STREAMING_TOGGLE },
{ "BSV_RECORD_TOGGLE", RARCH_BSV_RECORD_TOGGLE },
{ "GRAB_MOUSE_TOGGLE", RARCH_GRAB_MOUSE_TOGGLE },
{ "GAME_FOCUS_TOGGLE", RARCH_GAME_FOCUS_TOGGLE },
{ "FULLSCREEN_TOGGLE", RARCH_FULLSCREEN_TOGGLE_KEY },
{ "UI_COMPANION_TOGGLE", RARCH_UI_COMPANION_TOGGLE },
{ "VRR_RUNLOOP_TOGGLE", RARCH_VRR_RUNLOOP_TOGGLE },
{ "RUNAHEAD_TOGGLE", RARCH_RUNAHEAD_TOGGLE },
{ "FPS_TOGGLE", RARCH_FPS_TOGGLE },
{ "STATISTICS_TOGGLE", RARCH_STATISTICS_TOGGLE },
{ "OVERLAY_NEXT", RARCH_OVERLAY_NEXT },
{ "OSK", RARCH_OSK },
{ "AI_SERVICE", RARCH_AI_SERVICE },
{ "NETPLAY_PING_TOGGLE", RARCH_NETPLAY_PING_TOGGLE },
{ "NETPLAY_HOST_TOGGLE", RARCH_NETPLAY_HOST_TOGGLE },
{ "NETPLAY_GAME_WATCH", RARCH_NETPLAY_GAME_WATCH },
{ "NETPLAY_PLAYER_CHAT", RARCH_NETPLAY_PLAYER_CHAT },
{ "NETPLAY_FADE_CHAT_TOGGLE", RARCH_NETPLAY_FADE_CHAT_TOGGLE },
{ "SEND_DEBUG_INFO", RARCH_SEND_DEBUG_INFO },
{ "MENU_UP", RETRO_DEVICE_ID_JOYPAD_UP },
{ "MENU_DOWN", RETRO_DEVICE_ID_JOYPAD_DOWN },
{ "MENU_LEFT", RETRO_DEVICE_ID_JOYPAD_LEFT },
{ "MENU_RIGHT", RETRO_DEVICE_ID_JOYPAD_RIGHT },
{ "MENU_A", RETRO_DEVICE_ID_JOYPAD_A },
{ "MENU_B", RETRO_DEVICE_ID_JOYPAD_B },
{ "AI_SERVICE", RARCH_AI_SERVICE },
};
#endif

1115
config.def.keybinds.h
View File

File diff suppressed because it is too large Load Diff

115
configuration.c
View File

@ -292,75 +292,87 @@ const struct input_bind_map input_config_bind_map[RARCH_BIND_LIST_END_NULL] = {
DECLARE_BIND(r_y_plus, RARCH_ANALOG_RIGHT_Y_PLUS, MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_PLUS),
DECLARE_BIND(r_y_minus, RARCH_ANALOG_RIGHT_Y_MINUS, MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_MINUS),
DECLARE_BIND(gun_trigger, RARCH_LIGHTGUN_TRIGGER, MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_TRIGGER ),
DECLARE_BIND(gun_offscreen_shot, RARCH_LIGHTGUN_RELOAD, MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_RELOAD ),
DECLARE_BIND(gun_aux_a, RARCH_LIGHTGUN_AUX_A, MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_AUX_A ),
DECLARE_BIND(gun_aux_b, RARCH_LIGHTGUN_AUX_B, MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_AUX_B ),
DECLARE_BIND(gun_aux_c, RARCH_LIGHTGUN_AUX_C, MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_AUX_C ),
DECLARE_BIND(gun_start, RARCH_LIGHTGUN_START, MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_START ),
DECLARE_BIND(gun_select, RARCH_LIGHTGUN_SELECT, MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_SELECT ),
DECLARE_BIND(gun_dpad_up, RARCH_LIGHTGUN_DPAD_UP, MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_UP ),
DECLARE_BIND(gun_dpad_down, RARCH_LIGHTGUN_DPAD_DOWN, MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_DOWN ),
DECLARE_BIND(gun_dpad_left, RARCH_LIGHTGUN_DPAD_LEFT, MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_LEFT ),
DECLARE_BIND(gun_dpad_right, RARCH_LIGHTGUN_DPAD_RIGHT, MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_RIGHT ),
DECLARE_BIND(gun_trigger, RARCH_LIGHTGUN_TRIGGER, MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_TRIGGER),
DECLARE_BIND(gun_offscreen_shot, RARCH_LIGHTGUN_RELOAD, MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_RELOAD),
DECLARE_BIND(gun_aux_a, RARCH_LIGHTGUN_AUX_A, MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_AUX_A),
DECLARE_BIND(gun_aux_b, RARCH_LIGHTGUN_AUX_B, MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_AUX_B),
DECLARE_BIND(gun_aux_c, RARCH_LIGHTGUN_AUX_C, MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_AUX_C),
DECLARE_BIND(gun_start, RARCH_LIGHTGUN_START, MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_START),
DECLARE_BIND(gun_select, RARCH_LIGHTGUN_SELECT, MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_SELECT),
DECLARE_BIND(gun_dpad_up, RARCH_LIGHTGUN_DPAD_UP, MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_UP),
DECLARE_BIND(gun_dpad_down, RARCH_LIGHTGUN_DPAD_DOWN, MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_DOWN),
DECLARE_BIND(gun_dpad_left, RARCH_LIGHTGUN_DPAD_LEFT, MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_LEFT),
DECLARE_BIND(gun_dpad_right, RARCH_LIGHTGUN_DPAD_RIGHT, MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_RIGHT),
DECLARE_BIND(turbo, RARCH_TURBO_ENABLE, MENU_ENUM_LABEL_VALUE_INPUT_TURBO_ENABLE),
DECLARE_META_BIND(1, toggle_fast_forward, RARCH_FAST_FORWARD_KEY, MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_KEY),
DECLARE_META_BIND(2, hold_fast_forward, RARCH_FAST_FORWARD_HOLD_KEY, MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_HOLD_KEY),
DECLARE_META_BIND(1, toggle_slowmotion, RARCH_SLOWMOTION_KEY, MENU_ENUM_LABEL_VALUE_INPUT_META_SLOWMOTION_KEY),
DECLARE_META_BIND(2, hold_slowmotion, RARCH_SLOWMOTION_HOLD_KEY, MENU_ENUM_LABEL_VALUE_INPUT_META_SLOWMOTION_HOLD_KEY),
DECLARE_META_BIND(2, toggle_vrr_runloop, RARCH_VRR_RUNLOOP_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_VRR_RUNLOOP_TOGGLE),
DECLARE_META_BIND(1, load_state, RARCH_LOAD_STATE_KEY, MENU_ENUM_LABEL_VALUE_INPUT_META_LOAD_STATE_KEY),
DECLARE_META_BIND(1, save_state, RARCH_SAVE_STATE_KEY, MENU_ENUM_LABEL_VALUE_INPUT_META_SAVE_STATE_KEY),
DECLARE_META_BIND(2, toggle_fullscreen, RARCH_FULLSCREEN_TOGGLE_KEY, MENU_ENUM_LABEL_VALUE_INPUT_META_FULLSCREEN_TOGGLE_KEY),
DECLARE_META_BIND(2, close_content, RARCH_CLOSE_CONTENT_KEY, MENU_ENUM_LABEL_VALUE_INPUT_META_CLOSE_CONTENT_KEY),
DECLARE_META_BIND(2, enable_hotkey, RARCH_ENABLE_HOTKEY, MENU_ENUM_LABEL_VALUE_INPUT_META_ENABLE_HOTKEY),
#ifdef HAVE_MENU
DECLARE_META_BIND(1, menu_toggle, RARCH_MENU_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_MENU_TOGGLE),
#endif
#ifdef HAVE_LAKKA
DECLARE_META_BIND(2, exit_emulator, RARCH_QUIT_KEY, MENU_ENUM_LABEL_VALUE_INPUT_META_RESTART_KEY),
#else
DECLARE_META_BIND(2, exit_emulator, RARCH_QUIT_KEY, MENU_ENUM_LABEL_VALUE_INPUT_META_QUIT_KEY),
#endif
DECLARE_META_BIND(2, state_slot_increase, RARCH_STATE_SLOT_PLUS, MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_PLUS),
DECLARE_META_BIND(2, state_slot_decrease, RARCH_STATE_SLOT_MINUS, MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_MINUS),
DECLARE_META_BIND(2, close_content, RARCH_CLOSE_CONTENT_KEY, MENU_ENUM_LABEL_VALUE_INPUT_META_CLOSE_CONTENT_KEY),
DECLARE_META_BIND(2, reset, RARCH_RESET, MENU_ENUM_LABEL_VALUE_INPUT_META_RESET),
DECLARE_META_BIND(1, toggle_fast_forward, RARCH_FAST_FORWARD_KEY, MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_KEY),
DECLARE_META_BIND(2, hold_fast_forward, RARCH_FAST_FORWARD_HOLD_KEY, MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_HOLD_KEY),
DECLARE_META_BIND(1, toggle_slowmotion, RARCH_SLOWMOTION_KEY, MENU_ENUM_LABEL_VALUE_INPUT_META_SLOWMOTION_KEY),
DECLARE_META_BIND(2, hold_slowmotion, RARCH_SLOWMOTION_HOLD_KEY, MENU_ENUM_LABEL_VALUE_INPUT_META_SLOWMOTION_HOLD_KEY),
DECLARE_META_BIND(1, rewind, RARCH_REWIND, MENU_ENUM_LABEL_VALUE_INPUT_META_REWIND),
DECLARE_META_BIND(2, movie_record_toggle, RARCH_BSV_RECORD_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_BSV_RECORD_TOGGLE),
DECLARE_META_BIND(2, pause_toggle, RARCH_PAUSE_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_PAUSE_TOGGLE),
DECLARE_META_BIND(2, frame_advance, RARCH_FRAMEADVANCE, MENU_ENUM_LABEL_VALUE_INPUT_META_FRAMEADVANCE),
DECLARE_META_BIND(2, reset, RARCH_RESET, MENU_ENUM_LABEL_VALUE_INPUT_META_RESET),
DECLARE_META_BIND(2, audio_mute, RARCH_MUTE, MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE),
DECLARE_META_BIND(2, volume_up, RARCH_VOLUME_UP, MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_UP),
DECLARE_META_BIND(2, volume_down, RARCH_VOLUME_DOWN, MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_DOWN),
DECLARE_META_BIND(1, load_state, RARCH_LOAD_STATE_KEY, MENU_ENUM_LABEL_VALUE_INPUT_META_LOAD_STATE_KEY),
DECLARE_META_BIND(1, save_state, RARCH_SAVE_STATE_KEY, MENU_ENUM_LABEL_VALUE_INPUT_META_SAVE_STATE_KEY),
DECLARE_META_BIND(2, state_slot_increase, RARCH_STATE_SLOT_PLUS, MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_PLUS),
DECLARE_META_BIND(2, state_slot_decrease, RARCH_STATE_SLOT_MINUS, MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_MINUS),
DECLARE_META_BIND(2, disk_eject_toggle, RARCH_DISK_EJECT_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_EJECT_TOGGLE),
DECLARE_META_BIND(2, disk_next, RARCH_DISK_NEXT, MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_NEXT),
DECLARE_META_BIND(2, disk_prev, RARCH_DISK_PREV, MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_PREV),
DECLARE_META_BIND(2, shader_toggle, RARCH_SHADER_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_TOGGLE),
DECLARE_META_BIND(2, shader_next, RARCH_SHADER_NEXT, MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_NEXT),
DECLARE_META_BIND(2, shader_prev, RARCH_SHADER_PREV, MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_PREV),
DECLARE_META_BIND(2, shader_toggle, RARCH_SHADER_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_TOGGLE),
DECLARE_META_BIND(2, cheat_toggle, RARCH_CHEAT_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_TOGGLE),
DECLARE_META_BIND(2, cheat_index_plus, RARCH_CHEAT_INDEX_PLUS, MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_INDEX_PLUS),
DECLARE_META_BIND(2, cheat_index_minus, RARCH_CHEAT_INDEX_MINUS, MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_INDEX_MINUS),
DECLARE_META_BIND(2, cheat_toggle, RARCH_CHEAT_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_TOGGLE),
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, osk_toggle, RARCH_OSK, MENU_ENUM_LABEL_VALUE_INPUT_META_OSK),
DECLARE_META_BIND(2, recording_toggle, RARCH_RECORDING_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_RECORDING_TOGGLE),
DECLARE_META_BIND(2, streaming_toggle, RARCH_STREAMING_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_STREAMING_TOGGLE),
DECLARE_META_BIND(2, movie_record_toggle, RARCH_BSV_RECORD_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_BSV_RECORD_TOGGLE),
DECLARE_META_BIND(2, grab_mouse_toggle, RARCH_GRAB_MOUSE_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_GRAB_MOUSE_TOGGLE),
DECLARE_META_BIND(2, game_focus_toggle, RARCH_GAME_FOCUS_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_GAME_FOCUS_TOGGLE),
DECLARE_META_BIND(2, toggle_fullscreen, RARCH_FULLSCREEN_TOGGLE_KEY, MENU_ENUM_LABEL_VALUE_INPUT_META_FULLSCREEN_TOGGLE_KEY),
DECLARE_META_BIND(2, desktop_menu_toggle, RARCH_UI_COMPANION_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_UI_COMPANION_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, 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, 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, netplay_ping_toggle, RARCH_NETPLAY_PING_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_PING_TOGGLE),
DECLARE_META_BIND(2, send_debug_info, RARCH_SEND_DEBUG_INFO, MENU_ENUM_LABEL_VALUE_INPUT_META_SEND_DEBUG_INFO),
DECLARE_META_BIND(2, netplay_host_toggle, RARCH_NETPLAY_HOST_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_HOST_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_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, 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_down, RARCH_VOLUME_DOWN, MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_DOWN),
DECLARE_META_BIND(2, overlay_next, RARCH_OVERLAY_NEXT, MENU_ENUM_LABEL_VALUE_INPUT_META_OVERLAY_NEXT),
DECLARE_META_BIND(2, disk_eject_toggle, RARCH_DISK_EJECT_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_EJECT_TOGGLE),
DECLARE_META_BIND(2, disk_next, RARCH_DISK_NEXT, MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_NEXT),
DECLARE_META_BIND(2, disk_prev, RARCH_DISK_PREV, MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_PREV),
DECLARE_META_BIND(2, grab_mouse_toggle, RARCH_GRAB_MOUSE_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_GRAB_MOUSE_TOGGLE),
DECLARE_META_BIND(2, game_focus_toggle, RARCH_GAME_FOCUS_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_GAME_FOCUS_TOGGLE),
DECLARE_META_BIND(2, desktop_menu_toggle, RARCH_UI_COMPANION_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_UI_COMPANION_TOGGLE),
#ifdef HAVE_MENU
DECLARE_META_BIND(1, menu_toggle, RARCH_MENU_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_MENU_TOGGLE),
#endif
DECLARE_META_BIND(2, recording_toggle, RARCH_RECORDING_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_RECORDING_TOGGLE),
DECLARE_META_BIND(2, streaming_toggle, RARCH_STREAMING_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_STREAMING_TOGGLE),
DECLARE_META_BIND(2, runahead_toggle, RARCH_RUNAHEAD_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_RUNAHEAD_TOGGLE),
DECLARE_META_BIND(2, ai_service, RARCH_AI_SERVICE, MENU_ENUM_LABEL_VALUE_INPUT_META_AI_SERVICE),
DECLARE_META_BIND(2, send_debug_info, RARCH_SEND_DEBUG_INFO, MENU_ENUM_LABEL_VALUE_INPUT_META_SEND_DEBUG_INFO),
};
#if defined(HAVE_METAL)
@ -2496,11 +2508,11 @@ void config_set_defaults(void *data)
const char *def_record = config_get_default_record();
const char *def_midi = config_get_default_midi();
const char *def_mitm = DEFAULT_NETPLAY_MITM_SERVER;
struct config_float_setting *float_settings = populate_settings_float (settings, &float_settings_size);
struct config_float_setting *float_settings = populate_settings_float (settings, &float_settings_size);
struct config_bool_setting *bool_settings = populate_settings_bool (settings, &bool_settings_size);
struct config_int_setting *int_settings = populate_settings_int (settings, &int_settings_size);
struct config_uint_setting *uint_settings = populate_settings_uint (settings, &uint_settings_size);
struct config_size_setting *size_settings = populate_settings_size (settings, &size_settings_size);
struct config_uint_setting *uint_settings = populate_settings_uint (settings, &uint_settings_size);
struct config_size_setting *size_settings = populate_settings_size (settings, &size_settings_size);
if (bool_settings && (bool_settings_size > 0))
{
@ -2699,6 +2711,11 @@ void config_set_defaults(void *data)
for (j = 0; j < RARCH_BIND_LIST_END; j++)
{
const struct retro_keybind *keyval = &input_config_binds[i][j];
/* No need to verify hotkeys for all users */
if (i > 0 && j > RARCH_CUSTOM_BIND_LIST_END)
continue;
if (keyval->valid)
retro_assert(j == keyval->id);
}

10
gfx/video_driver.c
View File

@ -269,18 +269,18 @@ const video_driver_t *video_drivers[] = {
#ifdef HAVE_VITA2D
&video_vita2d,
#endif
#ifdef HAVE_OPENGL
&video_gl2,
#ifdef HAVE_VULKAN
&video_vulkan,
#endif
#if defined(HAVE_OPENGL_CORE)
&video_gl3,
#endif
#ifdef HAVE_OPENGL
&video_gl2,
#endif
#ifdef HAVE_OPENGL1
&video_gl1,
#endif
#ifdef HAVE_VULKAN
&video_vulkan,
#endif
#ifdef HAVE_METAL
&video_metal,
#endif

74
input/input_defines.h
View File

@ -74,58 +74,66 @@ enum
/* Command binds. Not related to game input,
* only usable for port 0. */
RARCH_FAST_FORWARD_KEY = RARCH_FIRST_META_KEY,
RARCH_ENABLE_HOTKEY = RARCH_FIRST_META_KEY,
RARCH_MENU_TOGGLE,
RARCH_QUIT_KEY,
RARCH_CLOSE_CONTENT_KEY,
RARCH_RESET,
RARCH_FAST_FORWARD_KEY,
RARCH_FAST_FORWARD_HOLD_KEY,
RARCH_SLOWMOTION_KEY,
RARCH_SLOWMOTION_HOLD_KEY,
RARCH_VRR_RUNLOOP_TOGGLE,
RARCH_LOAD_STATE_KEY,
RARCH_SAVE_STATE_KEY,
RARCH_FULLSCREEN_TOGGLE_KEY,
RARCH_CLOSE_CONTENT_KEY,
RARCH_QUIT_KEY,
RARCH_STATE_SLOT_PLUS,
RARCH_STATE_SLOT_MINUS,
RARCH_REWIND,
RARCH_BSV_RECORD_TOGGLE,
RARCH_PAUSE_TOGGLE,
RARCH_FRAMEADVANCE,
RARCH_RESET,
RARCH_MUTE,
RARCH_VOLUME_UP,
RARCH_VOLUME_DOWN,
RARCH_LOAD_STATE_KEY,
RARCH_SAVE_STATE_KEY,
RARCH_STATE_SLOT_PLUS,
RARCH_STATE_SLOT_MINUS,
RARCH_DISK_EJECT_TOGGLE,
RARCH_DISK_NEXT,
RARCH_DISK_PREV,
RARCH_SHADER_TOGGLE,
RARCH_SHADER_NEXT,
RARCH_SHADER_PREV,
RARCH_SHADER_TOGGLE,
RARCH_CHEAT_TOGGLE,
RARCH_CHEAT_INDEX_PLUS,
RARCH_CHEAT_INDEX_MINUS,
RARCH_CHEAT_TOGGLE,
RARCH_SCREENSHOT,
RARCH_MUTE,
RARCH_OSK,
RARCH_RECORDING_TOGGLE,
RARCH_STREAMING_TOGGLE,
RARCH_BSV_RECORD_TOGGLE,
RARCH_GRAB_MOUSE_TOGGLE,
RARCH_GAME_FOCUS_TOGGLE,
RARCH_FULLSCREEN_TOGGLE_KEY,
RARCH_UI_COMPANION_TOGGLE,
RARCH_VRR_RUNLOOP_TOGGLE,
RARCH_RUNAHEAD_TOGGLE,
RARCH_FPS_TOGGLE,
RARCH_STATISTICS_TOGGLE,
RARCH_OVERLAY_NEXT,
RARCH_OSK,
RARCH_AI_SERVICE,
RARCH_NETPLAY_PING_TOGGLE,
RARCH_SEND_DEBUG_INFO,
RARCH_NETPLAY_HOST_TOGGLE,
RARCH_NETPLAY_GAME_WATCH,
RARCH_NETPLAY_PLAYER_CHAT,
RARCH_NETPLAY_FADE_CHAT_TOGGLE,
RARCH_ENABLE_HOTKEY,
RARCH_VOLUME_UP,
RARCH_VOLUME_DOWN,
RARCH_OVERLAY_NEXT,
RARCH_DISK_EJECT_TOGGLE,
RARCH_DISK_NEXT,
RARCH_DISK_PREV,
RARCH_GRAB_MOUSE_TOGGLE,
RARCH_GAME_FOCUS_TOGGLE,
RARCH_UI_COMPANION_TOGGLE,
RARCH_MENU_TOGGLE,
RARCH_RECORDING_TOGGLE,
RARCH_STREAMING_TOGGLE,
RARCH_RUNAHEAD_TOGGLE,
RARCH_AI_SERVICE,
RARCH_SEND_DEBUG_INFO,
RARCH_BIND_LIST_END,
RARCH_BIND_LIST_END_NULL

30
input/input_driver.c
View File

@ -272,15 +272,6 @@ input_driver_t *input_drivers[] = {
#if defined(SWITCH)
&input_switch,
#endif
#if defined(HAVE_SDL) || defined(HAVE_SDL2)
&input_sdl,
#endif
#if defined(DINGUX) && defined(HAVE_SDL_DINGUX)
&input_sdl_dingux,
#endif
#ifdef HAVE_DINPUT
&input_dinput,
#endif
#ifdef HAVE_X11
&input_x,
#endif
@ -290,9 +281,24 @@ input_driver_t *input_drivers[] = {
#ifdef XENON
&input_xenon360,
#endif
#if defined(_WIN32) && !defined(_XBOX) && _WIN32_WINNT >= 0x0501 && !defined(__WINRT__)
#ifdef HAVE_WINRAWINPUT
/* winraw only available since XP */
&input_winraw,
#endif
#endif
#if defined(HAVE_XINPUT2) || defined(HAVE_XINPUT_XBOX1) || defined(__WINRT__)
&input_xinput,
#endif
#ifdef HAVE_DINPUT
&input_dinput,
#endif
#if defined(HAVE_SDL) || defined(HAVE_SDL2)
&input_sdl,
#endif
#if defined(DINGUX) && defined(HAVE_SDL_DINGUX)
&input_sdl_dingux,
#endif
#ifdef GEKKO
&input_gx,
#endif
@ -319,12 +325,6 @@ input_driver_t *input_drivers[] = {
#endif
#ifdef DJGPP
&input_dos,
#endif
#if defined(_WIN32) && !defined(_XBOX) && _WIN32_WINNT >= 0x0501 && !defined(__WINRT__)
#ifdef HAVE_WINRAWINPUT
/* winraw only available since XP */
&input_winraw,
#endif
#endif
&input_null,
NULL,

520
intl/msg_hash_us.h
View File

@ -2628,6 +2628,22 @@ MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_USER_BINDS,
"Change controls for this port."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_ANDROID_INPUT_DISCONNECT_WORKAROUND,
"Android disconnect workaround"
)
MSG_HASH(
MENU_ENUM_LABEL_ANDROID_INPUT_DISCONNECT_WORKAROUND,
"Workaround for controllers disconnecting and reconnecting. Impedes 2 players with the identical controllers."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_QUIT_PRESS_TWICE,
"Confirm Quit"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_QUIT_PRESS_TWICE,
"Require the Quit hotkey to be pressed twice to quit RetroArch."
)
/* Settings > Input > Haptic Feedback/Vibration */
@ -2699,40 +2715,15 @@ MSG_HASH(
"Allow any user to control the menu. If disabled, only User 1 can control the menu."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_ANDROID_INPUT_DISCONNECT_WORKAROUND,
"Android disconnect workaround"
)
MSG_HASH(
MENU_ENUM_LABEL_ANDROID_INPUT_DISCONNECT_WORKAROUND,
"Workaround for controllers disconnecting and reconnecting. Impedes 2 players with the identical controllers."
)
/* Settings > Input > Hotkeys */
MSG_HASH(
MENU_ENUM_LABEL_VALUE_QUIT_PRESS_TWICE,
"Confirm Quit"
MENU_ENUM_LABEL_VALUE_INPUT_META_ENABLE_HOTKEY,
"Hotkey Enable"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_QUIT_PRESS_TWICE,
"Require the Quit hotkey to be pressed twice to quit RetroArch."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_MENU_ENUM_TOGGLE_GAMEPAD_COMBO,
"Menu Toggle Controller Combo"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_MENU_ENUM_TOGGLE_GAMEPAD_COMBO,
"Controller button combination to toggle menu."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_QUIT_GAMEPAD_COMBO,
"Quit Controller Combo"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_QUIT_GAMEPAD_COMBO,
"Controller button combination to quit RetroArch."
MENU_ENUM_SUBLABEL_INPUT_META_ENABLE_HOTKEY,
"When assigned, the 'Hotkey Enable' key must be held before any other hotkeys are recognized. Allows controller buttons to be mapped to hotkey functions without affecting normal input."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_HOTKEY_BLOCK_DELAY,
@ -2740,7 +2731,55 @@ MSG_HASH(
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_HOTKEY_BLOCK_DELAY,
"Add a delay in frames before normal input is blocked after pressing (and holding) the assigned 'Hotkey Enable' key. Allows normal input from the 'Hotkey Enable' key to be captured when it is mapped to another action (e.g. RetroPad 'Select')."
"Add a delay in frames before normal input is blocked after pressing the assigned 'Hotkey Enable' key. Allows normal input from the 'Hotkey Enable' key to be captured when it is mapped to another action (e.g. RetroPad 'Select')."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_MENU_ENUM_TOGGLE_GAMEPAD_COMBO,
"Menu Toggle (Controller Combo)"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_MENU_ENUM_TOGGLE_GAMEPAD_COMBO,
"Controller button combination to toggle menu."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_MENU_TOGGLE,
"Menu Toggle"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_MENU_TOGGLE,
"Switches the current display between menu and running content."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_QUIT_GAMEPAD_COMBO,
"Quit (Controller Combo)"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_QUIT_GAMEPAD_COMBO,
"Controller button combination to quit RetroArch."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_QUIT_KEY,
"Quit"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_QUIT_KEY,
"Closes RetroArch, ensuring all save data and configuration files are flushed to disk."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_CLOSE_CONTENT_KEY,
"Close Content"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_CLOSE_CONTENT_KEY,
"Closes the current content."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_RESET,
"Reset Content"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_RESET,
"Restarts the current content from the beginning."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_KEY,
@ -2774,89 +2813,17 @@ MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_SLOWMOTION_HOLD_KEY,
"Enables slow-motion when held. Content runs at normal speed when key is released."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_VRR_RUNLOOP_TOGGLE,
"Sync to Exact Content Framerate (Toggle)"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_VRR_RUNLOOP_TOGGLE,
"Toggles sync to exact content framerate on/off."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_LOAD_STATE_KEY,
"Load State"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_LOAD_STATE_KEY,
"Loads a saved state from the currently selected slot."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_SAVE_STATE_KEY,
"Save State"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_SAVE_STATE_KEY,
"Saves a state to the currently selected slot."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_FULLSCREEN_TOGGLE_KEY,
"Fullscreen (Toggle)"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_FULLSCREEN_TOGGLE_KEY,
"Switches between fullscreen and windowed display modes."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_CLOSE_CONTENT_KEY,
"Close Content"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_CLOSE_CONTENT_KEY,
"Closes the current content. Any unsaved changes might be lost."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_QUIT_KEY,
"Quit RetroArch"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_QUIT_KEY,
"Closes RetroArch, ensuring all save data and configuration files are flushed to disk."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_PLUS,
"Save State Slot +"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_STATE_SLOT_PLUS,
"Increments the currently selected save state slot index."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_MINUS,
"Save State Slot -"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_STATE_SLOT_MINUS,
"Decrements the currently selected save state slot index."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_REWIND,
"Rewind"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_REWIND_HOTKEY,
"Rewinds current content while key is held.\n'Rewind Support' must be enabled."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_BSV_RECORD_TOGGLE,
"Record Input Replay (Toggle)"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_BSV_RECORD_TOGGLE,
"Switches recording of gameplay inputs in .bsv format on/off."
"Rewinds current content while key is held. 'Rewind Support' must be enabled."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_PAUSE_TOGGLE,
"Pause (Toggle)"
"Pause"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_PAUSE_TOGGLE,
@ -2864,19 +2831,103 @@ MSG_HASH(
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_FRAMEADVANCE,
"Frameadvance"
"Frame Advance"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_FRAMEADVANCE,
"When content is paused, advances it by one frame."
"Advances content by one frame when paused."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE,
"Audio Mute"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_RESET,
"Reset Game"
MENU_ENUM_SUBLABEL_INPUT_META_MUTE,
"Switches audio output on/off."
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_RESET,
"Restarts the current content from the beginning."
MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_UP,
"Volume Up"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_VOLUME_UP,
"Increases output audio volume level."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_DOWN,
"Volume Down"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_VOLUME_DOWN,
"Decreases output audio volume level."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_LOAD_STATE_KEY,
"Load State"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_LOAD_STATE_KEY,
"Loads saved state from the currently selected slot."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_SAVE_STATE_KEY,
"Save State"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_SAVE_STATE_KEY,
"Saves state to the currently selected slot."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_PLUS,
"Next Save State Slot"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_STATE_SLOT_PLUS,
"Increments the currently selected save state slot index."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_MINUS,
"Previous Save State Slot"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_STATE_SLOT_MINUS,
"Decrements the currently selected save state slot index."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_EJECT_TOGGLE,
"Disc Eject (Toggle)"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_DISK_EJECT_TOGGLE,
"If virtual disc tray is closed, opens it and removes the loaded disc. Otherwise, inserts currently selected disc and closes the tray."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_NEXT,
"Next Disc"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_DISK_NEXT,
"Increments the currently selected disc index. Virtual disc tray must be open."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_PREV,
"Previous Disc"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_DISK_PREV,
"Decrements the currently selected disc index. Virtual disc tray must be open."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_TOGGLE,
"Shaders (Toggle)"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_SHADER_TOGGLE,
"Switches the currently selected shader on/off."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_NEXT,
@ -2894,13 +2945,14 @@ MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_SHADER_PREV,
"Loads and applies the previous shader preset file in the root of the 'Video Shaders' directory."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_TOGGLE,
"Shader (Toggle)"
MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_TOGGLE,
"Cheats (Toggle)"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_SHADER_TOGGLE,
"Switches the currently selected shader on/off."
MENU_ENUM_SUBLABEL_INPUT_META_CHEAT_TOGGLE,
"Switches the currently selected cheat on/off."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_INDEX_PLUS,
@ -2918,14 +2970,7 @@ MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_CHEAT_INDEX_MINUS,
"Decrements the currently selected cheat index."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_TOGGLE,
"Cheats (Toggle)"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_CHEAT_TOGGLE,
"Switches the currently selected cheat on/off."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_SCREENSHOT,
"Take Screenshot"
@ -2935,21 +2980,80 @@ MSG_HASH(
"Captures an image of the current content."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE,
"Audio Mute (Toggle)"
MENU_ENUM_LABEL_VALUE_INPUT_META_RECORDING_TOGGLE,
"Recording (Toggle)"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_MUTE,
"Switches audio output on/off."
MENU_ENUM_SUBLABEL_INPUT_META_RECORDING_TOGGLE,
"Starts/stops recording of the current session to a local video file."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_OSK,
"On-Screen Keyboard (Toggle)"
MENU_ENUM_LABEL_VALUE_INPUT_META_STREAMING_TOGGLE,
"Streaming (Toggle)"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_OSK,
"Switches on-screen keyboard on/off."
MENU_ENUM_SUBLABEL_INPUT_META_STREAMING_TOGGLE,
"Starts/stops streaming of the current session to an online video platform."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_BSV_RECORD_TOGGLE,
"Record Input Replay (Toggle)"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_BSV_RECORD_TOGGLE,
"Switches recording of gameplay inputs in .bsv format on/off."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_GRAB_MOUSE_TOGGLE,
"Grab Mouse (Toggle)"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_GRAB_MOUSE_TOGGLE,
"Grabs or releases the mouse. When grabbed, the system cursor is hidden and confined to the RetroArch display window, improving relative mouse input."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_GAME_FOCUS_TOGGLE,
"Game Focus (Toggle)"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_GAME_FOCUS_TOGGLE,
"Switches 'Game Focus' mode on/off. When content has focus, hotkeys are disabled (full keyboard input is passed to the running core) and mouse is grabbed."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_FULLSCREEN_TOGGLE_KEY,
"Fullscreen (Toggle)"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_FULLSCREEN_TOGGLE_KEY,
"Switches between fullscreen and windowed display modes."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_UI_COMPANION_TOGGLE,
"Desktop Menu (Toggle)"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_UI_COMPANION_TOGGLE,
"Opens the companion WIMP (Windows, Icons, Menus, Pointer) desktop user interface."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_VRR_RUNLOOP_TOGGLE,
"Sync to Exact Content Framerate (Toggle)"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_VRR_RUNLOOP_TOGGLE,
"Toggles sync to exact content framerate on/off."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_RUNAHEAD_TOGGLE,
"Run-Ahead (Toggle)"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_RUNAHEAD_TOGGLE,
"Switches Run-Ahead on/off."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_FPS_TOGGLE,
"Show FPS (Toggle)"
@ -2966,22 +3070,39 @@ MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_STATISTICS_TOGGLE,
"Switches the display of on-screen technical statistics on/off."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_OSK,
"On-Screen Keyboard (Toggle)"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_OSK,
"Switches on-screen keyboard on/off."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_OVERLAY_NEXT,
"Next Overlay"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_OVERLAY_NEXT,
"Switches to the next available layout of the currently active on-screen overlay."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_AI_SERVICE,
"AI Service"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_AI_SERVICE,
"Captures an image of current content to translate and/or read aloud any on-screen text. 'AI Service' must be enabled and configured."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_PING_TOGGLE,
"Show Netplay Ping (Toggle)"
"Netplay Ping (Toggle)"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_NETPLAY_PING_TOGGLE,
"Switches the ping counter for the current netplay room on/off."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_SEND_DEBUG_INFO,
"Send Debug Info"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_SEND_DEBUG_INFO,
"Sends diagnostic info about your device and RetroArch configuration to our servers for analysis."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_HOST_TOGGLE,
"Netplay Hosting (Toggle)"
@ -3014,125 +3135,14 @@ MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_NETPLAY_FADE_CHAT_TOGGLE,
"Toggle between fading and static netplay chat messages."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_ENABLE_HOTKEY,
"Hotkey Enable"
MENU_ENUM_LABEL_VALUE_INPUT_META_SEND_DEBUG_INFO,
"Send Debug Info"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_ENABLE_HOTKEY,
"When assigned, the 'Hotkey Enable' key must be pressed (and held) before any other hotkeys are recognized. Allows controller buttons to be mapped to hotkey functions without affecting normal input."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_UP,
"Volume Up"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_VOLUME_UP,
"Increases output audio volume level."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_DOWN,
"Volume Down"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_VOLUME_DOWN,
"Decreases output audio volume level."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_OVERLAY_NEXT,
"Next Overlay"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_OVERLAY_NEXT,
"Switches to the next available layout of the currently active on-screen overlay."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_EJECT_TOGGLE,
"Disc Eject Toggle"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_DISK_EJECT_TOGGLE,
"If virtual disc tray is closed, opens it and removes the loaded disc. Otherwise, inserts currently selected disc and closes the tray."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_NEXT,
"Next Disc"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_DISK_NEXT,
"Increments the currently selected disc index.\nVirtual disc tray must be open."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_PREV,
"Previous Disc"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_DISK_PREV,
"Decrements the currently selected disc index.\nVirtual disc tray must be open."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_GRAB_MOUSE_TOGGLE,
"Grab Mouse (Toggle)"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_GRAB_MOUSE_TOGGLE,
"Grabs or releases the mouse. When grabbed, the system cursor is hidden and confined to the RetroArch display window, improving relative mouse input."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_GAME_FOCUS_TOGGLE,
"Game Focus (Toggle)"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_GAME_FOCUS_TOGGLE,
"Enables or disables 'Game Focus' mode. When content has focus, hotkeys are disabled (full keyboard input is passed to the running core) and the mouse is grabbed."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_UI_COMPANION_TOGGLE,
"Desktop Menu (Toggle)"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_UI_COMPANION_TOGGLE,
"Opens the companion WIMP (Windows, Icons, Menus, Pointer) desktop user interface."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_MENU_TOGGLE,
"Menu (Toggle)"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_MENU_TOGGLE,
"Switches the current display between menu and running content."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_RECORDING_TOGGLE,
"Recording (Toggle)"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_RECORDING_TOGGLE,
"Starts/stops recording of the current session to a local video file."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_STREAMING_TOGGLE,
"Streaming (Toggle)"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_STREAMING_TOGGLE,
"Starts/stops streaming of the current session to an online video platform."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_RUNAHEAD_TOGGLE,
"Run-Ahead (Toggle)"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_RUNAHEAD_TOGGLE,
"Switches Run-Ahead on/off."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_INPUT_META_AI_SERVICE,
"AI Service"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_INPUT_META_AI_SERVICE,
"Captures an image of the current content then translates and/or reads aloud any on-screen text.\n'AI Service' Must be enabled and configured."
MENU_ENUM_SUBLABEL_INPUT_META_SEND_DEBUG_INFO,
"Sends diagnostic info about your device and RetroArch configuration to our servers for analysis."
)
/* Settings > Input > Port # Controls */

13
menu/drivers/materialui.c
View File

@ -365,6 +365,7 @@ typedef struct
uint32_t list_hint_text;
uint32_t list_hint_text_highlighted;
uint32_t status_bar_text;
uint32_t disabled_text;
/* Screensaver */
uint32_t screensaver_tint;
/* Background colours */
@ -1905,6 +1906,8 @@ static void materialui_prepare_colors(
mui->colors.list_hint_text = (current_theme->list_hint_text << 8) | 0xFF;
mui->colors.list_hint_text_highlighted = (current_theme->list_hint_text_highlighted << 8) | 0xFF;
mui->colors.status_bar_text = (current_theme->status_bar_text << 8) | 0xFF;
/* Disabled color */
mui->colors.disabled_text = (current_theme->list_text << 8) | 0x7F;
/* > Background colours */
hex32_to_rgba_normalized(
@ -4208,6 +4211,7 @@ static void materialui_render_menu_entry_default(
case MUI_ENTRY_VALUE_TEXT:
{
int value_x_offset = 0;
uint32_t entry_value_color = 0;
unsigned entry_value_width_max = (usable_width / 2) - mui->margin;
char value_buf[255];
@ -4266,13 +4270,18 @@ static void materialui_render_menu_entry_default(
entry_value_width = (entry_value_len + 1) * mui->font_data.list.glyph_width;
}
entry_value_color = (entry_selected || touch_feedback_active)
? mui->colors.list_text_highlighted : mui->colors.list_text;
if (string_is_equal(value_buf, "null"))
entry_value_color = mui->colors.disabled_text;
/* Draw value string */
gfx_display_draw_text(mui->font_data.list.font, value_buf,
entry_x + value_x_offset + node->entry_width - (int)mui->margin - (int)mui->landscape_optimization.entry_margin,
label_y,
video_width, video_height,
(entry_selected || touch_feedback_active) ?
mui->colors.list_text_highlighted : mui->colors.list_text,
entry_value_color,
TEXT_ALIGN_RIGHT, 1.0f, false, 0.0f, draw_text_outside);
}
break;

10
menu/drivers/ozone.c
View File

@ -4960,7 +4960,9 @@ static void ozone_draw_entry_value(
y,
video_width,
video_height,
COLOR_TEXT_ALPHA(ozone->theme->text_selected_rgba, alpha_uint32),
!string_is_equal(value, "null")
? COLOR_TEXT_ALPHA(ozone->theme->text_selected_rgba, alpha_uint32)
: COLOR_TEXT_ALPHA(ozone->theme->text_selected_rgba, alpha_uint32 >> 1),
TEXT_ALIGN_RIGHT,
1.0f,
false,
@ -4977,9 +4979,9 @@ static void ozone_draw_entry_value(
y,
video_width,
video_height,
COLOR_TEXT_ALPHA((switch_is_on
? ozone->theme->text_selected_rgba
: ozone->theme->text_sublabel_rgba), alpha_uint32),
switch_is_on
? COLOR_TEXT_ALPHA(ozone->theme->text_selected_rgba, alpha_uint32)
: COLOR_TEXT_ALPHA(ozone->theme->text_selected_rgba, alpha_uint32 >> 1),
TEXT_ALIGN_RIGHT,
1.0f,
false,

35
menu/drivers/rgui.c
View File

@ -193,6 +193,8 @@ typedef struct
/* Screensaver colors */
uint16_t ss_bg_color;
uint16_t ss_particle_color;
/* Null color */
uint16_t disabled_color;
} rgui_colors_t;
typedef struct
@ -3183,6 +3185,7 @@ static void prepare_rgui_colors(rgui_t *rgui,
{
rgui_theme_t theme_colors;
uint32_t ss_particle_color_argb32 = 0;
uint32_t disabled_color_argb32 = 0;
rgui->color_theme = menu_rgui_color_theme;
if (menu_rgui_transparency)
@ -3245,6 +3248,13 @@ static void prepare_rgui_colors(rgui_t *rgui,
rgui->colors.ss_particle_color = argb32_to_pixel_platform_format(
ss_particle_color_argb32 | 0xFF000000);
/* Disabled color is a mix of normal color and shadow color, with 50% opacity */
disabled_color_argb32 = (theme_colors.normal_color +
theme_colors.shadow_color +
(theme_colors.normal_color ^ theme_colors.shadow_color)) >> 1;
rgui->colors.disabled_color = argb32_to_pixel_platform_format(
disabled_color_argb32 | 0x7F000000);
rgui->flags |= RGUI_FLAG_BG_MODIFIED
| RGUI_FLAG_FORCE_REDRAW;
}
@ -5473,13 +5483,22 @@ static void rgui_render(void *data,
gfx_animation_ticker(&ticker);
}
/* Print entry value */
blit_line(rgui,
fb_width,
ticker_x_offset + term_end_x - ((entry_value_len + 1) * rgui->font_width_stride),
y,
type_str_buf,
entry_color, rgui->colors.shadow_color);
{
uint16_t entry_value_color = entry_color;
if (!entry_selected &&
( string_is_equal(entry_value, "null")
|| string_is_equal(entry_value, "...")))
entry_value_color = rgui->colors.disabled_color;
/* Print entry value */
blit_line(rgui,
fb_width,
ticker_x_offset + term_end_x - ((entry_value_len + 1) * rgui->font_width_stride),
y,
type_str_buf,
entry_value_color, rgui->colors.shadow_color);
}
break;
case RGUI_ENTRY_VALUE_SWITCH_ON:
rgui_render_toggle_switch(rgui, fb_width,
@ -5497,7 +5516,7 @@ static void rgui_render(void *data,
(term_end_x - ((entry_value_len + 1) * rgui->font_width_stride)),
y,
false,
entry_color, rgui->colors.shadow_color);
rgui->colors.disabled_color, rgui->colors.shadow_color);
break;
case RGUI_ENTRY_VALUE_CHECKMARK:
/* Print marker for currently selected

5
menu/drivers/xmb.c
View File

@ -960,12 +960,15 @@ static void xmb_draw_text(
if (alpha > xmb->alpha)
alpha = xmb->alpha;
a8 = 255 * alpha;
a8 = 0xFF * alpha;
/* Avoid drawing 100% transparent text */
if (a8 == 0)
return;
if (string_is_equal(str, "null"))
a8 = 0x7F * alpha;
color = FONT_COLOR_RGBA(
settings->uints.menu_font_color_red,
settings->uints.menu_font_color_green,

99
menu/menu_displaylist.c
View File

@ -6266,42 +6266,12 @@ unsigned menu_displaylist_build_list(
break;
case DISPLAYLIST_INPUT_HOTKEY_BINDS_LIST:
{
bool hotkey_enable_found = false;
size_t hotkey_enable_index = 0;
/* "Hotkey Enable" */
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_QUIT_PRESS_TWICE,
PARSE_ONLY_BOOL, false) == 0)
(enum msg_hash_enums)(
MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_BEGIN + RARCH_FIRST_META_KEY),
PARSE_ONLY_BIND, false) == 0)
count++;
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_INPUT_MENU_ENUM_TOGGLE_GAMEPAD_COMBO,
PARSE_ONLY_UINT, false) == 0)
count++;
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_INPUT_QUIT_GAMEPAD_COMBO,
PARSE_ONLY_UINT, false) == 0)
count++;
/* Hotkey enable bind comes first - due to the
* way binds are implemented, have to search the
* entire list for it... */
for (i = 0; i < RARCH_BIND_LIST_END; i++)
{
if (input_config_bind_map_get_retro_key(i) == RARCH_ENABLE_HOTKEY)
{
hotkey_enable_found = true;
hotkey_enable_index = i;
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
(enum msg_hash_enums)(
MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_BEGIN + i),
PARSE_ONLY_BIND, false) == 0)
count++;
break;
}
}
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_INPUT_HOTKEY_BLOCK_DELAY,
PARSE_ONLY_UINT, false) == 0)
@ -6310,8 +6280,24 @@ unsigned menu_displaylist_build_list(
/* All other binds come last */
for (i = 0; i < RARCH_BIND_LIST_END; i++)
{
if (hotkey_enable_found && (hotkey_enable_index == i))
/* Skip "Hotkey Enable" */
if (i == RARCH_FIRST_META_KEY)
continue;
/* Show combo entries before normal binds */
else if (input_config_bind_map_get_retro_key(i) == RARCH_MENU_TOGGLE)
{
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_INPUT_MENU_ENUM_TOGGLE_GAMEPAD_COMBO,
PARSE_ONLY_UINT, false) == 0)
count++;
}
else if (input_config_bind_map_get_retro_key(i) == RARCH_QUIT_KEY)
{
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_INPUT_QUIT_GAMEPAD_COMBO,
PARSE_ONLY_UINT, false) == 0)
count++;
}
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
(enum msg_hash_enums)(
@ -7022,12 +7008,6 @@ unsigned menu_displaylist_build_list(
MENU_ENUM_LABEL_INPUT_MAX_USERS,
PARSE_ONLY_UINT, false) == 0)
count++;
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_INPUT_SMALL_KEYBOARD_ENABLE,
PARSE_ONLY_BOOL, false) == 0)
count++;
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_INPUT_POLL_TYPE_BEHAVIOR,
PARSE_ONLY_UINT, false) == 0)
@ -7036,6 +7016,10 @@ unsigned menu_displaylist_build_list(
MENU_ENUM_LABEL_INPUT_ICADE_ENABLE,
PARSE_ONLY_BOOL, false) == 0)
count++;
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_INPUT_SMALL_KEYBOARD_ENABLE,
PARSE_ONLY_BOOL, false) == 0)
count++;
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_INPUT_KEYBOARD_GAMEPAD_MAPPING_TYPE,
PARSE_ONLY_UINT, false) == 0)
@ -7072,6 +7056,14 @@ unsigned menu_displaylist_build_list(
MENU_ENUM_LABEL_INPUT_BUTTON_AXIS_THRESHOLD,
PARSE_ONLY_FLOAT, false) == 0)
count++;
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_INPUT_ANALOG_DEADZONE,
PARSE_ONLY_FLOAT, false) == 0)
count++;
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_INPUT_ANALOG_SENSITIVITY,
PARSE_ONLY_FLOAT, false) == 0)
count++;
#if defined(GEKKO)
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_INPUT_MOUSE_SCALE,
@ -7082,14 +7074,6 @@ unsigned menu_displaylist_build_list(
MENU_ENUM_LABEL_INPUT_TOUCH_SCALE,
PARSE_ONLY_UINT, false) == 0)
count++;
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_INPUT_ANALOG_DEADZONE,
PARSE_ONLY_FLOAT, false) == 0)
count++;
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_INPUT_ANALOG_SENSITIVITY,
PARSE_ONLY_FLOAT, false) == 0)
count++;
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_INPUT_BIND_TIMEOUT,
PARSE_ONLY_UINT, false) == 0)
@ -7102,6 +7086,10 @@ unsigned menu_displaylist_build_list(
MENU_ENUM_LABEL_INPUT_BIND_MODE,
PARSE_ONLY_UINT, false) == 0)
count++;
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_QUIT_PRESS_TWICE,
PARSE_ONLY_BOOL, false) == 0)
count++;
#if defined(HAVE_DINPUT) || defined(HAVE_WINRAWINPUT)
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_INPUT_NOWINKEY_ENABLE,
@ -10079,14 +10067,15 @@ unsigned menu_displaylist_build_list(
case DISPLAYLIST_DRIVER_SETTINGS_LIST:
{
menu_displaylist_build_info_t build_list[] = {
{MENU_ENUM_LABEL_INPUT_DRIVER, PARSE_ONLY_STRING_OPTIONS},
{MENU_ENUM_LABEL_JOYPAD_DRIVER, PARSE_ONLY_STRING_OPTIONS},
{MENU_ENUM_LABEL_MENU_DRIVER, PARSE_ONLY_STRING_OPTIONS},
{MENU_ENUM_LABEL_VIDEO_DRIVER, PARSE_ONLY_STRING_OPTIONS},
{MENU_ENUM_LABEL_AUDIO_DRIVER, PARSE_ONLY_STRING_OPTIONS},
#if 0
/* This is better suited under audio options only */
{MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER,PARSE_ONLY_STRING_OPTIONS},
{MENU_ENUM_LABEL_CAMERA_DRIVER, PARSE_ONLY_STRING_OPTIONS},
{MENU_ENUM_LABEL_LOCATION_DRIVER, PARSE_ONLY_STRING_OPTIONS},
{MENU_ENUM_LABEL_MENU_DRIVER, PARSE_ONLY_STRING_OPTIONS},
#endif
{MENU_ENUM_LABEL_INPUT_DRIVER, PARSE_ONLY_STRING_OPTIONS},
{MENU_ENUM_LABEL_JOYPAD_DRIVER, PARSE_ONLY_STRING_OPTIONS},
{MENU_ENUM_LABEL_RECORD_DRIVER, PARSE_ONLY_STRING_OPTIONS},
{MENU_ENUM_LABEL_MIDI_DRIVER, PARSE_ONLY_STRING_OPTIONS},
#ifdef HAVE_BLUETOOTH
@ -10095,6 +10084,8 @@ unsigned menu_displaylist_build_list(
#if defined(HAVE_LAKKA) || defined(HAVE_WIFI)
{MENU_ENUM_LABEL_WIFI_DRIVER, PARSE_ONLY_STRING_OPTIONS},
#endif
{MENU_ENUM_LABEL_CAMERA_DRIVER, PARSE_ONLY_STRING_OPTIONS},
{MENU_ENUM_LABEL_LOCATION_DRIVER, PARSE_ONLY_STRING_OPTIONS},
};
for (i = 0; i < ARRAY_SIZE(build_list); i++)