From 9e2b39b85a7cc17f93e1f0684246ec259588338c Mon Sep 17 00:00:00 2001
From: SindenLightgun <47393540+SindenLightgun@users.noreply.github.com>
Date: Sat, 2 Nov 2019 17:29:14 +0000
Subject: [PATCH 1/2] Added non-X11 lightgun support

The current method for getting the lightgun aiming coordinates "udev_lightgun_aiming_state" only work in X11 which is shown if you follow the code through, the required coordinates are not set otherwise. I've added an X11 if statement and left that block of code as it is. For the non-X11 code block I've used the methods from the touchscreen/pointer function which successfully gets absolute coordinates back from the mouse device in non-X11. This update is tested and working on the Raspberry Pi for an absolute mouse based device and it was not working before.
---
 input/drivers/udev_input.c | 43 ++++++++++++++++++++++++++++++++------
 1 file changed, 37 insertions(+), 6 deletions(-)

diff --git a/input/drivers/udev_input.c b/input/drivers/udev_input.c
index 0dd54091d3..f7e01aca78 100644
--- a/input/drivers/udev_input.c
+++ b/input/drivers/udev_input.c
@@ -808,16 +808,15 @@ 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 )
 {
-   const int edge_detect = 32700;
-   struct video_viewport vp;
+   const int edge_detect       = 32700;
    bool inside                 = false;
+   int16_t abs_x 			       = 0;
+   int16_t abs_y  			    = 0;
    int16_t res_x               = 0;
    int16_t res_y               = 0;
    int16_t res_screen_x        = 0;
    int16_t res_screen_y        = 0;
-
-   udev_input_mouse_t *mouse = udev_get_mouse(udev, port);
-
+   struct video_viewport vp;
    vp.x                        = 0;
    vp.y                        = 0;
    vp.width                    = 0;
@@ -825,9 +824,17 @@ static int16_t udev_lightgun_aiming_state(udev_input_t *udev, unsigned port, uns
    vp.full_width               = 0;
    vp.full_height              = 0;
 
-   if (!mouse)
+   udev_input_mouse_t *mouse = udev_get_mouse(udev, port);
+
+	if (!mouse)
       return 0;
 
+   /* The existing code only set values with X11, if you follow these methods through they state this.
+	 * So added an X11 if-block and provided an alternative that does work with absolute mouse
+	 * device in non-X11. */
+	#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;
@@ -847,6 +854,30 @@ static int16_t udev_lightgun_aiming_state(udev_input_t *udev, unsigned port, uns
    }
 
    return 0;
+   
+   #else 
+	/* Non X11 code branch.
+    * Use similar code to touchscreen methods to get abs mouse which works on non X11. */
+
+   abs_x = udev_mouse_get_pointer_x(mouse, false);
+   abs_y = udev_mouse_get_pointer_y(mouse, false);
+   
+   inside = (abs_x >= -edge_detect) && (abs_y >= -edge_detect) && (abs_x <= edge_detect) && (abs_y <= edge_detect);
+   
+   switch ( id )
+   {
+   case RETRO_DEVICE_ID_LIGHTGUN_SCREEN_X:
+      return inside ? abs_x : 0;
+   case RETRO_DEVICE_ID_LIGHTGUN_SCREEN_Y:
+      return inside ? abs_y : 0;
+   case RETRO_DEVICE_ID_LIGHTGUN_IS_OFFSCREEN:
+      return !inside;
+   default:
+      break;
+   }
+
+   return 0;
+   #endif
 }
 
 static int16_t udev_mouse_state(udev_input_t *udev,

From 68c11b1ab505b866bbfa9be792863118c0dbaca9 Mon Sep 17 00:00:00 2001
From: SindenLightgun <47393540+SindenLightgun@users.noreply.github.com>
Date: Sat, 25 Jan 2020 00:11:14 +0000
Subject: [PATCH 2/2] Stop lightgun offscreen centering the aim

When the lightgun aim was on the edges it was flagging as offscreen which is good but was also centering the aim to the centre of the screen which doesn't seem necessary.
---
 input/drivers/udev_input.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/input/drivers/udev_input.c b/input/drivers/udev_input.c
index f7e01aca78..fb6731c605 100644
--- a/input/drivers/udev_input.c
+++ b/input/drivers/udev_input.c
@@ -844,9 +844,9 @@ static int16_t udev_lightgun_aiming_state(udev_input_t *udev, unsigned port, uns
    switch ( id )
    {
    case RETRO_DEVICE_ID_LIGHTGUN_SCREEN_X:
-      return inside ? res_x : 0;
+      return res_x;
    case RETRO_DEVICE_ID_LIGHTGUN_SCREEN_Y:
-      return inside ? res_y : 0;
+      return res_y;
    case RETRO_DEVICE_ID_LIGHTGUN_IS_OFFSCREEN:
       return !inside;
    default:
@@ -867,9 +867,9 @@ static int16_t udev_lightgun_aiming_state(udev_input_t *udev, unsigned port, uns
    switch ( id )
    {
    case RETRO_DEVICE_ID_LIGHTGUN_SCREEN_X:
-      return inside ? abs_x : 0;
+      return abs_x;
    case RETRO_DEVICE_ID_LIGHTGUN_SCREEN_Y:
-      return inside ? abs_y : 0;
+      return abs_y;
    case RETRO_DEVICE_ID_LIGHTGUN_IS_OFFSCREEN:
       return !inside;
    default: