diff --git a/input/input_driver.h b/input/input_driver.h index 7bde935407..6c5b4f1a0f 100644 --- a/input/input_driver.h +++ b/input/input_driver.h @@ -58,6 +58,7 @@ enum input_toggle_type INPUT_TOGGLE_L1_R1_START_SELECT, INPUT_TOGGLE_START_SELECT, INPUT_TOGGLE_L3_R, + INPUT_TOGGLE_L_R, INPUT_TOGGLE_LAST }; diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 6506af7fd3..4ace8ed3fa 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -1706,6 +1706,9 @@ static void setting_get_string_representation_toggle_gamepad_combo( case INPUT_TOGGLE_L3_R: strlcpy(s, "L3 + R", len); break; + case INPUT_TOGGLE_L_R: + strlcpy(s, "L + R", len); + break; } } @@ -6268,7 +6271,7 @@ static bool setting_append_list( (*list)[list_info->index - 1].action_ok = &setting_action_ok_uint; (*list)[list_info->index - 1].get_string_representation = &setting_get_string_representation_toggle_gamepad_combo; - menu_settings_list_current_add_range(list, list_info, 0, 5, 1, true, true); + menu_settings_list_current_add_range(list, list_info, 0, (INPUT_TOGGLE_LAST-1), 1, true, true); CONFIG_BOOL( list, list_info, diff --git a/retroarch.c b/retroarch.c index 8d27451066..ccfe66dc9f 100644 --- a/retroarch.c +++ b/retroarch.c @@ -2495,6 +2495,12 @@ static bool input_driver_toggle_button_combo( if (!BIT256_GET_PTR(p_input, RETRO_DEVICE_ID_JOYPAD_R)) return false; break; + case INPUT_TOGGLE_L_R: + if (!BIT256_GET_PTR(p_input, RETRO_DEVICE_ID_JOYPAD_L)) + return false; + if (!BIT256_GET_PTR(p_input, RETRO_DEVICE_ID_JOYPAD_R)) + return false; + break; default: case INPUT_TOGGLE_NONE: return false;