mac/input: move mouse event handling into input helper

der richter committed 2 years ago

Commit db4eac11 parent ab419a62 files · +40 −47Browse files

Unified · Split

2 files

osdep/mac/input_helper.swift +28 −0
video/out/mac/view.swift +12 −47

@@ -115,6 +115,16 @@ class InputHelper: NSObject { · 114 unmodified lines
115	}	115	}
116	}	116	}
117		117
		118	func processMouse(event: NSEvent) {
		119	if !mouseEnabled() { return }
		120	lock.withLock {
		121	putKey(map(button: event.buttonNumber), modifiers: event.modifierFlags, type: event.type)
		122	if event.clickCount > 1 {
		123	putKey(map(button: event.buttonNumber), modifiers: event.modifierFlags, type: .keyUp)
		124	}
		125	}
		126	}
		127
118	func draggable(at pos: NSPoint) -> Bool {	128	func draggable(at pos: NSPoint) -> Bool {
119	lock.withLock {	129	lock.withLock {
120	guard let input = input else { return false }	130	guard let input = input else { return false }
@@ -158,6 +168,12 @@ class InputHelper: NSObject { · 37 unmodified lines
158	let typeMapping: [NSEvent.EventType:UInt32] = [	168	let typeMapping: [NSEvent.EventType:UInt32] = [
159	.keyDown: MP_KEY_STATE_DOWN,	169	.keyDown: MP_KEY_STATE_DOWN,
160	.keyUp: MP_KEY_STATE_UP,	170	.keyUp: MP_KEY_STATE_UP,
		171	.leftMouseDown: MP_KEY_STATE_DOWN,
		172	.leftMouseUp: MP_KEY_STATE_UP,
		173	.rightMouseDown: MP_KEY_STATE_DOWN,
		174	.rightMouseUp: MP_KEY_STATE_UP,
		175	.otherMouseDown: MP_KEY_STATE_DOWN,
		176	.otherMouseUp: MP_KEY_STATE_UP,
161	]	177	]
162		178
163	return Int32(typeMapping[type] ?? 0);	179	return Int32(typeMapping[type] ?? 0);
@@ -182,6 +198,18 @@ class InputHelper: NSObject { · 18 unmodified lines
182	return Int32(mask)	198	return Int32(mask)
183	}	199	}
184		200
		201	private func map(button: Int) -> Int32 {
		202	let buttonMapping: [Int:Int32] = [
		203	0: SWIFT_MBTN_LEFT,
		204	1: SWIFT_MBTN_RIGHT,
		205	2: SWIFT_MBTN_MID,
		206	3: SWIFT_MBTN_BACK,
		207	4: SWIFT_MBTN_FORWARD,
		208	]
		209
		210	return Int32(buttonMapping[button] ?? SWIFT_MBTN9 + Int32(button - 5));
		211	}
		212
185	@objc func open(files: [String]) {	213	@objc func open(files: [String]) {
186	lock.withLock {	214	lock.withLock {
187	guard let input = input else { return }	215	guard let input = input else { return }

video/out/mac/view.swift+12−47

     }
     override func mouseDown(with event: NSEvent) {
-        if input?.mouseEnabled() ?? true {
+        hasMouseDown = true
-            signalMouseDown(event)
+        input?.processMouse(event: event)
-        }
     }
     override func mouseUp(with event: NSEvent) {
-        if input?.mouseEnabled() ?? true {
+        hasMouseDown = false
-            signalMouseUp(event)
-        }
         common.window?.isMoving = false
+        input?.processMouse(event: event)
     }
     override func rightMouseDown(with event: NSEvent) {
-        if input?.mouseEnabled() ?? true {
+        hasMouseDown = true
-            signalMouseDown(event)
+        input?.processMouse(event: event)
-        }
     }
     override func rightMouseUp(with event: NSEvent) {
-        if input?.mouseEnabled() ?? true {
+        hasMouseDown = false
-            signalMouseUp(event)
+        input?.processMouse(event: event)
-        }
     }
     override func otherMouseDown(with event: NSEvent) {
-        if input?.mouseEnabled() ?? true {
+        hasMouseDown = true
-            signalMouseDown(event)
+        input?.processMouse(event: event)
-        }
     }
     override func otherMouseUp(with event: NSEvent) {
-        if input?.mouseEnabled() ?? true {
+        hasMouseDown = false
-            signalMouseUp(event)
+        input?.processMouse(event: event)
-        }
     }
     override func magnify(with event: NSEvent) {
         common.window?.addWindowScale(Double(event.magnification))
     }
-    func signalMouseDown(_ event: NSEvent) {
-        signalMouseEvent(event, MP_KEY_STATE_DOWN)
-        if event.clickCount > 1 {
-            signalMouseEvent(event, MP_KEY_STATE_UP)
-        }
-    }
-    func signalMouseUp(_ event: NSEvent) {
-        signalMouseEvent(event, MP_KEY_STATE_UP)
-    }
-    func signalMouseEvent(_ event: NSEvent, _ state: UInt32) {
-        hasMouseDown = state == MP_KEY_STATE_DOWN
-        let mpkey = getMpvButton(event)
-        input?.put(key: (mpkey | Int32(state)), modifiers: event.modifierFlags)
-    }
     func signalMouseMovement(_ event: NSEvent) {
         var point = convert(event.locationInWindow, from: nil)
         point = convertToBacking(point)
         guard let window = common.window else { return false }
         return !hasMouseDown && containsMouseLocation() && window.isKeyWindow
     }
-    func getMpvButton(_ event: NSEvent) -> Int32 {
-        let buttonNumber = event.buttonNumber
-        switch (buttonNumber) {
-            case 0:  return SWIFT_MBTN_LEFT
-            case 1:  return SWIFT_MBTN_RIGHT
-            case 2:  return SWIFT_MBTN_MID
-            case 3:  return SWIFT_MBTN_BACK
-            case 4:  return SWIFT_MBTN_FORWARD
-            default: return SWIFT_MBTN9 + Int32(buttonNumber - 5)
-        }
-    }
 }

mac/input: move mouse event handling into input helper

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code