8 changed files with 38 additions and 705 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,6 +0,0 @@
-st.o
-st
-x.o
-config.h
-*.orig
-*.rej
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -1,3 +0,0 @@
-{
-    "C_Cpp.errorSquiggles": "disabled"
-}
--- a/13
+++ b/13
@ -1,13 +0,0 @@
-Implement Toggle Layers
-    AltR + AltL to cycle Layers
-    default layer
-    navigational layer
-        I   >   Arrow Up
-        K   >   Arrow Down
-        J   >   Arrow Left
-        L   >   Arrow Right
-
-        SHIFT +
-        I   >   Page Up
-        K   >   Page Down
-                
--- a/config.def.h
+++ b/config.def.h
@ -5,7 +5,7 @@
 *
 * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
 */
-static char *font = "Hack Nerd Font Mono:pixelsize=12:antialias=true:autohint=true";
+static char *font = "Liberation Mono:pixelsize=12:antialias=true:autohint=true";
 static int borderpx = 2;

 /*
@ -16,7 +16,7 @@ static int borderpx = 2;
 * 4: value of shell in /etc/passwd
 * 5: value of shell in config.h
 */
-static char *shell = "/bin/bash";
+static char *shell = "/bin/sh";
 char *utmp = NULL;
 /* scroll program: to enable use a string like "scroll" */
 char *scroll = NULL;
