Makefile

@@ -44,9 +44,7 @@ dist: clean
 install: st
 	mkdir -p $(DESTDIR)$(PREFIX)/bin
 	cp -f st $(DESTDIR)$(PREFIX)/bin
-	cp -f st-copyout $(DESTDIR)$(PREFIX)/bin
 	chmod 755 $(DESTDIR)$(PREFIX)/bin/st
-	chmod 755 $(DESTDIR)$(PREFIX)/bin/st-copyout
 	mkdir -p $(DESTDIR)$(MANPREFIX)/man1
 	sed "s/VERSION/$(VERSION)/g" < st.1 > $(DESTDIR)$(MANPREFIX)/man1/st.1
 	chmod 644 $(DESTDIR)$(MANPREFIX)/man1/st.1
@@ -55,8 +53,6 @@ install: st
 
 uninstall:
 	rm -f $(DESTDIR)$(PREFIX)/bin/st
-	rm -f $(DESTDIR)$(PREFIX)/bin/st-copyout
-	rm -f $(DESTDIR)$(MANPREFIX)/man1/st.1
 	rm -f $(DESTDIR)$(MANPREFIX)/man1/st.1
 
 .PHONY: all options clean dist install uninstall

README.md

@@ -11,7 +11,6 @@ The list below shows the currently applied patches to the master branch.
 - st-alpha-20220206-0.8.5.diff (adds transparency)
 - st-anysize-20220718-baa9357.diff (st leaves no gaps if the height/width doesn't match a multiple of
   character height)
-- st-externalpipe-0.8.4.diff (allows reading and writing st's screen through a pipe)
 - st-ligatures-scrollback-20230105-0.9.diff (scrollback compatible addition of ligatures)
 - st-scrollback-0.8.5.diff (add scrollback functionality)
 
@@ -20,7 +19,7 @@ The list below shows the currently applied patches to the master branch.
 There are various shortcuts and hotkeys used in this version. Included in my build are the following.
 
 | ModKey | Shift | Key             | Function        |
-| ------ | ----- | --------------- | -------------------------------------------- |
+| ------ | ----- | --------------- | --------------- |
 | Alt    |       | Break           | Send break      |
 | Alt    |       | Print           | Toggle printer  |
 | Alt    |       | Print           | Print screen    |
@@ -35,7 +34,6 @@ There are various shortcuts and hotkeys used in this version. Included in my bui
 |        |       | MouseScrollDown | Scroll down     |
 | Alt    | Shift | u               | Zoom in         |
 | Alt    | Shift | i               | Zoom out        |
-| Alt    |       | o               | copy output of previous command to clipboard |
 
 ## Installation
 

config.def.h

@@ -184,8 +184,6 @@ static MouseShortcut mshortcuts[] = {
 #define MODKEY Mod1Mask
 #define TERMMOD (ControlMask|ShiftMask)
 
-static char *copyoutput[] = { "/bin/sh", "-c", "st-copyout", "externalpipe", NULL };
-
 static Shortcut shortcuts[] = {
 	/* mask                 keysym          function        argument */
 	{ MODKEY,		XK_Break,       sendbreak,      {.i =  0} },
@@ -201,7 +199,6 @@ static Shortcut shortcuts[] = {
 	{ MODKEY,		XK_U,           zoom,           {.f = +1} },
 	{ MODKEY|ShiftMask,	XK_U,           zoom,           {.f = +1} },
 	{ MODKEY|ShiftMask,	XK_I,           zoom,           {.f = -1} },
-	{ MODKEY,               XK_o,           externalpipe,   {.v = copyoutput } },
 };
 
 /*

st-copyout

@@ -1,13 +0,0 @@
-#!/bin/sh
-# 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=$(mktemp /tmp/st-cmd-output.XXXXXX)
-trap 'rm "$tmpfile"' 0 1 15
-sed -n "w $tmpfile"
-sed -i 's/\x0//g' "$tmpfile"
-ps1="$(grep "\S" "$tmpfile" | tail -n 1 | sed 's/^\s*//' | cut -d' ' -f1)"
-chosen="$(grep -F "$ps1" "$tmpfile" | sed '$ d' | tac | dmenu -p "Copy which command's output?" -i -l 10 | sed 's/[^^]/[&]/g; s/\^/\\^/g')"
-eps1="$(echo "$ps1" | sed 's/[^^]/[&]/g; s/\^/\\^/g')"
-awk "/^$chosen$/{p=1;print;next} p&&/$eps1/{p=0};p" "$tmpfile" | xclip -selection clipboard

st-externalpipe-0.8.4.diff

@@ -1,92 +0,0 @@
-diff --git a/st.c b/st.c
-index 76b7e0d..0e9a614 100644
---- a/st.c
-+++ b/st.c
-@@ -723,8 +723,14 @@ sigchld(int a)
- 	if ((p = waitpid(pid, &stat, WNOHANG)) < 0)
- 		die("waiting for pid %hd failed: %s\n", pid, strerror(errno));
- 
--	if (pid != p)
-+	if (pid != p) {
-+		if (p == 0 && wait(&stat) < 0)
-+			die("wait: %s\n", strerror(errno));
-+
-+		/* reinstall sigchld handler */
-+		signal(SIGCHLD, sigchld);
- 		return;
-+	}
- 
- 	if (WIFEXITED(stat) && WEXITSTATUS(stat))
- 		die("child exited with status %d\n", WEXITSTATUS(stat));
-@@ -1926,6 +1932,59 @@ strparse(void)
- 	}
- }
- 
-+void
-+externalpipe(const Arg *arg)
-+{
-+	int to[2];
-+	char buf[UTF_SIZ];
-+	void (*oldsigpipe)(int);
-+	Glyph *bp, *end;
-+	int lastpos, n, newline;
-+
-+	if (pipe(to) == -1)
-+		return;
-+
-+	switch (fork()) {
-+	case -1:
-+		close(to[0]);
-+		close(to[1]);
-+		return;
-+	case 0:
-+		dup2(to[0], STDIN_FILENO);
-+		close(to[0]);
-+		close(to[1]);
-+		execvp(((char **)arg->v)[0], (char **)arg->v);
-+		fprintf(stderr, "st: execvp %s\n", ((char **)arg->v)[0]);
-+		perror("failed");
-+		exit(0);
-+	}
-+
-+	close(to[0]);
-+	/* ignore sigpipe for now, in case child exists early */
-+	oldsigpipe = signal(SIGPIPE, SIG_IGN);
-+	newline = 0;
-+	for (n = 0; n < term.row; n++) {
-+		bp = term.line[n];
-+		lastpos = MIN(tlinelen(n) + 1, term.col) - 1;
-+		if (lastpos < 0)
-+			break;
-+		end = &bp[lastpos + 1];
-+		for (; bp < end; ++bp)
-+			if (xwrite(to[1], buf, utf8encode(bp->u, buf)) < 0)
-+				break;
-+		if ((newline = term.line[n][lastpos].mode & ATTR_WRAP))
-+			continue;
-+		if (xwrite(to[1], "\n", 1) < 0)
-+			break;
-+		newline = 0;
-+	}
-+	if (newline)
-+		(void)xwrite(to[1], "\n", 1);
-+	close(to[1]);
-+	/* restore */
-+	signal(SIGPIPE, oldsigpipe);
-+}
-+
- void
- strdump(void)
- {
-diff --git a/st.h b/st.h
-index 3d351b6..392b64e 100644
---- a/st.h
-+++ b/st.h
-@@ -81,6 +81,7 @@ void die(const char *, ...);
- void redraw(void);
- void draw(void);
- 
-+void externalpipe(const Arg *);
- void printscreen(const Arg *);
- void printsel(const Arg *);
- void sendbreak(const Arg *);

st.c

@@ -725,14 +725,8 @@ sigchld(int a)
 	if ((p = waitpid(pid, &stat, WNOHANG)) < 0)
 		die("waiting for pid %hd failed: %s\n", pid, strerror(errno));
 
-	if (pid != p) {
+	if (pid != p)
-		if (p == 0 && wait(&stat) < 0)
-			die("wait: %s\n", strerror(errno));
-
-		/* reinstall sigchld handler */
-		signal(SIGCHLD, sigchld);
 		return;
-	}
 
 	if (WIFEXITED(stat) && WEXITSTATUS(stat))
 		die("child exited with status %d\n", WEXITSTATUS(stat));
@@ -2049,59 +2043,6 @@ strparse(void)
 	}
 }
 
