Use Mac-specific input devices when possible (#524)

* Use VZMacKeyboardConfiguration when possible

* Use VZMacTrackpadConfiguration when possible
This commit is contained in:
Nikolay Edigaryev
2023-06-23 17:54:47 +00:00
committed by GitHub
parent e89ef32a83
commit 1b53ce42f8
4 changed files with 15 additions and 4 deletions
+9 -3
View File
@@ -98,11 +98,17 @@ struct Darwin: Platform {
return result
}
func keyboards() -> [VZKeyboardConfiguration] {
if #available(macOS 14, *) {
return [VZMacKeyboardConfiguration()]
} else {
return [VZUSBKeyboardConfiguration()]
}
}
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()]
return [VZMacTrackpadConfiguration()]
} else {
return [VZUSBScreenCoordinatePointingDeviceConfiguration()]
}
+4
View File
@@ -31,6 +31,10 @@ struct Linux: Platform {
return result
}
func keyboards() -> [VZKeyboardConfiguration] {
[VZUSBKeyboardConfiguration()]
}
func pointingDevices() -> [VZPointingDeviceConfiguration] {
[VZUSBScreenCoordinatePointingDeviceConfiguration()]
}
+1
View File
@@ -5,5 +5,6 @@ protocol Platform: Codable {
func bootLoader(nvramURL: URL) throws -> VZBootLoader
func platform(nvramURL: URL) throws -> VZPlatformConfiguration
func graphicsDevice(vmConfig: VMConfig) -> VZGraphicsDeviceConfiguration
func keyboards() -> [VZKeyboardConfiguration]
func pointingDevices() -> [VZPointingDeviceConfiguration]
}
+1 -1
View File
@@ -292,7 +292,7 @@ class VM: NSObject, VZVirtualMachineDelegate, ObservableObject {
configuration.audioDevices = [soundDeviceConfiguration]
// Keyboard and mouse
configuration.keyboards = [VZUSBKeyboardConfiguration()]
configuration.keyboards = vmConfig.platform.keyboards()
configuration.pointingDevices = vmConfig.platform.pointingDevices()
// Networking