From 79264c72787bcbe1a5815bb4e2776d55f7501aad Mon Sep 17 00:00:00 2001 From: "Mark W. Kidd" Date: Wed, 2 Jan 2019 21:24:33 -0500 Subject: [PATCH] refactor and restore non-android bind hold behavior --- menu/widgets/menu_input_bind_dialog.c | 51 ++++++++++++++++----------- 1 file changed, 31 insertions(+), 20 deletions(-) diff --git a/menu/widgets/menu_input_bind_dialog.c b/menu/widgets/menu_input_bind_dialog.c index 01b232e461..b10df5f55c 100644 --- a/menu/widgets/menu_input_bind_dialog.c +++ b/menu/widgets/menu_input_bind_dialog.c @@ -585,32 +585,43 @@ bool menu_input_key_bind_iterate(menu_input_ctx_bind_t *bind) input_driver_keyboard_mapping_set_block( true ); menu_input_key_bind_poll_bind_state( &binds, menu_bind_port, timed_out ); - /*keep resetting bind during the hold period, or we'll potentially bind joystick and mouse, etc.*/ - binds.buffer = *( binds.output ); + /*keep resetting bind during the hold period, or we'll potentially bind joystick and mouse, etc.*/ + binds.buffer = *( binds.output ); - if ( menu_input_key_bind_poll_find_hold( &binds, &binds.buffer ) ) + if ( settings->uints.input_bind_timeout == 0 ) { - /*inhibit timeout*/ - rarch_timer_begin_new_time( &binds.timer_timeout, settings->uints.input_bind_timeout ); - - /*run hold timer*/ - rarch_timer_tick( &binds.timer_hold ); - - snprintf( bind->s, bind->len, - "[%s]\npress keyboard, mouse or joypad\nand hold ...", - input_config_bind_map_get_desc( - menu_input_binds.begin - MENU_SETTINGS_BIND_BEGIN ) ); - - /*hold complete?*/ - if ( rarch_timer_has_expired( &binds.timer_hold ) ) - { - complete = true; + if ( ( binds.skip && !menu_input_binds.skip ) || + menu_input_key_bind_poll_find_trigger( &menu_input_binds, &binds, &( binds.buffer ) ) ) + { + complete = true; } } else { - /*reset hold countdown*/ - rarch_timer_begin_new_time( &binds.timer_hold, settings->uints.input_bind_hold ); + if ( menu_input_key_bind_poll_find_hold( &binds, &binds.buffer ) ) + { + /*inhibit timeout*/ + rarch_timer_begin_new_time( &binds.timer_timeout, settings->uints.input_bind_timeout ); + + /*run hold timer*/ + rarch_timer_tick( &binds.timer_hold ); + + snprintf( bind->s, bind->len, + "[%s]\npress keyboard, mouse or joypad\nand hold ...", + input_config_bind_map_get_desc( + menu_input_binds.begin - MENU_SETTINGS_BIND_BEGIN ) ); + + /*hold complete?*/ + if ( rarch_timer_has_expired( &binds.timer_hold ) ) + { + complete = true; + } + } + else + { + /*reset hold countdown*/ + rarch_timer_begin_new_time( &binds.timer_hold, settings->uints.input_bind_hold ); + } } if ( complete )