-void
-externalpipe(const Arg *arg)
-{
-	int to[2];
-	char buf[UTF_SIZ];
-	void (*oldsigpipe)(int);
-	Glyph *bp, *end;
-	int lastpos, n, newline;
-
-	if (pipe(to) == -1)
-		return;
-
-	switch (fork()) {
-	case -1:
-		close(to[0]);
-		close(to[1]);
-		return;
-	case 0:
-		dup2(to[0], STDIN_FILENO);
-		close(to[0]);
-		close(to[1]);
-		execvp(((char **)arg->v)[0], (char **)arg->v);
-		fprintf(stderr, "st: execvp %s\n", ((char **)arg->v)[0]);
-		perror("failed");
-		exit(0);
-	}
-
-	close(to[0]);
-	/* ignore sigpipe for now, in case child exists early */
-	oldsigpipe = signal(SIGPIPE, SIG_IGN);
-	newline = 0;
-	for (n = 0; n < term.row; n++) {
-		bp = term.line[n];
-		lastpos = MIN(tlinelen(n) + 1, term.col) - 1;
-		if (lastpos < 0)
-			break;
-		end = &bp[lastpos + 1];
-		for (; bp < end; ++bp)
-			if (xwrite(to[1], buf, utf8encode(bp->u, buf)) < 0)
-				break;
-		if ((newline = term.line[n][lastpos].mode & ATTR_WRAP))
-			continue;
-		if (xwrite(to[1], "\n", 1) < 0)
-			break;
-		newline = 0;
-	}
-	if (newline)
-		(void)xwrite(to[1], "\n", 1);
-	close(to[1]);
-	/* restore */
-	signal(SIGPIPE, oldsigpipe);
-}
-
 void
 strdump(void)
 {

st.h

@@ -84,7 +84,6 @@ void draw(void);
 
 void kscrolldown(const Arg *);
 void kscrollup(const Arg *);
-void externalpipe(const Arg *);
 void printscreen(const Arg *);
 void printsel(const Arg *);
 void sendbreak(const Arg *);