Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Any pad can control the menu #13173

Merged
merged 4 commits into from Nov 3, 2021
Merged

Any pad can control the menu #13173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aa78114
Any pad can control the menu
gblues Oct 31, 2021
abf9979
optimize out cumulative_bits
gblues Nov 2, 2021
e06385e
Incorporate PR feedback
gblues Nov 2, 2021
5ab3c84
apply one more optimization
gblues Nov 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions config.def.h
View file
Open in desktop
Expand Up @@ -841,14 +841,18 @@ static const unsigned input_backtouch_toggle = false;

#define DEFAULT_OVERLAY_SHOW_INPUTS_PORT 0

#define DEFAULT_ALL_USERS_CONTROL_MENU false

#if defined(ANDROID) || defined(_WIN32)
#define DEFAULT_MENU_SWAP_OK_CANCEL_BUTTONS true
#else
#define DEFAULT_MENU_SWAP_OK_CANCEL_BUTTONS false
#endif

#if defined(WIIU)
#define DEFAULT_ALL_USERS_CONTROL_MENU true
#else
#define DEFAULT_ALL_USERS_CONTROL_MENU false
#endif

#define DEFAULT_QUIT_PRESS_TWICE true

#define DEFAULT_LOG_TO_FILE false
Expand Down
1 change: 1 addition & 0 deletions configuration.c
View file
Open in desktop
Expand Up @@ -1587,6 +1587,7 @@ static struct config_bool_setting *populate_settings_bool(
SETTING_BOOL("desktop_menu_enable", &settings->bools.desktop_menu_enable, true, DEFAULT_DESKTOP_MENU_ENABLE, false);
SETTING_BOOL("video_gpu_record", &settings->bools.video_gpu_record, true, DEFAULT_GPU_RECORD, false);
SETTING_BOOL("input_remap_binds_enable", &settings->bools.input_remap_binds_enable, true, true, false);
SETTING_BOOL("all_users_control_menu", &settings->bools.input_all_users_control_menu, true, DEFAULT_ALL_USERS_CONTROL_MENU, false);
SETTING_BOOL("menu_swap_ok_cancel_buttons", &settings->bools.input_menu_swap_ok_cancel_buttons, true, DEFAULT_MENU_SWAP_OK_CANCEL_BUTTONS, false);
#ifdef HAVE_NETWORKING
SETTING_BOOL("netplay_public_announce", &settings->bools.netplay_public_announce, true, DEFAULT_NETPLAY_PUBLIC_ANNOUNCE, false);
Expand Down
1 change: 1 addition & 0 deletions configuration.h
View file
Open in desktop
Expand Up @@ -593,6 +593,7 @@ typedef struct settings
bool input_overlay_auto_scale;
bool input_descriptor_label_show;
bool input_descriptor_hide_unbound;
bool input_all_users_control_menu;
bool input_menu_swap_ok_cancel_buttons;
bool input_backtouch_enable;
bool input_backtouch_toggle;
Expand Down
2 changes: 1 addition & 1 deletion input/drivers/android_input.c
View file
Open in desktop
Expand Up @@ -1367,7 +1367,7 @@ static int16_t android_input_state(
const input_device_driver_t *joypad,
const input_device_driver_t *sec_joypad,
rarch_joypad_info_t *joypad_info,
const struct retro_keybind **binds,
const retro_keybind_set *binds,
bool keyboard_mapping_blocked,
unsigned port,
unsigned device,
Expand Down
2 changes: 1 addition & 1 deletion input/drivers/cocoa_input.c
View file
Open in desktop
Expand Up @@ -377,7 +377,7 @@ static int16_t cocoa_input_state(
const input_device_driver_t *joypad,
const input_device_driver_t *sec_joypad,
rarch_joypad_info_t *joypad_info,
const struct retro_keybind **binds,
const retro_keybind_set *binds,
bool keyboard_mapping_blocked,
unsigned port,
unsigned device,
Expand Down
2 changes: 1 addition & 1 deletion input/drivers/dinput.c
View file
Open in desktop
Expand Up @@ -484,7 +484,7 @@ static int16_t dinput_input_state(
const input_device_driver_t *joypad,
const input_device_driver_t *sec_joypad,
rarch_joypad_info_t *joypad_info,
const struct retro_keybind **binds,
const retro_keybind_set *binds,
bool keyboard_mapping_blocked,
unsigned port,
unsigned device,
Expand Down
2 changes: 1 addition & 1 deletion input/drivers/dos_input.c
View file
Open in desktop
Expand Up @@ -54,7 +54,7 @@ static int16_t dos_input_state(
const input_device_driver_t *joypad,
const input_device_driver_t *sec_joypad,
rarch_joypad_info_t *joypad_info,
const struct retro_keybind **binds,
const retro_keybind_set *binds,
bool keyboard_mapping_blocked,
unsigned port,
unsigned device,
Expand Down
2 changes: 1 addition & 1 deletion input/drivers/gx_input.c
View file
Open in desktop
Expand Up @@ -64,7 +64,7 @@ static int16_t rvl_input_state(
const input_device_driver_t *joypad,
const input_device_driver_t *sec_joypad,
rarch_joypad_info_t *joypad_info,
const struct retro_keybind **binds,
const retro_keybind_set *binds,
bool keyboard_mapping_blocked,
unsigned port,
unsigned device,
Expand Down
2 changes: 1 addition & 1 deletion input/drivers/linuxraw_input.c
View file
Open in desktop
Expand Up @@ -77,7 +77,7 @@ static int16_t linuxraw_input_state(
const input_device_driver_t *joypad,
const input_device_driver_t *sec_joypad,
rarch_joypad_info_t *joypad_info,
const struct retro_keybind **binds,
const retro_keybind_set *binds,
bool keyboard_mapping_blocked,
unsigned port,
unsigned device,
Expand Down
2 changes: 1 addition & 1 deletion input/drivers/ps3_input.c
View file
Open in desktop
Expand Up @@ -98,7 +98,7 @@ static int16_t ps3_input_state(
const input_device_driver_t *joypad,
const input_device_driver_t *sec_joypad,
rarch_joypad_info_t *joypad_info,
const struct retro_keybind **binds,
const retro_keybind_set *binds,
bool keyboard_mapping_blocked,
unsigned port,
unsigned device,
Expand Down
2 changes: 1 addition & 1 deletion input/drivers/psl1ght_input.c
View file
Open in desktop
Expand Up @@ -216,7 +216,7 @@ static int16_t ps3_input_state(
const input_device_driver_t *joypad,
const input_device_driver_t *sec_joypad,
rarch_joypad_info_t *joypad_info,
const struct retro_keybind **binds,
const retro_keybind_set *binds,
bool keyboard_mapping_blocked,
unsigned port,
unsigned device,
Expand Down
2 changes: 1 addition & 1 deletion input/drivers/psp_input.c
View file
Open in desktop
Expand Up @@ -237,7 +237,7 @@ static int16_t vita_input_state(
const input_device_driver_t *joypad,
const input_device_driver_t *sec_joypad,
rarch_joypad_info_t *joypad_info,
const struct retro_keybind **binds,
const retro_keybind_set *binds,
bool keyboard_mapping_blocked,
unsigned port,
unsigned device,
Expand Down
2 changes: 1 addition & 1 deletion input/drivers/qnx_input.c
View file
Open in desktop
Expand Up @@ -773,7 +773,7 @@ static int16_t qnx_input_state(
const input_device_driver_t *joypad,
const input_device_driver_t *sec_joypad,
rarch_joypad_info_t *joypad_info,
const struct retro_keybind **binds,
const retro_keybind_set *binds,
bool keyboard_mapping_blocked,
unsigned port,
unsigned device,
Expand Down
2 changes: 1 addition & 1 deletion input/drivers/rwebinput_input.c
View file
Open in desktop
Expand Up @@ -429,7 +429,7 @@ static int16_t rwebinput_input_state(
const input_device_driver_t *joypad,
const input_device_driver_t *sec_joypad,
rarch_joypad_info_t *joypad_info,
const struct retro_keybind **binds,
const retro_keybind_set *binds,
bool keyboard_mapping_blocked,
unsigned port,
unsigned device,
Expand Down
2 changes: 1 addition & 1 deletion input/drivers/sdl_input.c
View file
Open in desktop
Expand Up @@ -114,7 +114,7 @@ static int16_t sdl_input_state(
const input_device_driver_t *joypad,
const input_device_driver_t *sec_joypad,
rarch_joypad_info_t *joypad_info,
const struct retro_keybind **binds,
const retro_keybind_set *binds,
bool keyboard_mapping_blocked,
unsigned port,
unsigned device,
Expand Down
2 changes: 1 addition & 1 deletion input/drivers/switch_input.c
View file
Open in desktop
Expand Up @@ -286,7 +286,7 @@ static int16_t switch_input_state(
const input_device_driver_t *joypad,
const input_device_driver_t *sec_joypad,
rarch_joypad_info_t *joypad_info,
const struct retro_keybind **binds,
const retro_keybind_set *binds,
bool keyboard_mapping_blocked,
unsigned port,
unsigned device,
Expand Down
2 changes: 1 addition & 1 deletion input/drivers/udev_input.c
View file
Open in desktop
Expand Up @@ -1101,7 +1101,7 @@ static int16_t udev_input_state(
const input_device_driver_t *joypad,
const input_device_driver_t *sec_joypad,
rarch_joypad_info_t *joypad_info,
const struct retro_keybind **binds,
const retro_keybind_set *binds,
bool keyboard_mapping_blocked,
unsigned port,
unsigned device,
Expand Down
2 changes: 1 addition & 1 deletion input/drivers/uwp_input.c
View file
Open in desktop
Expand Up @@ -55,7 +55,7 @@ static int16_t uwp_input_state(
const input_device_driver_t *joypad,
const input_device_driver_t *sec_joypad,
rarch_joypad_info_t *joypad_info,
const struct retro_keybind **binds,
const retro_keybind_set *binds,
bool keyboard_mapping_blocked,
unsigned port,
unsigned device,
Expand Down
2 changes: 1 addition & 1 deletion input/drivers/wayland_input.c
View file
Open in desktop
Expand Up @@ -152,7 +152,7 @@ static int16_t input_wl_state(
const input_device_driver_t *joypad,
const input_device_driver_t *sec_joypad,
rarch_joypad_info_t *joypad_info,
const struct retro_keybind **binds,
const retro_keybind_set *binds,
bool keyboard_mapping_blocked,
unsigned port,
unsigned device,
Expand Down
2 changes: 1 addition & 1 deletion input/drivers/wiiu_input.c
View file
Open in desktop
Expand Up @@ -90,7 +90,7 @@ static int16_t wiiu_input_state(
const input_device_driver_t *joypad,
const input_device_driver_t *sec_joypad,
rarch_joypad_info_t *joypad_info,
const struct retro_keybind **binds,
const retro_keybind_set *binds,
bool keyboard_mapping_blocked,
unsigned port,
unsigned device,
Expand Down
4 changes: 2 additions & 2 deletions input/drivers/winraw_input.c
View file
Open in desktop
Expand Up @@ -611,7 +611,7 @@ static int16_t winraw_input_lightgun_state(
winraw_mouse_t *mouse,
const input_device_driver_t *joypad,
rarch_joypad_info_t *joypad_info,
const struct retro_keybind **binds,
const retro_keybind_set *binds,
bool keyboard_mapping_blocked,
unsigned port,
unsigned id,
Expand Down Expand Up @@ -682,7 +682,7 @@ static int16_t winraw_input_state(
const input_device_driver_t *joypad,
const input_device_driver_t *sec_joypad,
rarch_joypad_info_t *joypad_info,
const struct retro_keybind **binds,
const retro_keybind_set *binds,
bool keyboard_mapping_blocked,
unsigned port,
unsigned device,
Expand Down
2 changes: 1 addition & 1 deletion input/drivers/x11_input.c
View file
Open in desktop
Expand Up @@ -147,7 +147,7 @@ static int16_t x_input_state(
const input_device_driver_t *joypad,
const input_device_driver_t *sec_joypad,
rarch_joypad_info_t *joypad_info,
const struct retro_keybind **binds,
const retro_keybind_set *binds,
bool keyboard_mapping_blocked,
unsigned port,
unsigned device,
Expand Down