aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJozanLeClerc <bousset.rudy@gmail.com>2020-11-17 20:18:52 +0100
committerJozanLeClerc <bousset.rudy@gmail.com>2020-11-17 20:18:52 +0100
commit6b9616595d831f64ddb175d1a3e8d25a4886a8f0 (patch)
tree3de843abfd61e66709dc348a3ad7b529e8bff1eb
parentChanged font again (diff)
downloadst-6b9616595d831f64ddb175d1a3e8d25a4886a8f0.tar.gz
st-6b9616595d831f64ddb175d1a3e8d25a4886a8f0.tar.bz2
st-6b9616595d831f64ddb175d1a3e8d25a4886a8f0.tar.xz
st-6b9616595d831f64ddb175d1a3e8d25a4886a8f0.tar.zst
st-6b9616595d831f64ddb175d1a3e8d25a4886a8f0.zip
cpyout ported for FreeBSD
-rw-r--r--.gitignore1
-rw-r--r--config.h2
-rwxr-xr-xst-cpyout37
3 files changed, 31 insertions, 9 deletions
diff --git a/.gitignore b/.gitignore
index 6642034..a59cf7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -126,5 +126,6 @@ flycheck_*.el
*.def.h
*.rej
*.orig
+.ccls*
st
compile_flags.txt
diff --git a/config.h b/config.h
index c78b436..bdeb228 100644
--- a/config.h
+++ b/config.h
@@ -207,6 +207,7 @@ static char *cpyurlcmd[] = { "/bin/sh", "-c",
"tmp=$(sed 's/.*│//g' | tr -d '\n' | grep -aEo '(((http|https|gopher|gemini|ftp|ftps|git)://|www\\.)[a-zA-Z0-9.]*[:]?[a-zA-Z0-9./@$&%?$#=_-~]*)|((magnet:\\?xt=urn:btih:)[a-zA-Z0-9]*)' | uniq | sed 's/^www./http:\\/\\/www\\./g' ); IFS=; [ ! -z $tmp ] && echo $tmp | dmenu -i -l 10 | tr -d '\n' | xclip -selection clipboard",
"externalpipe", NULL };
static char *cpyoutcmd[] = { "/bin/sh", "-c", "/usr/local/bin/st-cpyout", "externalpipe", NULL };
+static char *cpyoutnopcmd[] = { "/bin/sh", "-c", "/usr/local/bin/st-cpyout noprompt", "externalpipe", NULL };
static Shortcut shortcuts[] = {
/* mask keysym function argument */
@@ -230,6 +231,7 @@ static Shortcut shortcuts[] = {
{ TERMMOD, XK_J, kscrolldown, {.i = 1} },
{ TERMMOD, XK_Y, externalpipe, {.v = cpyurlcmd} },
{ TERMMOD, XK_O, externalpipe, {.v = cpyoutcmd} },
+ { TERMMOD, XK_P, externalpipe, {.v = cpyoutnopcmd} },
};
/*
diff --git a/st-cpyout b/st-cpyout
index 1912dc8..652289a 100755
--- a/st-cpyout
+++ b/st-cpyout
@@ -1,14 +1,33 @@
-#!/bin/sh
+#!/usr/local/bin/dash
# Using external pipe with st, give a dmenu prompt of recent commands,
# allowing the user to copy the output of one.
# xclip required for this script.
# By Jaywalker and Luke
-tmpfile=$(gmktemp /tmp/st-cmd-output.XXXXXX)
-trap 'grm "$tmpfile"' 0 1 15
-gsed -n "w $tmpfile"
-gsed -i 's/\x0//g' "$tmpfile"
-ps1="$(grep "\S" "$tmpfile" | gtail -n 1 | gsed 's/^\s*//' | gcut -d' ' -f1)"
-chosen="$(grep -F "$ps1" "$tmpfile" | gsed '$ d' | gtac | dmenu -i -l 10 | gsed 's/[^^]/[&]/g; s/\^/\\^/g')"
-eps1="$(gecho "$ps1" | gsed 's/[^^]/[&]/g; s/\^/\\^/g')"
-gawk "/^$chosen$/{p=1;print;next} p&&/$eps1/{p=0};p" "$tmpfile" | xclip -selection clipboard
+# Adapted for FreeBSD by Joe
+mem=$(cat)
+mem=$(printf "%s" "$mem" | gsed 's/\x0//g')
+ps1=$(printf "%s" "$mem" |
+ gtac |
+ tail -n1 |
+ gsed 's/%.\+/%/')
+chosen=$(printf "%s" "$mem" |
+ grep -F "$ps1" |
+ sed '$ d' |
+ gtac |
+ dmenu -i -l 10 |
+ sed 's/[^^]/[&]/g; s/\^/\\^/g')
+eps1=$(echo "$ps1" |
+ sed 's/[^^]/[&]/g; s/\^/\\^/g')
+if [ "$1" = "noprompt" ]; then
+ printf "%s" "$mem" |
+ gawk "/^$chosen$/{p=1;print;next} p&&/$eps1/{p=0};p" |
+ gtac |
+ sed '$ d' |
+ gtac |
+ xclip -selection clipboard
+else
+ printf "%s" "$mem" |
+ gawk "/^$chosen$/{p=1;print;next} p&&/$eps1/{p=0};p" |
+ xclip -selection clipboard
+fi