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

Merge pull request #12579 from grant2258/touchpad

Browse Source 
udev fixes add pointer pressed to pointer device to allow udev users to access this device
This commit is contained in:
Autechre 2021-07-08 12:04:04 +02:00 committed by GitHub
commit 7dba607d76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 44 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
input/drivers/udev_input.c
View File

@ -112,6 +112,7 @@ typedef struct
int32_t x_rel, y_rel; int32_t x_rel, y_rel;
bool l, r, m, b4, b5; bool l, r, m, b4, b5;
bool wu, wd, whu, whd; bool wu, wd, whu, whd;
bool pp;
} udev_input_mouse_t; } udev_input_mouse_t;
struct udev_input_device struct udev_input_device
@ -427,7 +428,9 @@ static void udev_handle_mouse(void *data,
case BTN_MIDDLE: case BTN_MIDDLE:
mouse->m = event->value; mouse->m = event->value;
break; break;
case BTN_TOUCH:
mouse->pp = event->value;
break;
/*case BTN_??: /*case BTN_??:
mouse->b4 = event->value; mouse->b4 = event->value;
break;*/ break;*/
@ -478,11 +481,14 @@ static void udev_handle_mouse(void *data,
break; break;
} }
} }
#define test_bit(array, bit) (array[bit/8] & (1<<(bit%8)))
static int udev_input_add_device(udev_input_t *udev, static int 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]; unsigned char keycaps[(KEY_MAX / 8) + 1];
unsigned char abscaps[(ABS_MAX / 8) + 1];
int has_absolutes = 0;
int fd; int fd;
struct stat st; struct stat st;
#if defined(HAVE_EPOLL) #if defined(HAVE_EPOLL)
@ -494,6 +500,9 @@ static int udev_input_add_device(udev_input_t *udev,
udev_input_device_t **tmp; udev_input_device_t **tmp;
udev_input_device_t *device = NULL; udev_input_device_t *device = NULL;
memset(keycaps, '\0', sizeof (keycaps));
memset(keycaps, '\0', sizeof (abscaps));
st.st_dev = 0; st.st_dev = 0;
if (stat(devnode, &st) < 0) if (stat(devnode, &st) < 0)
@ -520,33 +529,36 @@ static int udev_input_add_device(udev_input_t *udev,
if (ioctl(fd, EVIOCGBIT(EV_KEY, sizeof (keycaps)), keycaps) == -1) if (ioctl(fd, EVIOCGBIT(EV_KEY, sizeof (keycaps)), keycaps) == -1)
return -1; /* gotta have some buttons! return -1 to skip error logging for this:) */ return -1; /* gotta have some buttons! return -1 to skip error logging for this:) */
if (ioctl(fd, EVIOCGABS(ABS_X), &absinfo) >= 0)
if (ioctl(fd, EVIOCGBIT(EV_ABS, sizeof (abscaps)), abscaps) != -1)
{ {
if (absinfo.minimum >= absinfo.maximum ) if ( (test_bit(abscaps, ABS_X)) && (test_bit(abscaps, ABS_Y)) )
{ {
device->mouse.x_min = -1; /* might be a touchpad... */
device->mouse.x_max = -1; if (test_bit(keycaps, BTN_TOUCH))
{
/* touchpad, touchscreen, or tablet. */
has_absolutes = 1;
} }
else }
}
device->mouse.x_min = device->mouse.y_min = device->mouse.x_max = device->mouse.y_max = 0;
if (has_absolutes)
{ {
struct input_absinfo absinfo;
if (ioctl(fd, EVIOCGABS(ABS_X), &absinfo) == -1)
return 0;
device->mouse.x_min = absinfo.minimum; device->mouse.x_min = absinfo.minimum;
device->mouse.x_max = absinfo.maximum; device->mouse.x_max = absinfo.maximum;
}
}
if (ioctl(fd, EVIOCGABS(ABS_Y), &absinfo) >= 0) if (ioctl(fd, EVIOCGABS(ABS_Y), &absinfo) == -1)
{ return 0;
if (absinfo.minimum >= absinfo.maximum )
{
device->mouse.y_min = -1;
device->mouse.y_max = -1;
}
else
{
device->mouse.y_min = absinfo.minimum; device->mouse.y_min = absinfo.minimum;
device->mouse.y_max = absinfo.maximum; device->mouse.y_max = absinfo.maximum;
} }
}
} }
tmp = ( udev_input_device_t**)realloc(udev->devices, tmp = ( udev_input_device_t**)realloc(udev->devices,
@ -944,7 +956,7 @@ static int16_t udev_pointer_state(udev_input_t *udev,
case RETRO_DEVICE_ID_POINTER_Y: case RETRO_DEVICE_ID_POINTER_Y:
return udev_mouse_get_pointer_y(mouse, screen); return udev_mouse_get_pointer_y(mouse, screen);
case RETRO_DEVICE_ID_POINTER_PRESSED: case RETRO_DEVICE_ID_POINTER_PRESSED:
return mouse->l; return mouse->pp;
} }
return 0; return 0;
@ -1241,10 +1253,10 @@ static bool open_devices(udev_input_t *udev,
if (fd != -1) if (fd != -1)
{ {
int check = udev_input_add_device(udev, type, devnode, cb); int check = udev_input_add_device(udev, type, devnode, cb);
if (!check && check != -1 ) if (check == 0)
RARCH_DBG("[udev] udev_input_add_device error : %s (%s).\n", RARCH_LOG("[udev] udev_input_add_device error : %s (%s).\n",
devnode, strerror(errno)); devnode, strerror(errno));
else if (check != -1 && check != 0) else if (check == 1 )
{ {
char ident[255]; char ident[255];
if (ioctl(fd, EVIOCGNAME(sizeof(ident)), ident) < 0) if (ioctl(fd, EVIOCGNAME(sizeof(ident)), ident) < 0)
@ -1257,7 +1269,7 @@ static bool open_devices(udev_input_t *udev,
devnode); devnode);
device_keyboard++; device_keyboard++;
} }
else else if (type == UDEV_INPUT_MOUSE || type== UDEV_INPUT_TOUCHPAD)
{ {
RARCH_LOG("[udev]: Added Device mouse#%d %s (%s) .\n", RARCH_LOG("[udev]: Added Device mouse#%d %s (%s) .\n",
device_mouse, device_mouse,