From b409ced5ad67a1650483385b0ca8ab2afc12a904 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Andr=C3=A9=20Santoni?= Date: Wed, 29 Jun 2016 10:46:07 +0200 Subject: [PATCH] Add start+select to the list of gamepad combos --- menu/cbs/menu_cbs_get_value.c | 3 +++ menu/menu_setting.c | 2 +- retroarch.cfg | 2 +- runloop.c | 5 +++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c index 6fa75b9e7a..3667600716 100644 --- a/menu/cbs/menu_cbs_get_value.c +++ b/menu/cbs/menu_cbs_get_value.c @@ -761,6 +761,9 @@ static void menu_action_setting_disp_set_label_menu_toggle_gamepad_combo( break; case 2: snprintf(s, len, "%s", "L3 + R3"); + break; + case 3: + snprintf(s, len, "%s", "Start + Select"); break; } } diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 1013b1c5b1..c7213081e6 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -5788,7 +5788,7 @@ static bool setting_append_list( parent_group, general_write_handler, general_read_handler); - menu_settings_list_current_add_range(list, list_info, 0, 2, 1, true, true); + menu_settings_list_current_add_range(list, list_info, 0, 3, 1, true, true); menu_settings_list_current_add_enum_idx(list, list_info, MENU_ENUM_LABEL_INPUT_MENU_ENUM_TOGGLE_GAMEPAD_COMBO); CONFIG_BOOL( diff --git a/retroarch.cfg b/retroarch.cfg index 907f2b02b2..a95f8b8882 100644 --- a/retroarch.cfg +++ b/retroarch.cfg @@ -614,7 +614,7 @@ # input_menu_toggle = f1 # RetroPad button combination to toggle menu -# 0 = none, 1 = L + R + Y + D-Pad Down, 2 = L3 + R3 +# 0 = none, 1 = L + R + Y + D-Pad Down, 2 = L3 + R3, 3 = Start + Select # input_menu_toggle_gamepad_combo = 0 # Toggles mouse grab. When mouse is grabbed, RetroArch hides the mouse, diff --git a/runloop.c b/runloop.c index 383c4d3b65..d862b9df0d 100644 --- a/runloop.c +++ b/runloop.c @@ -330,6 +330,11 @@ static bool runloop_cmd_get_state_menu_toggle_button_combo( return false; if (!BIT64_GET(input.state, RETRO_DEVICE_ID_JOYPAD_R3)) return false; + case 3: + if (!BIT64_GET(input.state, RETRO_DEVICE_ID_JOYPAD_START)) + return false; + if (!BIT64_GET(input.state, RETRO_DEVICE_ID_JOYPAD_SELECT)) + return false; break; }