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

Added menu toggle for 'Down+Select'

This commit is contained in:
Rob Loach 2019-01-28 11:43:57 -05:00
parent e8e384aa4f
commit fa875692c3
No known key found for this signature in database
GPG Key ID: 627C60834A74A21A
5 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
input/input_driver.h
View File

@ -60,6 +60,7 @@ enum input_toggle_type
INPUT_TOGGLE_L3_R, INPUT_TOGGLE_L3_R,
INPUT_TOGGLE_L_R, INPUT_TOGGLE_L_R,
INPUT_TOGGLE_HOLD_START, INPUT_TOGGLE_HOLD_START,
INPUT_TOGGLE_DOWN_SELECT,
INPUT_TOGGLE_LAST INPUT_TOGGLE_LAST
}; };

6
intl/msg_hash_us.h
View File

@ -16,7 +16,7 @@ MSG_HASH(
"Increase or decrease the Switch screen brightness" "Increase or decrease the Switch screen brightness"
) )
#endif #endif
#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX) #if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
MSG_HASH( MSG_HASH(
MENU_ENUM_LABEL_VALUE_SWITCH_CPU_PROFILE, MENU_ENUM_LABEL_VALUE_SWITCH_CPU_PROFILE,
"CPU Overclock" "CPU Overclock"
@ -8132,3 +8132,7 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_MENU_SOUND_BGM, MENU_ENUM_LABEL_VALUE_MENU_SOUND_BGM,
"Enable BGM sound" "Enable BGM sound"
) )
MSG_HASH(
MENU_ENUM_LABEL_VALUE_DOWN_SELECT,
"Down + Select"
)

3
menu/menu_setting.c
View File

@ -2056,6 +2056,9 @@ static void setting_get_string_representation_toggle_gamepad_combo(
case INPUT_TOGGLE_HOLD_START: case INPUT_TOGGLE_HOLD_START:
strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_HOLD_START), len); strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_HOLD_START), len);
break; break;
case INPUT_TOGGLE_DOWN_SELECT:
strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_DOWN_SELECT), len);
break;
} }
} }

1
msg_hash.h
View File

@ -2241,6 +2241,7 @@ enum msg_hash_enums
#endif #endif
MENU_ENUM_LABEL_VALUE_HOLD_START, MENU_ENUM_LABEL_VALUE_HOLD_START,
MENU_ENUM_LABEL_VALUE_DOWN_SELECT,
MENU_LABEL(PLAYLIST_USE_OLD_FORMAT), MENU_LABEL(PLAYLIST_USE_OLD_FORMAT),
MENU_LABEL(MENU_SOUNDS), MENU_LABEL(MENU_SOUNDS),
MENU_LABEL(MENU_SOUND_OK), MENU_LABEL(MENU_SOUND_OK),

6
retroarch.c
View File

@ -2554,6 +2554,12 @@ static bool input_driver_toggle_button_combo(
if (!BIT256_GET_PTR(p_input, RETRO_DEVICE_ID_JOYPAD_R)) if (!BIT256_GET_PTR(p_input, RETRO_DEVICE_ID_JOYPAD_R))
return false; return false;
break; break;
case INPUT_TOGGLE_DOWN_SELECT:
if (!BIT256_GET_PTR(p_input, RETRO_DEVICE_ID_JOYPAD_DOWN))
return false;
if (!BIT256_GET_PTR(p_input, RETRO_DEVICE_ID_JOYPAD_SELECT))
return false;
break;
case INPUT_TOGGLE_HOLD_START: case INPUT_TOGGLE_HOLD_START:
{ {
static rarch_timer_t timer = {0}; static rarch_timer_t timer = {0};