9 changed files with 280 additions and 676 deletions
--- a/2
+++ b/2
@ -24,7 +24,7 @@ st: $(OBJ)
 	$(CC) -o $@ $(OBJ) $(STLDFLAGS)

 clean:
-	rm -f st $(OBJ) st-$(VERSION).tar.gz config.h
+	rm -f st $(OBJ) st-$(VERSION).tar.gz

 dist: clean
 	mkdir -p st-$(VERSION)
--- a/config.def.h
+++ b/config.def.h
@ -5,8 +5,7 @@
 *
 * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
 */
-static char *font =
-    "FiraCode Nerd Font:pixelsize=16:antialias=true:autohint=true";
+static char *font = "Liberation Mono:pixelsize=12:antialias=true:autohint=true";
 static int borderpx = 2;

 /*
@ -94,39 +93,45 @@ char *termname = "st-256color";
 */
 unsigned int tabspaces = 8;

-/* bg opacity */
-float alpha = 0.8;
-
 /* Terminal colors (16 first used in escape sequence) */
 static const char *colorname[] = {
 	/* 8 normal colors */
-    [0] = "#282828", /* hard contrast: #1d2021 / soft contrast: #32302f */
-    [1] = "#cc241d", /* red     */
-    [2] = "#98971a", /* green   */
-    [3] = "#d79921", /* yellow  */
-    [4] = "#458588", /* blue    */
-    [5] = "#b16286", /* magenta */
-    [6] = "#689d6a", /* cyan    */
-    [7] = "#a89984", /* white   */
+	"black",
+	"red3",
+	"green3",
+	"yellow3",
+	"blue2",
+	"magenta3",
+	"cyan3",
+	"gray90",

 	/* 8 bright colors */
-    [8] = "#928374",  /* black   */
-    [9] = "#fb4934",  /* red     */
-    [10] = "#b8bb26", /* green   */
-    [11] = "#fabd2f", /* yellow  */
-    [12] = "#83a598", /* blue    */
-    [13] = "#d3869b", /* magenta */
-    [14] = "#8ec07c", /* cyan    */
-    [15] = "#ebdbb2", /* white   */
+	"gray50",
+	"red",
+	"green",
+	"yellow",
+	"#5c5cff",
+	"magenta",
+	"cyan",
+	"white",
+
+	[255] = 0,
+
+	/* more colors can be added after 255 to use with DefaultXX */
+	"#cccccc",
+	"#555555",
+	"gray90", /* default foreground colour */
+	"black", /* default background colour */
 };

+
 /*
 * Default colors (colorname index)
 * foreground, background, cursor, reverse cursor
 */
-unsigned int defaultfg = 15;
-unsigned int defaultbg = 0;
-unsigned int defaultcs = 15;
+unsigned int defaultfg = 258;
+unsigned int defaultbg = 259;
+unsigned int defaultcs = 256;
 static unsigned int defaultrcs = 257;

 /*
@ -196,10 +201,6 @@ static Shortcut shortcuts[] = {
 	{ TERMMOD,              XK_Y,           selpaste,       {.i =  0} },
 	{ ShiftMask,            XK_Insert,      selpaste,       {.i =  0} },
 	{ TERMMOD,              XK_Num_Lock,    numlock,        {.i =  0} },
-    {TERMMOD,
-     XK_U,
-     externalpipe,
-     {.v = (const char *[]){"st-grab-links", NULL}}},
 };

 /*
@ -467,6 +468,7 @@ static uint selmasks[] = {
 * Printable characters in ASCII, used to estimate the advance width
 * of single wide characters.
 */
-static char ascii_printable[] = " !\"#$%&'()*+,-./0123456789:;<=>?"
+static char ascii_printable[] =
+	" !\"#$%&'()*+,-./0123456789:;<=>?"
 	"@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
 	"`abcdefghijklmnopqrstuvwxyz{|}~";
