From c0926ad1a124414fa68f9c522f97cd780dadfba6 Mon Sep 17 00:00:00 2001
From: Richard <yuukifushimi@gmail.com>
Date: Fri, 18 Nov 2022 13:45:36 -0500
Subject: [PATCH] feat(iOS13): Pointer Movement Accuracy (#14641)

Co-authored-by: Richard <rf2222222@github.com>
---
 input/drivers/cocoa_input.c                   | 22 +++++++++++++++++--
 menu/menu_driver.c                            |  8 ++++++-
 .../MouseEmulation/EmulatorTouchMouse.swift   | 16 +++-----------
 ui/drivers/cocoa/cocoa_common.m               | 16 ++++++++++++++
 ui/drivers/ui_cocoatouch.m                    |  5 ++++-
 5 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/input/drivers/cocoa_input.c b/input/drivers/cocoa_input.c
index e232b8b776..302b31f0ca 100644
--- a/input/drivers/cocoa_input.c
+++ b/input/drivers/cocoa_input.c
@@ -450,7 +450,16 @@ static int16_t cocoa_input_state(
 #endif
                   }
 #ifdef IOS
-                    val = apple->mouse_rel_x;
+#ifdef HAVE_IOS_TOUCHMOUSE
+                  if (apple->window_pos_x > 0) {
+                     val = apple->window_pos_x - apple->mouse_x_last;
+                     apple->mouse_x_last = apple->window_pos_x;
+                  } else {
+                     val = apple->mouse_rel_x;
+                  }
+#else
+                  val = apple->mouse_rel_x;
+#endif
 #else
                   val = apple->window_pos_x - apple->mouse_x_last;
                   apple->mouse_x_last = apple->window_pos_x;
@@ -466,7 +475,16 @@ static int16_t cocoa_input_state(
 #endif
                   }
 #ifdef IOS
-                    val = apple->mouse_rel_y;
+#ifdef HAVE_IOS_TOUCHMOUSE
+                  if (apple->window_pos_y > 0) {
+                     val = apple->window_pos_y - apple->mouse_y_last;
+                     apple->mouse_y_last = apple->window_pos_y;
+                  } else {
+                     val = apple->mouse_rel_y;
+                  }
+#else
+                  val = apple->mouse_rel_y;
+#endif
 #else
                   val = apple->window_pos_y - apple->mouse_y_last;
                   apple->mouse_y_last = apple->window_pos_y;
diff --git a/menu/menu_driver.c b/menu/menu_driver.c
index a2bf259c78..09c00cf945 100644
--- a/menu/menu_driver.c
+++ b/menu/menu_driver.c
@@ -5723,6 +5723,12 @@ unsigned menu_event(
       menu_input_pointer_hw_state_t touchscreen_hw_state = {0};
 
       /* Read mouse */
+#ifdef HAVE_IOS_TOUCHMOUSE
+       if (menu_mouse_enable) {
+         settings->bools.menu_pointer_enable=true;
+         menu_pointer_enable=true;
+       }
+#else
       if (menu_mouse_enable)
          menu_input_get_mouse_hw_state(
                p_disp,
@@ -5736,7 +5742,7 @@ unsigned menu_event(
                input_overlay_enable,
                overlay_active,
                &mouse_hw_state);
-
+#endif
       /* Read touchscreen
        * Note: Could forgo this if mouse is currently active,
        * but this is 'cleaner' code... (if performance is a
diff --git a/pkg/apple/MouseEmulation/EmulatorTouchMouse.swift b/pkg/apple/MouseEmulation/EmulatorTouchMouse.swift
index 5299ec0d62..de482dc810 100644
--- a/pkg/apple/MouseEmulation/EmulatorTouchMouse.swift
+++ b/pkg/apple/MouseEmulation/EmulatorTouchMouse.swift
@@ -22,6 +22,7 @@ import UIKit
 @objc public protocol EmulatorTouchMouseHandlerDelegate: AnyObject {
    func handleMouseClick(isLeftClick: Bool, isPressed: Bool)
    func handleMouseMove(x: CGFloat, y: CGFloat)
+   func handlePointerMove(x: CGFloat, y: CGFloat)
 }
 
 @objcMembers public class EmulatorTouchMouseHandler: NSObject, UIPointerInteractionDelegate {
@@ -60,8 +61,6 @@ import UIKit
    
    private let mediumHaptic = UIImpactFeedbackGenerator(style: .medium)
    
-   private var previousPoint: CGPoint = CGPoint(x: 0, y: 0)
-
    public init(view: UIView, delegate: EmulatorTouchMouseHandlerDelegate? = nil) {
       self.view = view
       self.delegate = delegate
@@ -212,17 +211,8 @@ import UIKit
        defaultRegion: UIPointerRegion
      ) -> UIPointerRegion? {
         guard !enabled else { return defaultRegion }
-        let a = self.previousPoint
-        let b = request.location
-        delegate?.handleMouseMove(x: b.x-a.x, y: b.y-a.y)
-        self.previousPoint=b
+        let location = request.location;
+        delegate?.handlePointerMove(x: location.x, y: location.y)
         return defaultRegion
    }
-
-   @available(iOS 13.4, *)
-   public func pointerInteraction(_ interaction: UIPointerInteraction, styleFor region: UIPointerRegion) -> UIPointerStyle? {
-      guard !enabled else { return nil }
-      return UIPointerStyle.hidden()
-   }
-
 }
diff --git a/ui/drivers/cocoa/cocoa_common.m b/ui/drivers/cocoa/cocoa_common.m
index 4ea66633b9..13688a318a 100644
--- a/ui/drivers/cocoa/cocoa_common.m
+++ b/ui/drivers/cocoa/cocoa_common.m
@@ -371,7 +371,23 @@ void *glkitview_init(void);
         return;
     apple->mouse_rel_x = (int16_t)x;
     apple->mouse_rel_y = (int16_t)y;
+   // use location position to track pointer
+   if (@available(iOS 13.4, *)) {
+      apple->window_pos_x = 0;
+      apple->window_pos_y = 0;
+   }
 }
+
+-(void)handlePointerMoveWithX:(CGFloat)x y:(CGFloat)y
+{
+   cocoa_input_data_t *apple = (cocoa_input_data_t*)
+      input_state_get_ptr()->current_data;
+   if (!apple)
+      return;
+   apple->window_pos_x = (int16_t)x;
+   apple->window_pos_y = (int16_t)y;
+}
+
 #endif
 
 #pragma mark GCDWebServerDelegate
diff --git a/ui/drivers/ui_cocoatouch.m b/ui/drivers/ui_cocoatouch.m
index 1c68493d92..3251be9c1b 100644
--- a/ui/drivers/ui_cocoatouch.m
+++ b/ui/drivers/ui_cocoatouch.m
@@ -298,7 +298,10 @@ enum
 - (void)sendEvent:(UIEvent *)event
 {
    [super sendEvent:event];
-
+    if (@available(iOS 13.4, *)) {
+        if (event.type == UIEventTypeHover)
+            return;
+    }
    if (event.allTouches.count)
       handle_touch_event(event.allTouches.allObjects);