mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-31 06:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3175 from lakkatv/master

Browse Source 
Add start+select to the list of gamepad combos
This commit is contained in:
Twinaphex 2016-06-29 12:14:17 +02:00 committed by GitHub
commit 397c8acd51
4 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
menu/cbs/menu_cbs_get_value.c
View File

@ -761,6 +761,9 @@ static void menu_action_setting_disp_set_label_menu_toggle_gamepad_combo(
break; break;
case 2: case 2:
snprintf(s, len, "%s", "L3 + R3"); snprintf(s, len, "%s", "L3 + R3");
break;
case 3:
snprintf(s, len, "%s", "Start + Select");
break; break;
} }
} }

2
menu/menu_setting.c
View File

@ -5788,7 +5788,7 @@ static bool setting_append_list(
parent_group, parent_group,
general_write_handler, general_write_handler,
general_read_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); menu_settings_list_current_add_enum_idx(list, list_info, MENU_ENUM_LABEL_INPUT_MENU_ENUM_TOGGLE_GAMEPAD_COMBO);
CONFIG_BOOL( CONFIG_BOOL(

2
retroarch.cfg
View File

@ -614,7 +614,7 @@
# input_menu_toggle = f1 # input_menu_toggle = f1
# RetroPad button combination to toggle menu # 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 # input_menu_toggle_gamepad_combo = 0
# Toggles mouse grab. When mouse is grabbed, RetroArch hides the mouse, # Toggles mouse grab. When mouse is grabbed, RetroArch hides the mouse,

5
runloop.c
View File

@ -330,6 +330,11 @@ static bool runloop_cmd_get_state_menu_toggle_button_combo(
return false; return false;
if (!BIT64_GET(input.state, RETRO_DEVICE_ID_JOYPAD_R3)) if (!BIT64_GET(input.state, RETRO_DEVICE_ID_JOYPAD_R3))
return false; 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; break;
} }