reya/coop
1
0
Fork 0
Code Issues Pull Requests Releases Activity

chore: fix copy/paste on linux

Browse Source
This commit is contained in:
reya
2025-07-02 15:53:52 +07:00
parent 2e046ec5d7
commit f9bf29df09
3 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
crates/coop/src/views/chat.rs
View File

@@ -722,10 +722,7 @@ impl Chat {
.on_click({ .on_click({
let content = ClipboardItem::new_string(message.content.to_string()); let content = ClipboardItem::new_string(message.content.to_string());
cx.listener(move |_this, _event, _window, cx| { cx.listener(move |_this, _event, _window, cx| {
#[cfg(any(target_os = "linux", target_os = "freebsd"))] cx.write_to_clipboard(content.clone())
cx.write_to_primary(content.clone());
#[cfg(any(target_os = "windows", target_os = "macos"))]
cx.write_to_clipboard(content.clone());
}) })
}), }),
], ],
@@ -734,10 +731,7 @@ impl Chat {
.on_mouse_down(gpui::MouseButton::Middle, { .on_mouse_down(gpui::MouseButton::Middle, {
let content = ClipboardItem::new_string(message.content.to_string()); let content = ClipboardItem::new_string(message.content.to_string());
cx.listener(move |_this, _event, _window, cx| { cx.listener(move |_this, _event, _window, cx| {
#[cfg(any(target_os = "linux", target_os = "freebsd"))] cx.write_to_clipboard(content.clone())
cx.write_to_primary(content.clone());
#[cfg(any(target_os = "windows", target_os = "macos"))]
cx.write_to_clipboard(content.clone());
}) })
}) })
.on_double_click(cx.listener({ .on_double_click(cx.listener({

4
crates/coop/src/views/sidebar/mod.rs
View File

@@ -527,11 +527,7 @@ impl Sidebar {
let item = ClipboardItem::new_string(public_key); let item = ClipboardItem::new_string(public_key);
move |_, _, window, cx| { move |_, _, window, cx| {
#[cfg(any(target_os = "linux", target_os = "freebsd"))]
cx.write_to_primary(item.clone());
#[cfg(any(target_os = "windows", target_os = "macos"))]
cx.write_to_clipboard(item.clone()); cx.write_to_clipboard(item.clone());
window.push_notification("User's NPUB is copied", cx); window.push_notification("User's NPUB is copied", cx);
} }
})), })),

23
crates/ui/src/input/state.rs
View File

@@ -1146,6 +1146,9 @@ impl InputState {
cx: &mut Context<Self>, cx: &mut Context<Self>,
) { ) {
if event.button == MouseButton::Middle { if event.button == MouseButton::Middle {
#[cfg(any(target_os = "linux", target_os = "freebsd"))]
self.paste_from_primary(window, cx);
#[cfg(not(any(target_os = "linux", target_os = "freebsd")))]
self.paste(&Paste, window, cx); self.paste(&Paste, window, cx);
return; return;
} }
@@ -1228,13 +1231,21 @@ impl InputState {
self.replace_text_in_range(None, "", window, cx); self.replace_text_in_range(None, "", window, cx);
} }
pub(super) fn paste(&mut self, _paste: &Paste, window: &mut Window, cx: &mut Context<Self>) { pub(super) fn paste(&mut self, _: &Paste, window: &mut Window, cx: &mut Context<Self>) {
#[cfg(any(target_os = "linux", target_os = "freebsd"))] if let Some(clipboard) = cx.read_from_clipboard() {
let read_clipboard = cx.read_from_primary(); let mut new_text = clipboard.text().unwrap_or_default();
#[cfg(any(target_os = "macos", target_os = "windows"))]
let read_clipboard = cx.read_from_clipboard();
if let Some(clipboard) = read_clipboard { if !self.is_multi_line() {
new_text = new_text.replace('\n', "");
}
self.replace_text_in_range(None, &new_text, window, cx);
}
}
#[cfg(any(target_os = "linux", target_os = "freebsd"))]
pub(super) fn paste_from_primary(&mut self, window: &mut Window, cx: &mut Context<Self>) {
if let Some(clipboard) = cx.read_from_primary() {
let mut new_text = clipboard.text().unwrap_or_default(); let mut new_text = clipboard.text().unwrap_or_default();
if !self.is_multi_line() { if !self.is_multi_line() {