From f8b42898116fdbf5986fc90596a3447e3071ea65 Mon Sep 17 00:00:00 2001 From: pjft Date: Mon, 28 Sep 2020 15:14:37 +0100 Subject: [PATCH] Change udev driver for dual lightgun support in X11 --- input/drivers/udev_input.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/input/drivers/udev_input.c b/input/drivers/udev_input.c index 70e14e5bf5..e95085d6b0 100644 --- a/input/drivers/udev_input.c +++ b/input/drivers/udev_input.c @@ -797,7 +797,6 @@ static bool udev_pointer_is_off_window(const udev_input_t *udev) static int16_t udev_lightgun_aiming_state( udev_input_t *udev, unsigned port, unsigned id ) { - struct video_viewport vp; const int edge_detect = 32700; bool inside = false; int16_t res_x = 0; @@ -807,26 +806,12 @@ static int16_t udev_lightgun_aiming_state( udev_input_mouse_t *mouse = udev_get_mouse(udev, port); - vp.x = 0; - vp.y = 0; - vp.width = 0; - vp.height = 0; - vp.full_width = 0; - vp.full_height = 0; - if (!mouse) return 0; -#ifdef HAVE_X11 - /* udev->pointer_x and y is only set in X11 */ - 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) && (res_y >= -edge_detect) @@ -836,11 +821,9 @@ static int16_t udev_lightgun_aiming_state( switch ( id ) { case RETRO_DEVICE_ID_LIGHTGUN_SCREEN_X: - if (inside) return res_x; break; case RETRO_DEVICE_ID_LIGHTGUN_SCREEN_Y: - if (inside) return res_y; break; case RETRO_DEVICE_ID_LIGHTGUN_IS_OFFSCREEN: