From ebc5e18956508eefa60d72de26de7c7f73fc7726 Mon Sep 17 00:00:00 2001 From: kewl fft Date: Sat, 2 Jun 2018 21:53:02 +0100 Subject: [PATCH] add xclip support for clipboard copy and paste functions --- share/functions/fish_clipboard_copy.fish | 2 ++ share/functions/fish_clipboard_paste.fish | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/share/functions/fish_clipboard_copy.fish b/share/functions/fish_clipboard_copy.fish index b747799ca..512aad358 100644 --- a/share/functions/fish_clipboard_copy.fish +++ b/share/functions/fish_clipboard_copy.fish @@ -5,5 +5,7 @@ function fish_clipboard_copy # Silence error so no error message shows up # if e.g. X isn't running. commandline | xsel --clipboard 2>/dev/null + else if type -q xclip + commandline | xclip -selection clipboard 2>/dev/null end end diff --git a/share/functions/fish_clipboard_paste.fish b/share/functions/fish_clipboard_paste.fish index f82c56e57..942724160 100644 --- a/share/functions/fish_clipboard_paste.fish +++ b/share/functions/fish_clipboard_paste.fish @@ -9,6 +9,10 @@ function fish_clipboard_paste if not set data (xsel --clipboard 2>/dev/null) return 1 end + else if type -q xclip + if not set data (xclip -selection clipboard -o 2>/dev/null) + return 1 + end end # Also split on \r to turn it into a newline, # otherwise the output looks really confusing.