mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-12 00:40:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add player mouse index handling to udev input driver

Browse Source
This commit is contained in:
Zoran Vuckovic 2017-06-08 18:49:08 +02:00
parent a74197dc49
commit 44930716ba
1 changed files with 31 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
input/drivers/udev_input.c
View File

@ -54,6 +54,7 @@
#include "../common/linux_common.h" #include "../common/linux_common.h"
#include "../common/udev_common.h" #include "../common/udev_common.h"
#include "../common/epoll_common.h" #include "../common/epoll_common.h"
#include "../configuration.h"
#include "../../verbosity.h" #include "../../verbosity.h"
@ -184,6 +185,33 @@ static void udev_input_kb_free(void)
#endif #endif
} }
static udev_input_mouse_t *udev_get_mouse(struct udev_input *udev, unsigned port)
{
unsigned i;
unsigned mouse_index = 0;
settings_t *settings = config_get_ptr();
udev_input_mouse_t *mouse = NULL;
if (port >= MAX_USERS)
return NULL;
for (i = 0; i < udev->num_devices; ++i)
{
if (udev->devices[i]->type != UDEV_INPUT_MOUSE)
continue;
if (mouse_index == settings->uints.input_mouse_index[port])
{
mouse = &udev->devices[i]->state.mouse;
break;
}
++mouse_index;
}
return mouse;
}
static void udev_handle_touchpad(void *data, static void udev_handle_touchpad(void *data,
const struct input_event *event, udev_input_device_t *dev) const struct input_event *event, udev_input_device_t *dev)
{ {
@ -512,20 +540,7 @@ static void udev_input_poll(void *data)
static int16_t udev_mouse_state(udev_input_t *udev, static int16_t udev_mouse_state(udev_input_t *udev,
unsigned port, unsigned id, bool screen) unsigned port, unsigned id, bool screen)
{ {
unsigned i, j; udev_input_mouse_t *mouse = udev_get_mouse(udev, port);
udev_input_mouse_t *mouse = NULL;
for (i = j = 0; i < udev->num_devices; ++i)
{
if (udev->devices[i]->type != UDEV_INPUT_MOUSE)
continue;
if (j == port)
{
mouse = &udev->devices[i]->state.mouse;
break;
}
++j;
}
if (!mouse) if (!mouse)
return 0; return 0;
@ -558,20 +573,7 @@ static int16_t udev_mouse_state(udev_input_t *udev,
static int16_t udev_lightgun_state(udev_input_t *udev, static int16_t udev_lightgun_state(udev_input_t *udev,
unsigned port, unsigned id) unsigned port, unsigned id)
{ {
unsigned i, j; udev_input_mouse_t *mouse = udev_get_mouse(udev, port);
udev_input_mouse_t *mouse = NULL;
for (i = j = 0; i < udev->num_devices; ++i)
{
if (udev->devices[i]->type != UDEV_INPUT_MOUSE)
continue;
if (j == port)
{
mouse = &udev->devices[i]->state.mouse;
break;
}
++j;
}
if (!mouse) if (!mouse)
return 0; return 0;
@ -623,13 +625,12 @@ static int16_t udev_pointer_state(udev_input_t *udev,
unsigned port, unsigned id, bool screen) unsigned port, unsigned id, bool screen)
{ {
struct video_viewport vp; struct video_viewport vp;
unsigned i, j;
bool inside = false; bool inside = false;
int16_t res_x = 0; int16_t res_x = 0;
int16_t res_y = 0; int16_t res_y = 0;
int16_t res_screen_x = 0; int16_t res_screen_x = 0;
int16_t res_screen_y = 0; int16_t res_screen_y = 0;
udev_input_mouse_t *mouse = NULL; udev_input_mouse_t *mouse = udev_get_mouse(udev, port);
vp.x = 0; vp.x = 0;
vp.y = 0; vp.y = 0;
@ -638,18 +639,6 @@ static int16_t udev_pointer_state(udev_input_t *udev,
vp.full_width = 0; vp.full_width = 0;
vp.full_height = 0; vp.full_height = 0;
for (i = j = 0; i < udev->num_devices; ++i)
{
if (udev->devices[i]->type != UDEV_INPUT_MOUSE)
continue;
if (j == port)
{
mouse = &udev->devices[i]->state.mouse;
break;
}
++j;
}
if (!mouse) if (!mouse)
return 0; return 0;