open.source/espanso
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(core): wire up parameters in clipboard injector

Browse Source
This commit is contained in:
Federico Terzi 2021-06-08 20:48:33 +02:00
parent 136b4791df
commit 645cd78573
1 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
espanso/src/cli/worker/engine/dispatch/executor/clipboard_injector.rs
View File

@ -67,26 +67,28 @@ impl<'a> ClipboardInjectorAdapter<'a> {
params.pre_paste_delay.try_into().unwrap(),
));
// TODO: handle case of custom combination
let combination = if cfg!(target_os = "macos") {
&[Key::Meta, Key::V]
let mut custom_combination = None;
if let Some(custom_shortcut) = params.paste_shortcut {
if let Some(combination) = parse_combination(&custom_shortcut) {
custom_combination = Some(combination);
} else {
error!("'{}' is not a valid paste shortcut", custom_shortcut);
}
}
let combination = if let Some(custom_combination) = custom_combination {
custom_combination
} else if cfg!(target_os = "macos") {
vec![Key::Meta, Key::V]
} else {
&[Key::Control, Key::V]
vec![Key::Control, Key::V]
};
// TODO: handle user-specified delays
// let paste_combination_delay = if cfg!(target_os = "macos") {
// 5
// } else {
// InjectionOptions::default().delay
// };
// TODO: handle options
self.injector.send_key_combination(
combination,
&combination,
InjectionOptions {
delay: params.paste_shortcut_event_delay as i32,
..Default::default()
disable_fast_inject: params.disable_x11_fast_inject,
},
)?;
@ -192,3 +194,13 @@ impl<'a> Drop for ClipboardRestoreGuard<'a> {
}
}
}
fn parse_combination(combination: &str) -> Option<Vec<Key>> {
let tokens = combination.split("+");
let mut keys: Vec<Key> = Vec::new();
for token in tokens {
keys.push(Key::parse(token)?);
}
Some(keys)
}