--- a/st-alpha-20240814-a0274bc.diff
+++ b/st-alpha-20240814-a0274bc.diff
@ -1,129 +0,0 @@
-diff --git a/config.def.h b/config.def.h
-index 2cd740a..019a4e1 100644
--- a/config.def.h
-+++ b/config.def.h
-@@ -93,6 +93,9 @@ char *termname = "st-256color";
-  */
- unsigned int tabspaces = 8;
- 
-+/* bg opacity */
-+float alpha = 0.8;
-+
- /* Terminal colors (16 first used in escape sequence) */
- static const char *colorname[] = {
- 	/* 8 normal colors */
-diff --git a/x.c b/x.c
-index d73152b..f32fd6c 100644
--- a/x.c
-+++ b/x.c
-@@ -105,6 +105,7 @@ typedef struct {
- 	XSetWindowAttributes attrs;
- 	int scr;
- 	int isfixed; /* is fixed geometry? */
-+	int depth; /* bit depth */
- 	int l, t; /* left and top offset */
- 	int gm; /* geometry mask */
- } XWindow;
-@@ -752,7 +753,7 @@ xresize(int col, int row)
- 
- 	XFreePixmap(xw.dpy, xw.buf);
- 	xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
-			DefaultDepth(xw.dpy, xw.scr));
-+			xw.depth);
- 	XftDrawChange(xw.draw, xw.buf);
- 	xclear(0, 0, win.w, win.h);
- 
-@@ -812,6 +813,10 @@ xloadcols(void)
- 			else
- 				die("could not allocate color %d\n", i);
- 		}
-+
-+	dc.col[defaultbg].color.alpha = (unsigned short)(0xffff * alpha);
-+	dc.col[defaultbg].pixel &= 0x00FFFFFF;
-+	dc.col[defaultbg].pixel |= (unsigned char)(0xff * alpha) << 24;
- 	loaded = 1;
- }
- 
-@@ -842,6 +847,12 @@ xsetcolorname(int x, const char *name)
- 	XftColorFree(xw.dpy, xw.vis, xw.cmap, &dc.col[x]);
- 	dc.col[x] = ncolor;
- 
-+	if (x == defaultbg) {
-+		dc.col[defaultbg].color.alpha = (unsigned short)(0xffff * alpha);
-+		dc.col[defaultbg].pixel &= 0x00FFFFFF;
-+		dc.col[defaultbg].pixel |= (unsigned char)(0xff * alpha) << 24;
-+	}
-+
- 	return 0;
- }
- 
-@@ -1134,11 +1145,25 @@ xinit(int cols, int rows)
- 	Window parent, root;
- 	pid_t thispid = getpid();
- 	XColor xmousefg, xmousebg;
-+	XWindowAttributes attr;
-+	XVisualInfo vis;
- 
- 	if (!(xw.dpy = XOpenDisplay(NULL)))
- 		die("can't open display\n");
- 	xw.scr = XDefaultScreen(xw.dpy);
-	xw.vis = XDefaultVisual(xw.dpy, xw.scr);
-+
-+	root = XRootWindow(xw.dpy, xw.scr);
-+	if (!(opt_embed && (parent = strtol(opt_embed, NULL, 0))))
-+		parent = root;
-+
-+	if (XMatchVisualInfo(xw.dpy, xw.scr, 32, TrueColor, &vis) != 0) {
-+		xw.vis = vis.visual;
-+		xw.depth = vis.depth;
-+	} else {
-+		XGetWindowAttributes(xw.dpy, parent, &attr);
-+		xw.vis = attr.visual;
-+		xw.depth = attr.depth;
-+	}
- 
- 	/* font */
- 	if (!FcInit())
-@@ -1148,7 +1173,7 @@ xinit(int cols, int rows)
- 	xloadfonts(usedfont, 0);
- 
- 	/* colors */
-	xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
-+	xw.cmap = XCreateColormap(xw.dpy, parent, xw.vis, None);
- 	xloadcols();
- 
- 	/* adjust fixed window geometry */
-@@ -1168,11 +1193,8 @@ xinit(int cols, int rows)
- 		| ButtonMotionMask | ButtonPressMask | ButtonReleaseMask;
- 	xw.attrs.colormap = xw.cmap;
- 
-	root = XRootWindow(xw.dpy, xw.scr);
-	if (!(opt_embed && (parent = strtol(opt_embed, NULL, 0))))
-		parent = root;
-	xw.win = XCreateWindow(xw.dpy, root, xw.l, xw.t,
-			win.w, win.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput,
-+	xw.win = XCreateWindow(xw.dpy, parent, xw.l, xw.t,
-+			win.w, win.h, 0, xw.depth, InputOutput,
- 			xw.vis, CWBackPixel | CWBorderPixel | CWBitGravity
- 			| CWEventMask | CWColormap, &xw.attrs);
- 	if (parent != root)
-@@ -1183,7 +1205,7 @@ xinit(int cols, int rows)
- 	dc.gc = XCreateGC(xw.dpy, xw.win, GCGraphicsExposures,
- 			&gcvalues);
- 	xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
-			DefaultDepth(xw.dpy, xw.scr));
-+			xw.depth);
- 	XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel);
- 	XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h);
- 
-@@ -2047,6 +2069,10 @@ main(int argc, char *argv[])
- 	case 'a':
- 		allowaltscreen = 0;
- 		break;
-+	case 'A':
-+		alpha = strtof(EARGF(usage()), NULL);
-+		LIMIT(alpha, 0.0, 1.0);
-+		break;
- 	case 'c':
- 		opt_class = EARGF(usage());
- 		break;
--- a/st-clipboard-0.8.3.diff
+++ b/st-clipboard-0.8.3.diff
@ -1,12 +0,0 @@
-diff --git a/x.c b/x.c
-index e5f1737..5cabd60 100644
--- a/x.c
-+++ b/x.c
-@@ -673,6 +673,7 @@ setsel(char *str, Time t)
- 	XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, t);
- 	if (XGetSelectionOwner(xw.dpy, XA_PRIMARY) != xw.win)
- 		selclear();
-+	clipcopy(NULL);
- }
- 
- void
--- a/st-externalpipe-0.8.5.diff
+++ b/st-externalpipe-0.8.5.diff
@ -1,104 +0,0 @@
-diff --git a/st.c b/st.c
-index 034954d..98f2589 100644
--- a/st.c
-+++ b/st.c
-@@ -718,8 +718,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));
-@@ -803,7 +809,7 @@ ttynew(const char *line, char *cmd, const char *out, char **args)
- 		break;
- 	default:
- #ifdef __OpenBSD__
-		if (pledge("stdio rpath tty proc", NULL) == -1)
-+		if (pledge("stdio rpath tty proc exec", NULL) == -1)
- 			die("pledge\n");
- #endif
- 		close(s);
-@@ -1991,6 +1997,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 fd3b0d8..754cd08 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 *);
-- 
-2.42.0
-
--- a/st-gruvbox-dark-0.8.5.diff
+++ b/st-gruvbox-dark-0.8.5.diff
@ -1,66 +0,0 @@
-diff --git a/config.def.h b/config.def.h
-index 91ab8ca..a068694 100644
--- a/config.def.h
-+++ b/config.def.h
-@@ -96,32 +96,24 @@ unsigned int tabspaces = 8;
- /* Terminal colors (16 first used in escape sequence) */
- static const char *colorname[] = {
- 	/* 8 normal colors */
-	"black",
-	"red3",
-	"green3",
-	"yellow3",
-	"blue2",
-	"magenta3",
-	"cyan3",
-	"gray90",
-+	[0] = "#282828", /* hard contrast: #1d2021 / soft contrast: #32302f */
-+	[1] = "#cc241d", /* red     */
-+	[2] = "#98971a", /* green   */
-+	[3] = "#d79921", /* yellow  */
-+	[4] = "#458588", /* blue    */
-+	[5] = "#b16286", /* magenta */
-+	[6] = "#689d6a", /* cyan    */
-+	[7] = "#a89984", /* white   */
- 
- 	/* 8 bright colors */
-	"gray50",
-	"red",
-	"green",
-	"yellow",
-	"#5c5cff",
-	"magenta",
-	"cyan",
-	"white",
-
-	[255] = 0,
-
-	/* more colors can be added after 255 to use with DefaultXX */
-	"#cccccc",
-	"#555555",
-	"gray90", /* default foreground colour */
-	"black", /* default background colour */
-+	[8]  = "#928374", /* black   */
-+	[9]  = "#fb4934", /* red     */
-+	[10] = "#b8bb26", /* green   */
-+	[11] = "#fabd2f", /* yellow  */
-+	[12] = "#83a598", /* blue    */
-+	[13] = "#d3869b", /* magenta */
-+	[14] = "#8ec07c", /* cyan    */
-+	[15] = "#ebdbb2", /* white   */
- };
- 
- 
-@@ -129,9 +121,9 @@ static const char *colorname[] = {
-  * Default colors (colorname index)
-  * foreground, background, cursor, reverse cursor
-  */
-unsigned int defaultfg = 258;
-unsigned int defaultbg = 259;
-unsigned int defaultcs = 256;
-+unsigned int defaultfg = 15;
-+unsigned int defaultbg = 0;
-+unsigned int defaultcs = 15;
- static unsigned int defaultrcs = 257;
- 
- /*
--- a/st.c
+++ b/st.c
@ -718,14 +718,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 (p == 0 && wait(&stat) < 0)
-			die("wait: %s\n", strerror(errno));
-
-		/* reinstall sigchld handler */
-		signal(SIGCHLD, sigchld);
+	if (pid != p)
 		return;
-	}

 	if (WIFEXITED(stat) && WEXITSTATUS(stat))
 		die("child exited with status %d\n", WEXITSTATUS(stat));
