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

(input_driver.c) Further simplifications

This commit is contained in:
twinaphex 2019-04-21 16:13:11 +02:00
parent b6fd875230
commit 8312d67a11
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
input/input_driver.c
View File

@ -1743,7 +1743,8 @@ int16_t input_joypad_analog(const input_device_driver_t *drv,
if (idx == RETRO_DEVICE_INDEX_ANALOG_BUTTON) if (idx == RETRO_DEVICE_INDEX_ANALOG_BUTTON)
{ {
/* A RETRO_DEVICE_JOYPAD button? */ /* A RETRO_DEVICE_JOYPAD button?
* Otherwise, not a suitable button */
if (ident < RARCH_FIRST_CUSTOM_BIND) if (ident < RARCH_FIRST_CUSTOM_BIND)
{ {
uint32_t axis = 0; uint32_t axis = 0;
@ -1752,30 +1753,27 @@ int16_t input_joypad_analog(const input_device_driver_t *drv,
if (!bind->valid) if (!bind->valid)
return 0; return 0;
axis = bind->joyaxis; axis = (bind->joyaxis == AXIS_NONE)
? joypad_info.auto_binds[ident].joyaxis
if (axis == AXIS_NONE) : bind->joyaxis;
axis = joypad_info.auto_binds[ident].joyaxis;
/* Analog button. */ /* Analog button. */
/* no deadzone/sensitivity correction for analog buttons currently */ /* no deadzone/sensitivity correction for analog buttons currently */
if (drv->axis) if (drv->axis)
res = abs(drv->axis(joypad_info.joy_idx, axis)); res = abs(drv->axis(joypad_info.joy_idx, axis));
/* If the result is zero, it's got a digital button attached to it */ /* If the result is zero, it's got a digital button
* attached to it instead */
if (res == 0) if (res == 0)
{ {
uint16_t key = bind->joykey; uint16_t key = (bind->joykey == NO_BTN)
? joypad_info.auto_binds[ident].joykey
if (key == NO_BTN) : bind->joykey;
key = joypad_info.auto_binds[ident].joykey;
if (drv->button(joypad_info.joy_idx, key)) if (drv->button(joypad_info.joy_idx, key))
res = 0x7fff; res = 0x7fff;
} }
} }
else /* not a suitable button */
res = 0;
} }
else else
{ {
@ -1845,7 +1843,6 @@ int16_t input_joypad_analog(const input_device_driver_t *drv,
**/ **/
bool input_mouse_button_raw(unsigned port, unsigned id) bool input_mouse_button_raw(unsigned port, unsigned id)
{ {
int16_t res;
rarch_joypad_info_t joypad_info; rarch_joypad_info_t joypad_info;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
@ -1857,10 +1854,8 @@ bool input_mouse_button_raw(unsigned port, unsigned id)
joypad_info.joy_idx = settings->uints.input_joypad_map[port]; joypad_info.joy_idx = settings->uints.input_joypad_map[port];
joypad_info.auto_binds = input_autoconf_binds[joypad_info.joy_idx]; joypad_info.auto_binds = input_autoconf_binds[joypad_info.joy_idx];
res = current_input->input_state(current_input_data, if (current_input->input_state(current_input_data,
joypad_info, libretro_input_binds, port, RETRO_DEVICE_MOUSE, 0, id); joypad_info, libretro_input_binds, port, RETRO_DEVICE_MOUSE, 0, id))
if (res)
return true; return true;
return false; return false;
} }