mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-03 10:21:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

CLeanup input_menu_keys_pressed_internal

Browse Source
This commit is contained in:
twinaphex 2017-01-10 16:34:55 +01:00
parent 98a346db2d
commit baf351e1ee
1 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
input/input_driver.c
View File

@ -492,27 +492,19 @@ void state_tracker_update_input(uint16_t *input1, uint16_t *input2)
} }
#ifdef HAVE_MENU #ifdef HAVE_MENU
static INLINE bool input_menu_keys_pressed_internal(unsigned i, static INLINE bool input_menu_keys_pressed_internal(
unsigned max_users) const struct retro_keybind **binds,
unsigned i,
unsigned max_users,
bool bind_valid, bool all_users_control_menu)
{ {
if ( if (
(((!input_driver_block_libretro_input && ((i < RARCH_FIRST_META_KEY))) (((!input_driver_block_libretro_input && ((i < RARCH_FIRST_META_KEY)))
|| !input_driver_block_hotkey)) || !input_driver_block_hotkey)) && bind_valid
) )
{ {
settings_t *settings = config_get_ptr(); unsigned port;
int port_max = all_users_control_menu ? max_users : 1;
if (settings->input.binds[0][i].valid)
{
int port;
const struct retro_keybind *binds[MAX_USERS] = {NULL};
int port_max = 1;
if (settings->input.all_users_control_menu)
port_max = max_users;
for (port = 0; port < max_users; port++)
binds[port] = settings->input.binds[port];
for (port = 0; port < port_max; port++) for (port = 0; port < port_max; port++)
{ {
@ -521,7 +513,6 @@ static INLINE bool input_menu_keys_pressed_internal(unsigned i,
return true; return true;
} }
} }
}
if (i >= RARCH_FIRST_META_KEY) if (i >= RARCH_FIRST_META_KEY)
{ {
@ -630,7 +621,15 @@ uint64_t input_menu_keys_pressed(
for (i = 0; i < RARCH_BIND_LIST_END; i++) for (i = 0; i < RARCH_BIND_LIST_END; i++)
{ {
if (input_menu_keys_pressed_internal(i, max_users)) unsigned port;
const struct retro_keybind *binds[MAX_USERS] = {NULL};
for (port = 0; port < max_users; port++)
binds[port] = settings->input.binds[port];
if (input_menu_keys_pressed_internal(binds, i, max_users,
settings->input.binds[0][i].valid,
settings->input.all_users_control_menu))
ret |= (UINT64_C(1) << i); ret |= (UINT64_C(1) << i);
} }