libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-02-02 15:05:09 +00:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

Get rid of input_wl_is_pressed

Browse Source
This commit is contained in:
twinaphex 2017-06-07 00:09:31 +02:00
parent deb804ab2f
commit 604a558382
2 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
input/drivers/udev_input.c
View File

@ -580,12 +580,14 @@ 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 &&
BIT_GET(udev_key_state,
if (binds
&& 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 &&
BIT_GET(udev_key_state,
if (binds
&& binds[id_plus].valid
&& BIT_GET(udev_key_state,
rarch_keysym_lut[binds[id_plus].key]))
pressed_plus = 0x7fff;

36
input/drivers/wayland_input.c
View File

@ -109,8 +109,9 @@ static void input_wl_poll(void *data)
wl->mouse.delta_x = wl->mouse.x - wl->mouse.last_x;
wl->mouse.delta_y = wl->mouse.y - wl->mouse.last_y;
wl->mouse.last_x = wl->mouse.x;
wl->mouse.last_y = wl->mouse.y;
wl->mouse.last_x = wl->mouse.x;
wl->mouse.last_y = wl->mouse.y;
if (!wl->mouse.focus)
{
wl->mouse.delta_x = 0;
@ -121,18 +122,6 @@ static void input_wl_poll(void *data)
wl->joypad->poll();
}
static bool input_wl_is_pressed(input_ctx_wayland_data_t *wl,
const struct retro_keybind *binds, unsigned id)
{
if (id < RARCH_BIND_LIST_END)
{
const struct retro_keybind *bind = &binds[id];
unsigned bit = rarch_keysym_lut[binds[id].key];
return BIT_GET(wl->key_state, bit);
}
return false;
}
static int16_t input_wl_analog_pressed(input_ctx_wayland_data_t *wl,
const struct retro_keybind *binds,
unsigned idx, unsigned id)
@ -144,9 +133,17 @@ static int16_t input_wl_analog_pressed(input_ctx_wayland_data_t *wl,
input_conv_analog_id_to_bind_id(idx, id, &id_minus, &id_plus);
if (binds && binds[id_minus].valid && input_wl_is_pressed(wl, binds, id_minus))
if (binds
&& binds[id_minus].valid
&& (id_minus < RARCH_BIND_LIST_END)
&& BIT_GET(wl->key_state, rarch_keysym_lut[binds[id_minus].key])
)
pressed_minus = -0x7fff;
if (binds && binds[id_plus].valid && input_wl_is_pressed(wl, binds, id_plus))
if (binds
&& binds[id_plus].valid
&& (id_plus < RARCH_BIND_LIST_END)
&& BIT_GET(wl->key_state, rarch_keysym_lut[binds[id_plus].key])
)
pressed_plus = 0x7fff;
return pressed_plus + pressed_minus;
@ -218,10 +215,9 @@ static int16_t input_wl_state(void *data,
switch (device)
{
case RETRO_DEVICE_JOYPAD:
if (binds[port] && binds[port][id].valid)
return input_wl_is_pressed(wl, binds[port], id) ||
input_joypad_pressed(wl->joypad, joypad_info, port, binds[port], id);
break;
if (id < RARCH_BIND_LIST_END)
return BIT_GET(wl->key_state, rarch_keysym_lut[binds[id]->key]);
return input_joypad_pressed(wl->joypad, joypad_info, port, binds[port], id);
case RETRO_DEVICE_ANALOG:
ret = input_wl_analog_pressed(wl, binds[port], idx, id);
if (!ret && binds[port])