mirror of
https://github.com/storytold/vectorcraft.git
synced 2026-10-26 18:56:55 -06:00
- The worker reads the clipboard only while nothing is copied in the app and a document is open (as the in-line check did before), and idles on a channel otherwise; it sends a verdict and wakes the UI only when the answer changes. - The in-line check (Windows, macOS, web) keeps its short-circuit: it doesn't open the system clipboard after an in-app copy or without a document, as before the PR. - A dead worker hands the check back to the UI thread instead of freezing the last verdict. - Dropping the app wakes the worker and waits (250 ms at most) until it has let go of its clipboard handle: on X11 the last arboard handle alive hands what the app copied to the clipboard manager, and a detached worker holding it would lose that handover at exit. - The factory stays in `Services` until the first frame takes it (no extra app fields); main.rs installs it with `cfg!(target_os = "linux")`. - Tests trimmed from five to three that share tests_sysclip's helpers: the frame never waits on a slow clipboard and only the probe thread reads it (nothing read without a document), the probe rests after an in-app copy and lets go of its handle when the app drops, and a dead probe falls back to the in-line check. The in-line case is already covered by tests_clipboard. - ROADMAP (Last updated, Platforms, Shipped so far) and docs/development.md (Linux: clipboard owners that never answer). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
129 lines
6.6 KiB
Rust
129 lines
6.6 KiB
Rust
//! The system clipboard's formats: Copy and Cut publish every flavour the engine makes
|
|
//! ([`Session::clipboard_flavours`](vectorcraft_engine::Session::clipboard_flavours): text, SVG,
|
|
//! PDF, PNG), and a Paste first turns what another app copied (SVG, PDF, an EMF, text, a bitmap,
|
|
//! or a copied file that is one of them) into the internal clipboard with the `clipboard.import*`
|
|
//! commands. The host installs the platform side as
|
|
//! [`Services::system_clipboard`](crate::Services::system_clipboard); without it (the web) Copy
|
|
//! publishes SVG text through egui and Paste takes SVG text, and the pictures and files the host
|
|
//! reads from a paste itself ([`VectorcraftApp::paste_from_host`]).
|
|
|
|
use serde_json::{Value, json};
|
|
use vectorcraft_engine::cmd::clipboard::{EMF, Flavour, PASTE_ORDER, PDF, SVG, TEXT, looks_like_svg};
|
|
|
|
use crate::VectorcraftApp;
|
|
|
|
/// The platform clipboard, with every format it carries.
|
|
pub trait SystemClipboard {
|
|
/// Replace the clipboard's contents with `flavours` (best first; none empties it).
|
|
fn write(&mut self, flavours: &[Flavour]) -> Result<(), String>;
|
|
/// Does the clipboard still hold what [`Self::write`] last put there (nothing copied since)?
|
|
fn holds_ours(&mut self) -> bool;
|
|
/// The first of `mimes` the clipboard holds; `image/*` is any bitmap (returned as PNG, BMP…).
|
|
fn read(&mut self, mimes: &[&'static str]) -> Option<Flavour>;
|
|
/// Does the clipboard hold one of `mimes`? Cheap enough to ask a few times a second.
|
|
fn has(&mut self, mimes: &[&'static str]) -> bool;
|
|
}
|
|
|
|
/// Makes a second system-clipboard handle, to check off the UI thread whether Paste has something
|
|
/// to take ([`Services::clipboard_probe`](crate::Services::clipboard_probe)). It is called on that
|
|
/// thread and the handle lives and dies there, so the handle needn't be `Send`.
|
|
pub type ClipboardProbeFactory = Box<dyn FnOnce() -> Box<dyn SystemClipboard> + Send>;
|
|
|
|
/// The command (and its params) that loads `f` into the internal clipboard, centred on `center`.
|
|
pub(crate) fn import_command(f: &Flavour, center: Option<[f64; 2]>) -> (&'static str, Value) {
|
|
let b64 = || vectorcraft_format::base64_encode(&f.data);
|
|
match f.mime {
|
|
TEXT => {
|
|
let text = String::from_utf8_lossy(&f.data);
|
|
if looks_like_svg(&text) {
|
|
("clipboard.importSvg", json!({ "svg": text, "center": center }))
|
|
} else {
|
|
("clipboard.importText", json!({ "text": text, "center": center }))
|
|
}
|
|
}
|
|
SVG => ("clipboard.importSvg", json!({ "dataBase64": b64(), "center": center })),
|
|
PDF => ("clipboard.importPdf", json!({ "dataBase64": b64(), "center": center })),
|
|
EMF => ("clipboard.importEmf", json!({ "dataBase64": b64(), "center": center })),
|
|
mime => ("clipboard.importImage", json!({ "dataBase64": b64(), "mime": mime, "center": center })),
|
|
}
|
|
}
|
|
|
|
impl VectorcraftApp {
|
|
/// After Copy or Cut: offer the copied objects to other apps.
|
|
pub(crate) fn publish_clipboard(&mut self) {
|
|
match self.services.system_clipboard.as_mut() {
|
|
Some(cb) => {
|
|
if let Err(e) = cb.write(&self.session.clipboard_flavours()) {
|
|
self.ui.status = format!("Couldn't copy to the system clipboard: {e}");
|
|
}
|
|
}
|
|
None if self.session.prefs.copy_as_svg => {
|
|
self.clipboard_out = self.session.clipboard_svg();
|
|
self.clipboard_published = self.clipboard_out.clone();
|
|
}
|
|
None => {}
|
|
}
|
|
}
|
|
|
|
/// Paste `f`, which the host read from the system clipboard itself (a web page's paste carries
|
|
/// pictures and files, egui's Paste event text only), as the paste chord `held` pastes:
|
|
/// unless a field or the Type tool has the keyboard, as with the paste keys.
|
|
pub fn paste_from_host(&mut self, ctx: &egui::Context, f: Flavour, held: egui::Modifiers) {
|
|
if ctx.egui_wants_keyboard_input() || self.session.tool_wants_text() {
|
|
return;
|
|
}
|
|
self.clipboard_in = Some(f);
|
|
crate::menus::invoke(self, crate::shortcuts::paste_command(held), json!({}));
|
|
}
|
|
|
|
/// Before a paste: what another app put on the system clipboard replaces the internal
|
|
/// clipboard (centred in the view). What we published ourselves keeps the lossless internal
|
|
/// copy. An error means nothing should be pasted.
|
|
pub(crate) fn adopt_system_clipboard(&mut self) -> Result<(), String> {
|
|
let pasted = self.clipboard_in.take();
|
|
let center = self.view().map(|v| [v.center.x, v.center.y]);
|
|
let (cmd, params) = match (pasted, self.services.system_clipboard.as_mut()) {
|
|
// A picture or file the host read from the paste.
|
|
(Some(f), _) if f.mime != TEXT => import_command(&f, center),
|
|
(_, Some(cb)) => {
|
|
if cb.holds_ours() {
|
|
return Ok(());
|
|
}
|
|
let Some(f) = cb.read(&PASTE_ORDER) else { return Ok(()) };
|
|
import_command(&f, center)
|
|
}
|
|
// Text only: SVG markup is art, other text is left alone.
|
|
(pasted, None) => {
|
|
let text =
|
|
pasted.map(|f| String::from_utf8_lossy(&f.data).into_owned()).or_else(|| self.services.clipboard_read.as_mut().and_then(|f| f()));
|
|
let Some(text) = text.filter(|t| looks_like_svg(t)) else { return Ok(()) };
|
|
if self.clipboard_published.as_deref() == Some(text.as_str()) {
|
|
return Ok(());
|
|
}
|
|
self.clipboard_published = Some(text.clone());
|
|
("clipboard.importSvg", json!({ "svg": text, "center": center }))
|
|
}
|
|
};
|
|
self.session.execute(cmd, ¶ms).map(drop).map_err(|e| {
|
|
self.clipboard_published = None;
|
|
format!("Couldn't paste from the clipboard: {e}")
|
|
})
|
|
}
|
|
|
|
/// The text on the system clipboard, if any.
|
|
pub(crate) fn system_clipboard_text(&mut self) -> Option<String> {
|
|
match self.services.system_clipboard.as_mut() {
|
|
Some(cb) => cb.read(&[TEXT]).map(|f| String::from_utf8_lossy(&f.data).into_owned()),
|
|
None => self.services.clipboard_read.as_mut().and_then(|read| read()),
|
|
}
|
|
}
|
|
|
|
/// Does the system clipboard hold something Paste can take (with nothing copied in the app)?
|
|
pub(crate) fn system_clipboard_pasteable(&mut self) -> bool {
|
|
match self.services.system_clipboard.as_mut() {
|
|
Some(cb) => cb.has(&PASTE_ORDER),
|
|
None => self.services.clipboard_read.as_mut().and_then(|read| read()).is_some_and(|t| looks_like_svg(&t)),
|
|
}
|
|
}
|
|
}
|