@ -93,9 +93,6 @@ 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 */
@ -204,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} },
-	{ ShiftMask,            XK_Prior,     kscrollup,      {.i = -1} },
-    { ShiftMask,            XK_Next,   kscrolldown,    {.i = -1} },
-	{ ShiftMask,            Button4, kscrollup,      {.i = 1} },
-	{ ShiftMask,            Button5, kscrolldown,    {.i = 1} },
 };

 /*
--- a/patches/st-focus-20230610-68d1ad9.diff
+++ b/patches/st-focus-20230610-68d1ad9.diff
@ -1,538 +0,0 @@
-From e08d495aaa29c53273942985f40212ef72715604 Mon Sep 17 00:00:00 2001
-From: Julius Huelsmann <juliusHuelsmann@gmail.com>
-Date: Sat, 30 May 2020 01:11:42 +0200
-Subject: [PATCH 1/7] chore: add alpha patch
-
---
- config.def.h | 11 +++++++----
- config.mk    |  2 +-
- st.h         |  1 +
- x.c          | 40 ++++++++++++++++++++++++++++++----------
- 4 files changed, 39 insertions(+), 15 deletions(-)
-
-diff --git a/config.def.h b/config.def.h
-index 91ab8ca..6bd6e8d 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 */
-@@ -120,8 +123,7 @@ static const char *colorname[] = {
- 	/* more colors can be added after 255 to use with DefaultXX */
- 	"#cccccc",
- 	"#555555",
-	"gray90", /* default foreground colour */
-	"black", /* default background colour */
-+	"black",
- };
- 
- 
-@@ -129,8 +131,9 @@ static const char *colorname[] = {
-  * Default colors (colorname index)
-  * foreground, background, cursor, reverse cursor
-  */
-unsigned int defaultfg = 258;
-unsigned int defaultbg = 259;
-+unsigned int defaultfg = 7;
-+unsigned int defaultbg = 258;
-+//static 
- unsigned int defaultcs = 256;
- static unsigned int defaultrcs = 257;
- 
-diff --git a/config.mk b/config.mk
-index 1e306f8..47c615e 100644
--- a/config.mk
-+++ b/config.mk
-@@ -16,7 +16,7 @@ PKG_CONFIG = pkg-config
- INCS = -I$(X11INC) \
-        `$(PKG_CONFIG) --cflags fontconfig` \
-        `$(PKG_CONFIG) --cflags freetype2`
-LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft \
-+LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft -lXrender\
-        `$(PKG_CONFIG) --libs fontconfig` \
-        `$(PKG_CONFIG) --libs freetype2`
- 
-diff --git a/st.h b/st.h
-index fd3b0d8..9f91e2a 100644
--- a/st.h
-+++ b/st.h
-@@ -124,3 +124,4 @@ extern unsigned int tabspaces;
- extern unsigned int defaultfg;
- extern unsigned int defaultbg;
- extern unsigned int defaultcs;
-+extern float alpha;
-diff --git a/x.c b/x.c
-index 2a3bd38..27e81d1 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;
-@@ -243,6 +244,7 @@ static char *usedfont = NULL;
- static double usedfontsize = 0;
- static double defaultfontsize = 0;
- 
-+static char *opt_alpha = NULL;
- static char *opt_class = NULL;
- static char **opt_cmd  = NULL;
- static char *opt_embed = NULL;
-@@ -752,7 +754,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 +814,13 @@ xloadcols(void)
- 			else
- 				die("could not allocate color %d\n", i);
- 		}
-+
-+	/* set alpha value of bg color */
-+	if (opt_alpha)
-+		alpha = strtof(opt_alpha, NULL);
-+	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;
- }
- 
-@@ -1134,11 +1143,23 @@ xinit(int cols, int rows)
- 	Window parent;
- 	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);
-+
-+	if (!(opt_embed && (parent = strtol(opt_embed, NULL, 0)))) {
-+		parent = XRootWindow(xw.dpy, xw.scr);
-+		xw.depth = 32;
-+	} else {
-+		XGetWindowAttributes(xw.dpy, parent, &attr);
-+		xw.depth = attr.depth;
-+	}
-+
-+	XMatchVisualInfo(xw.dpy, xw.scr, xw.depth, TrueColor, &vis);
-+	xw.vis = vis.visual;
- 
- 	/* font */
- 	if (!FcInit())
-@@ -1148,7 +1169,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,19 +1189,15 @@ xinit(int cols, int rows)
- 		| ButtonMotionMask | ButtonPressMask | ButtonReleaseMask;
- 	xw.attrs.colormap = xw.cmap;
- 
-	if (!(opt_embed && (parent = strtol(opt_embed, NULL, 0))))
-		parent = XRootWindow(xw.dpy, xw.scr);
- 	xw.win = XCreateWindow(xw.dpy, parent, xw.l, xw.t,
-			win.w, win.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput,
-+			win.w, win.h, 0, xw.depth, InputOutput,
- 			xw.vis, CWBackPixel | CWBorderPixel | CWBitGravity
- 			| CWEventMask | CWColormap, &xw.attrs);
- 
- 	memset(&gcvalues, 0, sizeof(gcvalues));
- 	gcvalues.graphics_exposures = False;
-	dc.gc = XCreateGC(xw.dpy, parent, GCGraphicsExposures,
-			&gcvalues);
-	xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
-			DefaultDepth(xw.dpy, xw.scr));
-+	xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h, xw.depth);
-+	dc.gc = XCreateGC(xw.dpy, xw.buf, GCGraphicsExposures, &gcvalues);
- 	XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel);
- 	XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h);
- 
-@@ -2035,6 +2052,9 @@ main(int argc, char *argv[])
- 	case 'a':
- 		allowaltscreen = 0;
- 		break;
-+	case 'A':
-+		opt_alpha = EARGF(usage());
-+		break;
- 	case 'c':
- 		opt_class = EARGF(usage());
- 		break;
-- 
-2.34.1
-
-
-From 292b70d7b9976e624931f8ec264a8875e29d2f3c Mon Sep 17 00:00:00 2001
-From: Julius Huelsmann <juliusHuelsmann@gmail.com>
-Date: Sat, 30 May 2020 01:13:35 +0200
-Subject: [PATCH 2/7] [patch:focus] add initial patch
-
---
- config.def.h |  6 +++---
- st.h         |  2 +-
- x.c          | 33 +++++++++++++++++++--------------
- 3 files changed, 23 insertions(+), 18 deletions(-)
-
-diff --git a/config.def.h b/config.def.h
-index 6bd6e8d..cdfbaf1 100644
--- a/config.def.h
-+++ b/config.def.h
-@@ -94,7 +94,7 @@ char *termname = "st-256color";
- unsigned int tabspaces = 8;
- 
- /* bg opacity */
-float alpha = 0.8;
-+float alpha = 0.8, alphaUnfocused = 0.6;
- 
- /* Terminal colors (16 first used in escape sequence) */
- static const char *colorname[] = {
-@@ -132,10 +132,10 @@ static const char *colorname[] = {
-  * foreground, background, cursor, reverse cursor
-  */
- unsigned int defaultfg = 7;
-unsigned int defaultbg = 258;
-//static 
-+unsigned int defaultbg = 0;
- unsigned int defaultcs = 256;
- static unsigned int defaultrcs = 257;
-+unsigned int bg = 17, bgUnfocused = 16;
- 
- /*
-  * Default shape of cursor
-diff --git a/st.h b/st.h
-index 9f91e2a..62e3486 100644
--- a/st.h
-+++ b/st.h
-@@ -124,4 +124,4 @@ extern unsigned int tabspaces;
- extern unsigned int defaultfg;
- extern unsigned int defaultbg;
- extern unsigned int defaultcs;
-extern float alpha;
-+extern float alpha, alphaUnfocused;
-diff --git a/x.c b/x.c
-index 27e81d1..05d6e2e 100644
--- a/x.c
-+++ b/x.c
-@@ -255,6 +255,7 @@ static char *opt_name  = NULL;
- static char *opt_title = NULL;
- 
- static uint buttons; /* bit field of pressed buttons */
-+static int focused = 0;
- 
- void
- clipcopy(const Arg *dummy)
-@@ -792,35 +793,38 @@ xloadcolor(int i, const char *name, Color *ncolor)
- 	return XftColorAllocName(xw.dpy, xw.vis, xw.cmap, name, ncolor);
- }
- 
-+void
-+xloadalpha(void)
-+{
-+	float const usedAlpha = focused ? alpha : alphaUnfocused;
-+	if (opt_alpha) alpha = strtof(opt_alpha, NULL);
-+	dc.col[defaultbg].color.alpha = (unsigned short)(0xffff * usedAlpha);
-+	dc.col[defaultbg].pixel &= 0x00FFFFFF;
-+	dc.col[defaultbg].pixel |= (unsigned char)(0xff * usedAlpha) << 24;
-+}
-+
- void
- xloadcols(void)
- {
-	int i;
- 	static int loaded;
- 	Color *cp;
- 
-	if (loaded) {
-		for (cp = dc.col; cp < &dc.col[dc.collen]; ++cp)
-			XftColorFree(xw.dpy, xw.vis, xw.cmap, cp);
-	} else {
-		dc.collen = MAX(LEN(colorname), 256);
-		dc.col = xmalloc(dc.collen * sizeof(Color));
-+	if (!loaded) {
-+		dc.collen = 1 + (defaultbg = MAX(LEN(colorname), 256));
-+		dc.col = xmalloc((dc.collen) * sizeof(Color));
- 	}
- 
-	for (i = 0; i < dc.collen; i++)
-+	for (int i = 0; i+1 < dc.collen; ++i)
- 		if (!xloadcolor(i, NULL, &dc.col[i])) {
- 			if (colorname[i])
- 				die("could not allocate color '%s'\n", colorname[i]);
- 			else
- 				die("could not allocate color %d\n", i);
- 		}
-+	if (dc.collen) // cannot die, as the color is already loaded.
-+		xloadcolor(focused ?bg :bgUnfocused, NULL, &dc.col[defaultbg]);
- 
-	/* set alpha value of bg color */
-	if (opt_alpha)
-		alpha = strtof(opt_alpha, NULL);
-	dc.col[defaultbg].color.alpha = (unsigned short)(0xffff * alpha);
-	dc.col[defaultbg].pixel &= 0x00FFFFFF;
-	dc.col[defaultbg].pixel |= (unsigned char)(0xff * alpha) << 24;
-+	xloadalpha();
- 	loaded = 1;
- }
- 
-@@ -2106,6 +2110,7 @@ run:
- 	XSetLocaleModifiers("");
- 	cols = MAX(cols, 1);
- 	rows = MAX(rows, 1);
-+	defaultbg = MAX(LEN(colorname), 256);
- 	tnew(cols, rows);
- 	xinit(cols, rows);
- 	xsetenv();
-- 
-2.34.1
-
-
-From 9bb6788325306d9ec2bead559dacd031287a2b8c Mon Sep 17 00:00:00 2001
-From: Julius Huelsmann <juliusHuelsmann@gmail.com>
-Date: Fri, 5 Jun 2020 20:48:06 +0200
-Subject: [PATCH 3/7] [patch:focus]: fix
-
---
- x.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/x.c b/x.c
-index 05d6e2e..97481ba 100644
--- a/x.c
-+++ b/x.c
-@@ -1798,12 +1798,22 @@ focus(XEvent *ev)
- 		xseturgency(0);
- 		if (IS_SET(MODE_FOCUS))
- 			ttywrite("\033[I", 3, 0);
-+		if (!focused) {
-+			xloadcols();
-+			redraw();
-+		}
-+		focused = 1;
- 	} else {
- 		if (xw.ime.xic)
- 			XUnsetICFocus(xw.ime.xic);
- 		win.mode &= ~MODE_FOCUSED;
- 		if (IS_SET(MODE_FOCUS))
- 			ttywrite("\033[O", 3, 0);
-+		if (focused) {
-+			xloadcols();
-+			redraw();
-+		}
-+		focused = 0;
- 	}
- }
- 
-- 
-2.34.1
-
-
-From 62b6683ddf40aff222b59d5e074770d8d7336342 Mon Sep 17 00:00:00 2001
-From: Julius Huelsmann <juliusHuelsmann@gmail.com>
-Date: Sat, 6 Jun 2020 12:57:43 +0200
-Subject: [PATCH 4/7] [patch:focus]: fix
-
---
- x.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/x.c b/x.c
-index 97481ba..c4a4b00 100644
--- a/x.c
-+++ b/x.c
-@@ -1799,10 +1799,10 @@ focus(XEvent *ev)
- 		if (IS_SET(MODE_FOCUS))
- 			ttywrite("\033[I", 3, 0);
- 		if (!focused) {
-+			focused = 1;
- 			xloadcols();
- 			redraw();
- 		}
-		focused = 1;
- 	} else {
- 		if (xw.ime.xic)
- 			XUnsetICFocus(xw.ime.xic);
-@@ -1810,10 +1810,10 @@ focus(XEvent *ev)
- 		if (IS_SET(MODE_FOCUS))
- 			ttywrite("\033[O", 3, 0);
- 		if (focused) {
-+			focused = 0;
- 			xloadcols();
- 			redraw();
- 		}
-		focused = 0;
- 	}
- }
- 
-- 
-2.34.1
-
-
-From dc6c039192e887e70a2e6f07ac55c317e6b1c3be Mon Sep 17 00:00:00 2001
-From: Julius Huelsmann <juliusHuelsmann@gmail.com>
-Date: Thu, 23 Jul 2020 18:17:50 +0200
-Subject: [PATCH 5/7] potential fix: exchange redraw with tfulldirt
-
---
- st.c | 1 -
- st.h | 1 +
- x.c  | 4 ++--
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/st.c b/st.c
-index 62def59..8ee76a3 100644
--- a/st.c
-+++ b/st.c
-@@ -194,7 +194,6 @@ static void tsetscroll(int, int);
- static void tswapscreen(void);
- static void tsetmode(int, int, const int *, int);
- static int twrite(const char *, int, int);
-static void tfulldirt(void);
- static void tcontrolcode(uchar );
- static void tdectest(char );
- static void tdefutf8(char);
-diff --git a/st.h b/st.h
-index 62e3486..13be339 100644
--- a/st.h
-+++ b/st.h
-@@ -79,6 +79,7 @@ typedef union {
- 
- void die(const char *, ...);
- void redraw(void);
-+void tfulldirt(void);
- void draw(void);
- 
- void printscreen(const Arg *);
-diff --git a/x.c b/x.c
-index c4a4b00..92c87b4 100644
--- a/x.c
-+++ b/x.c
-@@ -1801,7 +1801,7 @@ focus(XEvent *ev)
- 		if (!focused) {
- 			focused = 1;
- 			xloadcols();
-			redraw();
-+			tfulldirt();
- 		}
- 	} else {
- 		if (xw.ime.xic)
-@@ -1812,7 +1812,7 @@ focus(XEvent *ev)
- 		if (focused) {
- 			focused = 0;
- 			xloadcols();
-			redraw();
-+			tfulldirt();
- 		}
- 	}
- }
-- 
-2.34.1
-
-
-From 4da97936d57e3528ef7cf36c254c0985f6640132 Mon Sep 17 00:00:00 2001
-From: Wim Stockman <wim@yasendfile.org>
-Date: Sat, 4 Feb 2023 13:46:02 +0100
-Subject: [PATCH 6/7] Performs upgrade avoid reloading all the colors again and
- again also avoids problem when colors are set dynamically when focus in and
- out that the colourpallette is not reset each time.
-
---
- x.c | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/x.c b/x.c
-index 92c87b4..879bf0e 100644
--- a/x.c
-+++ b/x.c
-@@ -796,6 +796,7 @@ xloadcolor(int i, const char *name, Color *ncolor)
- void
- xloadalpha(void)
- {
-+	xloadcolor(focused ?bg :bgUnfocused, NULL, &dc.col[defaultbg]);
- 	float const usedAlpha = focused ? alpha : alphaUnfocused;
- 	if (opt_alpha) alpha = strtof(opt_alpha, NULL);
- 	dc.col[defaultbg].color.alpha = (unsigned short)(0xffff * usedAlpha);
-@@ -821,8 +822,6 @@ xloadcols(void)
- 			else
- 				die("could not allocate color %d\n", i);
- 		}
-	if (dc.collen) // cannot die, as the color is already loaded.
-		xloadcolor(focused ?bg :bgUnfocused, NULL, &dc.col[defaultbg]);
- 
- 	xloadalpha();
- 	loaded = 1;
-@@ -1800,7 +1799,7 @@ focus(XEvent *ev)
- 			ttywrite("\033[I", 3, 0);
- 		if (!focused) {
- 			focused = 1;
-			xloadcols();
-+			xloadalpha();
- 			tfulldirt();
- 		}
- 	} else {
-@@ -1811,7 +1810,7 @@ focus(XEvent *ev)
- 			ttywrite("\033[O", 3, 0);
- 		if (focused) {
- 			focused = 0;
-			xloadcols();
-+			xloadalpha();
- 			tfulldirt();
- 		}
- 	}
-- 
-2.34.1
-
-
-From ec16984d95e0ff9ac33b2b3d30f292c3a327c473 Mon Sep 17 00:00:00 2001
-From: Julius Huelsmann <juliusHuelsmann@gmail.com>
-Date: Sat, 10 Jun 2023 13:16:11 +0200
-Subject: [PATCH 7/7] changed default config a bit
-
---
- config.def.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/config.def.h b/config.def.h
-index cdfbaf1..779178f 100644
--- a/config.def.h
-+++ b/config.def.h
-@@ -94,7 +94,7 @@ char *termname = "st-256color";
- unsigned int tabspaces = 8;
- 
- /* bg opacity */
-float alpha = 0.8, alphaUnfocused = 0.6;
-+float alpha = 0.93, alphaUnfocused = 0.6;
- 
- /* Terminal colors (16 first used in escape sequence) */
- static const char *colorname[] = {
-@@ -135,7 +135,7 @@ unsigned int defaultfg = 7;
- unsigned int defaultbg = 0;
- unsigned int defaultcs = 256;
- static unsigned int defaultrcs = 257;
-unsigned int bg = 17, bgUnfocused = 16;
-+unsigned int bg = 0, bgUnfocused = 16;
- 
- /*
-  * Default shape of cursor
-- 
-2.34.1
-
--- a/st.c
+++ b/st.c
@ -35,7 +35,6 @@
 #define ESC_ARG_SIZ   16
 #define STR_BUF_SIZ   ESC_BUF_SIZ
 #define STR_ARG_SIZ   ESC_ARG_SIZ
-#define HISTSIZE      2000

 /* macros */
 #define IS_SET(flag)		((term.mode & (flag)) != 0)
@ -43,9 +42,6 @@
 #define ISCONTROLC1(c)		(BETWEEN(c, 0x80, 0x9f))
 #define ISCONTROL(c)		(ISCONTROLC0(c) || ISCONTROLC1(c))
 #define ISDELIM(u)		(u && wcschr(worddelimiters, u))
-#define TLINE(y)		((y) < term.scr ? term.hist[((y) + term.histi - \
-            term.scr + HISTSIZE + 1) % HISTSIZE] : \
-            term.line[(y) - term.scr])

 enum term_mode {
 	MODE_WRAP        = 1 << 0,
@ -119,9 +115,6 @@ typedef struct {
 	int col;      /* nb col */
 	Line *line;   /* screen */
 	Line *alt;    /* alternate screen */
-	Line hist[HISTSIZE]; /* history buffer */
-	int histi;    /* history index */
-	int scr;      /* scroll back */
 	int *dirty;   /* dirtyness of lines */
 	TCursor c;    /* cursor */
 	int ocx;      /* old cursor col */
@ -192,8 +185,8 @@ static void tnewline(int);
 static void tputtab(int);
 static void tputc(Rune);
 static void treset(void);
-static void tscrollup(int, int, int);
-static void tscrolldown(int, int, int);
+static void tscrollup(int, int);
+static void tscrolldown(int, int);
 static void tsetattr(const int *, int);
 static void tsetchar(Rune, const Glyph *, int, int);
 static void tsetdirt(int, int);
@ -416,10 +409,10 @@ tlinelen(int y)
 {
 	int i = term.col;

-	if (TLINE(y)[i - 1].mode & ATTR_WRAP)
+	if (term.line[y][i - 1].mode & ATTR_WRAP)
 		return i;

-	while (i > 0 && TLINE(y)[i - 1].u == ' ')
+	while (i > 0 && term.line[y][i - 1].u == ' ')
 		--i;

 	return i;
@ -528,7 +521,7 @@ selsnap(int *x, int *y, int direction)
 		 * Snap around if the word wraps around at the end or
 		 * beginning of a line.
 		 */
-		prevgp = &TLINE(*y)[*x];
+		prevgp = &term.line[*y][*x];
 		prevdelim = ISDELIM(prevgp->u);
 		for (;;) {
 			newx = *x + direction;
@ -543,14 +536,14 @@ selsnap(int *x, int *y, int direction)
 					yt = *y, xt = *x;
 				else
 					yt = newy, xt = newx;
-				if (!(TLINE(yt)[xt].mode & ATTR_WRAP))
+				if (!(term.line[yt][xt].mode & ATTR_WRAP))
 					break;
 			}

 			if (newx >= tlinelen(newy))
 				break;

-			gp = &TLINE(newy)[newx];
+			gp = &term.line[newy][newx];
 			delim = ISDELIM(gp->u);
 			if (!(gp->mode & ATTR_WDUMMY) && (delim != prevdelim
 					|| (delim && gp->u != prevgp->u)))
@ -571,14 +564,14 @@ selsnap(int *x, int *y, int direction)
 		*x = (direction < 0) ? 0 : term.col - 1;
 		if (direction < 0) {
 			for (; *y > 0; *y += direction) {
-				if (!(TLINE(*y-1)[term.col-1].mode
+				if (!(term.line[*y-1][term.col-1].mode
 						& ATTR_WRAP)) {
 					break;
 				}
 			}
 		} else if (direction > 0) {
 			for (; *y < term.row-1; *y += direction) {
-				if (!(TLINE(*y)[term.col-1].mode
+				if (!(term.line[*y][term.col-1].mode
 						& ATTR_WRAP)) {
 					break;
 				}
@ -609,13 +602,13 @@ getsel(void)
 		}

 		if (sel.type == SEL_RECTANGULAR) {
-			gp = &TLINE(y)[sel.nb.x];
+			gp = &term.line[y][sel.nb.x];
 			lastx = sel.ne.x;
 		} else {
-			gp = &TLINE(y)[sel.nb.y == y ? sel.nb.x : 0];
+			gp = &term.line[y][sel.nb.y == y ? sel.nb.x : 0];
 			lastx = (sel.ne.y == y) ? sel.ne.x : term.col-1;
 		}
-		last = &TLINE(y)[MIN(lastx, linelen-1)];
+		last = &term.line[y][MIN(lastx, linelen-1)];
 		while (last >= gp && last->u == ' ')
 			--last;

@ -851,9 +844,6 @@ void
 ttywrite(const char *s, size_t n, int may_echo)
 {
 	const char *next;
-	Arg arg = (Arg) { .i = term.scr };
-
-	kscrolldown(&arg);

 	if (may_echo && IS_SET(MODE_ECHO))
 		twrite(s, n, 1);
@ -1065,53 +1055,13 @@ tswapscreen(void)
 }

 void
-kscrolldown(const Arg* a)
-{
-	int n = a->i;
-
-	if (n < 0)
-		n = term.row + n;
-
-	if (n > term.scr)
-		n = term.scr;
-
-	if (term.scr > 0) {
-		term.scr -= n;
-		selscroll(0, -n);
-		tfulldirt();
-	}
-}
-
-void
-kscrollup(const Arg* a)
-{
-	int n = a->i;
-
-	if (n < 0)
-		n = term.row + n;
-
-	if (term.scr <= HISTSIZE-n) {
-		term.scr += n;
-		selscroll(0, n);
-		tfulldirt();
-	}
-}
-
-void
-tscrolldown(int orig, int n, int copyhist)
+tscrolldown(int orig, int n)
 {
 	int i;
 	Line temp;

 	LIMIT(n, 0, term.bot-orig+1);

-	if (copyhist) {
-		term.histi = (term.histi - 1 + HISTSIZE) % HISTSIZE;
-		temp = term.hist[term.histi];
-		term.hist[term.histi] = term.line[term.bot];
-		term.line[term.bot] = temp;
-	}
-
 	tsetdirt(orig, term.bot-n);
 	tclearregion(0, term.bot-n+1, term.col-1, term.bot);

@ -1121,28 +1071,17 @@ tscrolldown(int orig, int n, int copyhist)
 		term.line[i-n] = temp;
 	}

-	if (term.scr == 0)
-		selscroll(orig, n);
+	selscroll(orig, n);
 }

 void
-tscrollup(int orig, int n, int copyhist)
+tscrollup(int orig, int n)
 {
 	int i;
 	Line temp;

 	LIMIT(n, 0, term.bot-orig+1);

-	if (copyhist) {
-		term.histi = (term.histi + 1) % HISTSIZE;
-		temp = term.hist[term.histi];
-		term.hist[term.histi] = term.line[orig];
-		term.line[orig] = temp;
-	}
-
-	if (term.scr > 0 && term.scr < HISTSIZE)
-		term.scr = MIN(term.scr + n, HISTSIZE-1);
-
 	tclearregion(0, orig, term.col-1, orig+n-1);
 	tsetdirt(orig+n, term.bot);

@ -1152,8 +1091,7 @@ tscrollup(int orig, int n, int copyhist)
 		term.line[i+n] = temp;
 	}

-	if (term.scr == 0)
-		selscroll(orig, -n);
+	selscroll(orig, -n);
 }

 void
@ -1182,7 +1120,7 @@ tnewline(int first_col)
 	int y = term.c.y;

 	if (y == term.bot) {
-		tscrollup(term.top, 1, 1);
+		tscrollup(term.top, 1);
 	} else {
 		y++;
 	}
@ -1350,14 +1288,14 @@ void
 tinsertblankline(int n)
 {
 	if (BETWEEN(term.c.y, term.top, term.bot))
-		tscrolldown(term.c.y, n, 0);
+		tscrolldown(term.c.y, n);
 }

 void
 tdeleteline(int n)
 {
 	if (BETWEEN(term.c.y, term.top, term.bot))
-		tscrollup(term.c.y, n, 0);
+		tscrollup(term.c.y, n);
 }

 int32_t
@ -1795,11 +1733,11 @@ csihandle(void)
 	case 'S': /* SU -- Scroll <n> line up */
 		if (csiescseq.priv) break;
 		DEFAULT(csiescseq.arg[0], 1);
-		tscrollup(term.top, csiescseq.arg[0], 0);
+		tscrollup(term.top, csiescseq.arg[0]);
 		break;
 	case 'T': /* SD -- Scroll <n> line down */
 		DEFAULT(csiescseq.arg[0], 1);
-		tscrolldown(term.top, csiescseq.arg[0], 0);
+		tscrolldown(term.top, csiescseq.arg[0]);
 		break;
 	case 'L': /* IL -- Insert <n> blank lines */
 		DEFAULT(csiescseq.arg[0], 1);
@ -2375,7 +2313,7 @@ eschandle(uchar ascii)
 		return 0;
 	case 'D': /* IND -- Linefeed */
 		if (term.c.y == term.bot) {
-			tscrollup(term.top, 1, 1);
+			tscrollup(term.top, 1);
 		} else {
 			tmoveto(term.c.x, term.c.y+1);
 		}
@ -2388,7 +2326,7 @@ eschandle(uchar ascii)
 		break;
 	case 'M': /* RI -- Reverse index */
 		if (term.c.y == term.top) {
-			tscrolldown(term.top, 1, 1);
+			tscrolldown(term.top, 1);
 		} else {
 			tmoveto(term.c.x, term.c.y-1);
 		}
@ -2611,7 +2549,7 @@ twrite(const char *buf, int buflen, int show_ctrl)
 void
 tresize(int col, int row)
 {
-	int i, j;
+	int i;
 	int minrow = MIN(row, term.row);
 	int mincol = MIN(col, term.col);
 	int *bp;
@ -2648,14 +2586,6 @@ tresize(int col, int row)
 	term.dirty = xrealloc(term.dirty, row * sizeof(*term.dirty));
 	term.tabs = xrealloc(term.tabs, col * sizeof(*term.tabs));

-	for (i = 0; i < HISTSIZE; i++) {
-		term.hist[i] = xrealloc(term.hist[i], col * sizeof(Glyph));
-		for (j = mincol; j < col; j++) {
-			term.hist[i][j] = term.c.attr;
-			term.hist[i][j].u = ' ';
-		}
-	}
-
 	/* resize each row to new width, zero-pad if needed */
 	for (i = 0; i < minrow; i++) {
 		term.line[i] = xrealloc(term.line[i], col * sizeof(Glyph));
@ -2714,7 +2644,7 @@ drawregion(int x1, int y1, int x2, int y2)
 			continue;

 		term.dirty[y] = 0;
-		xdrawline(TLINE(y), x1, y, x2);
+		xdrawline(term.line[y], x1, y, x2);
 	}
 }

@ -2735,9 +2665,8 @@ draw(void)
 		cx--;

 	drawregion(0, 0, term.col, term.row);
-	if (term.scr == 0)
-		xdrawcursor(cx, term.c.y, term.line[term.c.y][cx],
-				term.ocx, term.ocy, term.line[term.ocy][term.ocx]);
+	xdrawcursor(cx, term.c.y, term.line[term.c.y][cx],
+			term.ocx, term.ocy, term.line[term.ocy][term.ocx]);
 	term.ocx = cx;
 	term.ocy = term.c.y;
 	xfinishdraw();
--- a/st.h
+++ b/st.h
@ -81,8 +81,6 @@ void die(const char *, ...);
 void redraw(void);
 void draw(void);

-void kscrolldown(const Arg *);
-void kscrollup(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;