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

(udev_input.c) Cleanup

Browse Source
This commit is contained in:
twinaphex 2015-10-23 08:22:59 +02:00
parent 3841b1b96f
commit 90cb9c5157
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
input/drivers/udev_input.c
View File

@ -600,15 +600,20 @@ static bool udev_input_key_pressed(void *data, int key, enum input_device_type *
{
udev_input_t *udev = (udev_input_t*)data;
settings_t *settings = config_get_ptr();
bool keyboard_pressed = udev_input_is_pressed(udev, settings->input.binds[0], key);
bool joypad_pressed = input_joypad_pressed(udev->joypad, 0, settings->input.binds[0], key);
if (keyboard_pressed)
if (udev_input_is_pressed(udev, settings->input.binds[0], key))
{
*device = INPUT_DEVICE_TYPE_KEYBOARD;
if (joypad_pressed)
*device = INPUT_DEVICE_TYPE_JOYPAD;
return true;
}
return keyboard_pressed || joypad_pressed;
if (input_joypad_pressed(udev->joypad, 0, settings->input.binds[0], key))
{
*device = INPUT_DEVICE_TYPE_JOYPAD;
return true;
}
return false;
}
static bool udev_input_meta_key_pressed(void *data, int key, enum input_device_type *device)