From a4eddf742d04a05af76eba378ed1b6868d7c970d Mon Sep 17 00:00:00 2001
From: der richter <der.richter@gmx.de>
Date: Thu, 14 Mar 2024 23:58:10 +0100
Subject: mac/input: move scroll wheel event handling into input helper

---
 osdep/mac/input_helper.swift | 45 +++++++++++++++++++++++++++++++++++++++-----
 video/out/mac/view.swift     | 36 +----------------------------------
 2 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/osdep/mac/input_helper.swift b/osdep/mac/input_helper.swift
index c9891b7a7e..1c626d2e6d 100644
--- a/osdep/mac/input_helper.swift
+++ b/osdep/mac/input_helper.swift
@@ -125,6 +125,43 @@ class InputHelper: NSObject {
         }
     }
 
+    private func preciseScroll(_ event: NSEvent) {
+        var delta: Double
+        var cmd: Int32
+
+        if abs(event.deltaY) >= abs(event.deltaX) {
+            delta = Double(event.deltaY) * 0.1
+            cmd = delta > 0 ? SWIFT_WHEEL_UP : SWIFT_WHEEL_DOWN
+        } else {
+            delta = Double(event.deltaX) * 0.1
+            cmd = delta > 0 ? SWIFT_WHEEL_LEFT : SWIFT_WHEEL_RIGHT
+        }
+
+        putAxis(cmd, modifiers: event.modifierFlags, delta: abs(delta))
+    }
+
+    func processWheel(event: NSEvent) {
+        if !mouseEnabled() { return }
+        lock.withLock {
+            if event.hasPreciseScrollingDeltas {
+                preciseScroll(event)
+            } else {
+                let modifiers = event.modifierFlags
+                let deltaX = modifiers.contains(.shift) ? event.scrollingDeltaY : event.scrollingDeltaX
+                let deltaY = modifiers.contains(.shift) ? event.scrollingDeltaX : event.scrollingDeltaY
+                var mpkey: Int32
+
+                if abs(deltaY) >= abs(deltaX) {
+                    mpkey = deltaY > 0 ? SWIFT_WHEEL_UP : SWIFT_WHEEL_DOWN
+                } else {
+                    mpkey = deltaX > 0 ? SWIFT_WHEEL_LEFT : SWIFT_WHEEL_RIGHT
+                }
+
+                putKey(mpkey, modifiers: modifiers)
+            }
+        }
+    }
+
     func draggable(at pos: NSPoint) -> Bool {
         lock.withLock {
             guard let input = input else { return false }
@@ -147,11 +184,9 @@ class InputHelper: NSObject {
         }
     }
 
-    func putAxis(_ mpkey: Int32, modifiers: NSEvent.ModifierFlags, delta: Double) {
-        lock.withLock {
-            guard let input = input else { return }
-            mp_input_put_wheel(input, mpkey | mapModifier(modifiers), delta)
-        }
+    private func putAxis(_ mpkey: Int32, modifiers: NSEvent.ModifierFlags, delta: Double) {
+        guard let input = input else { return }
+        mp_input_put_wheel(input, mpkey | mapModifier(modifiers), delta)
     }
 
     @discardableResult @objc func command(_ cmd: String) -> Bool {
diff --git a/video/out/mac/view.swift b/video/out/mac/view.swift
index 3d2cd1c51b..0d94c2d096 100644
--- a/video/out/mac/view.swift
+++ b/video/out/mac/view.swift
@@ -189,42 +189,8 @@ class View: NSView, CALayerDelegate {
         }
     }
 
-    func preciseScroll(_ event: NSEvent) {
-        var delta: Double
-        var cmd: Int32
-
-        if abs(event.deltaY) >= abs(event.deltaX) {
-            delta = Double(event.deltaY) * 0.1
-            cmd = delta > 0 ? SWIFT_WHEEL_UP : SWIFT_WHEEL_DOWN
-        } else {
-            delta = Double(event.deltaX) * 0.1
-            cmd = delta > 0 ? SWIFT_WHEEL_LEFT : SWIFT_WHEEL_RIGHT
-        }
-
-        input?.putAxis(cmd, modifiers: event.modifierFlags, delta: abs(delta))
-    }
-
     override func scrollWheel(with event: NSEvent) {
-        if !(input?.mouseEnabled() ?? true) {
-            return
-        }
-
-        if event.hasPreciseScrollingDeltas {
-            preciseScroll(event)
-        } else {
-            let modifiers = event.modifierFlags
-            let deltaX = modifiers.contains(.shift) ? event.scrollingDeltaY : event.scrollingDeltaX
-            let deltaY = modifiers.contains(.shift) ? event.scrollingDeltaX : event.scrollingDeltaY
-            var mpkey: Int32
-
-            if abs(deltaY) >= abs(deltaX) {
-                mpkey = deltaY > 0 ? SWIFT_WHEEL_UP : SWIFT_WHEEL_DOWN
-            } else {
-                mpkey = deltaX > 0 ? SWIFT_WHEEL_LEFT : SWIFT_WHEEL_RIGHT
-            }
-
-            input?.put(key: mpkey, modifiers: modifiers)
-        }
+        input?.processWheel(event: event)
     }
 
     func containsMouseLocation() -> Bool {
-- 
cgit v1.2.3