macOS: fix mouse capture release

osy86 · osy86 · commit fa21e39885d4 · 2020-12-03T14:09:05.000-06:00
diff --git a/Platform/macOS/Display/VMDisplayMetalWindowController.swift b/Platform/macOS/Display/VMDisplayMetalWindowController.swift
@@ -255,4 +255,7 @@ extension VMDisplayMetalWindowController: VMMetalViewInputDelegate {
         sendExtendedKey(.release, keyCode: keyCode)
     }
     
+    func requestReleaseCapture() {
+        releaseMouse()
+    }
 }
diff --git a/Platform/macOS/Display/VMMetalView.swift b/Platform/macOS/Display/VMMetalView.swift
@@ -204,7 +204,7 @@ class VMMetalView: MTKView {
         logger.debug("modifers: \(modifiers)")
         if modifiers.isSuperset(of: [.option, .control]) {
             logger.debug("release cursor")
-            releaseMouse()
+            inputDelegate?.requestReleaseCapture()
         }
         sendModifiers(lastModifiers.subtracting(modifiers), press: false)
         sendModifiers(modifiers.subtracting(lastModifiers), press: true)
diff --git a/Platform/macOS/Display/VMMetalViewInputDelegate.swift b/Platform/macOS/Display/VMMetalViewInputDelegate.swift
@@ -22,4 +22,5 @@ protocol VMMetalViewInputDelegate: class {
     func mouseScroll(dy: CGFloat, button: CSInputButton)
     func keyDown(keyCode: Int)
     func keyUp(keyCode: Int)
+    func requestReleaseCapture()
 }

Original file line number	Diff line number	Diff line change
`@@ -255,4 +255,7 @@ extension VMDisplayMetalWindowController: VMMetalViewInputDelegate {`
`255`	`255`	`sendExtendedKey(.release, keyCode: keyCode)`
`256`	`256`	`}`
`257`	`257`
	`258`	`+ func requestReleaseCapture() {`
	`259`	`+ releaseMouse()`
	`260`	`+ }`
`258`	`261`	`}`
Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ class VMMetalView: MTKView {`
`204`	`204`	`logger.debug("modifers: \(modifiers)")`
`205`	`205`	`if modifiers.isSuperset(of: [.option, .control]) {`
`206`	`206`	`logger.debug("release cursor")`
`207`		`- releaseMouse()`
	`207`	`+ inputDelegate?.requestReleaseCapture()`
`208`	`208`	`}`
`209`	`209`	`sendModifiers(lastModifiers.subtracting(modifiers), press: false)`
`210`	`210`	`sendModifiers(modifiers.subtracting(lastModifiers), press: true)`
Original file line number	Diff line number	Diff line change
`@@ -22,4 +22,5 @@ protocol VMMetalViewInputDelegate: class {`
`22`	`22`	`func mouseScroll(dy: CGFloat, button: CSInputButton)`
`23`	`23`	`func keyDown(keyCode: Int)`
`24`	`24`	`func keyUp(keyCode: Int)`
	`25`	`+ func requestReleaseCapture()`
`25`	`26`	`}`