@ -809,7 +803,7 @@ ttynew(const char *line, char *cmd, const char *out, char **args)
 		break;
 	default:
 #ifdef __OpenBSD__
-		if (pledge("stdio rpath tty proc exec", NULL) == -1)
+		if (pledge("stdio rpath tty proc", NULL) == -1)
 			die("pledge\n");
 #endif
 		close(s);
@ -2004,59 +1998,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)
 {
--- a/st.h
+++ b/st.h
@ -81,7 +81,6 @@ 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 *);
--- a/x.c
+++ b/x.c
@ -105,7 +105,6 @@ typedef struct {
 	XSetWindowAttributes attrs;
 	int scr;
 	int isfixed; /* is fixed geometry? */
-	int depth; /* bit depth */
 	int l, t; /* left and top offset */
 	int gm; /* geometry mask */
 } XWindow;
@ -687,7 +686,6 @@ setsel(char *str, Time t)
 	XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, t);
 	if (XGetSelectionOwner(xw.dpy, XA_PRIMARY) != xw.win)
 		selclear();
-	clipcopy(NULL);
 }

 void
@ -754,7 +752,7 @@ xresize(int col, int row)

 	XFreePixmap(xw.dpy, xw.buf);
 	xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
-			xw.depth);
+			DefaultDepth(xw.dpy, xw.scr));
 	XftDrawChange(xw.draw, xw.buf);
 	xclear(0, 0, win.w, win.h);

