`9dca739`

app: integrate X11 clipboard for system-wide file copy/paste

Authored by mfwolffe <wolffemf@dukes.jmu.edu> 3 months ago

SHA: 9dca739f7d9a5db2ddc969230416b28e58abecb9
Parents: ef80a58
Tree: 6d2bc32

1 changed file

Status	File	+	-
M	`garfield/src/app.rs`	37	3

garfield/src/app.rsmodified

  use anyhow::Result;
  use gartk_core::{InputEvent, Key, MouseButton, Point, Rect, Theme};
  use gartk_render::{Renderer, TextStyle};
 -use gartk_x11::{Connection, EventLoop, EventLoopConfig, Window, WindowConfig};
 +use gartk_x11::{ClipboardManager, Connection, EventLoop, EventLoopConfig, Window, WindowConfig};
  use std::path::PathBuf;
  use std::time::Instant;
  use x11rb::protocol::xproto::{ConnectionExt, ImageFormat};
      preview_loader: PreviewLoader,
      /// Async image preview loader.
      image_preview_loader: ImagePreviewLoader,
 +    /// X11 clipboard manager for system clipboard integration.
 +    x11_clipboard: ClipboardManager,
+ }
  /// State for a paste operation with conflicts.
          window.focus()?;
 +        // Create X11 clipboard manager for system clipboard integration
 +        let x11_clipboard = ClipboardManager::new(conn.clone(), window.id())?;
++
          // Create graphics context for blitting
          let gc = conn.generate_id()?;
          conn.inner().create_gc(gc, window.id(), &Default::default())?;
              pending_paste: None,
              preview_loader: PreviewLoader::new(),
              image_preview_loader: ImagePreviewLoader::new(),
 +            x11_clipboard,
          };
          app.update_status_bar();
                          ev.request_redraw();
+                     }
+                 }
 +                InputEvent::SelectionRequest(req) => {
 +                    // Another application is requesting our clipboard data
 +                    tracing::debug!("Received SelectionRequest event");
 +                    if let Err(e) = self.x11_clipboard.handle_selection_request(&req) {
 +                        tracing::warn!("Failed to handle selection request: {}", e);
 +                    }
 +                }
 +                InputEvent::SelectionClear => {
 +                    // We lost clipboard ownership to another application
 +                    tracing::debug!("Received SelectionClear event");
 +                    self.x11_clipboard.handle_selection_clear();
 +                }
                  _ => {}
+             }
          let paths = self.get_selected_paths();
          if !paths.is_empty() {
              let count = paths.len();
 -            self.clipboard.copy(paths);
++
 +            // Update internal clipboard
 +            self.clipboard.copy(paths.clone());
++
 +            // Update X11 system clipboard so other apps can paste
 +            if let Err(e) = self.x11_clipboard.set_files(&paths, false) {
 +                tracing::warn!("Failed to set X11 clipboard: {}", e);
 +            }
++
              let msg = if count == 1 { "1 item copied".to_string() } else { format!("{} items copied", count) };
              self.status_bar.set_status_message(msg);
              self.update_status_bar();
          let paths = self.get_selected_paths();
          if !paths.is_empty() {
              let count = paths.len();
 -            self.clipboard.cut(paths);
++
 +            // Update internal clipboard
 +            self.clipboard.cut(paths.clone());
++
 +            // Update X11 system clipboard with cut flag so other apps know to move
 +            if let Err(e) = self.x11_clipboard.set_files(&paths, true) {
 +                tracing::warn!("Failed to set X11 clipboard: {}", e);
 +            }
++
              let msg = if count == 1 { "1 item cut".to_string() } else { format!("{} items cut", count) };
              self.status_bar.set_status_message(msg);
              self.update_status_bar();