feat(clipboard): Linux + Windows host clipboard backends as the pf-clipboard crate (Phase 1 host + Phase 3)
ci / web (pull_request) Successful in 1m9s
apple / swift (pull_request) Successful in 1m19s
apple / screenshots (pull_request) Has been skipped
ci / docs-site (pull_request) Successful in 1m30s
windows / build (aarch64-pc-windows-msvc) (pull_request) Successful in 5m16s
ci / bench (pull_request) Successful in 6m8s
ci / rust (pull_request) Failing after 7m6s
windows / build (x86_64-pc-windows-msvc) (pull_request) Successful in 6m33s
android / android (pull_request) Successful in 12m39s

The host half of the shared clipboard (design/clipboard-and-file-transfer.md §4),
ported from feat/shared-clipboard (6bd8c18b) into the post-W6 crate shape: the
backends land as a pf-clipboard subsystem crate (the pf-inject/pf-capture
pattern) instead of growing punktfunk-host back out, and the ~340-line
punktfunk1.rs integration is re-implemented against the native.rs/control.rs
split that replaced it.

pf-clipboard:
- host::wayland — ext-data-control-v1 (KWin / wlroots / Sway / Hyprland).
- host::mutter — GNOME via Mutter's *direct* org.gnome.Mutter.RemoteDesktop
  clipboard (no data-control at any GNOME version; the xdg portal needs an
  interactive grant a headless host can't answer).
- host::windows + host::winfmt — Win32 clipboard on a hidden message-loop
  window: WM_CLIPBOARDUPDATE listener + OLE delayed rendering (WM_RENDERFORMAT)
  for text / CF_HTML / RTF / PNG.
- host::session — the backend-agnostic coordinator bridging HostClipboard to
  the QUIC clipboard plane (offers, fetch accept-loop, remote offers, pastes).
- A portable facade (policy / enabled / cap_advertised / ClipCoordCmd / start /
  spawn_decline_loop) so the orchestrator compiles cfg-free on every platform;
  ClipCoordCmd moves into the crate (it was host-owned before).

punktfunk-host glue:
- handshake.rs advertises HOST_CAP_CLIPBOARD via pf_clipboard::cap_advertised.
- serve_session starts the coordinator (gated on a real compositor — the
  synthetic source stays out of the session clipboard) and spawns the
  CLIP_FETCH_UNAVAILABLE decline loop when the policy is on but no backend bound.
- control.rs gains the ClipControl/ClipOffer arms + the host-offer forward
  branch, and the e2e session test (cap advertise → ClipState ack with
  BACKEND_UNAVAILABLE → fetch decline) rides in native.rs's tests.

Still opt-in default OFF (PUNKTFUNK_CLIPBOARD). Remaining: the macOS client
(design §5) — then this becomes user-visible.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
2026-07-17 13:02:20 +02:00
co-authored by Claude Opus 4.8
parent 4ef90d586d
commit 391f8fb9f7
14 changed files with 3165 additions and 4 deletions
+257
View File
@@ -0,0 +1,257 @@
//! Pure byte conversions between the Win32 clipboard formats and the portable wire MIMEs
//! (`design/clipboard-and-file-transfer.md` §3.5). Kept free of any `windows`-crate dependency so it
//! compiles on every host and its unit tests exercise the fiddly bits (CF_HTML offset math, UTF-16
//! (de)serialization) without a Windows box. The [`super::windows`] backend is the only production
//! consumer; it wraps these with the actual `GetClipboardData`/`SetClipboardData` calls.
//!
//! Format map (Win32 ↔ wire):
//! * `CF_UNICODETEXT` (UTF-16LE + NUL) ↔ `text/plain;charset=utf-8`
//! * `"HTML Format"` (CF_HTML, UTF-8 + ASCII header) ↔ `text/html`
//! * `"Rich Text Format"` (raw RTF) ↔ `text/rtf`
//! * `"PNG"` (raw PNG) ↔ `image/png` — identity, handled inline by the backend.
// ---- CF_UNICODETEXT ↔ text/plain;charset=utf-8 -----------------------------------------------
/// `CF_UNICODETEXT` HGLOBAL bytes → UTF-8 wire bytes. `raw` is the exact `GlobalSize`-length buffer;
/// it holds little-endian UTF-16 code units terminated by a single `0x0000`.
pub fn text_from_utf16(raw: &[u8]) -> Vec<u8> {
// Reinterpret each LE 2-byte pair as a UTF-16 code unit; a stray odd trailing byte (never present
// in valid data) is dropped by `chunks_exact`.
let mut units: Vec<u16> = raw
.chunks_exact(2)
.map(|c| u16::from_le_bytes([c[0], c[1]]))
.collect();
// Strip exactly one trailing NUL terminator if present (guard against eating a real code unit).
if units.last() == Some(&0) {
units.pop();
}
String::from_utf16_lossy(&units).into_bytes()
}
/// UTF-8 wire bytes → `CF_UNICODETEXT` HGLOBAL bytes (UTF-16LE + a required `0x0000` terminator).
pub fn text_to_utf16(wire: &[u8]) -> Vec<u8> {
let s = String::from_utf8_lossy(wire);
let mut out = Vec::with_capacity(wire.len() * 2 + 2);
for u in s.encode_utf16() {
out.extend_from_slice(&u.to_le_bytes());
}
out.extend_from_slice(&0u16.to_le_bytes()); // REQUIRED NUL terminator for CF_UNICODETEXT
out
}
// ---- "HTML Format" (CF_HTML) ↔ text/html -----------------------------------------------------
//
// CF_HTML is UTF-8: an ASCII `Key:Value\r\n` header carrying byte offsets, then the HTML with
// `<!--StartFragment-->`/`<!--EndFragment-->` markers. Offsets are byte counts from buffer start;
// the offsets live *inside* the header, so their digit-width feeds back into the header length. The
// spec-blessed fix (Chromium/Firefox/LibreOffice) is fixed-width 10-digit zero-padded offsets, which
// makes the header a compile-time constant and every offset a one-pass computation.
const CF_HTML_HEADER: &str = "Version:0.9\r\n\
StartHTML:0000000000\r\n\
EndHTML:0000000000\r\n\
StartFragment:0000000000\r\n\
EndFragment:0000000000\r\n";
const CF_HTML_PREFIX: &str = "<html><body>\r\n<!--StartFragment-->";
const CF_HTML_SUFFIX: &str = "<!--EndFragment-->\r\n</body></html>";
/// UTF-8 HTML fragment (wire bytes) → a `CF_HTML` buffer, NUL-terminated. The trailing NUL is the
/// conventional CF_HTML expectation (§4); `EndHTML` still points at content end, before the NUL.
pub fn html_to_cf(wire: &[u8]) -> Vec<u8> {
let fragment = String::from_utf8_lossy(wire);
let start_html = CF_HTML_HEADER.len(); // 105
let start_fragment = start_html + CF_HTML_PREFIX.len(); // 139
let end_fragment = start_fragment + fragment.len(); // byte length — fragment may be multibyte
let end_html = end_fragment + CF_HTML_SUFFIX.len();
let mut buf = Vec::with_capacity(end_html + 1);
buf.extend_from_slice(CF_HTML_HEADER.as_bytes());
buf.extend_from_slice(CF_HTML_PREFIX.as_bytes());
buf.extend_from_slice(fragment.as_bytes());
buf.extend_from_slice(CF_HTML_SUFFIX.as_bytes());
// Overwrite the four zero-padded fields in place, restricting the search to the header region so a
// fragment that happens to contain "StartHTML:" can't fool the patcher.
patch_offset(&mut buf[..start_html], b"StartHTML:", start_html);
patch_offset(&mut buf[..start_html], b"EndHTML:", end_html);
patch_offset(&mut buf[..start_html], b"StartFragment:", start_fragment);
patch_offset(&mut buf[..start_html], b"EndFragment:", end_fragment);
buf.push(0); // conventional NUL terminator
buf
}
/// A `CF_HTML` buffer → the UTF-8 HTML fragment (wire bytes). Uses the `StartFragment`/`EndFragment`
/// offsets; falls back to `StartHTML`/`EndHTML`, then to the whole buffer, if the markers are absent.
pub fn html_from_cf(raw: &[u8]) -> Vec<u8> {
let range = header_range(raw, b"StartFragment:", b"EndFragment:")
.or_else(|| header_range(raw, b"StartHTML:", b"EndHTML:"));
match range {
// Content is UTF-8 per spec; return the exact slice (drop any trailing NUL for cleanliness).
Some((start, end)) => {
let slice = &raw[start..end];
strip_trailing_nul(slice).to_vec()
}
None => strip_trailing_nul(raw).to_vec(),
}
}
/// Resolve `[start_label .. end_label]` into a validated byte range within `raw`.
fn header_range(raw: &[u8], start_label: &[u8], end_label: &[u8]) -> Option<(usize, usize)> {
let start = read_header_offset(raw, start_label)?;
let end = read_header_offset(raw, end_label)?;
if start <= end && end <= raw.len() {
Some((start, end))
} else {
None
}
}
/// Overwrite the 10 ASCII digits following `label` in `header` with `value`, zero-padded.
fn patch_offset(header: &mut [u8], label: &[u8], value: usize) {
if let Some(pos) = find(header, label) {
let at = pos + label.len();
if at + 10 <= header.len() {
let digits = format!("{value:010}");
header[at..at + 10].copy_from_slice(digits.as_bytes());
}
}
}
/// Read the decimal integer following `label:` in the ASCII header. The colon-suffixed labels only
/// match in the header, never the marker comments (`<!--StartFragment-->`) or fragment text.
fn read_header_offset(raw: &[u8], label: &[u8]) -> Option<usize> {
let mut at = find(raw, label)? + label.len();
let mut n: usize = 0;
let mut any = false;
while let Some(&b) = raw.get(at) {
if b.is_ascii_digit() {
n = n.checked_mul(10)?.checked_add((b - b'0') as usize)?;
any = true;
at += 1;
} else {
break; // stops at '\r'
}
}
any.then_some(n)
}
fn find(hay: &[u8], needle: &[u8]) -> Option<usize> {
if needle.is_empty() || needle.len() > hay.len() {
return None;
}
hay.windows(needle.len()).position(|w| w == needle)
}
// ---- "Rich Text Format" ↔ text/rtf -----------------------------------------------------------
/// `"Rich Text Format"` HGLOBAL bytes → RTF wire bytes. RTF is `{ }`-delimited; some producers append
/// a NUL past the final `}`, so strip a single trailing NUL to keep the wire payload byte-clean.
pub fn rtf_from_cf(raw: &[u8]) -> Vec<u8> {
strip_trailing_nul(raw).to_vec()
}
fn strip_trailing_nul(b: &[u8]) -> &[u8] {
match b.last() {
Some(0) => &b[..b.len() - 1],
_ => b,
}
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn text_round_trips_and_handles_terminator() {
// UTF-8 → UTF-16LE+NUL → UTF-8.
let wire = "héllo 🌍".as_bytes();
let cf = text_to_utf16(wire);
// Ends with a single 0x0000 terminator.
assert_eq!(&cf[cf.len() - 2..], &[0, 0]);
assert_eq!(text_from_utf16(&cf), wire);
// A CF buffer *without* a terminator still decodes (no code unit eaten).
let no_term: Vec<u8> = "hi".encode_utf16().flat_map(u16::to_le_bytes).collect();
assert_eq!(text_from_utf16(&no_term), b"hi");
// Empty text → just the terminator → empty wire.
assert_eq!(text_to_utf16(b""), vec![0, 0]);
assert_eq!(text_from_utf16(&[0, 0]), b"");
}
#[test]
fn cf_html_matches_the_spec_offsets() {
// The worked example from the format reference: fragment "Hello".
let cf = html_to_cf(b"Hello");
let s = String::from_utf8(cf.clone()).unwrap();
assert!(s.contains("StartHTML:0000000105"), "{s}");
assert!(s.contains("EndHTML:0000000178"), "{s}");
assert!(s.contains("StartFragment:0000000139"), "{s}");
assert!(s.contains("EndFragment:0000000144"), "{s}");
// The declared fragment range must slice back to exactly "Hello".
let start = read_header_offset(&cf, b"StartFragment:").unwrap();
let end = read_header_offset(&cf, b"EndFragment:").unwrap();
assert_eq!(&cf[start..end], b"Hello");
// Trailing NUL present, and EndHTML points *before* it.
assert_eq!(*cf.last().unwrap(), 0);
assert_eq!(read_header_offset(&cf, b"EndHTML:").unwrap(), cf.len() - 1);
}
#[test]
fn cf_html_round_trips_including_multibyte() {
for frag in [
"Hello",
"<b>bold</b> & <i>ital</i>",
"café ☕ <span>x</span>",
"",
] {
let cf = html_to_cf(frag.as_bytes());
assert_eq!(html_from_cf(&cf), frag.as_bytes(), "fragment {frag:?}");
}
}
#[test]
fn cf_html_extract_tolerates_foreign_producers() {
// A producer that adds SourceURL and uses Version 1.0 — offsets must still drive extraction,
// never a hardcoded 105-byte header.
let fragment = "picked";
let prefix = "<html><body><!--StartFragment-->";
let header_body = format!(
"Version:1.0\r\nStartHTML:{sh:010}\r\nEndHTML:{eh:010}\r\n\
StartFragment:{sf:010}\r\nEndFragment:{ef:010}\r\nSourceURL:https://x/\r\n",
sh = 0,
eh = 0,
sf = 0,
ef = 0,
);
// Compute real offsets against this ad-hoc layout.
let start_html = header_body.len();
let start_fragment = start_html + prefix.len();
let end_fragment = start_fragment + fragment.len();
let end_html = end_fragment + "<!--EndFragment--></body></html>".len();
let full = format!(
"Version:1.0\r\nStartHTML:{start_html:010}\r\nEndHTML:{end_html:010}\r\n\
StartFragment:{start_fragment:010}\r\nEndFragment:{end_fragment:010}\r\nSourceURL:https://x/\r\n\
{prefix}{fragment}<!--EndFragment--></body></html>"
);
assert_eq!(html_from_cf(full.as_bytes()), fragment.as_bytes());
}
#[test]
fn cf_html_extract_falls_back_without_markers() {
// No fragment markers at all → whole buffer (minus any NUL).
let mut b = b"<p>no markers</p>".to_vec();
assert_eq!(html_from_cf(&b), b"<p>no markers</p>");
b.push(0);
assert_eq!(html_from_cf(&b), b"<p>no markers</p>");
}
#[test]
fn rtf_strips_one_trailing_nul() {
assert_eq!(rtf_from_cf(br"{\rtf1 hi}"), br"{\rtf1 hi}");
assert_eq!(rtf_from_cf(b"{\\rtf1 hi}\0"), br"{\rtf1 hi}");
// Only one NUL is stripped.
assert_eq!(rtf_from_cf(b"x\0\0"), b"x\0");
}
}