cicada update

7 files changed, 37 insertions, 683 deletions

diff --git a/st/config.def.h b/st/config.def.h
index fc87e29..f86d587 100755
--- a/st/config.def.h
+++ b/st/config.def.h
@@ -1,4 +1,5 @@
 /* See LICENSE file for copyright and license details. */
+#include "themes/default.h"
 
 /*
  * appearance
@@ -94,48 +95,49 @@ char *termname = "st-256color";
 unsigned int tabspaces = 8;
 
 /* bg opacity */
-float alpha = 0.85;
+float alpha = 0.9;
 
 /* Terminal colors (16 first used in escape sequence) */
-static const char *colorname[] = {
-	/* 8 normal colors */
-	"black",
-	"red3",
-	"green3",
-	"yellow3",
-	"blue2",
-	"magenta3",
-	"cyan3",
-	"gray90",
-
-	/* 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 */
-};
+
+//static const char *colorname[] = {
+//	/* 8 normal colors */
+//	"black",
+//	"red3",
+//	"green3",
+//	"yellow3",
+//	"blue2",
+//	"magenta3",
+//	"cyan3",
+//	"gray90",
+//
+//	/* 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 */
+//};
 
 
 /*
  * Default colors (colorname index)
  * foreground, background, cursor, reverse cursor
  */
-unsigned int defaultfg = 258;
-unsigned int defaultbg = 259;
-unsigned int defaultcs = 256;
-static unsigned int defaultrcs = 257;
+//unsigned int defaultfg = 258;
+//unsigned int defaultbg = 259;
+//unsigned int defaultcs = 256;
+//static unsigned int defaultrcs = 257;
 
 /*
  * Default shape of cursor
diff --git a/st/config.h b/st/config.h
index f86d587..ca15b57 100755
--- a/st/config.h
+++ b/st/config.h
@@ -95,7 +95,7 @@ char *termname = "st-256color";
 unsigned int tabspaces = 8;
 
 /* bg opacity */
-float alpha = 0.9;
+float alpha = 0.97;
 
 /* Terminal colors (16 first used in escape sequence) */
 