@ -814,10 +812,6 @@ xloadcols(void)
 			else
 				die("could not allocate color %d\n", i);
 		}
-
-	dc.col[defaultbg].color.alpha = (unsigned short)(0xffff * alpha);
-	dc.col[defaultbg].pixel &= 0x00FFFFFF;
-	dc.col[defaultbg].pixel |= (unsigned char)(0xff * alpha) << 24;
 	loaded = 1;
 }

@ -848,12 +842,6 @@ xsetcolorname(int x, const char *name)
 	XftColorFree(xw.dpy, xw.vis, xw.cmap, &dc.col[x]);
 	dc.col[x] = ncolor;

-	if (x == defaultbg) {
-		dc.col[defaultbg].color.alpha = (unsigned short)(0xffff * alpha);
-		dc.col[defaultbg].pixel &= 0x00FFFFFF;
-		dc.col[defaultbg].pixel |= (unsigned char)(0xff * alpha) << 24;
-	}
-
 	return 0;
 }

@ -1146,25 +1134,11 @@ xinit(int cols, int rows)
 	Window parent, root;
 	pid_t thispid = getpid();
 	XColor xmousefg, xmousebg;
-	XWindowAttributes attr;
-	XVisualInfo vis;

 	if (!(xw.dpy = XOpenDisplay(NULL)))
 		die("can't open display\n");
 	xw.scr = XDefaultScreen(xw.dpy);
-
-	root = XRootWindow(xw.dpy, xw.scr);
-	if (!(opt_embed && (parent = strtol(opt_embed, NULL, 0))))
-		parent = root;
-
-	if (XMatchVisualInfo(xw.dpy, xw.scr, 32, TrueColor, &vis) != 0) {
-		xw.vis = vis.visual;
-		xw.depth = vis.depth;
-	} else {
-		XGetWindowAttributes(xw.dpy, parent, &attr);
-		xw.vis = attr.visual;
-		xw.depth = attr.depth;
-	}
+	xw.vis = XDefaultVisual(xw.dpy, xw.scr);

 	/* font */
 	if (!FcInit())
@ -1174,7 +1148,7 @@ xinit(int cols, int rows)
 	xloadfonts(usedfont, 0);

 	/* colors */
-	xw.cmap = XCreateColormap(xw.dpy, parent, xw.vis, None);
+	xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
 	xloadcols();

 	/* adjust fixed window geometry */
@ -1194,8 +1168,11 @@ xinit(int cols, int rows)
 		| ButtonMotionMask | ButtonPressMask | ButtonReleaseMask;
 	xw.attrs.colormap = xw.cmap;

-	xw.win = XCreateWindow(xw.dpy, parent, xw.l, xw.t,
-			win.w, win.h, 0, xw.depth, InputOutput,
+	root = XRootWindow(xw.dpy, xw.scr);
+	if (!(opt_embed && (parent = strtol(opt_embed, NULL, 0))))
+		parent = root;
+	xw.win = XCreateWindow(xw.dpy, root, xw.l, xw.t,
+			win.w, win.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput,
 			xw.vis, CWBackPixel | CWBorderPixel | CWBitGravity
 			| CWEventMask | CWColormap, &xw.attrs);
 	if (parent != root)
@ -1206,7 +1183,7 @@ xinit(int cols, int rows)
 	dc.gc = XCreateGC(xw.dpy, xw.win, GCGraphicsExposures,
 			&gcvalues);
 	xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
-			xw.depth);
+			DefaultDepth(xw.dpy, xw.scr));
 	XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel);
 	XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h);

@ -2070,10 +2047,6 @@ main(int argc, char *argv[])
 	case 'a':
 		allowaltscreen = 0;
 		break;
-	case 'A':
-		alpha = strtof(EARGF(usage()), NULL);
-		LIMIT(alpha, 0.0, 1.0);
-		break;
 	case 'c':
 		opt_class = EARGF(usage());
 		break;