CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-01-30 16:14:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cut down on some code duplication

Browse Source
This commit is contained in:
twinaphex 2017-05-24 02:02:01 +02:00
parent b70b40969b
commit 80b5bcd16c
2 changed files with 52 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
input/input_driver.c
View File

@ -537,50 +537,6 @@ void state_tracker_update_input(uint16_t *input1, uint16_t *input2)
}
#ifdef HAVE_MENU
static bool input_driver_toggle_button_combo(
unsigned mode, uint64_t input)
{
switch (mode)
{
case INPUT_TOGGLE_DOWN_Y_L_R:
if (!BIT64_GET(input, RETRO_DEVICE_ID_JOYPAD_DOWN))
return false;
if (!BIT64_GET(input, RETRO_DEVICE_ID_JOYPAD_Y))
return false;
if (!BIT64_GET(input, RETRO_DEVICE_ID_JOYPAD_L))
return false;
if (!BIT64_GET(input, RETRO_DEVICE_ID_JOYPAD_R))
return false;
break;
case INPUT_TOGGLE_L3_R3:
if (!BIT64_GET(input, RETRO_DEVICE_ID_JOYPAD_L3))
return false;
if (!BIT64_GET(input, RETRO_DEVICE_ID_JOYPAD_R3))
return false;
break;
case INPUT_TOGGLE_L1_R1_START_SELECT:
if (!BIT64_GET(input, RETRO_DEVICE_ID_JOYPAD_START))
return false;
if (!BIT64_GET(input, RETRO_DEVICE_ID_JOYPAD_SELECT))
return false;
if (!BIT64_GET(input, RETRO_DEVICE_ID_JOYPAD_L))
return false;
if (!BIT64_GET(input, RETRO_DEVICE_ID_JOYPAD_R))
return false;
break;
case INPUT_TOGGLE_START_SELECT:
if (!BIT64_GET(input, RETRO_DEVICE_ID_JOYPAD_START))
return false;
if (!BIT64_GET(input, RETRO_DEVICE_ID_JOYPAD_SELECT))
return false;
break;
default:
case INPUT_TOGGLE_NONE:
return false;
}
return true;
}
/**
* input_menu_keys_pressed:
@ -645,19 +601,6 @@ uint64_t input_menu_keys_pressed(void *data, uint64_t last_input)
input_driver_block_hotkey = true;
}
#ifdef HAVE_MENU
{
const struct retro_keybind *mtkey = &input_config_binds[0][RARCH_MENU_TOGGLE];
if (
mtkey->valid &&
((settings->uints.input_menu_toggle_gamepad_combo != INPUT_TOGGLE_NONE) &&
input_driver_toggle_button_combo(
settings->uints.input_menu_toggle_gamepad_combo, last_input))
)
ret |= (UINT64_C(1) << RARCH_MENU_TOGGLE);
}
#endif
for (i = 0; i < RARCH_BIND_LIST_END; i++)
{
const struct retro_keybind *mtkey = &input_config_binds[0][i];
@ -849,14 +792,6 @@ uint64_t input_keys_pressed(void *data, uint64_t last_input)
input_driver_block_hotkey = false;
}
#ifdef HAVE_MENU
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)))
ret |= (UINT64_C(1) << RARCH_MENU_TOGGLE);
#endif
for (i = 0; i < RARCH_BIND_LIST_END; i++)
{
if (

52
retroarch.c
View File

@ -2241,6 +2241,53 @@ bool runloop_msg_queue_pull(const char **ret)
#define runloop_netplay_pause() ((void)0)
#endif
#ifdef HAVE_MENU
static bool input_driver_toggle_button_combo(
unsigned mode, uint64_t input)
{
switch (mode)
{
case INPUT_TOGGLE_DOWN_Y_L_R:
if (!BIT64_GET(input, RETRO_DEVICE_ID_JOYPAD_DOWN))
return false;
if (!BIT64_GET(input, RETRO_DEVICE_ID_JOYPAD_Y))
return false;
if (!BIT64_GET(input, RETRO_DEVICE_ID_JOYPAD_L))
return false;
if (!BIT64_GET(input, RETRO_DEVICE_ID_JOYPAD_R))
return false;
break;
case INPUT_TOGGLE_L3_R3:
if (!BIT64_GET(input, RETRO_DEVICE_ID_JOYPAD_L3))
return false;
if (!BIT64_GET(input, RETRO_DEVICE_ID_JOYPAD_R3))
return false;
break;
case INPUT_TOGGLE_L1_R1_START_SELECT:
if (!BIT64_GET(input, RETRO_DEVICE_ID_JOYPAD_START))
return false;
if (!BIT64_GET(input, RETRO_DEVICE_ID_JOYPAD_SELECT))
return false;
if (!BIT64_GET(input, RETRO_DEVICE_ID_JOYPAD_L))
return false;
if (!BIT64_GET(input, RETRO_DEVICE_ID_JOYPAD_R))
return false;
break;
case INPUT_TOGGLE_START_SELECT:
if (!BIT64_GET(input, RETRO_DEVICE_ID_JOYPAD_START))
return false;
if (!BIT64_GET(input, RETRO_DEVICE_ID_JOYPAD_SELECT))
return false;
break;
default:
case INPUT_TOGGLE_NONE:
return false;
}
return true;
}
#endif
static enum runloop_state runloop_check_state(
settings_t *settings,
bool input_nonblock_state,
@ -2269,6 +2316,11 @@ static enum runloop_state runloop_check_state(
last_input = current_input;
#ifdef HAVE_MENU
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)))
current_input |= (UINT64_C(1) << RARCH_MENU_TOGGLE);
if (menu_driver_binding_state)
current_input = 0;
#endif