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

(udev/x11) Simplifications

Browse Source
This commit is contained in:
twinaphex 2017-06-07 01:17:55 +02:00
parent 9e93bdbe27
commit 603d4d0464
2 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
input/drivers/udev_input.c
View File

@ -580,13 +580,11 @@ static int16_t udev_analog_pressed(const struct retro_keybind *binds,
input_conv_analog_id_to_bind_id(idx, id, &id_minus, &id_plus);
if (binds
&& binds[id_minus].valid
if ( binds[id_minus].valid
&& BIT_GET(udev_key_state,
rarch_keysym_lut[binds[id_minus].key]))
pressed_minus = -0x7fff;
if (binds
&& binds[id_plus].valid
if ( binds[id_plus].valid
&& BIT_GET(udev_key_state,
rarch_keysym_lut[binds[id_plus].key]))
pressed_plus = 0x7fff;
@ -661,7 +659,6 @@ static int16_t udev_input_state(void *data,
const struct retro_keybind **binds,
unsigned port, unsigned device, unsigned idx, unsigned id)
{
int16_t ret;
udev_input_t *udev = (udev_input_t*)data;
switch (device)
@ -672,11 +669,15 @@ static int16_t udev_input_state(void *data,
return input_joypad_pressed(udev->joypad,
joypad_info, port, binds[port], id);
case RETRO_DEVICE_ANALOG:
ret = udev_analog_pressed(binds[port], idx, id);
if (!ret && binds[port])
ret = input_joypad_analog(udev->joypad,
joypad_info, port, idx, id, binds[port]);
return ret;
if (binds[port])
{
int16_t ret = udev_analog_pressed(binds[port], idx, id);
if (!ret)
ret = input_joypad_analog(udev->joypad,
joypad_info, port, idx, id, binds[port]);
return ret;
}
break;
case RETRO_DEVICE_KEYBOARD:
return id < RETROK_LAST && BIT_GET(udev_key_state,
rarch_keysym_lut[(enum retro_key)id]);

33
input/drivers/x11_input.c
View File

@ -222,22 +222,21 @@ static int16_t x_input_state(void *data,
const struct retro_keybind **binds, unsigned port,
unsigned device, unsigned idx, unsigned id)
{
int16_t ret = 0;
x11_input_t *x11 = (x11_input_t*)data;
switch (device)
{
case RETRO_DEVICE_JOYPAD:
{
int key = binds[port][id].key;
int keycode = XKeysymToKeycode(x11->display,
rarch_keysym_lut[(enum retro_key)key]);
ret = x11->state[keycode >> 3] & (1 << (keycode & 7));
int16_t ret = 0;
int keycode = XKeysymToKeycode(x11->display,
rarch_keysym_lut[(enum retro_key)binds[port][id].key]);
ret = x11->state[keycode >> 3] & (1 << (keycode & 7));
if (!ret)
ret = input_joypad_pressed(x11->joypad,
joypad_info, port, binds[port], id);
return ret;
}
if (!ret)
return input_joypad_pressed(x11->joypad,
joypad_info, port, binds[port], id);
return ret;
case RETRO_DEVICE_KEYBOARD:
if (id < RETROK_LAST)
{
@ -248,13 +247,15 @@ static int16_t x_input_state(void *data,
break;
case RETRO_DEVICE_ANALOG:
if (binds[port])
ret = x_pressed_analog(x11, binds[port], idx, id);
if (!ret && binds[port])
return input_joypad_analog(x11->joypad, joypad_info,
port, idx,
id, binds[port]);
return ret;
{
int16_t ret = x_pressed_analog(x11, binds[port], idx, id);
if (!ret)
ret = input_joypad_analog(x11->joypad, joypad_info,
port, idx,
id, binds[port]);
return ret;
}
break;
case RETRO_DEVICE_MOUSE:
return x_mouse_state(x11, id);
case RARCH_DEVICE_MOUSE_SCREEN: