diff --git a/src/config/mod.rs b/src/config/mod.rs index 3e68ea1..f1a2914 100644 --- a/src/config/mod.rs +++ b/src/config/mod.rs @@ -95,6 +95,9 @@ fn default_passive_arg_delimiter() -> char { fn default_passive_arg_escape() -> char { '\\' } +fn default_passive_delay() -> u64 { + 100 +} fn default_passive_key() -> KeyModifier { KeyModifier::OFF } @@ -206,6 +209,9 @@ pub struct Configs { #[serde(default = "default_passive_key")] pub passive_key: KeyModifier, + #[serde(default = "default_passive_delay")] + pub passive_delay: u64, + #[serde(default = "default_enable_passive")] pub enable_passive: bool, diff --git a/src/engine.rs b/src/engine.rs index 6a30364..28e8cf5 100644 --- a/src/engine.rs +++ b/src/engine.rs @@ -349,23 +349,23 @@ impl< let previous_clipboard = self.clipboard_manager.get_clipboard().unwrap_or_default(); // Sleep for a while, giving time to effectively copy the text - std::thread::sleep(std::time::Duration::from_millis(100)); // TODO: avoid hardcoding + std::thread::sleep(std::time::Duration::from_millis(config.passive_delay)); // Clear the clipboard, for new-content detection later self.clipboard_manager.set_clipboard(""); + // Sleep for a while, giving time to effectively copy the text + std::thread::sleep(std::time::Duration::from_millis(config.passive_delay)); + // Trigger a copy shortcut to transfer the content of the selection to the clipboard self.keyboard_manager.trigger_copy(&config); // Sleep for a while, giving time to effectively copy the text - std::thread::sleep(std::time::Duration::from_millis(100)); // TODO: avoid hardcoding + std::thread::sleep(std::time::Duration::from_millis(config.passive_delay)); // Then get the text from the clipboard and render the match output let clipboard = self.clipboard_manager.get_clipboard(); - // Restore original clipboard now, in case expansion doesn't happen at all - self.clipboard_manager.set_clipboard(&previous_clipboard); - if let Some(clipboard) = clipboard { // Don't expand empty clipboards, as usually they are the result of an empty passive selection if clipboard.trim().is_empty() { @@ -380,16 +380,19 @@ impl< // Paste back the result in the field self.clipboard_manager.set_clipboard(&payload); - std::thread::sleep(std::time::Duration::from_millis(100)); // TODO: avoid hardcoding + std::thread::sleep(std::time::Duration::from_millis(config.passive_delay)); self.keyboard_manager.trigger_paste(&config); - - self.clipboard_manager.set_clipboard(&previous_clipboard); } _ => warn!("Cannot expand passive match"), } } } + std::thread::sleep(std::time::Duration::from_millis(config.passive_delay)); + + // Restore original clipboard + self.clipboard_manager.set_clipboard(&previous_clipboard); + // Re-allow espanso to interpret actions self.is_injecting.store(false, Release); }