ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert bind/hold behavior for now

This commit is contained in:
twinaphex 2019-06-20 11:45:51 +02:00
parent c064d30250
commit 37c04932bf
2 changed files with 34 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.def.h
View File

@ -817,7 +817,7 @@ static const unsigned input_poll_type_behavior = 2;
static const unsigned input_bind_timeout = 5; static const unsigned input_bind_timeout = 5;
static const unsigned input_bind_hold = 1; static const unsigned input_bind_hold = 2;
static const unsigned menu_thumbnails_default = 3; static const unsigned menu_thumbnails_default = 3;

64
menu/widgets/menu_input_bind_dialog.c
View File

@ -391,6 +391,7 @@ static bool menu_input_key_bind_poll_find_trigger_pad(
return false; return false;
} }
static bool menu_input_key_bind_poll_find_hold_pad( static bool menu_input_key_bind_poll_find_hold_pad(
struct menu_bind_state *new_state, struct menu_bind_state *new_state,
struct retro_keybind * output, struct retro_keybind * output,
@ -584,45 +585,46 @@ bool menu_input_key_bind_iterate(menu_input_ctx_bind_t *bind)
input_driver_keyboard_mapping_set_block( true ); input_driver_keyboard_mapping_set_block( true );
menu_input_key_bind_poll_bind_state( &binds, menu_bind_port, timed_out ); 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.*/ #ifdef ANDROID
binds.buffer = *( binds.output );
if ( settings->uints.input_bind_timeout == 0 ) /*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 ( ( binds.skip && !menu_input_binds.skip ) || /*inhibit timeout*/
menu_input_key_bind_poll_find_trigger( &menu_input_binds, &binds, &( binds.buffer ) ) ) rarch_timer_begin_new_time( &binds.timer_timeout, settings->uints.input_bind_timeout );
{
complete = true; /*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 else
{ {
if ( menu_input_key_bind_poll_find_hold( &binds, &binds.buffer ) ) /*reset hold countdown*/
{ rarch_timer_begin_new_time( &binds.timer_hold, settings->uints.input_bind_hold );
/*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 );
}
} }
#else
if ( ( binds.skip && !menu_input_binds.skip ) ||
menu_input_key_bind_poll_find_trigger( &menu_input_binds, &binds, &( binds.buffer ) ) )
{
complete = true;
}
#endif
if ( complete ) if ( complete )
{ {
/*update bind*/ /*update bind*/