Use helper binary for clipboard access (#262)

.github/workflows/ci.yml

@@ -29,11 +29,6 @@ jobs:
         profile: minimal
         components: clippy
 
-    - name: Install dependencies for clipboard access
-      if: matrix.os == 'ubuntu-latest'
-      run: |
-        sudo apt-get -qq install libxcb-shape0-dev libxcb-xfixes0-dev
-
     - name: Build Debug
       run: |
         rustc --version

Cargo.toml

@@ -40,7 +40,6 @@ serde = "1.0"
 anyhow = "1.0.33"
 unicode-width = "0.1"
 textwrap = "0.12"
-clipboard = { version = "0.5", optional = true }
 
 [target.'cfg(not(windows))'.dependencies]
 pprof = { version = "0.3", features = ["flamegraph"], optional = true }
@@ -49,7 +48,7 @@ pprof = { version = "0.3", features = ["flamegraph"], optional = true }
 maintenance = { status = "actively-developed" }
 
 [features]
-default=["clipboard"]
+default=[]
 timing=["scopetime/enabled"]
 
 [workspace]

Makefile

@@ -26,13 +26,13 @@ release-linux-musl: build-linux-musl-release
 	tar -C ./target/x86_64-unknown-linux-musl/release/ -czvf ./release/gitui-linux-musl.tar.gz ./gitui
 
 build-linux-musl-debug:
-	cargo build --target=x86_64-unknown-linux-musl --no-default-features
+	cargo build --target=x86_64-unknown-linux-musl
 
 build-linux-musl-release:
-	cargo build --release --target=x86_64-unknown-linux-musl --no-default-features
+	cargo build --release --target=x86_64-unknown-linux-musl
 
 test-linux-musl:
-	cargo test --workspace --target=x86_64-unknown-linux-musl --no-default-features
+	cargo test --workspace --target=x86_64-unknown-linux-musl
 
 test:
 	cargo test --workspace

src/clipboard.rs

@@ -1,33 +1,47 @@
 use anyhow::Result;
-#[cfg(feature = "clipboard")]
-use clipboard::{ClipboardContext, ClipboardProvider};
+use std::io::Write;
+use std::process::{Command, Stdio};
 
-#[cfg(feature = "clipboard")]
-pub fn copy_string(string: String) -> Result<()> {
+fn execute_copy_command(
+    command: &mut Command,
+    string: &str,
+) -> Result<()> {
     use anyhow::anyhow;
 
-    let mut ctx: ClipboardContext = ClipboardProvider::new()
-        .map_err(|e| {
-            anyhow!("failed to get access to clipboard: {}", e)
-        })?;
-    ctx.set_contents(string).map_err(|e| {
-        anyhow!("failed to set clipboard contents: {}", e)
-    })?;
+    let mut process = command
+        .stdin(Stdio::piped())
+        .stdout(Stdio::null())
+        .spawn()
+        .map_err(|e| anyhow!("`{:?}`: {}", command, e))?;
+
+    process
+        .stdin
+        .as_mut()
+        .ok_or_else(|| anyhow!("`{:?}`", command))?
+        .write_all(string.as_bytes())
+        .map_err(|e| anyhow!("`{:?}`: {}", command, e))?;
+
+    process
+        .wait()
+        .map_err(|e| anyhow!("`{:?}`: {}", command, e))?;
 
     Ok(())
 }
 
-#[cfg(not(feature = "clipboard"))]
-pub fn copy_string(_string: String) -> Result<()> {
-    Ok(())
+#[cfg(target_os = "linux")]
+pub fn copy_string(string: &str) -> Result<()> {
+    execute_copy_command(
+        Command::new("xclip").arg("-selection").arg("clipboard"),
+        string,
+    )
 }
 
-#[cfg(feature = "clipboard")]
-pub const fn is_supported() -> bool {
-    true
+#[cfg(target_os = "macos")]
+pub fn copy_string(string: &str) -> Result<()> {
+    execute_copy_command(&mut Command::new("pbcopy"), string)
 }
 
-#[cfg(not(feature = "clipboard"))]
-pub fn is_supported() -> bool {
-    false
+#[cfg(windows)]
+pub fn copy_string(string: &str) -> Result<()> {
+    execute_copy_command(&mut Command::new("clip"), string)
 }

src/components/diff.rs

@@ -269,7 +269,7 @@ impl DiffComponent {
                 self,
                 "copy to clipboard error:",
                 crate::clipboard::copy_string(
-                    lines_to_copy.join("\n")
+                    &lines_to_copy.join("\n")
                 )
             );
         }
@@ -611,13 +611,11 @@ impl Component for DiffComponent {
             self.focused,
         ));
 
-        if crate::clipboard::is_supported() {
-            out.push(CommandInfo::new(
-                strings::commands::copy(&self.key_config),
-                true,
-                self.focused,
-            ));
-        }
+        out.push(CommandInfo::new(
+            strings::commands::copy(&self.key_config),
+            true,
+            self.focused,
+        ));
 
         out.push(
             CommandInfo::new(
@@ -697,9 +695,7 @@ impl Component for DiffComponent {
                         }
                     }
                     Ok(true)
-                } else if e == self.key_config.copy
-                    && crate::clipboard::is_supported()
-                {
+                } else if e == self.key_config.copy {
                     self.copy_selection()?;
                     Ok(true)
                 } else {