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
fix primary modifier shortcut conflicts
altic-dev4a96a0eea504
diff --git a/Sources/Fluid/ContentView.swift b/Sources/Fluid/ContentView.swiftindex 39e6d0be..4aeec06f 100644--- a/Sources/Fluid/ContentView.swift+++ b/Sources/Fluid/ContentView.swift@@ -1018,11 +1018,13 @@ struct ContentView: View {}}- let configuredShortcuts: [(ShortcutRecordingTarget, HotkeyShortcut)] = [- (.secondaryDictation, self.promptModeHotkeyShortcut),+ var configuredShortcuts: [(ShortcutRecordingTarget, HotkeyShortcut)] = [(.edit, self.rewriteModeHotkeyShortcut),(.cancel, self.cancelRecordingHotkeyShortcut),]+ if self.isPromptModeShortcutEnabled {+ configuredShortcuts.append((.secondaryDictation, self.promptModeHotkeyShortcut))+ }let optionalConfiguredShortcuts: [(ShortcutRecordingTarget, HotkeyShortcut?)] = [(.command, self.commandModeHotkeyShortcut),(.pasteLast, self.pasteLastTranscriptionHotkeyShortcut),diff --git a/Sources/Fluid/Services/GlobalHotkeyManager.swift b/Sources/Fluid/Services/GlobalHotkeyManager.swiftindex 1d283e84..e974e41f 100644--- a/Sources/Fluid/Services/GlobalHotkeyManager.swift+++ b/Sources/Fluid/Services/GlobalHotkeyManager.swift@@ -23,6 +23,7 @@ private final nonisolated class HotkeyState: @unchecked Sendable {var isPromptAssignmentKeyPressed = falsevar pressedModifierKeyCodes: Set<UInt16> = []var modifierOnlyKeyDown = false+ var activeModifierOnlyType: HotkeyHoldModeType?var otherKeyPressedDuringModifier = falsevar modifierPressStartTime: Date?var holdModeStartTriggeredTypes: Set<HotkeyHoldModeType> = []@@ -132,6 +133,11 @@ final class GlobalHotkeyManager: NSObject {set { self.state.withLock { self.state.modifierOnlyKeyDown = newValue } }}+ private nonisolated var activeModifierOnlyType: HotkeyHoldModeType? {+ get { self.state.withLock { self.state.activeModifierOnlyType } }+ set { self.state.withLock { self.state.activeModifierOnlyType = newValue } }+ }+private nonisolated var otherKeyPressedDuringModifier: Bool {get { self.state.withLock { self.state.otherKeyPressedDuringModifier } }set { self.state.withLock { self.state.otherKeyPressedDuringModifier = newValue } }@@ -898,6 +904,14 @@ final class GlobalHotkeyManager: NSObject {)}+ for shortcut in self.primaryShortcuts where shortcut.isModifierOnlyShortcut {+ if self.handleModifierOnlyShortcutFlagsChanged(+ behavior: self.primaryModifierOnlyBehavior(for: shortcut),+ keyCode: keyCode,+ modifiers: eventModifiers+ ) { return nil }+ }+if self.handlePromptAssignmentFlagsChanged(keyCode: keyCode, modifiers: eventModifiers) { return nil }if self.handlePromptModeFlagsChanged(keyCode: keyCode, modifiers: eventModifiers) { return nil }@@ -966,14 +980,6 @@ final class GlobalHotkeyManager: NSObject {modifiers: eventModifiers) { return nil }- for shortcut in self.primaryShortcuts where shortcut.isModifierOnlyShortcut {- if self.handleModifierOnlyShortcutFlagsChanged(- behavior: self.primaryModifierOnlyBehavior(for: shortcut),- keyCode: keyCode,- modifiers: eventModifiers- ) { return nil }- }-default:break}@@ -1022,23 +1028,31 @@ final class GlobalHotkeyManager: NSObject {(.shift, [56, 60]),]- var synchronizedKeyCodes = Set<UInt16>()-- for (flag, keyCodes) in activeModifierGroups where activeModifiers.contains(flag) {- let livePressedKeyCodes = keyCodes.filter {- CGEventSource.keyState(.combinedSessionState, key: CGKeyCode($0))- }+ // Flags tell us a modifier family is active, not which physical side. Preserve the+ // side-specific keys we already observed instead of rediscovering them from keyState.+ var synchronizedKeyCodes = self.pressedModifierKeyCodes.filter { keyCode in+ guard let flag = HotkeyShortcut.modifierFlag(forKeyCode: keyCode) else { return false }+ return activeModifiers.contains(flag)+ }- if !livePressedKeyCodes.isEmpty {- synchronizedKeyCodes.formUnion(livePressedKeyCodes)- continue- }+ guard let changedGroup = activeModifierGroups.first(where: { $0.0 == changedFlag }) else {+ return synchronizedKeyCodes+ }- // If the changed modifier family is active but the live key-state query did not yet- // reflect it, trust the current event's key code for this transition.- if flag == changedFlag {+ if activeModifiers.contains(changedFlag) {+ if synchronizedKeyCodes.contains(changedKeyCode) {+ let siblingKeyCodes = changedGroup.1.filter { $0 != changedKeyCode }+ let siblingIsTracked = siblingKeyCodes.contains { synchronizedKeyCodes.contains($0) }+ if siblingIsTracked,+ !CGEventSource.keyState(.combinedSessionState, key: CGKeyCode(changedKeyCode))+ {+ synchronizedKeyCodes.remove(changedKeyCode)+ }+ } else {synchronizedKeyCodes.insert(changedKeyCode)}+ } else {+ synchronizedKeyCodes.subtract(changedGroup.1)}return synchronizedKeyCodes@@ -1322,6 +1336,7 @@ final class GlobalHotkeyManager: NSObject {self.pressedModifierKeyCodes = []self.modifierOnlyKeyDown = false+ self.activeModifierOnlyType = nilself.otherKeyPressedDuringModifier = falseself.modifierPressStartTime = nilself.clearAutomaticPressTracking()@@ -1450,12 +1465,12 @@ final class GlobalHotkeyManager: NSObject {behavior: .init(shortcut: assignment.shortcut,isEnabled: true,- holdModeType: .promptMode,+ holdModeType: .promptAssignment,holdStartMessage: "Prompt shortcut modifier held (hold mode) - starting",holdReleaseMessage: "Prompt shortcut modifier released (hold mode) - stopping",toggleIgnoredMessage: "Prompt shortcut modifier released but another key was pressed - ignoring",- isModeKeyPressed: { self.isPromptModeKeyPressed },- setModeKeyPressed: { self.isPromptModeKeyPressed = $0 },+ isModeKeyPressed: { self.isPromptAssignmentKeyPressed },+ setModeKeyPressed: { self.isPromptAssignmentKeyPressed = $0 },onHoldStart: { self.triggerPromptSelection(assignment.selection) },onToggleRelease: {if self.asrService.isRunning {@@ -1498,6 +1513,7 @@ final class GlobalHotkeyManager: NSObject {let pressedModifierKeyCodes = HotkeyShortcut.normalizedModifierKeyCodes(from: Array(self.pressedModifierKeyCodes))if pressedModifierKeyCodes == expectedModifierKeyCodes {self.modifierOnlyKeyDown = true+ self.activeModifierOnlyType = behavior.holdModeTypeself.otherKeyPressedDuringModifier = falseself.modifierPressStartTime = Date()@@ -1505,7 +1521,8 @@ final class GlobalHotkeyManager: NSObject {return true}- if self.modifierOnlyKeyDown || behavior.isModeKeyPressed() {+ let isActiveModifierOnlyPress = self.activeModifierOnlyType == behavior.holdModeType+ if isActiveModifierOnlyPress || behavior.isModeKeyPressed() {let extraModifierKeyCodes = pressedModifierKeyCodes.filter { !expectedModifierKeyCodes.contains($0) }if !extraModifierKeyCodes.isEmpty {self.markModifierOnlyPressInterrupted(@@ -1514,7 +1531,7 @@ final class GlobalHotkeyManager: NSObject {}}- guard self.modifierOnlyKeyDown || behavior.isModeKeyPressed(),+ guard isActiveModifierOnlyPress || behavior.isModeKeyPressed(),expectedModifierKeyCodes.contains(keyCode),!pressedModifierKeyCodes.contains(keyCode)else {@@ -1523,6 +1540,7 @@ final class GlobalHotkeyManager: NSObject {let wasCleanPress = !self.otherKeyPressedDuringModifierself.modifierOnlyKeyDown = false+ self.activeModifierOnlyType = nilself.otherKeyPressedDuringModifier = falseself.modifierPressStartTime = nil@@ -1538,6 +1556,7 @@ final class GlobalHotkeyManager: NSObject {if relevantModifiers == expectedPressedModifiers {self.modifierOnlyKeyDown = true+ self.activeModifierOnlyType = behavior.holdModeTypeself.otherKeyPressedDuringModifier = falseself.modifierPressStartTime = Date()@@ -1545,7 +1564,8 @@ final class GlobalHotkeyManager: NSObject {return true}- if self.modifierOnlyKeyDown || behavior.isModeKeyPressed() {+ let isActiveModifierOnlyPress = self.activeModifierOnlyType == behavior.holdModeType+ if isActiveModifierOnlyPress || behavior.isModeKeyPressed() {let unexpectedModifiers = relevantModifiers.subtracting(expectedPressedModifiers)if !unexpectedModifiers.isEmpty {self.markModifierOnlyPressInterrupted(@@ -1554,7 +1574,7 @@ final class GlobalHotkeyManager: NSObject {}}- guard self.modifierOnlyKeyDown || behavior.isModeKeyPressed(),+ guard isActiveModifierOnlyPress || behavior.isModeKeyPressed(),keyCode == shortcut.keyCode,!relevantModifiers.contains(triggerFlag)else {@@ -1563,6 +1583,7 @@ final class GlobalHotkeyManager: NSObject {let wasCleanPress = !self.otherKeyPressedDuringModifierself.modifierOnlyKeyDown = false+ self.activeModifierOnlyType = nilself.otherKeyPressedDuringModifier = falseself.modifierPressStartTime = nil