mirror of
https://github.com/libretro/RetroArch
synced 2025-02-15 09:40:11 +00:00
udev fix dolphinbar and safeguard against not adding devices with no mouse or touch buttons detected (#13143)
* udev fixes * updates * small updates * fix condition Co-authored-by: grant2258 <you@example.com>
This commit is contained in:
grant2258
GitHub
parent
3137f8470b
commit
1ae36ee9a7
@ -113,6 +113,7 @@ typedef struct
|
||||
bool l, r, m, b4, b5;
|
||||
bool wu, wd, whu, whd;
|
||||
bool pp;
|
||||
int32_t abs;
|
||||
} udev_input_mouse_t;
|
||||
|
||||
struct udev_input_device
|
||||
@ -312,7 +313,7 @@ static int16_t udev_mouse_get_x(const udev_input_mouse_t *mouse)
|
||||
if (!video_driver_get_viewport_info(&vp))
|
||||
return 0;
|
||||
|
||||
if (mouse->x_min < mouse->x_max) /* mouse coords are absolute */
|
||||
if (mouse->abs) /* mouse coords are absolute */
|
||||
src_width = mouse->x_max - mouse->x_min + 1;
|
||||
else
|
||||
src_width = vp.full_width;
|
||||
@ -355,7 +356,7 @@ static int16_t udev_mouse_get_y(const udev_input_mouse_t *mouse)
|
||||
if (!video_driver_get_viewport_info(&vp))
|
||||
return 0;
|
||||
|
||||
if (mouse->y_min < mouse->y_max) /* mouse coords are absolute */
|
||||
if (mouse->abs) /* mouse coords are absolute */
|
||||
src_height = mouse->y_max - mouse->y_min + 1;
|
||||
else
|
||||
src_height = vp.full_height;
|
||||
@ -375,7 +376,7 @@ static int16_t udev_mouse_get_pointer_x(const udev_input_mouse_t *mouse, bool sc
|
||||
if (!video_driver_get_viewport_info(&vp))
|
||||
return 0;
|
||||
|
||||
if (mouse->x_min < mouse->x_max) /* mouse coords are absolute */
|
||||
if (mouse->abs) /* mouse coords are absolute */
|
||||
{
|
||||
src_min = mouse->x_min;
|
||||
src_width = mouse->x_max - mouse->x_min + 1;
|
||||
@ -410,7 +411,7 @@ static int16_t udev_mouse_get_pointer_y(const udev_input_mouse_t *mouse, bool sc
|
||||
if (!video_driver_get_viewport_info(&vp))
|
||||
return 0;
|
||||
|
||||
if (mouse->y_min < mouse->y_max) /* mouse coords are absolute */
|
||||
if (mouse->abs) /* mouse coords are absolute */
|
||||
{
|
||||
src_min = mouse->y_min;
|
||||
src_height = mouse->y_max - mouse->y_min + 1;
|
||||
@ -519,7 +520,6 @@ static int udev_input_add_device(udev_input_t *udev,
|
||||
unsigned char relcaps[(REL_MAX / 8) + 1] = {'\0'};
|
||||
udev_input_device_t **tmp = NULL;
|
||||
udev_input_device_t *device = NULL;
|
||||
int has_absolutes = 0;
|
||||
struct input_absinfo absinfo;
|
||||
int fd = -1;
|
||||
int ret = 0;
|
||||
@ -550,6 +550,9 @@ static int udev_input_add_device(udev_input_t *udev,
|
||||
|
||||
strlcpy(device->devnode, devnode, sizeof(device->devnode));
|
||||
|
||||
if (ioctl(fd, EVIOCGNAME(sizeof(device->ident)), device->ident) < 0)
|
||||
device->ident[0] = '\0';
|
||||
|
||||
/* UDEV_INPUT_MOUSE may report in absolute coords too */
|
||||
if (type == UDEV_INPUT_MOUSE || type == UDEV_INPUT_TOUCHPAD )
|
||||
{
|
||||
@ -560,13 +563,15 @@ static int udev_input_add_device(udev_input_t *udev,
|
||||
ret = -1;
|
||||
goto end;
|
||||
}
|
||||
|
||||
|
||||
if (ioctl(fd, EVIOCGBIT(EV_REL, sizeof (relcaps)), relcaps) != -1)
|
||||
{
|
||||
if ( (test_bit(relcaps, REL_X)) && (test_bit(relcaps, REL_Y)) )
|
||||
{
|
||||
if (test_bit(keycaps, BTN_MOUSE))
|
||||
mouse = 1;
|
||||
|
||||
if (!test_bit(keycaps, BTN_MOUSE))
|
||||
RARCH_LOG("[udev]: Waring REL pointer device (%s) has no mouse button\n",device->ident);
|
||||
}
|
||||
}
|
||||
|
||||
@ -574,13 +579,18 @@ static int udev_input_add_device(udev_input_t *udev,
|
||||
{
|
||||
if ( (test_bit(abscaps, ABS_X)) && (test_bit(abscaps, ABS_Y)) )
|
||||
{
|
||||
/* might be a touchpad... */
|
||||
mouse =1;
|
||||
|
||||
/* check for abs touch devices... */
|
||||
if (test_bit(keycaps, BTN_TOUCH))
|
||||
{
|
||||
/* abs device. */
|
||||
has_absolutes = 1;
|
||||
mouse =1;
|
||||
}
|
||||
device->mouse.abs = 1;
|
||||
|
||||
/* check for light gun or any other device that might not have a touch button */
|
||||
else
|
||||
device->mouse.abs = 2;
|
||||
|
||||
if ( !test_bit(keycaps, BTN_TOUCH) && !test_bit(keycaps, BTN_MOUSE) )
|
||||
RARCH_LOG("[udev]: Warning ABS pointer device (%s) has no touch or mouse button\n",device->ident);
|
||||
}
|
||||
}
|
||||
|
||||
@ -589,50 +599,32 @@ static int udev_input_add_device(udev_input_t *udev,
|
||||
device->mouse.x_max = 0;
|
||||
device->mouse.y_max = 0;
|
||||
|
||||
if (has_absolutes)
|
||||
if (device->mouse.abs)
|
||||
{
|
||||
|
||||
if (ioctl(fd, EVIOCGABS(ABS_X), &absinfo) == -1)
|
||||
{
|
||||
RARCH_LOG("[udev]: ABS pointer device (%s) Failed to get ABS_X parameters \n",device->ident);
|
||||
goto end;
|
||||
}
|
||||
|
||||
device->mouse.x_min = absinfo.minimum;
|
||||
device->mouse.x_max = absinfo.maximum;
|
||||
|
||||
if (ioctl(fd, EVIOCGABS(ABS_Y), &absinfo) == -1)
|
||||
{
|
||||
RARCH_LOG("[udev]: ABS pointer device (%s) Failed to get ABS_Y parameters \n",device->ident);
|
||||
goto end;
|
||||
}
|
||||
device->mouse.y_min = absinfo.minimum;
|
||||
device->mouse.y_max = absinfo.maximum;
|
||||
}
|
||||
}
|
||||
|
||||
if (!mouse)
|
||||
goto end;
|
||||
|
||||
/* Ive been through the source with a fine tooth comb the dolphin bar must have abs but is not advertising it or has no button so we will add a check here */
|
||||
|
||||
if ( !has_absolutes )
|
||||
{
|
||||
if (ioctl(fd, EVIOCGABS(ABS_X), &absinfo) >= 0)
|
||||
{
|
||||
if (absinfo.minimum < absinfo.maximum )
|
||||
{
|
||||
RARCH_LOG("[udev]: pointer device with (ABS_X) that failed find with button check found\n");
|
||||
device->mouse.x_min = absinfo.minimum;
|
||||
device->mouse.x_max = absinfo.maximum;
|
||||
}
|
||||
}
|
||||
|
||||
if (ioctl(fd, EVIOCGABS(ABS_Y), &absinfo) >= 0)
|
||||
{
|
||||
if (absinfo.minimum < absinfo.maximum )
|
||||
{
|
||||
RARCH_LOG("[udev]: pointer device with (ABS_X) that failed find with button check found \n");
|
||||
device->mouse.y_min = absinfo.minimum;
|
||||
device->mouse.y_max = absinfo.maximum;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (ioctl(fd, EVIOCGNAME(sizeof(device->ident)), device->ident) < 0)
|
||||
device->ident[0] = '\0';
|
||||
tmp = (udev_input_device_t**)realloc(udev->devices,
|
||||
(udev->num_devices + 1) * sizeof(*udev->devices));
|
||||
|
||||
@ -649,14 +641,14 @@ static int udev_input_add_device(udev_input_t *udev,
|
||||
/* Shouldn't happen, but just check it. */
|
||||
if (epoll_ctl(udev->fd, EPOLL_CTL_ADD, fd, &event) < 0)
|
||||
{
|
||||
RARCH_ERR("Failed to add FD (%d) to epoll list (%s).\n",
|
||||
RARCH_ERR("udev]: Failed to add FD (%d) to epoll list (%s).\n",
|
||||
fd, strerror(errno));
|
||||
}
|
||||
#elif defined(HAVE_KQUEUE)
|
||||
EV_SET(&event, fd, EVFILT_READ, EV_ADD, 0, 0, LISTENSOCKET);
|
||||
if (kevent(udev->fd, &event, 1, NULL, 0, NULL) == -1)
|
||||
{
|
||||
RARCH_ERR("Failed to add FD (%d) to kqueue list (%s).\n",
|
||||
RARCH_ERR("udev]: Failed to add FD (%d) to kqueue list (%s).\n",
|
||||
fd, strerror(errno));
|
||||
}
|
||||
#endif
|
||||
@ -790,7 +782,7 @@ static void udev_input_adopt_rel_pointer_position_from_mouse(
|
||||
bool r = video_driver_get_viewport_info(&view);
|
||||
int dx = udev_mouse_get_x(mouse);
|
||||
int dy = udev_mouse_get_y(mouse);
|
||||
if (r && (dx || dy) &&
|
||||
if (r && (dx || dy) &&
|
||||
video_driver_display_type_get() != RARCH_DISPLAY_X11)
|
||||
{
|
||||
int minX = view.x;
|
||||
@ -937,7 +929,7 @@ static int16_t udev_lightgun_aiming_state(
|
||||
res_x = udev_mouse_get_pointer_x(mouse, false);
|
||||
res_y = udev_mouse_get_pointer_y(mouse, false);
|
||||
|
||||
inside = (res_x >= -edge_detect)
|
||||
inside = (res_x >= -edge_detect)
|
||||
&& (res_y >= -edge_detect)
|
||||
&& (res_x <= edge_detect)
|
||||
&& (res_y <= edge_detect);
|
||||
@ -1013,7 +1005,7 @@ static bool udev_mouse_button_pressed(
|
||||
|
||||
if (!mouse)
|
||||
return false;
|
||||
|
||||
/* todo add multi touch button check pointer devices */
|
||||
switch ( key )
|
||||
{
|
||||
case RETRO_DEVICE_ID_MOUSE_LEFT:
|
||||
@ -1054,9 +1046,9 @@ static int16_t udev_pointer_state(udev_input_t *udev,
|
||||
case RETRO_DEVICE_ID_POINTER_Y:
|
||||
return udev_mouse_get_pointer_y(mouse, screen);
|
||||
case RETRO_DEVICE_ID_POINTER_PRESSED:
|
||||
if(mouse->x_min < mouse->x_max)
|
||||
if(mouse->abs == 1)
|
||||
return mouse->pp;
|
||||
else
|
||||
else
|
||||
return mouse->l;
|
||||
}
|
||||
return 0;
|
||||
@ -1147,15 +1139,15 @@ static int16_t udev_input_state(
|
||||
{
|
||||
if (binds[port][id].valid)
|
||||
{
|
||||
if (
|
||||
(binds[port][id].key < RETROK_LAST) &&
|
||||
if (
|
||||
(binds[port][id].key < RETROK_LAST) &&
|
||||
udev_keyboard_pressed(udev, binds[port][id].key)
|
||||
&& (( id != RARCH_GAME_FOCUS_TOGGLE)
|
||||
&& (( id != RARCH_GAME_FOCUS_TOGGLE)
|
||||
&& !keyboard_mapping_blocked)
|
||||
)
|
||||
return 1;
|
||||
else if (
|
||||
(binds[port][id].key < RETROK_LAST) &&
|
||||
else if (
|
||||
(binds[port][id].key < RETROK_LAST) &&
|
||||
udev_keyboard_pressed(udev, binds[port][id].key)
|
||||
&& ( id == RARCH_GAME_FOCUS_TOGGLE)
|
||||
)
|
||||
@ -1205,7 +1197,7 @@ static int16_t udev_input_state(
|
||||
|
||||
case RETRO_DEVICE_MOUSE:
|
||||
case RARCH_DEVICE_MOUSE_SCREEN:
|
||||
return udev_mouse_state(udev, port, id,
|
||||
return udev_mouse_state(udev, port, id,
|
||||
device == RARCH_DEVICE_MOUSE_SCREEN);
|
||||
|
||||
case RETRO_DEVICE_POINTER:
|
||||
@ -1250,7 +1242,7 @@ static int16_t udev_input_state(
|
||||
const uint32_t joyaxis = (bind_joyaxis != AXIS_NONE)
|
||||
? bind_joyaxis : autobind_joyaxis;
|
||||
if (!keyboard_mapping_blocked)
|
||||
if ((binds[port][new_id].key < RETROK_LAST)
|
||||
if ((binds[port][new_id].key < RETROK_LAST)
|
||||
&& udev_keyboard_pressed(udev, binds[port]
|
||||
[new_id].key))
|
||||
return 1;
|
||||
@ -1260,7 +1252,7 @@ static int16_t udev_input_state(
|
||||
port, (uint16_t)joykey))
|
||||
return 1;
|
||||
if (joyaxis != AXIS_NONE &&
|
||||
((float)abs(joypad->axis(port, joyaxis))
|
||||
((float)abs(joypad->axis(port, joyaxis))
|
||||
/ 0x8000) > axis_threshold)
|
||||
return 1;
|
||||
if (udev_mouse_button_pressed(udev, port,
|
||||
@ -1354,7 +1346,7 @@ static bool open_devices(udev_input_t *udev,
|
||||
{
|
||||
int check = udev_input_add_device(udev, type, devnode, cb);
|
||||
if (check == 0)
|
||||
RARCH_LOG("[udev] udev_input_add_device error : %s (%s).\n",
|
||||
RARCH_LOG("[udev]: udev_input_add_device error : %s (%s).\n",
|
||||
devnode, strerror(errno));
|
||||
|
||||
(void)check;
|
||||
@ -1443,15 +1435,16 @@ static void *udev_input_init(const char *joypad_driver)
|
||||
{
|
||||
if (udev->devices[i]->type != UDEV_INPUT_KEYBOARD)
|
||||
{
|
||||
RARCH_LOG("[udev]: Mouse #%u: \"%s\" (%s).\n",
|
||||
RARCH_LOG("[udev]: Mouse #%u: \"%s\" (%s) %s\n",
|
||||
mouse,
|
||||
udev->devices[i]->ident,
|
||||
udev->devices[i]->mouse.abs ? "ABS" : "REL",
|
||||
udev->devices[i]->devnode);
|
||||
|
||||
input_config_set_mouse_display_name(mouse, udev->devices[i]->ident);
|
||||
mouse++;
|
||||
}
|
||||
else
|
||||
else
|
||||
{
|
||||
RARCH_LOG("[udev]: Keyboard #%u: \"%s\" (%s).\n",
|
||||
keyboard,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user