Support trackpad on macOS and clipboard sharing on Linux (#202)

Fixes #66 Relates to #14 since fixes on Linux
cirruslabs · Aug 27, 2022 · 048a550 · 048a550
1 parent 553b363
commit 048a550
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/Sources/tart/Platform/Darwin.swift b/Sources/tart/Platform/Darwin.swift
@@ -84,4 +84,14 @@ struct Darwin: Platform {
 
         return result
     }
+
+    func pointingDevices() -> [VZPointingDeviceConfiguration] {
+        if #available(macOS 13, *) {
+            // Trackpad is only supported starting with macOS Ventura
+            // macOS Monterey will continue using a USB device == .darwin 
+            return [VZMacTrackpadConfiguration(), VZUSBScreenCoordinatePointingDeviceConfiguration()]
+        } else {
+            return [VZUSBScreenCoordinatePointingDeviceConfiguration()]
+        }
+    }
 }
diff --git a/Sources/tart/Platform/Linux.swift b/Sources/tart/Platform/Linux.swift
@@ -30,4 +30,8 @@ struct Linux: Platform {
 
         return result
     }
+
+    func pointingDevices() -> [VZPointingDeviceConfiguration] {
+        [VZUSBScreenCoordinatePointingDeviceConfiguration()]
+    }
 }
diff --git a/Sources/tart/Platform/Platform.swift b/Sources/tart/Platform/Platform.swift
@@ -5,4 +5,5 @@ protocol Platform: Codable {
     func bootLoader(nvramURL: URL) throws -> VZBootLoader
     func platform(nvramURL: URL) -> VZPlatformConfiguration
     func graphicsDevice(vmConfig: VMConfig) -> VZGraphicsDeviceConfiguration
+    func pointingDevices() -> [VZPointingDeviceConfiguration]
 }
diff --git a/Sources/tart/VM.swift b/Sources/tart/VM.swift
@@ -256,7 +256,7 @@ class VM: NSObject, VZVirtualMachineDelegate, ObservableObject {
 
     // Keyboard and mouse
     configuration.keyboards = [VZUSBKeyboardConfiguration()]
-    configuration.pointingDevices = [VZUSBScreenCoordinatePointingDeviceConfiguration()]
+    configuration.pointingDevices = vmConfig.platform.pointingDevices()
 
     // Networking
     let vio = VZVirtioNetworkDeviceConfiguration()