feat: finish Fn dictation with another key (#52)

Author: quanru

README.md

@@ -170,6 +170,7 @@ Modifier keys are logical choices: either the left or right physical key works.
 Your keyboard must report Fn as a Linux key; otherwise choose another key.
 
 - Tap to start; tap again to finish and paste.
+- With Fn as the trigger, pressing another key while recording also finishes and pastes. Escape still cancels; the finishing key still reaches the foreground app.
 - Hold past the threshold to speak; release to finish and paste.
 - Select one preset, or choose **Record a shortcut…** to capture a custom combination such as Ctrl+Alt+Space. Only one trigger is active.
 - Press the active trigger twice to send Enter without dictation. This can submit messages or execute terminal commands.

README.zh-CN.md

@@ -132,6 +132,7 @@ Esc 可停止后续输入，但不能撤回已输入的文字；焦点变化时
 如果键盘没有向 Linux 上报 Fn 按键，请选择其他键。
 
 - 短按开始，再按一次结束并粘贴。
+- 使用 Fn 作为触发键时，录音期间按其他键也会结束并粘贴。Esc 仍用于取消；结束录音的按键仍会传给前台应用。
 - 长按超过阈值开始说话，松开结束并粘贴。
 - 可直接选择一个预设，或选择**录制快捷键…**来录制 Ctrl+Alt+Space 这样的组合键；任何时候只会生效一个快捷键。
 - 连续按两次当前触发快捷键会在不听写的情况下发送回车，可能发送消息或执行终端命令。

src/doubao_input/app.py

@@ -260,6 +260,7 @@ def _build(self) -> None:
             enter=self._voice_enter, cancel_input=self._cancel_input,
             shortcut=self._injector.send_shortcut,
             prime=self._voice_prime, discard=self._tm.discard_primed_audio,
+            is_recording=lambda: self.app_state.is_recording,
             debug_edge=self._debug_edge, error=lambda message: logger.warning("PTT error: %s", message))
 
         # ---- Initial state: cached params? ----

src/doubao_input/trigger/controller.py

@@ -12,12 +12,14 @@ class TriggerController:
     def __init__(self, reader_factory, schedule, cancel, *, start, stop, toggle, enter,
                  cancel_input, debug_edge, error, escape_edge=lambda pressed: None,
                  prime=lambda: None, discard=lambda: None,
-                 shortcut=lambda key, modifiers=(): None):
+                 shortcut=lambda key, modifiers=(): None,
+                 is_recording=lambda: False):
         self._factory = reader_factory
         self._schedule, self._cancel = schedule, cancel
         self._actions = start, stop, toggle, enter
         self._prime, self._discard = prime, discard
         self._shortcut = shortcut
+        self._is_recording = is_recording
         self._escape_edge = escape_edge
         self._cancel_input, self._debug_edge, self._error = cancel_input, debug_edge, error
         self._timers = TimerScope(schedule, cancel)
@@ -53,7 +55,7 @@ def configure(self, settings, *, strict=False):
             return self._available
         generation = self._generation + 1
         configured = (settings.doubao_key, *settings.doubao_modifiers)
-        keys = ({1} | set(CAPTURABLE_KEY_CODES)) if self.capturing else (
+        keys = ({1} | set(CAPTURABLE_KEY_CODES)) if (self.capturing or settings.doubao_key == 464) else (
             {1}.union(*(equivalent_key_codes(code) for code in configured))
             if settings.doubao_key else set())
         candidate = self._factory(on_press=lambda: None, on_release=lambda: None,
@@ -152,6 +154,10 @@ def _edge(self, code, pressed):
             return
         if not self._settings or not self._gesture:
             return
+        if (pressed and self._settings.doubao_key == 464 and code != 464
+                and self._is_recording()):
+            self._actions[1]()
+            return
         if pressed:
             self._down_keys.add(code)
             if (key_codes_match(code, self._settings.doubao_key)

tests/unit/test_trigger_controller.py

@@ -23,9 +23,11 @@ def reader(**kwargs):
         self.start, self.stop, self.toggle, self.enter, self.cancel = [Mock() for _ in range(5)]
         self.shortcut = Mock()
         self.error = Mock()
+        self.recording_active = False
         self.control = TriggerController(reader, schedule, Mock(), start=self.start, stop=self.stop,
             toggle=self.toggle, enter=self.enter, cancel_input=self.cancel,
-            debug_edge=Mock(return_value=False), error=self.error, shortcut=self.shortcut)
+            debug_edge=Mock(return_value=False), error=self.error, shortcut=self.shortcut,
+            is_recording=lambda: self.recording_active)
         self.settings = Settings(doubao_key=100)
         self.control.configure(self.settings)
 
@@ -205,6 +207,35 @@ def test_hold_release_and_escape_preserve_gesture_behavior(self):
         self.edge(1, True)
         self.cancel.assert_called_once()
 
+    def test_fn_recording_finishes_on_any_other_key_press(self):
+        self.control.configure(replace(self.settings, doubao_key=464))
+        self.assertIn(30, self.readers[-1].callbacks["key_codes"])
+        self.edge(464, True)
+        self.edge(464, False)
+        self.timers[-1][1]()
+        self.toggle.assert_called_once()
+        self.recording_active = True
+        self.edge(30, True)
+        self.stop.assert_called_once()
+        self.edge(30, False)
+        self.stop.assert_called_once()
+
+    def test_fn_other_key_before_recording_does_not_finish(self):
+        self.control.configure(replace(self.settings, doubao_key=464))
+        self.edge(30, True)
+        self.stop.assert_not_called()
+        self.toggle.assert_not_called()
+
+    def test_fn_recording_escape_still_cancels(self):
+        self.control.configure(replace(self.settings, doubao_key=464))
+        self.recording_active = True
+        self.edge(1, True)
+        self.cancel.assert_called_once()
+        self.stop.assert_not_called()
+
+    def test_non_fn_trigger_keeps_listening_only_to_its_shortcut(self):
+        self.assertNotIn(30, self.readers[-1].callbacks["key_codes"])
+
     def test_dedicated_record_button_uses_same_gesture(self):
         self.aux("record", True)
         self.timers[-1][1]()