mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-27 23:37:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

only add mouse if it ha buttons and add vebose device friendly names

Browse Source
This commit is contained in:
Grant 2021-06-18 03:55:25 +01:00
parent a129764f0d
commit 7915b040a9
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
input/drivers/udev_input.c
View File

@ -482,6 +482,7 @@ static void udev_handle_mouse(void *data,
static bool udev_input_add_device(udev_input_t *udev, static bool udev_input_add_device(udev_input_t *udev,
enum udev_input_dev_type type, const char *devnode, device_handle_cb cb) enum udev_input_dev_type type, const char *devnode, device_handle_cb cb)
{ {
unsigned char keycaps[(KEY_MAX / 8) + 1];
int fd; int fd;
struct stat st; struct stat st;
#if defined(HAVE_EPOLL) #if defined(HAVE_EPOLL)
@ -516,6 +517,9 @@ static bool udev_input_add_device(udev_input_t *udev,
/* UDEV_INPUT_MOUSE may report in absolute coords too */ /* UDEV_INPUT_MOUSE may report in absolute coords too */
if (type == UDEV_INPUT_MOUSE || type == UDEV_INPUT_TOUCHPAD ) if (type == UDEV_INPUT_MOUSE || type == UDEV_INPUT_TOUCHPAD )
{ {
if (ioctl(fd, EVIOCGBIT(EV_KEY, sizeof (keycaps)), keycaps) == -1)
return 0; /* gotta have some buttons! :) */
if (ioctl(fd, EVIOCGABS(ABS_X), &absinfo) >= 0) if (ioctl(fd, EVIOCGABS(ABS_X), &absinfo) >= 0)
{ {
if (absinfo.minimum >= absinfo.maximum ) if (absinfo.minimum >= absinfo.maximum )
@ -1227,9 +1231,7 @@ static bool open_devices(udev_input_t *udev,
struct udev_list_entry *devs = NULL; struct udev_list_entry *devs = NULL;
struct udev_list_entry *item = NULL; struct udev_list_entry *item = NULL;
struct udev_enumerate *enumerate = udev_enumerate_new(udev->udev); struct udev_enumerate *enumerate = udev_enumerate_new(udev->udev);
#ifdef DEBUG
int device_index = 0; int device_index = 0;
#endif
if (!enumerate) if (!enumerate)
return false; return false;
@ -1254,15 +1256,21 @@ static bool open_devices(udev_input_t *udev,
if (fd != -1) if (fd != -1)
{ {
bool check = udev_input_add_device(udev, type, devnode, cb); bool check = udev_input_add_device(udev, type, devnode, cb);
#ifdef DEBUG
if (!check) if (!check)
RARCH_ERR("[udev] Failed to open device: %s (%s).\n", RARCH_DBG("[udev] udev_input_add_device SKIPPED : %s (%s).\n",
devnode, strerror(errno)); devnode, strerror(errno));
else else
RARCH_LOG("[udev]: %s #%d (%s).\n", {
char ident[255];
if (ioctl(fd, EVIOCGNAME(sizeof(ident)), ident) < 0)
ident[0] = '\0';
RARCH_LOG("[udev]: Added Device %s %s (%s).\n",
type == UDEV_INPUT_KEYBOARD ? "Keyboard" : "Mouse", type == UDEV_INPUT_KEYBOARD ? "Keyboard" : "Mouse",
device_index++, devnode); ident,
#endif devnode);
}
(void)check; (void)check;
close(fd); close(fd);
} }