Run a virtual iPhone on an Apple Silicon Mac.
Swift
record: always capture the VM window (#149)
TastyHeadphonesc4cf6c2da66b
diff --git a/sources/vphone-cli/VPhoneAppDelegate.swift b/sources/vphone-cli/VPhoneAppDelegate.swiftindex 8b21159a..1d442367 100644--- a/sources/vphone-cli/VPhoneAppDelegate.swift+++ b/sources/vphone-cli/VPhoneAppDelegate.swift@@ -128,6 +128,7 @@ class VPhoneAppDelegate: NSObject, NSApplicationDelegate {let mc = VPhoneMenuController(keyHelper: keyHelper, control: control)mc.vm = vm+ mc.captureView = wc.captureViewmc.onFilesPressed = { [weak fileWC, weak control] inguard let fileWC, let control else { return }fileWC.showWindow(control: control)diff --git a/sources/vphone-cli/VPhoneMenuController.swift b/sources/vphone-cli/VPhoneMenuController.swiftindex ffdbe60b..4d5f5a7b 100644--- a/sources/vphone-cli/VPhoneMenuController.swift+++ b/sources/vphone-cli/VPhoneMenuController.swift@@ -17,6 +17,7 @@ class VPhoneMenuController {var locationReplayStopItem: NSMenuItem?var screenRecorder: VPhoneScreenRecorder?var recordingItem: NSMenuItem?+ weak var captureView: VPhoneVirtualMachineView?init(keyHelper: VPhoneKeyHelper, control: VPhoneControl) {self.keyHelper = keyHelperdiff --git a/sources/vphone-cli/VPhoneMenuRecord.swift b/sources/vphone-cli/VPhoneMenuRecord.swiftindex 582f479c..6be1acff 100644--- a/sources/vphone-cli/VPhoneMenuRecord.swift+++ b/sources/vphone-cli/VPhoneMenuRecord.swift@@ -71,6 +71,7 @@ extension VPhoneMenuController {}private func activeCaptureView() -> NSView? {- NSApp.keyWindow?.contentView ?? NSApp.mainWindow?.contentView+ guard let captureView else { return nil }+ return captureView.window == nil ? nil : captureView}}diff --git a/sources/vphone-cli/VPhoneWindowController.swift b/sources/vphone-cli/VPhoneWindowController.swiftindex 2b3c1ca0..c2fb6dee 100644--- a/sources/vphone-cli/VPhoneWindowController.swift+++ b/sources/vphone-cli/VPhoneWindowController.swift@@ -7,9 +7,14 @@ class VPhoneWindowController: NSObject, NSToolbarDelegate {private var windowController: NSWindowController?private var statusTimer: Timer?private weak var control: VPhoneControl?+ private weak var virtualMachineView: VPhoneVirtualMachineView?private nonisolated static let homeItemID = NSToolbarItem.Identifier("home")+ var captureView: VPhoneVirtualMachineView? {+ virtualMachineView+ }+func showWindow(for vm: VZVirtualMachine, screenWidth: Int, screenHeight: Int, screenScale: Double,keyHelper: VPhoneKeyHelper, control: VPhoneControl, ecid: String?@@ -21,6 +26,7 @@ class VPhoneWindowController: NSObject, NSToolbarDelegate {view.capturesSystemKeys = trueview.keyHelper = keyHelperview.control = control+ virtualMachineView = viewlet vmView: NSView = viewlet scale = CGFloat(screenScale)