CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-22 10:49:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplify input_keys_pressed

Browse Source
This commit is contained in:
twinaphex 2017-05-21 22:31:15 +02:00
parent 77d83b4782
commit d7de9facc3
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
input/input_driver.c
View File

@ -665,7 +665,7 @@ static bool input_driver_toggle_button_combo(
*
* Returns: Input sample containg a mask of all pressed keys.
*/
uint64_t input_menu_keys_pressed(void *data, uint64_t *last_input)
uint64_t input_menu_keys_pressed(void *data, uint64_t last_input)
{
uint64_t ret = 0;
@ -726,7 +726,7 @@ uint64_t input_menu_keys_pressed(void *data, uint64_t *last_input)
const struct retro_keybind *mtkey = &input_config_binds[0][RARCH_MENU_TOGGLE];
if ( ((settings->uints.input_menu_toggle_gamepad_combo != INPUT_TOGGLE_NONE) &&
input_driver_toggle_button_combo(
settings->uints.input_menu_toggle_gamepad_combo, *last_input))
settings->uints.input_menu_toggle_gamepad_combo, last_input))
|| input_menu_keys_pressed_internal(
binds, settings, joypad_info, RARCH_MENU_TOGGLE, max_users,
mtkey->valid,
@ -801,8 +801,6 @@ uint64_t input_menu_keys_pressed(void *data, uint64_t *last_input)
}
}
*last_input = ret;
return ret;
}
#endif
@ -875,7 +873,7 @@ static INLINE bool input_keys_pressed_internal(
*
* Returns: Input sample containg a mask of all pressed keys.
*/
uint64_t input_keys_pressed(void *data, uint64_t *last_input)
uint64_t input_keys_pressed(void *data, uint64_t last_input)
{
unsigned i;
rarch_joypad_info_t joypad_info;
@ -932,7 +930,7 @@ uint64_t input_keys_pressed(void *data, uint64_t *last_input)
if (
((settings->uints.input_menu_toggle_gamepad_combo != INPUT_TOGGLE_NONE) &&
input_driver_toggle_button_combo(
settings->uints.input_menu_toggle_gamepad_combo, *last_input))
settings->uints.input_menu_toggle_gamepad_combo, last_input))
|| input_keys_pressed_internal(settings, joypad_info, RARCH_MENU_TOGGLE, binds))
ret |= (UINT64_C(1) << RARCH_MENU_TOGGLE);
#endif
@ -944,8 +942,6 @@ uint64_t input_keys_pressed(void *data, uint64_t *last_input)
ret |= (UINT64_C(1) << i);
}
*last_input = ret;
return ret;
}

4
input/input_driver.h
View File

@ -263,10 +263,10 @@ void input_poll(void);
int16_t input_state(unsigned port, unsigned device,
unsigned idx, unsigned id);
uint64_t input_keys_pressed(void *data, uint64_t *last_input);
uint64_t input_keys_pressed(void *data, uint64_t last_input);
#ifdef HAVE_MENU
uint64_t input_menu_keys_pressed(void *data, uint64_t *last_input);
uint64_t input_menu_keys_pressed(void *data, uint64_t last_input);
#endif
void *input_driver_get_data(void);

6
retroarch.c
View File

@ -2882,9 +2882,11 @@ int runloop_iterate(unsigned *sleep_ms)
current_input =
#ifdef HAVE_MENU
menu_is_alive ?
input_menu_keys_pressed(settings, &last_input) :
input_menu_keys_pressed(settings, last_input) :
#endif
input_keys_pressed(settings, &last_input);
input_keys_pressed(settings, last_input);
last_input = current_input;
if (input_driver_flushing_input)
{