diff --git a/st/st b/st/st
index 146ef10..e5c844e 100755
--- a/st/st
+++ b/st/st
diff --git a/st/st-alpha-20220206-0.8.5.diff b/st/st-alpha-20220206-0.8.5.diff
deleted file mode 100755
index ab029f6..0000000
--- a/st/st-alpha-20220206-0.8.5.diff
+++ /dev/null
@@ -1,146 +0,0 @@
-diff --git a/config.def.h b/config.def.h
-index 91ab8ca..6af616e 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/config.mk b/config.mk
-index 4c4c5d5..0114bad 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 519b9bd..8bb533d 100644
---- a/st.h
-+++ b/st.h
-@@ -126,3 +126,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 8a16faa..ddf4178 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;
-@@ -736,7 +738,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);
- 
-@@ -796,6 +798,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;
- }
- 
-@@ -1118,11 +1127,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())
-@@ -1132,7 +1153,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 */
-@@ -1152,19 +1173,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);
- 
-@@ -2019,6 +2036,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;
diff --git a/st/st-anysize-0.8.1.diff b/st/st-anysize-0.8.1.diff
deleted file mode 100755
index 1eaf2ba..0000000
--- a/st/st-anysize-0.8.1.diff
+++ /dev/null
@@ -1,152 +0,0 @@
-diff --git a/x.c b/x.c
-index 00cb6b1..8f87c0f 100644
---- a/x.c
-+++ b/x.c
-@@ -78,6 +78,7 @@ typedef XftGlyphFontSpec GlyphFontSpec;
- typedef struct {
- 	int tw, th; /* tty width and height */
- 	int w, h; /* window width and height */
-+	int hborderpx, vborderpx;
- 	int ch; /* char height */
- 	int cw; /* char width  */
- 	int mode; /* window state/mode flags */
-@@ -311,7 +312,7 @@ zoomreset(const Arg *arg)
- int
- evcol(XEvent *e)
- {
--	int x = e->xbutton.x - borderpx;
-+	int x = e->xbutton.x - win.hborderpx;
- 	LIMIT(x, 0, win.tw - 1);
- 	return x / win.cw;
- }
-@@ -319,7 +320,7 @@ evcol(XEvent *e)
- int
- evrow(XEvent *e)
- {
--	int y = e->xbutton.y - borderpx;
-+	int y = e->xbutton.y - win.vborderpx;
- 	LIMIT(y, 0, win.th - 1);
- 	return y / win.ch;
- }
-@@ -675,6 +676,9 @@ cresize(int width, int height)
- 	col = MAX(1, col);
- 	row = MAX(1, row);
- 
-+	win.hborderpx = (win.w - col * win.cw) / 2;
-+	win.vborderpx = (win.h - row * win.ch) / 2;
-+
- 	tresize(col, row);
- 	xresize(col, row);
- 	ttyresize(win.tw, win.th);
-@@ -793,8 +797,8 @@ xhints(void)
- 	sizeh->flags = PSize | PResizeInc | PBaseSize | PMinSize;
- 	sizeh->height = win.h;
- 	sizeh->width = win.w;
--	sizeh->height_inc = win.ch;
--	sizeh->width_inc = win.cw;
-+	sizeh->height_inc = 1;
-+	sizeh->width_inc = 1;
- 	sizeh->base_height = 2 * borderpx;
- 	sizeh->base_width = 2 * borderpx;
- 	sizeh->min_height = win.ch + 2 * borderpx;
-@@ -1022,8 +1026,8 @@ xinit(int cols, int rows)
- 	xloadcols();
- 
- 	/* adjust fixed window geometry */
--	win.w = 2 * borderpx + cols * win.cw;
--	win.h = 2 * borderpx + rows * win.ch;
-+	win.w = 2 * win.hborderpx + cols * win.cw;
-+	win.h = 2 * win.vborderpx + rows * win.ch;
- 	if (xw.gm & XNegative)
- 		xw.l += DisplayWidth(xw.dpy, xw.scr) - win.w - 2;
- 	if (xw.gm & YNegative)
-@@ -1123,7 +1127,7 @@ xinit(int cols, int rows)
- int
- xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x, int y)
- {
--	float winx = borderpx + x * win.cw, winy = borderpx + y * win.ch, xp, yp;
-+	float winx = win.hborderpx + x * win.cw, winy = win.vborderpx + y * win.ch, xp, yp;
- 	ushort mode, prevmode = USHRT_MAX;
- 	Font *font = &dc.font;
- 	int frcflags = FRC_NORMAL;
-@@ -1259,7 +1263,7 @@ void
- xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, int y)
- {
- 	int charlen = len * ((base.mode & ATTR_WIDE) ? 2 : 1);
--	int winx = borderpx + x * win.cw, winy = borderpx + y * win.ch,
-+	int winx = win.hborderpx + x * win.cw, winy = win.vborderpx + y * win.ch,
- 	    width = charlen * win.cw;
- 	Color *fg, *bg, *temp, revfg, revbg, truefg, truebg;
- 	XRenderColor colfg, colbg;
-@@ -1349,17 +1353,17 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
- 
- 	/* Intelligent cleaning up of the borders. */
- 	if (x == 0) {
--		xclear(0, (y == 0)? 0 : winy, borderpx,
-+		xclear(0, (y == 0)? 0 : winy, win.vborderpx,
- 			winy + win.ch +
--			((winy + win.ch >= borderpx + win.th)? win.h : 0));
-+			((winy + win.ch >= win.vborderpx + win.th)? win.h : 0));
- 	}
--	if (winx + width >= borderpx + win.tw) {
-+	if (winx + width >= win.hborderpx + win.tw) {
- 		xclear(winx + width, (y == 0)? 0 : winy, win.w,
--			((winy + win.ch >= borderpx + win.th)? win.h : (winy + win.ch)));
-+			((winy + win.ch >= win.vborderpx + win.th)? win.h : (winy + win.ch)));
- 	}
- 	if (y == 0)
--		xclear(winx, 0, winx + width, borderpx);
--	if (winy + win.ch >= borderpx + win.th)
-+		xclear(winx, 0, winx + width, win.hborderpx);
-+	if (winy + win.ch >= win.vborderpx + win.th)
- 		xclear(winx, winy + win.ch, winx + width, win.h);
- 
- 	/* Clean up the region we want to draw to. */
-@@ -1452,35 +1456,35 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
- 		case 3: /* Blinking Underline */
- 		case 4: /* Steady Underline */
- 			XftDrawRect(xw.draw, &drawcol,
--					borderpx + cx * win.cw,
--					borderpx + (cy + 1) * win.ch - \
-+					win.hborderpx + cx * win.cw,
-+					win.vborderpx + (cy + 1) * win.ch - \
- 						cursorthickness,
- 					win.cw, cursorthickness);
- 			break;
- 		case 5: /* Blinking bar */
- 		case 6: /* Steady bar */
- 			XftDrawRect(xw.draw, &drawcol,
--					borderpx + cx * win.cw,
--					borderpx + cy * win.ch,
-+					win.hborderpx + cx * win.cw,
-+					win.vborderpx + cy * win.ch,
- 					cursorthickness, win.ch);
- 			break;
- 		}
- 	} else {
- 		XftDrawRect(xw.draw, &drawcol,
--				borderpx + cx * win.cw,
--				borderpx + cy * win.ch,
-+				win.hborderpx + cx * win.cw,
-+				win.vborderpx + cy * win.ch,
- 				win.cw - 1, 1);
- 		XftDrawRect(xw.draw, &drawcol,
--				borderpx + cx * win.cw,
--				borderpx + cy * win.ch,
-+				win.hborderpx + cx * win.cw,
-+				win.vborderpx + cy * win.ch,
- 				1, win.ch - 1);
- 		XftDrawRect(xw.draw, &drawcol,
--				borderpx + (cx + 1) * win.cw - 1,
--				borderpx + cy * win.ch,
-+				win.hborderpx + (cx + 1) * win.cw - 1,
-+				win.vborderpx + cy * win.ch,
- 				1, win.ch - 1);
- 		XftDrawRect(xw.draw, &drawcol,
--				borderpx + cx * win.cw,
--				borderpx + (cy + 1) * win.ch - 1,
-+				win.hborderpx + cx * win.cw,
-+				win.vborderpx + (cy + 1) * win.ch - 1,
- 				win.cw, 1);
- 	}
- }
diff --git a/st/st-scrollback-0.8.5.diff b/st/st-scrollback-0.8.5.diff
deleted file mode 100755
index 750111d..0000000
--- a/st/st-scrollback-0.8.5.diff
+++ /dev/null
@@ -1,350 +0,0 @@
-diff --git a/config.def.h b/config.def.h
-index 91ab8ca..e3b469b 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -201,6 +201,8 @@ static Shortcut shortcuts[] = {
- 	{ TERMMOD,              XK_Y,           selpaste,       {.i =  0} },
- 	{ ShiftMask,            XK_Insert,      selpaste,       {.i =  0} },
- 	{ TERMMOD,              XK_Num_Lock,    numlock,        {.i =  0} },
-+	{ ShiftMask,            XK_Page_Up,     kscrollup,      {.i = -1} },
-+	{ ShiftMask,            XK_Page_Down,   kscrolldown,    {.i = -1} },
- };
- 
- /*
-diff --git a/st.c b/st.c
-index 51049ba..cd750f2 100644
---- a/st.c
-+++ b/st.c
-@@ -35,6 +35,7 @@
- #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)
-@@ -42,6 +43,9 @@
- #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,
-@@ -115,6 +119,9 @@ 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 */
-@@ -184,8 +191,8 @@ static void tnewline(int);
- static void tputtab(int);
- static void tputc(Rune);
- static void treset(void);
--static void tscrollup(int, int);
--static void tscrolldown(int, int);
-+static void tscrollup(int, int, int);
-+static void tscrolldown(int, int, int);
- static void tsetattr(const int *, int);
- static void tsetchar(Rune, const Glyph *, int, int);
- static void tsetdirt(int, int);
-@@ -416,10 +423,10 @@ tlinelen(int y)
- {
- 	int i = term.col;
- 
--	if (term.line[y][i - 1].mode & ATTR_WRAP)
-+	if (TLINE(y)[i - 1].mode & ATTR_WRAP)
- 		return i;
- 
--	while (i > 0 && term.line[y][i - 1].u == ' ')
-+	while (i > 0 && TLINE(y)[i - 1].u == ' ')
- 		--i;
- 
- 	return i;
-@@ -528,7 +535,7 @@ selsnap(int *x, int *y, int direction)
- 		 * Snap around if the word wraps around at the end or
- 		 * beginning of a line.
- 		 */
--		prevgp = &term.line[*y][*x];
-+		prevgp = &TLINE(*y)[*x];
- 		prevdelim = ISDELIM(prevgp->u);
- 		for (;;) {
- 			newx = *x + direction;
-@@ -543,14 +550,14 @@ selsnap(int *x, int *y, int direction)
- 					yt = *y, xt = *x;
- 				else
- 					yt = newy, xt = newx;
--				if (!(term.line[yt][xt].mode & ATTR_WRAP))
-+				if (!(TLINE(yt)[xt].mode & ATTR_WRAP))
- 					break;
- 			}
- 
- 			if (newx >= tlinelen(newy))
- 				break;
- 
--			gp = &term.line[newy][newx];
-+			gp = &TLINE(newy)[newx];
- 			delim = ISDELIM(gp->u);
- 			if (!(gp->mode & ATTR_WDUMMY) && (delim != prevdelim
- 					|| (delim && gp->u != prevgp->u)))
-@@ -571,14 +578,14 @@ selsnap(int *x, int *y, int direction)
- 		*x = (direction < 0) ? 0 : term.col - 1;
- 		if (direction < 0) {
- 			for (; *y > 0; *y += direction) {
--				if (!(term.line[*y-1][term.col-1].mode
-+				if (!(TLINE(*y-1)[term.col-1].mode
- 						& ATTR_WRAP)) {
- 					break;
- 				}
- 			}
- 		} else if (direction > 0) {
- 			for (; *y < term.row-1; *y += direction) {
--				if (!(term.line[*y][term.col-1].mode
-+				if (!(TLINE(*y)[term.col-1].mode
- 						& ATTR_WRAP)) {
- 					break;
- 				}
-@@ -609,13 +616,13 @@ getsel(void)
- 		}
- 
- 		if (sel.type == SEL_RECTANGULAR) {
--			gp = &term.line[y][sel.nb.x];
-+			gp = &TLINE(y)[sel.nb.x];
- 			lastx = sel.ne.x;
- 		} else {
--			gp = &term.line[y][sel.nb.y == y ? sel.nb.x : 0];
-+			gp = &TLINE(y)[sel.nb.y == y ? sel.nb.x : 0];
- 			lastx = (sel.ne.y == y) ? sel.ne.x : term.col-1;
- 		}
--		last = &term.line[y][MIN(lastx, linelen-1)];
-+		last = &TLINE(y)[MIN(lastx, linelen-1)];
- 		while (last >= gp && last->u == ' ')
- 			--last;
- 
-@@ -851,6 +858,9 @@ 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);
-@@ -1062,12 +1072,52 @@ tswapscreen(void)
- }
- 
- void
--tscrolldown(int orig, int n)
-+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)
- {
- 	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);
-@@ -1078,17 +1128,28 @@ tscrolldown(int orig, int n)
- 		term.line[i-n] = temp;
- 	}
- 
--	selscroll(orig, n);
-+	if (term.scr == 0)
-+		selscroll(orig, n);
- }
- 
- void
--tscrollup(int orig, int n)
-+tscrollup(int orig, int n, int copyhist)
- {
- 	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);
- 
-@@ -1098,7 +1159,8 @@ tscrollup(int orig, int n)
- 		term.line[i+n] = temp;
- 	}
- 
--	selscroll(orig, -n);
-+	if (term.scr == 0)
-+		selscroll(orig, -n);
- }
- 
- void
-@@ -1127,7 +1189,7 @@ tnewline(int first_col)
- 	int y = term.c.y;
- 
- 	if (y == term.bot) {
--		tscrollup(term.top, 1);
-+		tscrollup(term.top, 1, 1);
- 	} else {
- 		y++;
- 	}
-@@ -1292,14 +1354,14 @@ void
- tinsertblankline(int n)
- {
- 	if (BETWEEN(term.c.y, term.top, term.bot))
--		tscrolldown(term.c.y, n);
-+		tscrolldown(term.c.y, n, 0);
- }
- 
- void
- tdeleteline(int n)
- {
- 	if (BETWEEN(term.c.y, term.top, term.bot))
--		tscrollup(term.c.y, n);
-+		tscrollup(term.c.y, n, 0);
- }
- 
- int32_t
-@@ -1736,11 +1798,11 @@ csihandle(void)
- 		break;
- 	case 'S': /* SU -- Scroll <n> line up */
- 		DEFAULT(csiescseq.arg[0], 1);
--		tscrollup(term.top, csiescseq.arg[0]);
-+		tscrollup(term.top, csiescseq.arg[0], 0);
- 		break;
- 	case 'T': /* SD -- Scroll <n> line down */
- 		DEFAULT(csiescseq.arg[0], 1);
--		tscrolldown(term.top, csiescseq.arg[0]);
-+		tscrolldown(term.top, csiescseq.arg[0], 0);
- 		break;
- 	case 'L': /* IL -- Insert <n> blank lines */
- 		DEFAULT(csiescseq.arg[0], 1);
-@@ -2330,7 +2392,7 @@ eschandle(uchar ascii)
- 		return 0;
- 	case 'D': /* IND -- Linefeed */
- 		if (term.c.y == term.bot) {
--			tscrollup(term.top, 1);
-+			tscrollup(term.top, 1, 1);
- 		} else {
- 			tmoveto(term.c.x, term.c.y+1);
- 		}
-@@ -2343,7 +2405,7 @@ eschandle(uchar ascii)
- 		break;
- 	case 'M': /* RI -- Reverse index */
- 		if (term.c.y == term.top) {
--			tscrolldown(term.top, 1);
-+			tscrolldown(term.top, 1, 1);
- 		} else {
- 			tmoveto(term.c.x, term.c.y-1);
- 		}
-@@ -2557,7 +2619,7 @@ twrite(const char *buf, int buflen, int show_ctrl)
- void
- tresize(int col, int row)
- {
--	int i;
-+	int i, j;
- 	int minrow = MIN(row, term.row);
- 	int mincol = MIN(col, term.col);
- 	int *bp;
-@@ -2594,6 +2656,14 @@ 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));
-@@ -2652,7 +2722,7 @@ drawregion(int x1, int y1, int x2, int y2)
- 			continue;
- 
- 		term.dirty[y] = 0;
--		xdrawline(term.line[y], x1, y, x2);
-+		xdrawline(TLINE(y), x1, y, x2);
- 	}
- }
- 
-@@ -2673,8 +2743,9 @@ draw(void)
- 		cx--;
- 
- 	drawregion(0, 0, term.col, term.row);
--	xdrawcursor(cx, term.c.y, term.line[term.c.y][cx],
--			term.ocx, term.ocy, term.line[term.ocy][term.ocx]);
-+	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]);
- 	term.ocx = cx;
- 	term.ocy = term.c.y;
- 	xfinishdraw();
-diff --git a/st.h b/st.h
-index 519b9bd..da36b34 100644
---- a/st.h
-+++ b/st.h
-@@ -81,6 +81,8 @@ 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 *);
diff --git a/st/x.o b/st/x.o
index ec50e7d..34ec519 100644
--- a/st/x.o
+++ b/st/x.o