{
- let c = ch.to_ascii_uppercase();
- let code = match c {
- 'A' => Code::KeyA,
- 'B' => Code::KeyB,
- 'C' => Code::KeyC,
- 'D' => Code::KeyD,
- 'E' => Code::KeyE,
- 'F' => Code::KeyF,
- 'G' => Code::KeyG,
- 'H' => Code::KeyH,
- 'I' => Code::KeyI,
- 'J' => Code::KeyJ,
- 'K' => Code::KeyK,
- 'L' => Code::KeyL,
- 'M' => Code::KeyM,
- 'N' => Code::KeyN,
- 'O' => Code::KeyO,
- 'P' => Code::KeyP,
- 'Q' => Code::KeyQ,
- 'R' => Code::KeyR,
- 'S' => Code::KeyS,
- 'T' => Code::KeyT,
- 'U' => Code::KeyU,
- 'V' => Code::KeyV,
- 'W' => Code::KeyW,
- 'X' => Code::KeyX,
- 'Y' => Code::KeyY,
- 'Z' => Code::KeyZ,
- '0' => Code::Digit0,
- '1' => Code::Digit1,
- '2' => Code::Digit2,
- '3' => Code::Digit3,
- '4' => Code::Digit4,
- '5' => Code::Digit5,
- '6' => Code::Digit6,
- '7' => Code::Digit7,
- '8' => Code::Digit8,
- '9' => Code::Digit9,
- ';' => Code::Semicolon,
- ':' => Code::Semicolon,
- ',' => Code::Comma,
- '.' => Code::Period,
- '/' => Code::Slash,
- '\\' => Code::Backslash,
- '[' => Code::BracketLeft,
- ']' => Code::BracketRight,
- '\'' => Code::Quote,
- '`' => Code::Backquote,
- '-' => Code::Minus,
- '=' => Code::Equal,
- ' ' => Code::Space,
- _ => return None,
- };
- Some(code)
+fn parse_binding(
+ binding: &ShortcutBinding,
+) -> Result {
+ parse_global_hotkey(binding).map_err(|e| match e {
+ ShortcutBindingError::UnsupportedModifier(m) => QaHotkeyError::UnsupportedModifier(m),
+ ShortcutBindingError::UnsupportedKey(k) => QaHotkeyError::UnsupportedKey(k),
+ })
}
#[cfg(test)]
mod tests {
use super::*;
+ use global_hotkey::hotkey::{Code, Modifiers};
#[test]
fn parse_default_binding() {
- let binding = QaHotkeyBinding::default();
+ let binding = ShortcutBinding::default_qa();
let parsed = parse_binding(&binding).expect("default binding parses");
assert!(parsed.mods.contains(Modifiers::SHIFT));
assert_eq!(parsed.key, Code::Semicolon);
@@ -317,7 +169,7 @@ mod tests {
#[test]
fn parse_letter_binding() {
- let binding = QaHotkeyBinding {
+ let binding = ShortcutBinding {
primary: "k".into(),
modifiers: vec!["cmd".into(), "alt".into()],
};
@@ -329,7 +181,7 @@ mod tests {
#[test]
fn unsupported_modifier_rejected() {
- let binding = QaHotkeyBinding {
+ let binding = ShortcutBinding {
primary: ";".into(),
modifiers: vec!["hyper".into()],
};
@@ -341,7 +193,7 @@ mod tests {
#[test]
fn empty_primary_rejected() {
- let binding = QaHotkeyBinding {
+ let binding = ShortcutBinding {
primary: "".into(),
modifiers: vec!["cmd".into()],
};
@@ -353,7 +205,7 @@ mod tests {
#[test]
fn cmd_modifier_normalizes_per_platform() {
- let binding = QaHotkeyBinding {
+ let binding = ShortcutBinding {
primary: ";".into(),
modifiers: vec!["cmd".into(), "shift".into()],
};
@@ -370,4 +222,35 @@ mod tests {
assert!(parsed.mods.contains(Modifiers::SUPER));
}
}
+
+ #[test]
+ fn forward_loop_ignores_unrelated_hotkey_ids() {
+ let (event_tx, event_rx) = std::sync::mpsc::channel();
+ let (out_tx, out_rx) = std::sync::mpsc::channel();
+
+ event_tx
+ .send(GlobalHotKeyEvent {
+ id: 41,
+ state: HotKeyState::Pressed,
+ })
+ .unwrap();
+ event_tx
+ .send(GlobalHotKeyEvent {
+ id: 42,
+ state: HotKeyState::Released,
+ })
+ .unwrap();
+ event_tx
+ .send(GlobalHotKeyEvent {
+ id: 42,
+ state: HotKeyState::Pressed,
+ })
+ .unwrap();
+ drop(event_tx);
+
+ forward_loop(42, event_rx, out_tx);
+
+ assert!(matches!(out_rx.recv().unwrap(), QaHotkeyEvent::Pressed));
+ assert!(out_rx.try_recv().is_err());
+ }
}
diff --git a/openless-all/app/src-tauri/src/recorder.rs b/openless-all/app/src-tauri/src/recorder.rs
index 4057abdb..35b44788 100644
--- a/openless-all/app/src-tauri/src/recorder.rs
+++ b/openless-all/app/src-tauri/src/recorder.rs
@@ -18,6 +18,7 @@ use std::thread::{self, JoinHandle};
use cpal::traits::{DeviceTrait, HostTrait, StreamTrait};
use cpal::{SampleFormat, StreamConfig};
use parking_lot::Mutex;
+use serde::Serialize;
use thiserror::Error;
/// 目标采样率（与 Swift 端常量一致；不要改）。
@@ -34,6 +35,13 @@ pub trait AudioConsumer: Send + Sync {
fn consume_pcm_chunk(&self, pcm: &[u8]);
}
+#[derive(Debug, Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct MicrophoneDevice {
+ pub name: String,
+ pub is_default: bool,
+}
+
/// 采集器错误。
#[derive(Debug, Error)]
pub enum RecorderError {
@@ -55,6 +63,7 @@ impl Recorder {
///
/// 实际的 cpal Stream 在独立线程里构造、播放、最终析构——因为它 `!Send`。
pub fn start(
+ microphone_device_name: Option,
consumer: Arc,
level_handler: Arc,
) -> Result<(Self, Receiver), RecorderError> {
@@ -69,6 +78,7 @@ impl Recorder {
.name("openless-recorder".into())
.spawn(move || {
run_audio_thread(
+ microphone_device_name,
consumer,
level_handler,
stop_for_thread,
@@ -107,15 +117,47 @@ impl Recorder {
}
}
+pub fn list_input_devices() -> Result, RecorderError> {
+ let host = cpal::default_host();
+ let default_name = host
+ .default_input_device()
+ .and_then(|device| device.name().ok());
+ let devices = host
+ .input_devices()
+ .map_err(|e| RecorderError::EngineFailed(format!("input_devices: {e}")))?;
+
+ let mut result = Vec::new();
+ for device in devices {
+ let name = match device.name() {
+ Ok(name) => name,
+ Err(err) => {
+ log::warn!("[recorder] failed to read input device name: {err}");
+ continue;
+ }
+ };
+ result.push(MicrophoneDevice {
+ is_default: default_name.as_deref() == Some(name.as_str()),
+ name,
+ });
+ }
+ Ok(result)
+}
+
/// 音频线程主体：构造 Stream → 通过 startup_tx 报告 → 循环到 stop_flag。
fn run_audio_thread(
+ microphone_device_name: Option,
consumer: Arc,
level_handler: Arc,
stop_flag: Arc,
startup_tx: Sender>,
runtime_error_tx: Sender,
) {
- let (stream, state) = match build_input_stream(consumer, level_handler, runtime_error_tx.clone()) {
+ let (stream, state) = match build_input_stream(
+ microphone_device_name,
+ consumer,
+ level_handler,
+ runtime_error_tx.clone(),
+ ) {
Ok(s) => s,
Err(err) => {
// 启动失败：通知主线程后即退出。
@@ -133,9 +175,9 @@ fn run_audio_thread(
let _ = startup_tx.send(Ok(()));
// 启动 liveness watchdog 线程：检测录音回调是否静默停止
- const WATCHDOG_CHECK_INTERVAL_MS: u64 = 1000; // 每秒检查一次
- const CALLBACK_TIMEOUT_SECS: u64 = 3; // 3 秒没有回调视为异常
- const FIRST_CALLBACK_DEADLINE_SECS: u64 = 5; // 5 秒内必须收到首次回调
+ const WATCHDOG_CHECK_INTERVAL_MS: u64 = 1000; // 每秒检查一次
+ const CALLBACK_TIMEOUT_SECS: u64 = 3; // 3 秒没有回调视为异常
+ const FIRST_CALLBACK_DEADLINE_SECS: u64 = 5; // 5 秒内必须收到首次回调
let stop_flag_for_watchdog = Arc::clone(&stop_flag);
let state_for_watchdog = Arc::clone(&state);
@@ -160,10 +202,11 @@ fn run_audio_thread(
"[recorder] watchdog: 录音回调已停止 {} 秒，触发错误恢复",
elapsed.as_secs()
);
- let _ = runtime_error_tx_for_watchdog.send(RecorderError::EngineFailed(
- format!("录音回调静默停止 {} 秒", elapsed.as_secs())
- ));
- break; // 只报告一次
+ let _ =
+ runtime_error_tx_for_watchdog.send(RecorderError::EngineFailed(
+ format!("录音回调静默停止 {} 秒", elapsed.as_secs()),
+ ));
+ break; // 只报告一次
}
}
None => {
@@ -174,10 +217,11 @@ fn run_audio_thread(
"[recorder] watchdog: {} 秒内未收到首次回调，触发错误恢复",
elapsed.as_secs()
);
- let _ = runtime_error_tx_for_watchdog.send(RecorderError::EngineFailed(
- format!("录音启动后 {} 秒内未收到回调", elapsed.as_secs())
- ));
- break; // 只报告一次
+ let _ =
+ runtime_error_tx_for_watchdog.send(RecorderError::EngineFailed(
+ format!("录音启动后 {} 秒内未收到回调", elapsed.as_secs()),
+ ));
+ break; // 只报告一次
}
}
}
@@ -201,14 +245,13 @@ fn run_audio_thread(
/// 选默认输入设备 + 默认配置 + 构造 Stream。
fn build_input_stream(
+ microphone_device_name: Option,
consumer: Arc,
level_handler: Arc,
runtime_error_tx: Sender,
) -> Result<(cpal::Stream, Arc), RecorderError> {
let host = cpal::default_host();
- let device = host
- .default_input_device()
- .ok_or_else(|| RecorderError::EngineFailed("no default input device".into()))?;
+ let device = select_input_device(&host, microphone_device_name.as_deref())?;
let supported = device
.default_input_config()
@@ -220,7 +263,8 @@ fn build_input_stream(
let channels = config.channels as usize;
log::info!(
- "[recorder] inputFormat sampleRate={} channels={} fmt={:?}",
+ "[recorder] inputDevice={} inputFormat sampleRate={} channels={} fmt={:?}",
+ device.name().unwrap_or_else(|_| "".into()),
input_sr,
channels,
sample_format
@@ -241,6 +285,31 @@ fn build_input_stream(
Ok((stream, state))
}
+fn select_input_device(
+ host: &cpal::Host,
+ microphone_device_name: Option<&str>,
+) -> Result {
+ let preferred = microphone_device_name
+ .map(str::trim)
+ .filter(|name| !name.is_empty());
+ if let Some(preferred) = preferred {
+ let devices = host
+ .input_devices()
+ .map_err(|e| RecorderError::EngineFailed(format!("input_devices: {e}")))?;
+ for device in devices {
+ if device.name().ok().as_deref() == Some(preferred) {
+ return Ok(device);
+ }
+ }
+ log::warn!(
+ "[recorder] preferred input device not found; falling back to default: {preferred}"
+ );
+ }
+
+ host.default_input_device()
+ .ok_or_else(|| RecorderError::EngineFailed("no default input device".into()))
+}
+
/// 启动期 default_input_config 失败：依靠错误字符串关键字粗判权限问题。
/// cpal 在 macOS 没拿到 mic 授权时通常返回 `BackendSpecific`，我们尽力识别。
fn classify_default_config_err(msg: String) -> RecorderError {
diff --git a/openless-all/app/src-tauri/src/shortcut_binding.rs b/openless-all/app/src-tauri/src/shortcut_binding.rs
new file mode 100644
index 00000000..731f8532
--- /dev/null
+++ b/openless-all/app/src-tauri/src/shortcut_binding.rs
@@ -0,0 +1,253 @@
+//! Shared parsing/validation for user-configurable shortcut bindings.
+
+use global_hotkey::hotkey::{Code, HotKey, Modifiers};
+
+use crate::types::{HotkeyTrigger, ShortcutBinding};
+
+#[derive(Debug, thiserror::Error)]
+pub enum ShortcutBindingError {
+ #[error("不支持的修饰键: {0}")]
+ UnsupportedModifier(String),
+ #[error("不支持的主键: {0}")]
+ UnsupportedKey(String),
+}
+
+pub fn validate_binding(binding: &ShortcutBinding) -> Result<(), ShortcutBindingError> {
+ if legacy_modifier_trigger(binding).is_some() {
+ return Ok(());
+ }
+ if binding.modifiers.is_empty() && binding.primary.eq_ignore_ascii_case("shift") {
+ return Ok(());
+ }
+ parse_global_hotkey(binding)?;
+ Ok(())
+}
+
+pub fn parse_global_hotkey(binding: &ShortcutBinding) -> Result {
+ let mut mods = Modifiers::empty();
+ for raw in &binding.modifiers {
+ let tag = normalize_modifier_tag(raw);
+ let bit = match tag.as_str() {
+ "cmd" | "command" | "super" | "meta" | "win" => Modifiers::SUPER,
+ "ctrl" | "control" => Modifiers::CONTROL,
+ "alt" | "option" | "opt" => Modifiers::ALT,
+ "shift" => Modifiers::SHIFT,
+ other => return Err(ShortcutBindingError::UnsupportedModifier(other.to_string())),
+ };
+ mods |= bit;
+ }
+ let code = parse_primary(&binding.primary)?;
+ let mods = if mods.is_empty() { None } else { Some(mods) };
+ Ok(HotKey::new(mods, code))
+}
+
+pub fn legacy_modifier_trigger(binding: &ShortcutBinding) -> Option {
+ if !binding.modifiers.is_empty() {
+ return None;
+ }
+ match normalize_primary(&binding.primary).as_str() {
+ "rightoption" | "rightalt" => Some(HotkeyTrigger::RightOption),
+ "leftoption" | "leftalt" => Some(HotkeyTrigger::LeftOption),
+ "rightcontrol" | "rightctrl" => Some(HotkeyTrigger::RightControl),
+ "leftcontrol" | "leftctrl" => Some(HotkeyTrigger::LeftControl),
+ "rightcommand" | "rightcmd" | "rightsuper" | "rightmeta" => {
+ Some(HotkeyTrigger::RightCommand)
+ }
+ "fn" | "function" => Some(HotkeyTrigger::Fn),
+ _ => None,
+ }
+}
+
+pub fn binding_from_legacy_trigger(trigger: HotkeyTrigger) -> ShortcutBinding {
+ let primary = match trigger {
+ HotkeyTrigger::RightOption | HotkeyTrigger::RightAlt => "RightOption",
+ HotkeyTrigger::LeftOption => "LeftOption",
+ HotkeyTrigger::RightControl => "RightControl",
+ HotkeyTrigger::LeftControl => "LeftControl",
+ HotkeyTrigger::RightCommand => "RightCommand",
+ HotkeyTrigger::Fn => "Fn",
+ HotkeyTrigger::Custom => "RightOption",
+ };
+ ShortcutBinding {
+ primary: primary.into(),
+ modifiers: Vec::new(),
+ }
+}
+
+fn normalize_modifier_tag(raw: &str) -> String {
+ let tag = raw.trim().to_ascii_lowercase();
+ #[cfg(target_os = "windows")]
+ {
+ if matches!(tag.as_str(), "cmd" | "command") {
+ return "ctrl".to_string();
+ }
+ }
+ tag
+}
+
+fn normalize_primary(raw: &str) -> String {
+ raw.trim()
+ .chars()
+ .filter(|c| !matches!(c, ' ' | '-' | '_'))
+ .collect::()
+ .to_ascii_lowercase()
+}
+
+fn parse_primary(raw: &str) -> Result {
+ let trimmed = raw.trim();
+ if trimmed.is_empty() {
+ return Err(ShortcutBindingError::UnsupportedKey("(空)".into()));
+ }
+ if trimmed.chars().count() == 1 {
+ let ch = trimmed.chars().next().unwrap();
+ if let Some(code) = char_to_code(ch) {
+ return Ok(code);
+ }
+ }
+ let upper = trimmed.to_ascii_uppercase();
+ let named = match upper.as_str() {
+ "ENTER" | "RETURN" => Code::Enter,
+ "TAB" => Code::Tab,
+ "ESC" | "ESCAPE" => Code::Escape,
+ "SPACE" => Code::Space,
+ "BACKSPACE" => Code::Backspace,
+ "DELETE" | "DEL" => Code::Delete,
+ "HOME" => Code::Home,
+ "END" => Code::End,
+ "PAGEUP" => Code::PageUp,
+ "PAGEDOWN" => Code::PageDown,
+ "ARROWUP" | "UP" => Code::ArrowUp,
+ "ARROWDOWN" | "DOWN" => Code::ArrowDown,
+ "ARROWLEFT" | "LEFT" => Code::ArrowLeft,
+ "ARROWRIGHT" | "RIGHT" => Code::ArrowRight,
+ "F1" => Code::F1,
+ "F2" => Code::F2,
+ "F3" => Code::F3,
+ "F4" => Code::F4,
+ "F5" => Code::F5,
+ "F6" => Code::F6,
+ "F7" => Code::F7,
+ "F8" => Code::F8,
+ "F9" => Code::F9,
+ "F10" => Code::F10,
+ "F11" => Code::F11,
+ "F12" => Code::F12,
+ _ => return Err(ShortcutBindingError::UnsupportedKey(trimmed.to_string())),
+ };
+ Ok(named)
+}
+
+fn char_to_code(ch: char) -> Option {
+ let c = ch.to_ascii_uppercase();
+ let code = match c {
+ 'A' => Code::KeyA,
+ 'B' => Code::KeyB,
+ 'C' => Code::KeyC,
+ 'D' => Code::KeyD,
+ 'E' => Code::KeyE,
+ 'F' => Code::KeyF,
+ 'G' => Code::KeyG,
+ 'H' => Code::KeyH,
+ 'I' => Code::KeyI,
+ 'J' => Code::KeyJ,
+ 'K' => Code::KeyK,
+ 'L' => Code::KeyL,
+ 'M' => Code::KeyM,
+ 'N' => Code::KeyN,
+ 'O' => Code::KeyO,
+ 'P' => Code::KeyP,
+ 'Q' => Code::KeyQ,
+ 'R' => Code::KeyR,
+ 'S' => Code::KeyS,
+ 'T' => Code::KeyT,
+ 'U' => Code::KeyU,
+ 'V' => Code::KeyV,
+ 'W' => Code::KeyW,
+ 'X' => Code::KeyX,
+ 'Y' => Code::KeyY,
+ 'Z' => Code::KeyZ,
+ '0' | ')' => Code::Digit0,
+ '1' | '!' => Code::Digit1,
+ '2' | '@' => Code::Digit2,
+ '3' | '#' => Code::Digit3,
+ '4' | '$' => Code::Digit4,
+ '5' | '%' => Code::Digit5,
+ '6' | '^' => Code::Digit6,
+ '7' | '&' => Code::Digit7,
+ '8' | '*' => Code::Digit8,
+ '9' | '(' => Code::Digit9,
+ ';' | ':' => Code::Semicolon,
+ ',' | '<' => Code::Comma,
+ '.' | '>' => Code::Period,
+ '/' | '?' => Code::Slash,
+ '\\' | '|' => Code::Backslash,
+ '[' | '{' => Code::BracketLeft,
+ ']' | '}' => Code::BracketRight,
+ '\'' | '"' => Code::Quote,
+ '`' | '~' => Code::Backquote,
+ '-' | '_' => Code::Minus,
+ '=' | '+' => Code::Equal,
+ ' ' => Code::Space,
+ _ => return None,
+ };
+ Some(code)
+}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+
+ #[test]
+ fn parses_combo_and_single_key() {
+ let combo = ShortcutBinding {
+ primary: "D".into(),
+ modifiers: vec!["cmd".into(), "shift".into()],
+ };
+ let parsed = parse_global_hotkey(&combo).expect("combo parses");
+ assert!(parsed.mods.contains(Modifiers::SUPER));
+ assert!(parsed.mods.contains(Modifiers::SHIFT));
+ assert_eq!(parsed.key, Code::KeyD);
+
+ let single = ShortcutBinding {
+ primary: "F8".into(),
+ modifiers: vec![],
+ };
+ let parsed = parse_global_hotkey(&single).expect("single key parses");
+ assert!(parsed.mods.is_empty());
+ assert_eq!(parsed.key, Code::F8);
+ }
+
+ #[test]
+ fn detects_legacy_modifier_only() {
+ let binding = ShortcutBinding {
+ primary: "RightControl".into(),
+ modifiers: vec![],
+ };
+ assert_eq!(
+ legacy_modifier_trigger(&binding),
+ Some(HotkeyTrigger::RightControl)
+ );
+ }
+
+ #[test]
+ fn accepts_shifted_printable_aliases() {
+ let cases = [
+ ("?", Code::Slash),
+ ("!", Code::Digit1),
+ (":", Code::Semicolon),
+ ("+", Code::Equal),
+ ("_", Code::Minus),
+ ("{", Code::BracketLeft),
+ ("|", Code::Backslash),
+ ];
+ for (primary, expected) in cases {
+ let binding = ShortcutBinding {
+ primary: primary.into(),
+ modifiers: vec!["shift".into()],
+ };
+ let parsed = parse_global_hotkey(&binding).expect("shifted printable parses");
+ assert_eq!(parsed.key, expected);
+ assert!(parsed.mods.contains(Modifiers::SHIFT));
+ }
+ }
+}
diff --git a/openless-all/app/src-tauri/src/types.rs b/openless-all/app/src-tauri/src/types.rs
index c1266e24..f6c0e83d 100644
--- a/openless-all/app/src-tauri/src/types.rs
+++ b/openless-all/app/src-tauri/src/types.rs
@@ -109,10 +109,11 @@ fn default_true() -> bool {
true
}
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize)]
#[serde(default, rename_all = "camelCase")]
pub struct UserPreferences {
pub hotkey: HotkeyBinding,
+ pub dictation_hotkey: ShortcutBinding,
pub default_mode: PolishMode,
pub enabled_modes: Vec,
pub launch_at_login: bool,
@@ -120,6 +121,9 @@ pub struct UserPreferences {
/// 录音期间临时静音系统输出，停止/取消/出错后恢复原静音状态。
#[serde(default)]
pub mute_during_recording: bool,
+ /// 录音输入设备名称。空字符串 = 使用系统默认麦克风。
+ #[serde(default)]
+ pub microphone_device_name: String,
pub active_asr_provider: String, // "volcengine" | "apple-speech" | ...
pub active_llm_provider: String, // "ark" | "openai" | ...
/// Windows/Linux 粘贴成功后是否恢复用户原剪贴板。默认 true 跟历史行为一致；
@@ -154,11 +158,22 @@ pub struct UserPreferences {
/// coordinator 用 global-hotkey crate 注册组合键（modifier + 主键）。
/// 默认 Cmd+Shift+; (macOS) / Ctrl+Shift+; (Windows)。详见 issue #118。
#[serde(default = "default_qa_hotkey")]
- pub qa_hotkey: Option,
+ pub qa_hotkey: Option,
/// 是否把每次 QA 会话写进 history.json。默认 false：QA 默认临时不留痕。
/// 详见 issue #118。
#[serde(default)]
pub qa_save_history: bool,
+ /// 自定义录音组合键。当 `hotkey.trigger == Custom` 时，coordinator 用
+ /// `global-hotkey` crate 注册此组合键（支持 Toggle + Hold 模式）。
+ /// `None` 且 trigger == Custom 表示用户选了自定义但还没录制。
+ #[serde(default)]
+ pub custom_combo_hotkey: Option,
+ #[serde(default = "default_translation_hotkey")]
+ pub translation_hotkey: ShortcutBinding,
+ #[serde(default = "default_switch_style_hotkey")]
+ pub switch_style_hotkey: ShortcutBinding,
+ #[serde(default = "default_open_app_hotkey")]
+ pub open_app_hotkey: ShortcutBinding,
/// 本地 Qwen3-ASR 当前激活的模型 id（"qwen3-asr-0.6b" / "qwen3-asr-1.7b"）。
/// 仅在 active_asr_provider == "local-qwen3" 时有意义。
#[serde(default = "default_local_asr_model")]
@@ -185,8 +200,174 @@ fn default_local_asr_keep_loaded_secs() -> u32 {
300
}
-fn default_qa_hotkey() -> Option {
- Some(QaHotkeyBinding::default())
+#[derive(Debug, Clone, Deserialize)]
+#[serde(default, rename_all = "camelCase")]
+struct UserPreferencesWire {
+ hotkey: HotkeyBinding,
+ dictation_hotkey: Option,
+ default_mode: PolishMode,
+ enabled_modes: Vec,
+ launch_at_login: bool,
+ show_capsule: bool,
+ #[serde(default)]
+ mute_during_recording: bool,
+ #[serde(default)]
+ microphone_device_name: String,
+ active_asr_provider: String,
+ active_llm_provider: String,
+ restore_clipboard_after_paste: bool,
+ allow_non_tsf_insertion_fallback: bool,
+ working_languages: Vec,
+ translation_target_language: String,
+ chinese_script_preference: ChineseScriptPreference,
+ #[serde(default)]
+ output_language_preference: OutputLanguagePreference,
+ qa_hotkey: Option,
+ qa_save_history: bool,
+ custom_combo_hotkey: Option,
+ translation_hotkey: Option,
+ switch_style_hotkey: Option,
+ open_app_hotkey: Option,
+ #[serde(default = "default_local_asr_model")]
+ local_asr_active_model: String,
+ #[serde(default = "default_local_asr_mirror")]
+ local_asr_mirror: String,
+ #[serde(default = "default_local_asr_keep_loaded_secs")]
+ local_asr_keep_loaded_secs: u32,
+}
+
+impl Default for UserPreferencesWire {
+ fn default() -> Self {
+ let prefs = UserPreferences::default();
+ Self {
+ hotkey: prefs.hotkey,
+ dictation_hotkey: None,
+ default_mode: prefs.default_mode,
+ enabled_modes: prefs.enabled_modes,
+ launch_at_login: prefs.launch_at_login,
+ show_capsule: prefs.show_capsule,
+ mute_during_recording: prefs.mute_during_recording,
+ microphone_device_name: prefs.microphone_device_name,
+ active_asr_provider: prefs.active_asr_provider,
+ active_llm_provider: prefs.active_llm_provider,
+ restore_clipboard_after_paste: prefs.restore_clipboard_after_paste,
+ allow_non_tsf_insertion_fallback: prefs.allow_non_tsf_insertion_fallback,
+ working_languages: prefs.working_languages,
+ translation_target_language: prefs.translation_target_language,
+ chinese_script_preference: prefs.chinese_script_preference,
+ output_language_preference: prefs.output_language_preference,
+ qa_hotkey: prefs.qa_hotkey,
+ qa_save_history: prefs.qa_save_history,
+ custom_combo_hotkey: prefs.custom_combo_hotkey,
+ translation_hotkey: None,
+ switch_style_hotkey: None,
+ open_app_hotkey: None,
+ local_asr_active_model: prefs.local_asr_active_model,
+ local_asr_mirror: prefs.local_asr_mirror,
+ local_asr_keep_loaded_secs: prefs.local_asr_keep_loaded_secs,
+ }
+ }
+}
+
+impl<'de> Deserialize<'de> for UserPreferences {
+ fn deserialize(deserializer: D) -> Result
+ where
+ D: serde::Deserializer<'de>,
+ {
+ let wire = UserPreferencesWire::deserialize(deserializer)?;
+ let dictation_hotkey = match wire.dictation_hotkey {
+ Some(binding) => binding,
+ None => default_dictation_hotkey_from_legacy(&wire.hotkey, &wire.custom_combo_hotkey)
+ .map_err(serde::de::Error::custom)?,
+ };
+ Ok(Self {
+ hotkey: wire.hotkey,
+ dictation_hotkey,
+ default_mode: wire.default_mode,
+ enabled_modes: wire.enabled_modes,
+ launch_at_login: wire.launch_at_login,
+ show_capsule: wire.show_capsule,
+ mute_during_recording: wire.mute_during_recording,
+ microphone_device_name: wire.microphone_device_name,
+ active_asr_provider: wire.active_asr_provider,
+ active_llm_provider: wire.active_llm_provider,
+ restore_clipboard_after_paste: wire.restore_clipboard_after_paste,
+ allow_non_tsf_insertion_fallback: wire.allow_non_tsf_insertion_fallback,
+ working_languages: wire.working_languages,
+ translation_target_language: wire.translation_target_language,
+ chinese_script_preference: wire.chinese_script_preference,
+ output_language_preference: wire.output_language_preference,
+ qa_hotkey: wire.qa_hotkey,
+ qa_save_history: wire.qa_save_history,
+ custom_combo_hotkey: wire.custom_combo_hotkey,
+ translation_hotkey: wire
+ .translation_hotkey
+ .unwrap_or_else(default_translation_hotkey),
+ switch_style_hotkey: wire
+ .switch_style_hotkey
+ .unwrap_or_else(default_switch_style_hotkey),
+ open_app_hotkey: wire.open_app_hotkey.unwrap_or_else(default_open_app_hotkey),
+ local_asr_active_model: wire.local_asr_active_model,
+ local_asr_mirror: wire.local_asr_mirror,
+ local_asr_keep_loaded_secs: wire.local_asr_keep_loaded_secs,
+ })
+ }
+}
+
+fn default_qa_hotkey() -> Option {
+ Some(ShortcutBinding::default_qa())
+}
+
+fn default_translation_hotkey() -> ShortcutBinding {
+ ShortcutBinding {
+ primary: "Shift".into(),
+ modifiers: Vec::new(),
+ }
+}
+
+fn default_switch_style_hotkey() -> ShortcutBinding {
+ ShortcutBinding {
+ primary: "S".into(),
+ modifiers: default_app_shortcut_modifiers(),
+ }
+}
+
+fn default_open_app_hotkey() -> ShortcutBinding {
+ ShortcutBinding {
+ primary: "O".into(),
+ modifiers: default_app_shortcut_modifiers(),
+ }
+}
+
+fn default_app_shortcut_modifiers() -> Vec {
+ #[cfg(target_os = "macos")]
+ {
+ vec!["cmd".into(), "shift".into()]
+ }
+ #[cfg(not(target_os = "macos"))]
+ {
+ vec!["ctrl".into(), "shift".into()]
+ }
+}
+
+fn default_dictation_hotkey_from_legacy(
+ hotkey: &HotkeyBinding,
+ custom_combo_hotkey: &Option,
+) -> Result {
+ if hotkey.trigger == HotkeyTrigger::Custom {
+ if let Some(combo) = custom_combo_hotkey {
+ return Ok(ShortcutBinding {
+ primary: combo.primary.clone(),
+ modifiers: combo.modifiers.clone(),
+ });
+ }
+ return Err(
+ "hotkey.trigger is custom but dictationHotkey/customComboHotkey is missing".into(),
+ );
+ }
+ Ok(crate::shortcut_binding::binding_from_legacy_trigger(
+ hotkey.trigger,
+ ))
}
fn default_working_languages() -> Vec {
@@ -197,6 +378,11 @@ impl Default for UserPreferences {
fn default() -> Self {
Self {
hotkey: HotkeyBinding::default(),
+ dictation_hotkey: default_dictation_hotkey_from_legacy(
+ &HotkeyBinding::default(),
+ &None,
+ )
+ .expect("default legacy hotkey is not custom"),
default_mode: PolishMode::Light,
enabled_modes: vec![
PolishMode::Raw,
@@ -207,6 +393,7 @@ impl Default for UserPreferences {
launch_at_login: false,
show_capsule: true,
mute_during_recording: false,
+ microphone_device_name: String::new(),
active_asr_provider: "volcengine".into(),
active_llm_provider: "ark".into(),
restore_clipboard_after_paste: true,
@@ -217,6 +404,10 @@ impl Default for UserPreferences {
output_language_preference: OutputLanguagePreference::Auto,
qa_hotkey: default_qa_hotkey(),
qa_save_history: false,
+ custom_combo_hotkey: None,
+ translation_hotkey: default_translation_hotkey(),
+ switch_style_hotkey: default_switch_style_hotkey(),
+ open_app_hotkey: default_open_app_hotkey(),
local_asr_active_model: default_local_asr_model(),
local_asr_mirror: default_local_asr_mirror(),
local_asr_keep_loaded_secs: default_local_asr_keep_loaded_secs(),
@@ -224,6 +415,44 @@ impl Default for UserPreferences {
}
}
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
+#[serde(rename_all = "camelCase")]
+pub struct ShortcutBinding {
+ pub primary: String,
+ pub modifiers: Vec,
+}
+
+impl ShortcutBinding {
+ pub fn default_qa() -> Self {
+ #[cfg(target_os = "macos")]
+ {
+ Self {
+ primary: ";".into(),
+ modifiers: vec!["cmd".into(), "shift".into()],
+ }
+ }
+ #[cfg(not(target_os = "macos"))]
+ {
+ Self {
+ primary: ";".into(),
+ modifiers: vec!["ctrl".into(), "shift".into()],
+ }
+ }
+ }
+
+ pub fn display_label(&self) -> String {
+ let mut parts: Vec = Vec::new();
+ let modifier_order = ["cmd", "ctrl", "alt", "shift", "super"];
+ for tag in modifier_order {
+ if self.modifiers.iter().any(|m| m.eq_ignore_ascii_case(tag)) {
+ parts.push(modifier_display(tag).to_string());
+ }
+ }
+ parts.push(display_primary(&self.primary));
+ parts.join("+")
+ }
+}
+
/// 划词语音问答的全局快捷键绑定。原生名字符串：
/// - `primary`：主键（如 `";"`、`"."`、`"A"`、`"F1"`）。
/// - `modifiers`：修饰键集合，元素来自 `{"cmd","ctrl","alt","shift","super"}`。
@@ -257,7 +486,7 @@ impl Default for QaHotkeyBinding {
}
impl QaHotkeyBinding {
- /// 渲染成给前端展示的可读标签（macOS 用 `Cmd`，其他平台用 `Ctrl`）。
+ /// 渲染成给前端展示的可读标签。
/// 顺序与人类阅读习惯一致：`Cmd+Shift+;`、`Ctrl+Alt+Shift+.`。
pub fn display_label(&self) -> String {
let mut parts: Vec = Vec::new();
@@ -274,9 +503,46 @@ impl QaHotkeyBinding {
}
}
+/// 录音快捷键的自定义组合键绑定。结构与 `QaHotkeyBinding` 相同：
+/// - `primary`：主键（如 `"D"`、`"Space"`、`"F1"`）。
+/// - `modifiers`：修饰键集合，元素来自 `{"cmd","ctrl","alt","shift","super"}`。
+///
+/// 当 `HotkeyBinding.trigger == Custom` 时，coordinator 用 `global-hotkey` crate
+/// 注册此组合键，而非 modifier-only 的 CGEventTap / WH_KEYBOARD_LL。
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
+#[serde(rename_all = "camelCase")]
+pub struct ComboBinding {
+ pub primary: String,
+ pub modifiers: Vec,
+}
+
+impl ComboBinding {
+ /// 渲染成给前端展示的可读标签。复用 QaHotkeyBinding 的格式化逻辑。
+ pub fn display_label(&self) -> String {
+ let qa = QaHotkeyBinding {
+ primary: self.primary.clone(),
+ modifiers: self.modifiers.clone(),
+ };
+ qa.display_label()
+ }
+}
+
fn modifier_display(tag: &str) -> &'static str {
match tag {
- "cmd" => "Cmd",
+ "cmd" => {
+ #[cfg(target_os = "macos")]
+ {
+ "Cmd"
+ }
+ #[cfg(target_os = "windows")]
+ {
+ "Ctrl"
+ }
+ #[cfg(all(not(target_os = "macos"), not(target_os = "windows")))]
+ {
+ "Super"
+ }
+ }
"ctrl" => "Ctrl",
"alt" => {
#[cfg(target_os = "macos")]
@@ -319,6 +585,7 @@ pub enum HotkeyTrigger {
RightCommand,
Fn,
RightAlt, // Windows synonym for RightOption
+ Custom,
}
impl HotkeyTrigger {
@@ -331,6 +598,7 @@ impl HotkeyTrigger {
HotkeyTrigger::RightCommand => "右 Command",
HotkeyTrigger::Fn => "Fn (地球键)",
HotkeyTrigger::RightAlt => "右 Alt",
+ HotkeyTrigger::Custom => "自定义组合键",
}
}
}
@@ -361,7 +629,7 @@ impl HotkeyAdapterKind {
}
#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]
-#[serde(default, rename_all = "camelCase")]
+#[serde(rename_all = "camelCase")]
pub struct HotkeyBinding {
pub trigger: HotkeyTrigger,
pub mode: HotkeyMode,
@@ -392,6 +660,7 @@ impl HotkeyCapability {
HotkeyTrigger::LeftControl,
HotkeyTrigger::RightCommand,
HotkeyTrigger::Fn,
+ HotkeyTrigger::Custom,
],
requires_accessibility_permission: true,
supports_modifier_only_trigger: true,
@@ -410,6 +679,7 @@ impl HotkeyCapability {
HotkeyTrigger::RightAlt,
HotkeyTrigger::LeftControl,
HotkeyTrigger::RightCommand,
+ HotkeyTrigger::Custom,
],
requires_accessibility_permission: false,
supports_modifier_only_trigger: true,
@@ -430,6 +700,7 @@ impl HotkeyCapability {
HotkeyTrigger::RightAlt,
HotkeyTrigger::RightControl,
HotkeyTrigger::LeftControl,
+ HotkeyTrigger::Custom,
],
requires_accessibility_permission: false,
supports_modifier_only_trigger: true,
@@ -598,4 +869,43 @@ mod tests {
assert!(prefs.allow_non_tsf_insertion_fallback);
}
+
+ #[test]
+ fn legacy_custom_hotkey_without_custom_binding_is_rejected() {
+ let result = serde_json::from_str::(
+ r#"{
+ "hotkey": { "trigger": "custom", "mode": "toggle" }
+ }"#,
+ );
+
+ assert!(result.is_err());
+ }
+
+ #[test]
+ fn legacy_custom_hotkey_uses_custom_combo_binding() {
+ let prefs: UserPreferences = serde_json::from_str(
+ r#"{
+ "hotkey": { "trigger": "custom", "mode": "toggle" },
+ "customComboHotkey": { "primary": "D", "modifiers": ["cmd", "shift"] }
+ }"#,
+ )
+ .unwrap();
+
+ assert_eq!(prefs.dictation_hotkey.primary, "D");
+ assert_eq!(prefs.dictation_hotkey.modifiers, vec!["cmd", "shift"]);
+ }
+
+ #[test]
+ fn custom_hotkey_with_dictation_hotkey_preserves_dictation_binding() {
+ let prefs: UserPreferences = serde_json::from_str(
+ r#"{
+ "hotkey": { "trigger": "custom", "mode": "toggle" },
+ "dictationHotkey": { "primary": "Space", "modifiers": ["ctrl"] }
+ }"#,
+ )
+ .unwrap();
+
+ assert_eq!(prefs.dictation_hotkey.primary, "Space");
+ assert_eq!(prefs.dictation_hotkey.modifiers, vec!["ctrl"]);
+ }
}
diff --git a/openless-all/app/src-tauri/src/windows_ime_ipc.rs b/openless-all/app/src-tauri/src/windows_ime_ipc.rs
index b5585bf0..79f6ae5d 100644
--- a/openless-all/app/src-tauri/src/windows_ime_ipc.rs
+++ b/openless-all/app/src-tauri/src/windows_ime_ipc.rs
@@ -392,10 +392,7 @@ mod tests {
#[test]
fn submit_timeout_covers_native_async_commit_path() {
- assert!(
- IME_SUBMIT_TIMEOUT
- > Duration::from_millis(IME_NATIVE_ASYNC_COMMIT_TIMEOUT_MS)
- );
+ assert!(IME_SUBMIT_TIMEOUT > Duration::from_millis(IME_NATIVE_ASYNC_COMMIT_TIMEOUT_MS));
}
#[test]
diff --git a/openless-all/app/src-tauri/tauri.conf.json b/openless-all/app/src-tauri/tauri.conf.json
index 43ad54ed..b733be31 100644
--- a/openless-all/app/src-tauri/tauri.conf.json
+++ b/openless-all/app/src-tauri/tauri.conf.json
@@ -1,7 +1,7 @@
{
"$schema": "https://schema.tauri.app/config/2",
"productName": "OpenLess",
- "version": "1.2.20",
+ "version": "1.2.21",
"identifier": "com.openless.app",
"build": {
"beforeDevCommand": "npm run dev",
diff --git a/openless-all/app/src/App.tsx b/openless-all/app/src/App.tsx
index b1baac39..d047bf72 100644
--- a/openless-all/app/src/App.tsx
+++ b/openless-all/app/src/App.tsx
@@ -147,18 +147,38 @@ function isWindowHotkeyCandidate(event: KeyboardEvent): boolean {
}
function StartupShell() {
+ // 用透明背景：main window 是 transparent + macOSPrivateApi（NSVisualEffectView 磨砂）。
+ // 之前用 linear-gradient(rgba(245,245,247,0.96)...) 会盖过 macOS vibrancy，启动时
+ // 长时间在 'checking' phase（凭据迁移 / 权限 probe 慢）会让窗口看起来「左侧白屏 +
+ // 右侧磨砂」割裂。现在背景全透明，让磨砂统一展开，提示文字 + icon 用一个轻量
+ // pill 卡片承载，跟 capsule 视觉一致。
return (
-
+
OpenLess 正在启动
diff --git a/openless-all/app/src/components/Capsule.tsx b/openless-all/app/src/components/Capsule.tsx
index da5d5480..848b9a9b 100644
--- a/openless-all/app/src/components/Capsule.tsx
+++ b/openless-all/app/src/components/Capsule.tsx
@@ -246,6 +246,7 @@ function Pill({ os, state, level, insertedChars, message, onCancel, onConfirm }:
padding: '0 8px',
width: metrics.width,
height: metrics.height,
+ boxSizing: metrics.boxSizing,
borderRadius: 999,
background: 'rgba(255, 255, 255, 0.62)',
backdropFilter: useBackdrop ? 'blur(28px) saturate(180%)' : 'none',
@@ -327,7 +328,10 @@ export function Capsule() {
position: 'relative',
display: 'flex',
alignItems: 'center',
- justifyContent: os === 'win' ? 'flex-end' : 'center',
+ justifyContent: 'center',
+ paddingLeft: hostMetrics.horizontalInset,
+ paddingRight: hostMetrics.horizontalInset,
+ boxSizing: hostMetrics.boxSizing,
paddingTop: os === 'win'
? Math.max(0, hostMetrics.height - metrics.height - hostMetrics.bottomInset)
: 0,
@@ -345,7 +349,7 @@ export function Capsule() {
position: 'absolute',
left: '50%',
// macOS / Linux：胶囊窗口 220×110、pill 居中，badge 锚到 pill 中线上方 21+8。
- // Windows：pill 不居中（带 12pt 阴影 inset），用 hostMetrics 量到底部 inset + pill 高 + gap。
+ // Windows：host 比 pill 多出左右 12px / 底部 12px 的阴影空间，pill 仍保持居中。
bottom: os === 'win'
? `${hostMetrics.bottomInset + metrics.height + hostMetrics.badgeGap}px`
: 'calc(50% + 21px + 8px)',
diff --git a/openless-all/app/src/components/FloatingShell.tsx b/openless-all/app/src/components/FloatingShell.tsx
index 23f965aa..94ed25a2 100644
--- a/openless-all/app/src/components/FloatingShell.tsx
+++ b/openless-all/app/src/components/FloatingShell.tsx
@@ -23,6 +23,7 @@ import {
HOTKEY_MODE_MIGRATION_DEFERRED_KEY,
shouldShowHotkeyModeMigrationPrompt,
} from '../lib/hotkeyMigration';
+import { formatComboLabel } from '../lib/hotkey';
import { applyFontScale, readFontScale } from '../lib/fontScale';
import { getCredentials, openExternal } from '../lib/ipc';
import {
@@ -30,6 +31,7 @@ import {
shouldShowProviderSetupPrompt,
} from '../lib/providerSetup';
import { NAVIGATE_LOCAL_ASR_EVENT, type SettingsSectionId } from '../pages/Settings';
+import { useHotkeySettings } from '../state/HotkeySettingsContext';
import { useAppState, type AppTab } from '../state/useAppState';
interface NavItem {
@@ -74,6 +76,7 @@ function FloatingShellBody({ os, initialTab, initialSettings }: { os: OS; initia
const [providerPromptOpen, setProviderPromptOpen] = useState(false);
const [hotkeyModePromptOpen, setHotkeyModePromptOpen] = useState(false);
const [helpPopoverOpen, setHelpPopoverOpen] = useState(false);
+ const { prefs } = useHotkeySettings();
// tab 切换的 cross-fade：旧页 blur+fade out（180ms），结束后挂载新页（走 ol-page-slide enter）。
// displayTab 是实际渲染的 tab，currentTab 是用户点中的目标 tab。
@@ -161,6 +164,18 @@ function FloatingShellBody({ os, initialTab, initialSettings }: { os: OS; initia
setSettingsOpen(true);
};
+ // ⌘, 打开设置页面
+ useEffect(() => {
+ const onKeyDown = (e: KeyboardEvent) => {
+ if (e.metaKey && e.key === ',') {
+ e.preventDefault();
+ openSettings();
+ }
+ };
+ window.addEventListener('keydown', onKeyDown, true);
+ return () => window.removeEventListener('keydown', onKeyDown, true);
+ }, []);
+
const openProviderSettings = () => {
rememberProviderPrompt();
openSettings('providers');
@@ -241,6 +256,21 @@ function FloatingShellBody({ os, initialTab, initialSettings }: { os: OS; initia
+ {/* shortcut hint — 不要 dashed 边框，否则会切断"整片磨砂玻璃"的视觉 */}
+
+ {t('shell.shortcutLabel')}
+
+ {prefs ? formatComboLabel(prefs.dictationHotkey) : ''}
+ {t('shell.shortcutHint')}
+
+
+
{/* BETA 区域 — 去掉描边和实色背景，让它和底部 footer 一起浮在磨砂玻璃上 */}
{t('shell.betaTag')}
diff --git a/openless-all/app/src/components/ShortcutRecorder.tsx b/openless-all/app/src/components/ShortcutRecorder.tsx
new file mode 100644
index 00000000..e14da7c5
--- /dev/null
+++ b/openless-all/app/src/components/ShortcutRecorder.tsx
@@ -0,0 +1,219 @@
+import { useEffect, useRef, useState, type CSSProperties, type KeyboardEvent } from 'react';
+import { useTranslation } from 'react-i18next';
+import { currentPlatform, formatComboLabel } from '../lib/hotkey';
+import { setShortcutRecordingActive, validateShortcutBinding } from '../lib/ipc';
+import type { ShortcutBinding } from '../lib/types';
+
+export function ShortcutRecorder({
+ value,
+ onSave,
+ alignRecordButton = false,
+}: {
+ value: ShortcutBinding;
+ onSave: (binding: ShortcutBinding) => Promise;
+ alignRecordButton?: boolean;
+}) {
+ const { t } = useTranslation();
+ const [recording, setRecording] = useState(false);
+ const [error, setError] = useState(null);
+ const pendingModifier = useRef