config(apple): switch to trackpad when macOS guest is used on macOS 1…

…3+ host This is the second attempt to fix #4636 and #4645
utmapp · Mar 11, 2023 · ae8cce8 · ae8cce8
1 parent a358d5c
commit ae8cce8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/Configuration/UTMAppleConfiguration.swift b/Configuration/UTMAppleConfiguration.swift
@@ -272,15 +272,8 @@ extension UTMAppleConfiguration {
         vzconfig.networkDevices.append(contentsOf: networks.compactMap({ $0.vzNetworking() }))
         vzconfig.serialPorts.append(contentsOf: serials.compactMap({ $0.vzSerial() }))
         // add remaining devices
-        try virtualization.fillVZConfiguration(vzconfig)
+        try virtualization.fillVZConfiguration(vzconfig, isMacOSGuest: system.boot.operatingSystem == .macOS)
         #if arch(arm64)
-        /*
-        // Disable trackpad due to reported issues (#4636, #4645)
-        if #available(macOS 13, *), virtualization.hasPointer && system.boot.operatingSystem == .macOS {
-            // add a trackpad device
-            vzconfig.pointingDevices.insert(VZMacTrackpadConfiguration(), at: 0)
-        }
-        */
         if #available(macOS 12, *), system.boot.operatingSystem == .macOS {
             let graphics = VZMacGraphicsDeviceConfiguration()
             graphics.displays = displays.map({ display in

diff --git a/Configuration/UTMAppleConfigurationVirtualization.swift b/Configuration/UTMAppleConfigurationVirtualization.swift
@@ -113,7 +113,7 @@ extension UTMAppleConfigurationVirtualization {
 @available(iOS, unavailable, message: "Apple Virtualization not available on iOS")
 @available(macOS 11, *)
 extension UTMAppleConfigurationVirtualization {
-    func fillVZConfiguration(_ vzconfig: VZVirtualMachineConfiguration) throws {
+    func fillVZConfiguration(_ vzconfig: VZVirtualMachineConfiguration, isMacOSGuest: Bool = false) throws {
         if hasBalloon {
             vzconfig.memoryBalloonDevices = [VZVirtioTraditionalMemoryBalloonDeviceConfiguration()]
         }
@@ -137,6 +137,12 @@ extension UTMAppleConfigurationVirtualization {
             }
             if hasPointer {
                 vzconfig.pointingDevices = [VZUSBScreenCoordinatePointingDeviceConfiguration()]
+                #if arch(arm64)
+                if #available(macOS 13, *), isMacOSGuest {
+                    // replace with trackpad device
+                    vzconfig.pointingDevices = [VZMacTrackpadConfiguration()]
+                }
+                #endif
             }
         } else {
             if hasAudio || hasKeyboard || hasPointer {