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

Rewrite pressed functions

Browse Source
This commit is contained in:
twinaphex 2017-05-22 12:40:19 +02:00
parent f62490b14f
commit 10df6d3b54
1 changed files with 87 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
input/input_driver.c
View File

@ -536,43 +536,6 @@ void state_tracker_update_input(uint16_t *input1, uint16_t *input2)
} }
} }
static INLINE bool input_keys_pressed_internal_reuse(unsigned i)
{
if (i >= RARCH_FIRST_META_KEY)
{
if (current_input->meta_key_pressed(current_input_data, i))
return true;
}
#ifdef HAVE_OVERLAY
if (overlay_ptr && input_overlay_key_pressed(overlay_ptr, i))
return true;
#endif
#ifdef HAVE_COMMAND
if (input_driver_command)
{
command_handle_t handle;
handle.handle = input_driver_command;
handle.id = i;
if (command_get(&handle))
return true;
}
#endif
#ifdef HAVE_NETWORKGAMEPAD
if (input_driver_remote)
{
if (input_remote_key_pressed(i, 0))
return true;
}
#endif
return false;
}
#ifdef HAVE_MENU #ifdef HAVE_MENU
static bool input_driver_toggle_button_combo( static bool input_driver_toggle_button_combo(
unsigned mode, uint64_t input) unsigned mode, uint64_t input)
@ -721,10 +684,10 @@ uint64_t input_menu_keys_pressed(void *data, uint64_t last_input)
joypad_info.axis_threshold = input_driver_axis_threshold; joypad_info.axis_threshold = input_driver_axis_threshold;
if ( (sec && input_joypad_pressed(sec, if ( (sec && input_joypad_pressed(sec,
joypad_info, port, input_config_binds[0], i)) || joypad_info, port, input_config_binds[0], i)) ||
(first && input_joypad_pressed(first, (first && input_joypad_pressed(first,
joypad_info, port, input_config_binds[0], i)) joypad_info, port, input_config_binds[0], i))
) )
{ {
ret |= (UINT64_C(1) << i); ret |= (UINT64_C(1) << i);
continue; continue;
@ -732,8 +695,49 @@ uint64_t input_menu_keys_pressed(void *data, uint64_t last_input)
} }
} }
if (input_keys_pressed_internal_reuse(i)) if (i >= RARCH_FIRST_META_KEY)
{
if (current_input->meta_key_pressed(current_input_data, i))
{
ret |= (UINT64_C(1) << i);
continue;
}
}
#ifdef HAVE_OVERLAY
if (overlay_ptr && input_overlay_key_pressed(overlay_ptr, i))
{
ret |= (UINT64_C(1) << i); ret |= (UINT64_C(1) << i);
continue;
}
#endif
#ifdef HAVE_COMMAND
if (input_driver_command)
{
command_handle_t handle;
handle.handle = input_driver_command;
handle.id = i;
if (command_get(&handle))
{
ret |= (UINT64_C(1) << i);
continue;
}
}
#endif
#ifdef HAVE_NETWORKGAMEPAD
if (input_driver_remote)
{
if (input_remote_key_pressed(i, 0))
{
ret |= (UINT64_C(1) << i);
continue;
}
}
#endif
} }
for (i = 0; i < max_users; i++) for (i = 0; i < max_users; i++)
@ -897,8 +901,49 @@ uint64_t input_keys_pressed(void *data, uint64_t last_input)
} }
} }
if (input_keys_pressed_internal_reuse(i)) if (i >= RARCH_FIRST_META_KEY)
{
if (current_input->meta_key_pressed(current_input_data, i))
{
ret |= (UINT64_C(1) << i);
continue;
}
}
#ifdef HAVE_OVERLAY
if (overlay_ptr && input_overlay_key_pressed(overlay_ptr, i))
{
ret |= (UINT64_C(1) << i); ret |= (UINT64_C(1) << i);
continue;
}
#endif
#ifdef HAVE_COMMAND
if (input_driver_command)
{
command_handle_t handle;
handle.handle = input_driver_command;
handle.id = i;
if (command_get(&handle))
{
ret |= (UINT64_C(1) << i);
continue;
}
}
#endif
#ifdef HAVE_NETWORKGAMEPAD
if (input_driver_remote)
{
if (input_remote_key_pressed(i, 0))
{
ret |= (UINT64_C(1) << i);
continue;
}
}
#endif
} }
return ret; return ret;