wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-09-20 11:17:15 +03:00
Code Issues Projects Releases Wiki Activity

simplify middle mouse button paste logic

Browse Source 
Now that we can tell whether the mouse is grabbed, we can safely
process the paste in the same way that we use for keyboard initiated
pasting.
This commit is contained in:
Wez Furlong 2020-01-02 20:33:20 -08:00
parent 5f5113ce50
commit bafa36b8ca
1 changed files with 23 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/frontend/gui/termwindow.rs
View File

@ -373,51 +373,34 @@ impl WindowCallbacks for TermWindow {
}; };
if let WMEK::Press(MousePress::Middle) = event.kind { if let WMEK::Press(MousePress::Middle) = event.kind {
// The middle button will typically want to paste the clipboard but if !tab.is_mouse_grabbed() {
// obtaining the contents is an async operation that requires the // Middle mouse button is Paste
// event loop to pump.
// So we schedule that work and continue with dispatching the middle
// button once we have it.
// want to paste the clipboard,
let tab_id = tab.tab_id(); let tab_id = tab.tab_id();
let window_clone = self.window.as_ref().cloned().unwrap(); let future = self.window.as_ref().unwrap().get_clipboard();
let future = self.window.as_ref().unwrap().get_clipboard(); Connection::get().unwrap().spawn_task(async move {
Connection::get().unwrap().spawn_task(async move { if let Ok(clip) = future.await {
if let Ok(clip) = future.await { promise::Future::with_executor(executor(), move || {
window_clone.apply(move |myself, context| {
if let Some(myself) = myself.downcast_mut::<Self>() {
myself
.clipboard_contents
.lock()
.unwrap()
.replace(clip.clone());
let mux = Mux::get().unwrap(); let mux = Mux::get().unwrap();
if let Some(tab) = mux.get_tab(tab_id) { if let Some(tab) = mux.get_tab(tab_id) {
tab.mouse_event( tab.trickle_paste(clip)?;
mouse_event,
&mut Host {
writer: &mut *tab.writer(),
context,
},
)
.ok();
} }
} Ok(())
Ok(()) });
}); }
} });
}); return;
} else { }
tab.mouse_event(
mouse_event,
&mut Host {
writer: &mut *tab.writer(),
context,
},
)
.ok();
} }
tab.mouse_event(
mouse_event,
&mut Host {
writer: &mut *tab.writer(),
context,
},
)
.ok();
} }
match event.kind { match event.kind {