mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-31 06:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

(XInput Joypad) Cleanups

Browse Source
This commit is contained in:
twinaphex 2020-07-20 03:19:14 +02:00
parent 5f7e8593d0
commit abd3365a34
1 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
input/drivers_joypad/xinput_joypad.c
View File

@ -142,6 +142,25 @@ typedef struct
static XINPUT_VIBRATION g_xinput_rumble_states[4];
static xinput_joypad_state g_xinput_states[4];
/* Buttons are provided by XInput as bits of a uint16.
* Map from rarch button index (0..10) to a mask to
* bitwise-& the buttons against.
* dpad is handled seperately. */
static const uint16_t button_index_to_bitmap_code[] = {
XINPUT_GAMEPAD_A,
XINPUT_GAMEPAD_B,
XINPUT_GAMEPAD_X,
XINPUT_GAMEPAD_Y,
XINPUT_GAMEPAD_LEFT_SHOULDER,
XINPUT_GAMEPAD_RIGHT_SHOULDER,
XINPUT_GAMEPAD_START,
XINPUT_GAMEPAD_BACK,
XINPUT_GAMEPAD_LEFT_THUMB,
XINPUT_GAMEPAD_RIGHT_THUMB,
XINPUT_GAMEPAD_GUIDE
};
static INLINE int pad_index_to_xuser_index(unsigned pad)
{
#ifdef HAVE_DINPUT
@ -404,28 +423,10 @@ static void xinput_joypad_destroy(void)
#endif
}
/* Buttons are provided by XInput as bits of a uint16.
* Map from rarch button index (0..10) to a mask to
* bitwise-& the buttons against.
* dpad is handled seperately. */
static const uint16_t button_index_to_bitmap_code[] = {
XINPUT_GAMEPAD_A,
XINPUT_GAMEPAD_B,
XINPUT_GAMEPAD_X,
XINPUT_GAMEPAD_Y,
XINPUT_GAMEPAD_LEFT_SHOULDER,
XINPUT_GAMEPAD_RIGHT_SHOULDER,
XINPUT_GAMEPAD_START,
XINPUT_GAMEPAD_BACK,
XINPUT_GAMEPAD_LEFT_THUMB,
XINPUT_GAMEPAD_RIGHT_THUMB,
XINPUT_GAMEPAD_GUIDE
};
static int16_t xinput_joypad_button_state(
unsigned xuser, unsigned port, uint16_t joykey)
unsigned xuser, uint16_t btn_word,
unsigned port, uint16_t joykey)
{
uint16_t btn_word = g_xinput_states[xuser].xstate.Gamepad.wButtons;
unsigned hat_dir = GET_HAT_DIR(joykey);
if (hat_dir)
@ -453,13 +454,15 @@ static int16_t xinput_joypad_button_state(
static int16_t xinput_joypad_button(unsigned port, uint16_t joykey)
{
int xuser = pad_index_to_xuser_index(port);
uint16_t btn_word = 0;
#ifdef HAVE_DINPUT
if (xuser == -1)
return dinput_joypad.button(port, joykey);
#endif
if (!(g_xinput_states[xuser].connected))
return 0;
return xinput_joypad_button_state(xuser, port, joykey);
btn_word = g_xinput_states[xuser].xstate.Gamepad.wButtons;
return xinput_joypad_button_state(xuser, btn_word, port, joykey);
}
static int16_t xinput_joypad_axis_state(
@ -535,6 +538,7 @@ static int16_t xinput_joypad_state_func(
unsigned port)
{
unsigned i;
uint16_t btn_word;
int16_t ret = 0;
int xuser = pad_index_to_xuser_index(port);
XINPUT_GAMEPAD *pad = &(g_xinput_states[xuser].xstate.Gamepad);
@ -544,6 +548,7 @@ static int16_t xinput_joypad_state_func(
#endif
if (!(g_xinput_states[xuser].connected))
return 0;
btn_word = g_xinput_states[xuser].xstate.Gamepad.wButtons;
for (i = 0; i < RARCH_FIRST_CUSTOM_BIND; i++)
{
@ -555,7 +560,7 @@ static int16_t xinput_joypad_state_func(
if (
(uint16_t)joykey != NO_BTN
&& xinput_joypad_button_state(
xuser, port, (uint16_t)joykey))
xuser, btn_word, port, (uint16_t)joykey))
ret |= ( 1 << i);
else if (joyaxis != AXIS_NONE &&
((float)abs(xinput_joypad_axis_state(pad, port, joyaxis))