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

Cleanups

Browse Source
This commit is contained in:
twinaphex 2019-08-12 17:37:17 +02:00
parent b2e57db8c2
commit f117b22a46
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
retroarch.c
View File

@ -12324,16 +12324,6 @@ static void input_menu_keys_pressed(input_bits_t *p_new_state)
} }
#endif #endif
#define INPUT_KEYS_CHECK(cond1, cond2, cond3) \
for (i = cond1; i < cond2; i++) \
{ \
bool bit_pressed = !cond3 && binds[i].valid && current_input->input_state(current_input_data, joypad_info, &binds, 0, RETRO_DEVICE_JOYPAD, 0, i); \
if (bit_pressed || ((i >= RARCH_FIRST_META_KEY) && BIT64_GET(lifecycle_state, i)) || input_keys_pressed_other_sources(i, p_new_state)) \
{ \
BIT256_SET_PTR(p_new_state, i); \
} \
}
/** /**
* input_keys_pressed: * input_keys_pressed:
* *
@ -12387,12 +12377,24 @@ static void input_keys_pressed(input_bits_t *p_new_state)
} }
/* Check the libretro input first */ /* Check the libretro input first */
INPUT_KEYS_CHECK(0, RARCH_FIRST_META_KEY, for (i = 0; i < RARCH_FIRST_META_KEY; i++)
input_driver_block_libretro_input); {
bool bit_pressed = !input_driver_block_libretro_input && binds[i].valid && current_input->input_state(current_input_data, joypad_info, &binds, 0, RETRO_DEVICE_JOYPAD, 0, i);
if (bit_pressed || input_keys_pressed_other_sources(i, p_new_state))
{
BIT256_SET_PTR(p_new_state, i);
}
}
/* Check the hotkeys */ /* Check the hotkeys */
INPUT_KEYS_CHECK(RARCH_FIRST_META_KEY, RARCH_BIND_LIST_END, for (i = RARCH_FIRST_META_KEY; i < RARCH_BIND_LIST_END; i++)
input_driver_block_hotkey); {
bool bit_pressed = !input_driver_block_hotkey && binds[i].valid && current_input->input_state(current_input_data, joypad_info, &binds, 0, RETRO_DEVICE_JOYPAD, 0, i);
if (bit_pressed || BIT64_GET(lifecycle_state, i) || input_keys_pressed_other_sources(i, p_new_state))
{
BIT256_SET_PTR(p_new_state, i);
}
}
} }
int16_t input_driver_input_state( int16_t input_driver_input_state(