refactor(clipboard): drop marker dance, patch egui-winit instead (#16)

egui-winit on Linux eats Ctrl+V and reads text/plain only, so an
image-only clipboard made the keystroke vanish before the PTY (and thus
Claude Code) ever saw it.  The earlier fix worked around this with a
clipboard-polling marker swap that mutated the user's clipboard 6x/sec;
this matches alacritty's actual practice instead, where bare Ctrl+V is
just forwarded to the PTY as the raw 0x16 byte and the inner TUI does
its own wl-paste/xclip image read.

- Vendor egui-winit 0.31.1 under egui-winit/ with a one-liner that falls
  through to a Key event when the clipboard read yields no text, so
  input.rs's existing Ctrl+letter -> control-byte path kicks in.
- Wire it via [patch.crates-io] alongside the existing x11-clipboard pin.
- Strip pending_image / IMAGE_PASTE_MARKER / stash_image_and_mark /
  restore_image / process_clipboard_image_paste and the 150ms poll loop.

Net: -110 lines in alacritree/, +3 effective lines of patch in
egui-winit/, plus the vendored crate.

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: mathix420

Cargo.lock

@@ -24,3 +24,7 @@ toml_edit = "0.24.0"
 # TODO: Validation of fix for #6978. Remove before next release and use released `x11-clipboard`.
 [patch.crates-io]
 x11-clipboard = { git = "https://github.com/quininer/x11-clipboard.git", rev = "19ab2163cf0bd0db607e827a5214571990307866" }
+# Vendored egui-winit with a one-liner so Ctrl+V falls through to a Key event
+# when the clipboard isn't text (e.g. holds an image) — matches alacritty's
+# raw 0x16 forwarding and lets TUIs like Claude Code do their own wl-paste.
+egui-winit = { path = "egui-winit" }

Cargo.toml

@@ -21,7 +21,7 @@ toml = { workspace = true }
 xdg = "3.0.0"
 home = "0.5.5"
 fontdb = { version = "0.23", default-features = false, features = ["fontconfig", "memmap"] }
-arboard = { version = "3", default-features = false, features = ["wayland-data-control", "image-data"] }
+arboard = { version = "3", default-features = false, features = ["wayland-data-control"] }
 png = "0.17"
 # Desktop notifications when a background session rings the bell.
 notify-rust = "4"

alacritree/Cargo.toml

@@ -120,8 +120,6 @@ pub struct AlacritreeApp {
     quit_dialog_open: bool,
     pending_delete: Option<DeleteRequest>,
     pending_create: Option<CreateState>,
-    pending_image: Option<clipboard::PendingImage>,
-    last_clipboard_poll: Option<std::time::Instant>,
     notify_rx: Receiver<WorkspaceKey>,
     /// Shared across sessions; auto-invalidated when cell size changes.
     builtin_glyphs: crate::builtin_font::BuiltinGlyphCache,
@@ -228,8 +226,6 @@ impl AlacritreeApp {
             quit_dialog_open: false,
             pending_delete: None,
             pending_create: None,
-            pending_image: None,
-            last_clipboard_poll: None,
             notify_rx,
             builtin_glyphs: crate::builtin_font::BuiltinGlyphCache::new(),
         };
@@ -484,60 +480,6 @@ impl AlacritreeApp {
         }
     }
 
-    /// Two-phase shim around egui_winit's text-only Ctrl+V: while focused we
-    /// poll the clipboard and swap any image for a sentinel text; on the
-    /// matching `Event::Paste` we put the image back and write raw 0x16 to the
-    /// PTY so the inner TUI does its own `wl-paste` read (same effect as
-    /// alacritty's bare Ctrl+V).  Polling rather than reacting to Ctrl-down
-    /// avoids the compositor-propagation race: smithay-clipboard reads
-    /// happen-before our new selection is observable otherwise.
-    fn process_clipboard_image_paste(&mut self, ctx: &Context) {
-        let (focus_lost, marker_pasted, focused) = ctx.input_mut(|i| {
-            let mut focus_lost = false;
-            let mut marker = false;
-            i.events.retain(|ev| match ev {
-                egui::Event::WindowFocused(false) => {
-                    focus_lost = true;
-                    true
-                },
-                egui::Event::Paste(s) if s == clipboard::IMAGE_PASTE_MARKER => {
-                    marker = true;
-                    false
-                },
-                _ => true,
-            });
-            (focus_lost, marker, i.viewport().focused.unwrap_or(false))
-        });
-
-        const POLL_INTERVAL: std::time::Duration = std::time::Duration::from_millis(150);
-        if focused {
-            let now = std::time::Instant::now();
-            let due =
-                self.last_clipboard_poll.is_none_or(|t| now.duration_since(t) >= POLL_INTERVAL);
-            if due {
-                if let Some(image) = clipboard::stash_image_and_mark() {
-                    self.pending_image = Some(image);
-                }
-                self.last_clipboard_poll = Some(now);
-            }
-            ctx.request_repaint_after(POLL_INTERVAL);
-        }
-
-        if marker_pasted {
-            if let Some(image) = self.pending_image.take() {
-                clipboard::restore_image(&image);
-            }
-            if let Some(idx) = self.active_session_index() {
-                self.sessions[idx].write(vec![0x16]);
-            }
-        }
-        if focus_lost {
-            if let Some(image) = self.pending_image.take() {
-                clipboard::restore_image(&image);
-            }
-        }
-    }
-
     fn dispatch_action(&mut self, ctx: &Context, action: BindingAction) {
         match action {
             BindingAction::Chars(bytes) => {
@@ -1885,7 +1827,6 @@ impl eframe::App for AlacritreeApp {
     }
 
     fn update(&mut self, ctx: &Context, _frame: &mut eframe::Frame) {
-        self.process_clipboard_image_paste(ctx);
         let modal_open = self.is_modal_open();
         if !modal_open {
             self.handle_shortcuts(ctx);

alacritree/src/app.rs

@@ -7,10 +7,6 @@
 #[cfg(target_os = "linux")]
 use arboard::{GetExtLinux, LinuxClipboardKind, SetExtLinux};
 
-/// Sentinel text that smuggles a Ctrl+V keystroke past egui_winit's
-/// text-only paste handler when the real clipboard holds an image.
-pub const IMAGE_PASTE_MARKER: &str = "\u{1}alacritree-image-paste\u{1}";
-
 #[derive(Copy, Clone, Debug)]
 pub enum Target {
     /// `Ctrl+V` clipboard.
@@ -67,52 +63,3 @@ pub fn read(target: Target) -> Option<String> {
         },
     }
 }
-
-#[derive(Clone)]
-pub struct PendingImage {
-    pub width: usize,
-    pub height: usize,
-    pub bytes: Vec<u8>,
-}
-
-pub fn stash_image_and_mark() -> Option<PendingImage> {
-    let mut clip = arboard::Clipboard::new().ok()?;
-    if let Ok(text) = clip.get_text() {
-        if !text.is_empty() {
-            return None;
-        }
-    }
-    let image = match clip.get_image() {
-        Ok(img) => img,
-        Err(arboard::Error::ContentNotAvailable) => return None,
-        Err(e) => {
-            log::warn!("clipboard image read failed: {e}");
-            return None;
-        },
-    };
-    let stash =
-        PendingImage { width: image.width, height: image.height, bytes: image.bytes.into_owned() };
-    if let Err(e) = clip.set_text(IMAGE_PASTE_MARKER.to_owned()) {
-        log::warn!("clipboard marker write failed: {e}");
-        return None;
-    }
-    Some(stash)
-}
-
-pub fn restore_image(image: &PendingImage) {
-    let mut clip = match arboard::Clipboard::new() {
-        Ok(c) => c,
-        Err(e) => {
-            log::warn!("clipboard unavailable for image restore: {e}");
-            return;
-        },
-    };
-    let res = clip.set_image(arboard::ImageData {
-        width: image.width,
-        height: image.height,
-        bytes: std::borrow::Cow::Borrowed(&image.bytes),
-    });
-    if let Err(e) = res {
-        log::warn!("clipboard image restore failed: {e}");
-    }
-}