CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-01-11 05:16:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

input_menu_keys_pressed - remove some more boilerplate code

Browse Source
This commit is contained in:
twinaphex 2016-12-23 02:28:13 +01:00
parent af5aaa9db8
commit 87e5c5a1bd
1 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
input/input_driver.c
View File

@ -571,7 +571,7 @@ uint64_t input_menu_keys_pressed(
bool runloop_paused) bool runloop_paused)
{ {
unsigned i; unsigned i;
unsigned ids[11][2]; unsigned ids[13][2];
uint64_t ret = 0; uint64_t ret = 0;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
const struct retro_keybind *binds[MAX_USERS] = {NULL}; const struct retro_keybind *binds[MAX_USERS] = {NULL};
@ -631,24 +631,6 @@ uint64_t input_menu_keys_pressed(
if (menu_input_dialog_get_display_kb()) if (menu_input_dialog_get_display_kb())
goto end; goto end;
if (current_input->input_state(current_input_data, binds, 0,
RETRO_DEVICE_KEYBOARD, 0, RETROK_RETURN))
{
if (!settings->input.menu_swap_ok_cancel_buttons)
BIT64_SET(ret, RETRO_DEVICE_ID_JOYPAD_A);
else
BIT64_SET(ret, RETRO_DEVICE_ID_JOYPAD_B);
}
if (current_input->input_state(current_input_data, binds, 0,
RETRO_DEVICE_KEYBOARD, 0, RETROK_BACKSPACE))
{
if (!settings->input.menu_swap_ok_cancel_buttons)
BIT64_SET(ret, RETRO_DEVICE_ID_JOYPAD_B);
else
BIT64_SET(ret, RETRO_DEVICE_ID_JOYPAD_A);
}
ids[0][0] = RETROK_SPACE; ids[0][0] = RETROK_SPACE;
ids[0][1] = RETRO_DEVICE_ID_JOYPAD_START; ids[0][1] = RETRO_DEVICE_ID_JOYPAD_START;
ids[1][0] = RETROK_SLASH; ids[1][0] = RETROK_SLASH;
@ -671,8 +653,18 @@ uint64_t input_menu_keys_pressed(
ids[9][1] = RARCH_QUIT_KEY; ids[9][1] = RARCH_QUIT_KEY;
ids[10][0] = settings->input.binds[0][RARCH_FULLSCREEN_TOGGLE_KEY].key; ids[10][0] = settings->input.binds[0][RARCH_FULLSCREEN_TOGGLE_KEY].key;
ids[10][1] = RARCH_FULLSCREEN_TOGGLE_KEY; ids[10][1] = RARCH_FULLSCREEN_TOGGLE_KEY;
ids[11][0] = RETROK_BACKSPACE;
ids[11][1] = RETRO_DEVICE_ID_JOYPAD_B;
ids[12][0] = RETROK_RETURN;
ids[12][1] = RETRO_DEVICE_ID_JOYPAD_A;
for (i = 0; i < 11; i++) if (settings->input.menu_swap_ok_cancel_buttons)
ids[11][1] = RETRO_DEVICE_ID_JOYPAD_A;
if (settings->input.menu_swap_ok_cancel_buttons)
ids[12][1] = RETRO_DEVICE_ID_JOYPAD_B;
for (i = 0; i < 13; i++)
{ {
if (current_input->input_state(current_input_data, binds, 0, if (current_input->input_state(current_input_data, binds, 0,
RETRO_DEVICE_KEYBOARD, 0, ids[i][0])) RETRO_DEVICE_KEYBOARD, 0, ids[i][0]))