Fastest and only macOS Dictation app with on-device STT and custom trained AI enhancement model. Windows, iOS testflight! Android, Linux waitlist open! A local Wispr Flow alternative. Follow https://x.com/fluidvoiceapp for more
support different keyboard layouts
grohith327fb896ebebf9c
diff --git a/Sources/Fluid/Services/PasteDeliveryCoordinator.swift b/Sources/Fluid/Services/PasteDeliveryCoordinator.swiftindex 2f0680d2..8278f51f 100644--- a/Sources/Fluid/Services/PasteDeliveryCoordinator.swift+++ b/Sources/Fluid/Services/PasteDeliveryCoordinator.swift@@ -1,4 +1,5 @@import AppKit+import Carbonimport Foundationimport UniformTypeIdentifiers@@ -432,22 +433,79 @@ final class SystemPasteboardManager: PasteboardManaging {}}+@MainActor+enum KeyboardLayoutKeyCodeResolver {+ static func keyCode(for character: Character, qwertyFallback: CGKeyCode) -> CGKeyCode {+ guard let source = TISCopyCurrentKeyboardLayoutInputSource()?.takeRetainedValue(),+ let rawLayoutData = TISGetInputSourceProperty(source, kTISPropertyUnicodeKeyLayoutData)+ else {+ return qwertyFallback+ }++ let layoutData = Unmanaged<CFData>.fromOpaque(rawLayoutData).takeUnretainedValue() as Data+ return layoutData.withUnsafeBytes { buffer in+ guard let layout = buffer.baseAddress?.assumingMemoryBound(to: UCKeyboardLayout.self) else {+ return qwertyFallback+ }+ return self.keyCode(for: character, qwertyFallback: qwertyFallback) { keyCode in+ self.unmodifiedScalar(for: keyCode, layout: layout)+ }+ }+ }++ static func keyCode(+ for character: Character,+ qwertyFallback: CGKeyCode,+ translatedScalar: (CGKeyCode) -> Unicode.Scalar?+ ) -> CGKeyCode {+ guard let targetScalar = character.unicodeScalars.first else { return qwertyFallback }++ for keyCode: CGKeyCode in 0..<128 where translatedScalar(keyCode) == targetScalar {+ return keyCode+ }+ return qwertyFallback+ }++ private static func unmodifiedScalar(+ for keyCode: CGKeyCode,+ layout: UnsafePointer<UCKeyboardLayout>+ ) -> Unicode.Scalar? {+ var deadKeyState: UInt32 = 0+ var characters = [UniChar](repeating: 0, count: 4)+ var length = 0+ let status = UCKeyTranslate(+ layout,+ keyCode,+ UInt16(kUCKeyActionDisplay),+ 0,+ UInt32(LMGetKbdType()),+ UInt32(kUCKeyTranslateNoDeadKeysMask),+ &deadKeyState,+ characters.count,+ &length,+ &characters+ )+ guard status == noErr, length > 0 else { return nil }+ return Unicode.Scalar(characters[0])+ }+}+@MainActorfinal class SystemPasteCommandPoster: PasteCommandPosting {- private static let vKeyCode: CGKeyCode = 0x09nonisolated static let clipboardSettleDelayNanoseconds: UInt64 = 50_000_000func postGlobalPasteCommand() async -> Bool {guard AXIsProcessTrusted() else { return false }+ let pasteKeyCode = KeyboardLayoutKeyCodeResolver.keyCode(for: "v", qwertyFallback: 0x09)let source = CGEventSource(stateID: .combinedSessionState)guard let vDown = CGEvent(keyboardEventSource: source,- virtualKey: Self.vKeyCode,+ virtualKey: pasteKeyCode,keyDown: true), let vUp = CGEvent(keyboardEventSource: source,- virtualKey: Self.vKeyCode,+ virtualKey: pasteKeyCode,keyDown: false) else {return falsediff --git a/Tests/FluidDictationIntegrationTests/PasteDeliveryCoordinatorTests.swift b/Tests/FluidDictationIntegrationTests/PasteDeliveryCoordinatorTests.swiftindex e427caf2..2ffcefb4 100644--- a/Tests/FluidDictationIntegrationTests/PasteDeliveryCoordinatorTests.swift+++ b/Tests/FluidDictationIntegrationTests/PasteDeliveryCoordinatorTests.swift@@ -230,6 +230,27 @@ final class PasteDeliveryCoordinatorTests: XCTestCase {XCTAssertEqual(PasteDeliveryCoordinator.defaultSettlementDelayNanoseconds, 500_000_000)}+ func testPasteKeyResolverUsesTheKeyThatProducesVInTheActiveLayout() {+ let resolvedKeyCode = KeyboardLayoutKeyCodeResolver.keyCode(+ for: "v",+ qwertyFallback: 0x09+ ) { keyCode in+ keyCode == 0x2a ? "v" : nil+ }++ XCTAssertEqual(resolvedKeyCode, 0x2a)+ }++ func testPasteKeyResolverFallsBackWhenTheLayoutDoesNotExposeV() {+ let resolvedKeyCode = KeyboardLayoutKeyCodeResolver.keyCode(+ for: "v",+ qwertyFallback: 0x09,+ translatedScalar: { _ in nil }+ )++ XCTAssertEqual(resolvedKeyCode, 0x09)+ }+func testRecoveryActivationNeverRequestsAllWindows() {XCTAssertTrue(TypingService.recoveryActivationOptions.contains(.activateIgnoringOtherApps))XCTAssertFalse(TypingService.recoveryActivationOptions.contains(.activateAllWindows))