fix freeze on copy with wl-copy

senekor · extrawurst · commit 63f230f0d1de · 2023-03-07T18:50:09.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -39,6 +39,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * `edit` command duplication ([#1489](https://github.com/extrawurst/gitui/issues/1489))
 * syntax errors in `key_bindings.ron` will be logged ([#1491](https://github.com/extrawurst/gitui/issues/1491))
 * Fix UI freeze when copying with xclip installed on Linux ([#1497](https://github.com/extrawurst/gitui/issues/1497))
+* Fix UI freeze when copying with wl-copy installed on Linux ([#1497](https://github.com/extrawurst/gitui/issues/1497))
 * commit hooks report "command not found" on Windows with wsl2 installed ([#1528](https://github.com/extrawurst/gitui/issues/1528))
 * crashes on entering submodules ([#1510](https://github.com/extrawurst/gitui/issues/1510))
 * fix race issue: revlog messages sometimes appear empty ([#1473](https://github.com/extrawurst/gitui/issues/1473))
diff --git a/src/clipboard.rs b/src/clipboard.rs
@@ -49,14 +49,10 @@ fn exec_copy_with_args(
 	}
 }
 
-fn exec_copy(command: &str, text: &str) -> Result<()> {
-	exec_copy_with_args(command, &[], text, true)
-}
-
 #[cfg(all(target_family = "unix", not(target_os = "macos")))]
 pub fn copy_string(text: &str) -> Result<()> {
 	if std::env::var("WAYLAND_DISPLAY").is_ok() {
-		return exec_copy("wl-copy", text);
+		return exec_copy_with_args("wl-copy", &[], text, false);
 	}
 
 	if exec_copy_with_args(
@@ -78,6 +74,11 @@ pub fn copy_string(text: &str) -> Result<()> {
 	Ok(())
 }
 
+#[cfg(any(target_os = "macos", windows))]
+fn exec_copy(command: &str, text: &str) -> Result<()> {
+	exec_copy_with_args(command, &[], text, true)
+}
+
 #[cfg(target_os = "macos")]
 pub fn copy_string(text: &str) -> Result<()> {
 	exec_copy("pbcopy", text)

Original file line number	Diff line number	Diff line change
`@@ -49,14 +49,10 @@ fn exec_copy_with_args(`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`
`52`		`-fn exec_copy(command: &str, text: &str) -> Result<()> {`
`53`		`- exec_copy_with_args(command, &[], text, true)`
`54`		`-}`
`55`		`-`
`56`	`52`	`#[cfg(all(target_family = "unix", not(target_os = "macos")))]`
`57`	`53`	`pub fn copy_string(text: &str) -> Result<()> {`
`58`	`54`	`if std::env::var("WAYLAND_DISPLAY").is_ok() {`
`59`		`- return exec_copy("wl-copy", text);`
	`55`	`+ return exec_copy_with_args("wl-copy", &[], text, false);`
`60`	`56`	`}`
`61`	`57`
`62`	`58`	`if exec_copy_with_args(`
`@@ -78,6 +74,11 @@ pub fn copy_string(text: &str) -> Result<()> {`
`78`	`74`	`Ok(())`
`79`	`75`	`}`
`80`	`76`
	`77`	`+#[cfg(any(target_os = "macos", windows))]`
	`78`	`+fn exec_copy(command: &str, text: &str) -> Result<()> {`
	`79`	`+ exec_copy_with_args(command, &[], text, true)`
	`80`	`+}`
	`81`	`+`
`81`	`82`	`#[cfg(target_os = "macos")]`
`82`	`83`	`pub fn copy_string(text: &str) -> Result<()> {`
`83`	`84`	`exec_copy("pbcopy", text)`