fix(macos): 避免 Fn 长按与功能键误触发听写

openless-all/app/crates/openless-core/src/api.rs

@@ -3255,8 +3255,10 @@ impl OpenLessBackend {
  };
  let preferences = self.get_preferences();
  let mode = preferences.hotkey.mode;
- let modifier_only =
- crate::shortcut_types::legacy_modifier_trigger(&preferences.dictation_hotkey).is_some();
+ let modifier_only = crate::hotkey_interpreter::modifier_arbitration_required(
+ crate::shortcut_types::legacy_modifier_trigger(&preferences.dictation_hotkey),
+ mode,
+ );
  let (intent, reservation) = {
  let mut hotkey = self
  .hotkey

openless-all/app/crates/openless-core/src/hotkey_interpreter.rs

@@ -1,7 +1,7 @@
 use std::collections::VecDeque;
 use std::time::{Duration, Instant};
 
-use crate::shared_types::HotkeyMode;
+use crate::shared_types::{HotkeyMode, HotkeyTrigger};
 use crate::types::DictationPhase;
 
 /// Auto mode treats a shorter press as a latched Toggle press and a longer
@@ -21,6 +21,17 @@ const MODIFIER_ARBITRATION_GRACE: Duration = Duration::from_millis(150);
 /// awaits microphone/ASR setup. Keep a bounded set of those early Combined ids.
 const MAX_PENDING_COMBINED: usize = 64;
 
+/// macOS emits Fn Auto/Toggle edges only after native release arbitration.
+pub(crate) fn modifier_arbitration_required(
+ trigger: Option<HotkeyTrigger>,
+ mode: HotkeyMode,
+) -> bool {
+ trigger.is_some()
+ && !(cfg!(target_os = "macos")
+ && trigger == Some(HotkeyTrigger::Fn)
+ && matches!(mode, HotkeyMode::Auto | HotkeyMode::Toggle))
+}
+
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub(crate) enum HotkeyIntent {
  Noop,
@@ -266,6 +277,27 @@ impl HotkeyInterpreter {
 mod tests {
  use super::*;
 
+ #[test]
+ fn mac_fn_tap_arrives_pre_arbitrated_but_hold_and_other_modifiers_do_not() {
+ let fn_tap_needs_grace = !cfg!(target_os = "macos");
+ assert_eq!(
+ modifier_arbitration_required(Some(HotkeyTrigger::Fn), HotkeyMode::Auto),
+ fn_tap_needs_grace
+ );
+ assert_eq!(
+ modifier_arbitration_required(Some(HotkeyTrigger::Fn), HotkeyMode::Toggle),
+ fn_tap_needs_grace
+ );
+ assert!(modifier_arbitration_required(
+ Some(HotkeyTrigger::Fn),
+ HotkeyMode::Hold
+ ));
+ assert!(modifier_arbitration_required(
+ Some(HotkeyTrigger::LeftOption),
+ HotkeyMode::Auto
+ ));
+ }
+
  #[test]
  fn combined_before_pressed_cancels_only_that_generation() {
  let start = Instant::now();