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

Merge pull request #11388 from pjft/dual-lightgun

Browse Source 
Change udev driver for dual lightgun support in X11
This commit is contained in:
Autechre 2021-06-21 18:06:35 +02:00 committed by GitHub
commit 6986caed5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
input/drivers/udev_input.c
View File

@ -807,9 +807,7 @@ static bool udev_pointer_is_off_window(const udev_input_t *udev)
static int16_t udev_lightgun_aiming_state( static int16_t udev_lightgun_aiming_state(
udev_input_t *udev, unsigned port, unsigned id ) udev_input_t *udev, unsigned port, unsigned id )
{ {
#ifdef HAVE_X11
struct video_viewport vp;
#endif
const int edge_detect = 32700; const int edge_detect = 32700;
bool inside = false; bool inside = false;
int16_t res_x = 0; int16_t res_x = 0;
@ -819,28 +817,11 @@ static int16_t udev_lightgun_aiming_state(
udev_input_mouse_t *mouse = udev_get_mouse(udev, port); udev_input_mouse_t *mouse = udev_get_mouse(udev, port);
#ifdef HAVE_X11
vp.x = 0;
vp.y = 0;
vp.width = 0;
vp.height = 0;
vp.full_width = 0;
vp.full_height = 0;
#endif
if (!mouse) if (!mouse)
return 0; return 0;
#ifdef HAVE_X11 res_x = udev_mouse_get_pointer_x(mouse, false);
/* udev->pointer_x and y is only set in X11 */ res_y = udev_mouse_get_pointer_y(mouse, false);
if (!(video_driver_translate_coord_viewport_wrap(
&vp, udev->pointer_x, udev->pointer_y,
&res_x, &res_y, &res_screen_x, &res_screen_y)))
return 0;
#else
res_x = udev_mouse_get_pointer_x(mouse, false);
res_y = udev_mouse_get_pointer_y(mouse, false);
#endif
inside = (res_x >= -edge_detect) inside = (res_x >= -edge_detect)
&& (res_y >= -edge_detect) && (res_y >= -edge_detect)
@ -850,11 +831,9 @@ static int16_t udev_lightgun_aiming_state(
switch ( id ) switch ( id )
{ {
case RETRO_DEVICE_ID_LIGHTGUN_SCREEN_X: case RETRO_DEVICE_ID_LIGHTGUN_SCREEN_X:
if (inside)
return res_x; return res_x;
break; break;
case RETRO_DEVICE_ID_LIGHTGUN_SCREEN_Y: case RETRO_DEVICE_ID_LIGHTGUN_SCREEN_Y:
if (inside)
return res_y; return res_y;
break; break;
case RETRO_DEVICE_ID_LIGHTGUN_IS_OFFSCREEN: case RETRO_DEVICE_ID_LIGHTGUN_IS_OFFSCREEN: