Fix?

config.def.h

@@ -176,6 +176,8 @@ static uint forcemousemod = ShiftMask;
  */
 static MouseShortcut mshortcuts[] = {
 	/* mask                 button   function        argument       release */
+	{ ShiftMask,            Button4, kscrollup,      {.i = 1} },
+	{ ShiftMask,            Button5, kscrolldown,    {.i = 1} },
 	{ XK_ANY_MOD,           Button2, selpaste,       {.i = 0},      1 },
 	{ ShiftMask,            Button4, ttysend,        {.s = "\033[5;2~"} },
 	{ XK_ANY_MOD,           Button4, ttysend,        {.s = "\031"} },
@@ -201,6 +203,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,      {.f = -0.1} },
+	{ ShiftMask,            XK_Page_Down,   kscrolldown,    {.f = -0.1} },
 };
 
 /*

patches/st-anysize-20220718-baa9357.diff

@@ -0,0 +1,164 @@
+From 8dcdc4b21a73268e167d98aa30f24315c7f3b7ff Mon Sep 17 00:00:00 2001
+From: Bakkeby <bakkeby@gmail.com>
+Date: Mon, 18 Jul 2022 16:52:03 +0200
+Subject: [PATCH] Adding anysize patch
+
+---
+ x.c | 56 ++++++++++++++++++++++++++++++--------------------------
+ 1 file changed, 30 insertions(+), 26 deletions(-)
+
+diff --git a/x.c b/x.c
+index 2a3bd38..f534347 100644
+--- a/x.c
++++ b/x.c
+@@ -81,6 +81,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 */
+@@ -331,7 +332,7 @@ ttysend(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;
+ }
+@@ -339,7 +340,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;
+ }
+@@ -739,6 +740,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);
+@@ -869,8 +873,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;
+@@ -1152,8 +1156,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 + 2 * borderpx + cols * win.cw;
++	win.h = 2 * win.vborderpx + 2 * borderpx + rows * win.ch;
+ 	if (xw.gm & XNegative)
+ 		xw.l += DisplayWidth(xw.dpy, xw.scr) - win.w - 2;
+ 	if (xw.gm & YNegative)
+@@ -1242,7 +1246,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;
+@@ -1375,7 +1379,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;
+@@ -1465,17 +1469,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.hborderpx,
+ 			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.vborderpx);
++	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. */
+@@ -1569,35 +1573,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);
+ 	}
+ }
+-- 
+2.37.1
+

patches/st-scrollback-float-0.9.2.diff

@@ -0,0 +1,52 @@
+diff --git a/config.def.h b/config.def.h
+index 8b25d40..6769f99 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -201,8 +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} },
++	{ ShiftMask,            XK_Page_Up,     kscrollup,      {.f = -0.1} },
++	{ ShiftMask,            XK_Page_Down,   kscrolldown,    {.f = -0.1} },
+ };
+ 
+ /*
+diff --git a/st.c b/st.c
+index a3b3c9d..5a93594 100644
+--- a/st.c
++++ b/st.c
+@@ -1087,14 +1087,14 @@ tswapscreen(void)
+ void
+ kscrollup(const Arg *a)
+ {
+-	int n = a->i;
++	float n = a->f;
+ 
+ 	if (IS_SET(MODE_ALTSCREEN))
+ 		return;
+ 
+-	if (n < 0) n = (-n) * term.row;
++	if (n < 0) n = MAX((-n) * term.row, 1);
+ 	if (n > TSCREEN.size - term.row - TSCREEN.off) n = TSCREEN.size - term.row - TSCREEN.off;
+-	while (!TLINE(-n)) --n;
++	while (!TLINE((int)-n)) --n;
+ 	TSCREEN.off += n;
+ 	selscroll(0, n);
+ 	tfulldirt();
+@@ -1104,12 +1104,12 @@ void
+ kscrolldown(const Arg *a)
+ {
+ 
+-	int n = a->i;
++	float n = a->f;
+ 
+ 	if (IS_SET(MODE_ALTSCREEN))
+ 		return;
+ 
+-	if (n < 0) n = (-n) * term.row;
++	if (n < 0) n = MAX((-n) * term.row, 1);
+ 	if (n > TSCREEN.off) n = TSCREEN.off;
+ 	TSCREEN.off -= n;
+ 	selscroll(0, -n);

patches/st-scrollback-mouse-0.9.2.diff

@@ -0,0 +1,25 @@
+From 6b7e7e6c5c44dd6347ad49691b80d808c1b0cb77 Mon Sep 17 00:00:00 2001
+From: Jernej Jakob <jernej.jakob@gmail.com>
+Date: Mon, 1 Jul 2024 14:00:02 +0200
+Subject: [PATCH] [st][patch] Update st-scrollback-mouse for 0.9.2
+
+---
+ config.def.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/config.def.h b/config.def.h
+index 8b25d40..d259675 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -176,6 +176,8 @@ static uint forcemousemod = ShiftMask;
+  */
+ static MouseShortcut mshortcuts[] = {
+ 	/* mask                 button   function        argument       release */
++	{ ShiftMask,            Button4, kscrollup,      {.i = 1} },
++	{ ShiftMask,            Button5, kscrolldown,    {.i = 1} },
+ 	{ XK_ANY_MOD,           Button2, selpaste,       {.i = 0},      1 },
+ 	{ ShiftMask,            Button4, ttysend,        {.s = "\033[5;2~"} },
+ 	{ XK_ANY_MOD,           Button4, ttysend,        {.s = "\031"} },
+-- 
+2.44.2
+

patches/st-scrollback-ringbuffer-0.9.2.diff

@@ -0,0 +1,730 @@
+commit 0663bdf11a409961da5b1120741a69814da8ce65
+Author: Timo Röhling <timo@gaussglocke.de>
+Date:   Tue Nov 23 19:45:33 2021 +0100
+
+    Terminal scrollback with ring buffer
+    
+    This patch adds a ring buffer for scrollback to the terminal.  The
+    advantage of using a ring buffer is that the common case, scrolling with
+    no static screen content, can be achieved very efficiently by
+    incrementing and decrementing the starting line (modulo buffer size).
+    
+    The scrollback buffer is limited to HISTSIZE lines in order to bound
+    memory usage. As the lines are allocated on demand, it is possible to
+    implement unlimited scrollback with few changes.  If the terminal is
+    reset, the scroll back buffer is reset, too.
+
+diff --git a/config.def.h b/config.def.h
+index 2cd740a..8b25d40 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 b9f66e7..d9b163e 100644
+--- a/st.c
++++ b/st.c
+@@ -43,6 +43,10 @@
+ #define ISCONTROL(c)		(ISCONTROLC0(c) || ISCONTROLC1(c))
+ #define ISDELIM(u)		(u && wcschr(worddelimiters, u))
+ 
++#define TSCREEN term.screen[IS_SET(MODE_ALTSCREEN)]
++#define TLINEOFFSET(y) (((y) + TSCREEN.cur - TSCREEN.off + TSCREEN.size) % TSCREEN.size)
++#define TLINE(y) (TSCREEN.buffer[TLINEOFFSET(y)])
++
+ enum term_mode {
+ 	MODE_WRAP        = 1 << 0,
+ 	MODE_INSERT      = 1 << 1,
+@@ -109,12 +113,21 @@ typedef struct {
+ 	int alt;
+ } Selection;
+ 
++/* Screen lines */
++typedef struct {
++	Line* buffer;  /* ring buffer */
++	int size;      /* size of buffer */
++	int cur;       /* start of active screen */
++	int off;       /* scrollback line offset */
++	TCursor sc;    /* saved cursor */
++} LineBuffer;
++
+ /* Internal representation of the screen */
+ typedef struct {
+ 	int row;      /* nb row */
+ 	int col;      /* nb col */
+-	Line *line;   /* screen */
+-	Line *alt;    /* alternate screen */
++	LineBuffer screen[2]; /* screen and alternate screen */
++	int linelen;  /* allocated line length */
+ 	int *dirty;   /* dirtyness of lines */
+ 	TCursor c;    /* cursor */
+ 	int ocx;      /* old cursor col */
+@@ -203,6 +216,8 @@ static void tdeftran(char);
+ static void tstrsequence(uchar);
+ 
+ static void drawregion(int, int, int, int);
++static void clearline(Line, Glyph, int, int);
++static Line ensureline(Line);
+ 
+ static void selnormalize(void);
+ static void selscroll(int, int);
+@@ -408,11 +423,12 @@ int
+ tlinelen(int y)
+ {
+ 	int i = term.col;
++	Line line = TLINE(y);
+ 
+-	if (term.line[y][i - 1].mode & ATTR_WRAP)
++	if (line[i - 1].mode & ATTR_WRAP)
+ 		return i;
+ 
+-	while (i > 0 && term.line[y][i - 1].u == ' ')
++	while (i > 0 && line[i - 1].u == ' ')
+ 		--i;
+ 
+ 	return i;
+@@ -521,7 +537,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;
+@@ -536,14 +552,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)))
+@@ -564,14 +580,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;
+ 				}
+@@ -602,13 +618,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;
+ 
+@@ -949,12 +965,15 @@ int
+ tattrset(int attr)
+ {
+ 	int i, j;
++	int y = TLINEOFFSET(0);
+ 
+ 	for (i = 0; i < term.row-1; i++) {
++		Line line = TSCREEN.buffer[y];
+ 		for (j = 0; j < term.col-1; j++) {
+-			if (term.line[i][j].mode & attr)
++			if (line[j].mode & attr)
+ 				return 1;
+ 		}
++		y = (y+1) % TSCREEN.size;
+ 	}
+ 
+ 	return 0;
+@@ -976,14 +995,17 @@ void
+ tsetdirtattr(int attr)
+ {
+ 	int i, j;
++	int y = TLINEOFFSET(0);
+ 
+ 	for (i = 0; i < term.row-1; i++) {
++		Line line = TSCREEN.buffer[y];
+ 		for (j = 0; j < term.col-1; j++) {
+-			if (term.line[i][j].mode & attr) {
++			if (line[j].mode & attr) {
+ 				tsetdirt(i, i);
+ 				break;
+ 			}
+ 		}
++		y = (y+1) % TSCREEN.size;
+ 	}
+ }
+ 
+@@ -996,27 +1018,19 @@ tfulldirt(void)
+ void
+ tcursor(int mode)
+ {
+-	static TCursor c[2];
+-	int alt = IS_SET(MODE_ALTSCREEN);
+-
+ 	if (mode == CURSOR_SAVE) {
+-		c[alt] = term.c;
++		TSCREEN.sc = term.c;
+ 	} else if (mode == CURSOR_LOAD) {
+-		term.c = c[alt];
+-		tmoveto(c[alt].x, c[alt].y);
++		term.c = TSCREEN.sc;
++		tmoveto(term.c.x, term.c.y);
+ 	}
+ }
+ 
+ void
+ treset(void)
+ {
+-	uint i;
+-
+-	term.c = (TCursor){{
+-		.mode = ATTR_NULL,
+-		.fg = defaultfg,
+-		.bg = defaultbg
+-	}, .x = 0, .y = 0, .state = CURSOR_DEFAULT};
++	int i, j;
++	Glyph g = (Glyph){ .fg = defaultfg, .bg = defaultbg};
+ 
+ 	memset(term.tabs, 0, term.col * sizeof(*term.tabs));
+ 	for (i = tabspaces; i < term.col; i += tabspaces)
+@@ -1028,17 +1042,37 @@ treset(void)
+ 	term.charset = 0;
+ 
+ 	for (i = 0; i < 2; i++) {
+-		tmoveto(0, 0);
+-		tcursor(CURSOR_SAVE);
+-		tclearregion(0, 0, term.col-1, term.row-1);
+-		tswapscreen();
++		term.screen[i].sc = (TCursor){{
++			.fg = defaultfg,
++			.bg = defaultbg
++		}};
++		term.screen[i].cur = 0;
++		term.screen[i].off = 0;
++		for (j = 0; j < term.row; ++j) {
++			if (term.col != term.linelen)
++				term.screen[i].buffer[j] = xrealloc(term.screen[i].buffer[j], term.col * sizeof(Glyph));
++			clearline(term.screen[i].buffer[j], g, 0, term.col);
++		}
++		for (j = term.row; j < term.screen[i].size; ++j) {
++			free(term.screen[i].buffer[j]);
++			term.screen[i].buffer[j] = NULL;
++		}
+ 	}
++	tcursor(CURSOR_LOAD);
++	term.linelen = term.col;
++	tfulldirt();
+ }
+ 
+ void
+ tnew(int col, int row)
+ {
+-	term = (Term){ .c = { .attr = { .fg = defaultfg, .bg = defaultbg } } };
++	int i;
++	term = (Term){};
++	term.screen[0].buffer = xmalloc(HISTSIZE * sizeof(Line));
++	term.screen[0].size = HISTSIZE;
++	term.screen[1].buffer = NULL;
++	for (i = 0; i < HISTSIZE; ++i) term.screen[0].buffer[i] = NULL;
++
+ 	tresize(col, row);
+ 	treset();
+ }
+@@ -1046,14 +1080,42 @@ tnew(int col, int row)
+ void
+ tswapscreen(void)
+ {
+-	Line *tmp = term.line;
+-
+-	term.line = term.alt;
+-	term.alt = tmp;
+ 	term.mode ^= MODE_ALTSCREEN;
+ 	tfulldirt();
+ }
+ 
++void
++kscrollup(const Arg *a)
++{
++	int n = a->i;
++
++	if (IS_SET(MODE_ALTSCREEN))
++		return;
++
++	if (n < 0) n = (-n) * term.row;
++	if (n > TSCREEN.size - term.row - TSCREEN.off) n = TSCREEN.size - term.row - TSCREEN.off;
++	while (!TLINE(-n)) --n;
++	TSCREEN.off += n;
++	selscroll(0, n);
++	tfulldirt();
++}
++
++void
++kscrolldown(const Arg *a)
++{
++
++	int n = a->i;
++
++	if (IS_SET(MODE_ALTSCREEN))
++		return;
++
++	if (n < 0) n = (-n) * term.row;
++	if (n > TSCREEN.off) n = TSCREEN.off;
++	TSCREEN.off -= n;
++	selscroll(0, -n);
++	tfulldirt();
++}
++
+ void
+ tscrolldown(int orig, int n)
+ {
+@@ -1062,15 +1124,29 @@ tscrolldown(int orig, int n)
+ 
+ 	LIMIT(n, 0, term.bot-orig+1);
+ 
+-	tsetdirt(orig, term.bot-n);
+-	tclearregion(0, term.bot-n+1, term.col-1, term.bot);
++	/* Ensure that lines are allocated */
++	for (i = -n; i < 0; i++) {
++		TLINE(i) = ensureline(TLINE(i));
++	}
+ 
+-	for (i = term.bot; i >= orig+n; i--) {
+-		temp = term.line[i];
+-		term.line[i] = term.line[i-n];
+-		term.line[i-n] = temp;
++	/* Shift non-scrolling areas in ring buffer */
++	for (i = term.bot+1; i < term.row; i++) {
++		temp = TLINE(i);
++		TLINE(i) = TLINE(i-n);
++		TLINE(i-n) = temp;
++	}
++	for (i = 0; i < orig; i++) {
++		temp = TLINE(i);
++		TLINE(i) = TLINE(i-n);
++		TLINE(i-n) = temp;
+ 	}
+ 
++	/* Scroll buffer */
++	TSCREEN.cur = (TSCREEN.cur + TSCREEN.size - n) % TSCREEN.size;
++	/* Clear lines that have entered the view */
++	tclearregion(0, orig, term.linelen-1, orig+n-1);
++	/* Redraw portion of the screen that has scrolled */
++	tsetdirt(orig+n-1, term.bot);
+ 	selscroll(orig, n);
+ }
+ 
+@@ -1082,15 +1158,29 @@ tscrollup(int orig, int n)
+ 
+ 	LIMIT(n, 0, term.bot-orig+1);
+ 
+-	tclearregion(0, orig, term.col-1, orig+n-1);
+-	tsetdirt(orig+n, term.bot);
++	/* Ensure that lines are allocated */
++	for (i = term.row; i < term.row + n; i++) {
++		TLINE(i) = ensureline(TLINE(i));
++	}
+ 
+-	for (i = orig; i <= term.bot-n; i++) {
+-		temp = term.line[i];
+-		term.line[i] = term.line[i+n];
+-		term.line[i+n] = temp;
++	/* Shift non-scrolling areas in ring buffer */
++	for (i = orig-1; i >= 0; i--) {
++		temp = TLINE(i);
++		TLINE(i) = TLINE(i+n);
++		TLINE(i+n) = temp;
++	}
++	for (i = term.row-1; i >term.bot; i--) {
++		temp = TLINE(i);
++		TLINE(i) = TLINE(i+n);
++		TLINE(i+n) = temp;
+ 	}
+ 
++	/* Scroll buffer */
++	TSCREEN.cur = (TSCREEN.cur + n) % TSCREEN.size;
++	/* Clear lines that have entered the view */
++	tclearregion(0, term.bot-n+1, term.linelen-1, term.bot);
++	/* Redraw portion of the screen that has scrolled */
++	tsetdirt(orig, term.bot-n+1);
+ 	selscroll(orig, -n);
+ }
+ 
+@@ -1194,6 +1284,7 @@ tsetchar(Rune u, const Glyph *attr, int x, int y)
+ 		"⎻", "─", "⎼", "⎽", "├", "┤", "┴", "┬", /* p - w */
+ 		"│", "≤", "≥", "π", "≠", "£", "·", /* x - ~ */
+ 	};
++	Line line = TLINE(y);
+ 
+ 	/*
+ 	 * The table is proudly stolen from rxvt.
+@@ -1202,25 +1293,25 @@ tsetchar(Rune u, const Glyph *attr, int x, int y)
+ 	   BETWEEN(u, 0x41, 0x7e) && vt100_0[u - 0x41])
+ 		utf8decode(vt100_0[u - 0x41], &u, UTF_SIZ);
+ 
+-	if (term.line[y][x].mode & ATTR_WIDE) {
++	if (line[x].mode & ATTR_WIDE) {
+ 		if (x+1 < term.col) {
+-			term.line[y][x+1].u = ' ';
+-			term.line[y][x+1].mode &= ~ATTR_WDUMMY;
++			line[x+1].u = ' ';
++			line[x+1].mode &= ~ATTR_WDUMMY;
+ 		}
+-	} else if (term.line[y][x].mode & ATTR_WDUMMY) {
+-		term.line[y][x-1].u = ' ';
+-		term.line[y][x-1].mode &= ~ATTR_WIDE;
++	} else if (line[x].mode & ATTR_WDUMMY) {
++		line[x-1].u = ' ';
++		line[x-1].mode &= ~ATTR_WIDE;
+ 	}
+ 
+ 	term.dirty[y] = 1;
+-	term.line[y][x] = *attr;
+-	term.line[y][x].u = u;
++	line[x] = *attr;
++	line[x].u = u;
+ }
+ 
+ void
+ tclearregion(int x1, int y1, int x2, int y2)
+ {
+-	int x, y, temp;
++	int x, y, L, S, temp;
+ 	Glyph *gp;
+ 
+ 	if (x1 > x2)
+@@ -1228,15 +1319,16 @@ tclearregion(int x1, int y1, int x2, int y2)
+ 	if (y1 > y2)
+ 		temp = y1, y1 = y2, y2 = temp;
+ 
+-	LIMIT(x1, 0, term.col-1);
+-	LIMIT(x2, 0, term.col-1);
++	LIMIT(x1, 0, term.linelen-1);
++	LIMIT(x2, 0, term.linelen-1);
+ 	LIMIT(y1, 0, term.row-1);
+ 	LIMIT(y2, 0, term.row-1);
+ 
++	L = TLINEOFFSET(y1);
+ 	for (y = y1; y <= y2; y++) {
+ 		term.dirty[y] = 1;
+ 		for (x = x1; x <= x2; x++) {
+-			gp = &term.line[y][x];
++			gp = &TSCREEN.buffer[L][x];
+ 			if (selected(x, y))
+ 				selclear();
+ 			gp->fg = term.c.attr.fg;
+@@ -1244,6 +1336,7 @@ tclearregion(int x1, int y1, int x2, int y2)
+ 			gp->mode = 0;
+ 			gp->u = ' ';
+ 		}
++		L = (L + 1) % TSCREEN.size;
+ 	}
+ }
+ 
+@@ -1258,7 +1351,7 @@ tdeletechar(int n)
+ 	dst = term.c.x;
+ 	src = term.c.x + n;
+ 	size = term.col - src;
+-	line = term.line[term.c.y];
++	line = TLINE(term.c.y);
+ 
+ 	memmove(&line[dst], &line[src], size * sizeof(Glyph));
+ 	tclearregion(term.col-n, term.c.y, term.col-1, term.c.y);
+@@ -1275,7 +1368,7 @@ tinsertblank(int n)
+ 	dst = term.c.x + n;
+ 	src = term.c.x;
+ 	size = term.col - dst;
+-	line = term.line[term.c.y];
++	line = TLINE(term.c.y);
+ 
+ 	memmove(&line[dst], &line[src], size * sizeof(Glyph));
+ 	tclearregion(src, term.c.y, dst - 1, term.c.y);
+@@ -2079,7 +2172,7 @@ tdumpline(int n)
+ 	char buf[UTF_SIZ];
+ 	const Glyph *bp, *end;
+ 
+-	bp = &term.line[n][0];
++	bp = &TLINE(n)[0];
+ 	end = &bp[MIN(tlinelen(n), term.col) - 1];
+ 	if (bp != end || bp->u != ' ') {
+ 		for ( ; bp <= end; ++bp)
+@@ -2466,11 +2559,11 @@ check_control_code:
+ 	if (selected(term.c.x, term.c.y))
+ 		selclear();
+ 
+-	gp = &term.line[term.c.y][term.c.x];
++	gp = &TLINE(term.c.y)[term.c.x];
+ 	if (IS_SET(MODE_WRAP) && (term.c.state & CURSOR_WRAPNEXT)) {
+ 		gp->mode |= ATTR_WRAP;
+ 		tnewline(1);
+-		gp = &term.line[term.c.y][term.c.x];
++		gp = &TLINE(term.c.y)[term.c.x];
+ 	}
+ 
+ 	if (IS_SET(MODE_INSERT) && term.c.x+width < term.col) {
+@@ -2483,7 +2576,7 @@ check_control_code:
+ 			tnewline(1);
+ 		else
+ 			tmoveto(term.col - width, term.c.y);
+-		gp = &term.line[term.c.y][term.c.x];
++		gp = &TLINE(term.c.y)[term.c.x];
+ 	}
+ 
+ 	tsetchar(u, &term.c.attr, term.c.x, term.c.y);
+@@ -2514,6 +2607,11 @@ twrite(const char *buf, int buflen, int show_ctrl)
+ 	Rune u;
+ 	int n;
+ 
++	if (TSCREEN.off) {
++		TSCREEN.off = 0;
++		tfulldirt();
++	}
++
+ 	for (n = 0; n < buflen; n += charsize) {
+ 		if (IS_SET(MODE_UTF8)) {
+ 			/* process a complete utf8 char */
+@@ -2540,56 +2638,85 @@ twrite(const char *buf, int buflen, int show_ctrl)
+ }
+ 
+ void
+-tresize(int col, int row)
++clearline(Line line, Glyph g, int x, int xend)
+ {
+ 	int i;
++	g.mode = 0;
++	g.u = ' ';
++	for (i = x; i < xend; ++i) {
++		line[i] = g;
++	}
++}
++
++Line
++ensureline(Line line)
++{
++	if (!line) {
++		line = xmalloc(term.linelen * sizeof(Glyph));
++	}
++	return line;
++}
++
++void
++tresize(int col, int row)
++{
++	int i, j;
+ 	int minrow = MIN(row, term.row);
+ 	int mincol = MIN(col, term.col);
++	int linelen = MAX(col, term.linelen);
+ 	int *bp;
+-	TCursor c;
+ 
+-	if (col < 1 || row < 1) {
++	if (col < 1 || row < 1 || row > HISTSIZE) {
+ 		fprintf(stderr,
+ 		        "tresize: error resizing to %dx%d\n", col, row);
+ 		return;
+ 	}
+ 
+-	/*
+-	 * slide screen to keep cursor where we expect it -
+-	 * tscrollup would work here, but we can optimize to
+-	 * memmove because we're freeing the earlier lines
+-	 */
+-	for (i = 0; i <= term.c.y - row; i++) {
+-		free(term.line[i]);
+-		free(term.alt[i]);
++	/* Shift buffer to keep the cursor where we expect it */
++	if (row <= term.c.y) {
++		term.screen[0].cur = (term.screen[0].cur - row + term.c.y + 1) % term.screen[0].size;
++	}
++
++	/* Resize and clear line buffers as needed */
++	if (linelen > term.linelen) {
++		for (i = 0; i < term.screen[0].size; ++i) {
++			if (term.screen[0].buffer[i]) {
++				term.screen[0].buffer[i] = xrealloc(term.screen[0].buffer[i], linelen * sizeof(Glyph));
++				clearline(term.screen[0].buffer[i], term.c.attr, term.linelen, linelen);
++			}
++		}
++		for (i = 0; i < minrow; ++i) {
++			term.screen[1].buffer[i] = xrealloc(term.screen[1].buffer[i], linelen * sizeof(Glyph));
++			clearline(term.screen[1].buffer[i], term.c.attr, term.linelen, linelen);
++		}
+ 	}
+-	/* ensure that both src and dst are not NULL */
+-	if (i > 0) {
+-		memmove(term.line, term.line + i, row * sizeof(Line));
+-		memmove(term.alt, term.alt + i, row * sizeof(Line));
++	/* Allocate all visible lines for regular line buffer */
++	for (j = term.screen[0].cur, i = 0; i < row; ++i, j = (j + 1) % term.screen[0].size)
++	{
++		if (!term.screen[0].buffer[j]) {
++			term.screen[0].buffer[j] = xmalloc(linelen * sizeof(Glyph));
++		}
++		if (i >= term.row) {
++			clearline(term.screen[0].buffer[j], term.c.attr, 0, linelen);
++		}
+ 	}
+-	for (i += row; i < term.row; i++) {
+-		free(term.line[i]);
+-		free(term.alt[i]);
++	/* Resize alt screen */
++	term.screen[1].cur = 0;
++	term.screen[1].size = row;
++	for (i = row; i < term.row; ++i) {
++		free(term.screen[1].buffer[i]);
++	}
++	term.screen[1].buffer = xrealloc(term.screen[1].buffer, row * sizeof(Line));
++	for (i = term.row; i < row; ++i) {
++		term.screen[1].buffer[i] = xmalloc(linelen * sizeof(Glyph));
++		clearline(term.screen[1].buffer[i], term.c.attr, 0, linelen);
+ 	}
+ 
+ 	/* resize to new height */
+-	term.line = xrealloc(term.line, row * sizeof(Line));
+-	term.alt  = xrealloc(term.alt,  row * sizeof(Line));
+ 	term.dirty = xrealloc(term.dirty, row * sizeof(*term.dirty));
+ 	term.tabs = xrealloc(term.tabs, col * sizeof(*term.tabs));
+ 
+-	/* 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));
+-		term.alt[i]  = xrealloc(term.alt[i],  col * sizeof(Glyph));
+-	}
+-
+-	/* allocate any new rows */
+-	for (/* i = minrow */; i < row; i++) {
+-		term.line[i] = xmalloc(col * sizeof(Glyph));
+-		term.alt[i] = xmalloc(col * sizeof(Glyph));
+-	}
++	/* fix tabstops */
+ 	if (col > term.col) {
+ 		bp = term.tabs + term.col;
+ 
+@@ -2599,26 +2726,16 @@ tresize(int col, int row)
+ 		for (bp += tabspaces; bp < term.tabs + col; bp += tabspaces)
+ 			*bp = 1;
+ 	}
++
+ 	/* update terminal size */
+ 	term.col = col;
+ 	term.row = row;
++	term.linelen = linelen;
+ 	/* reset scrolling region */
+ 	tsetscroll(0, row-1);
+ 	/* make use of the LIMIT in tmoveto */
+ 	tmoveto(term.c.x, term.c.y);
+-	/* Clearing both screens (it makes dirty all lines) */
+-	c = term.c;
+-	for (i = 0; i < 2; i++) {
+-		if (mincol < col && 0 < minrow) {
+-			tclearregion(mincol, 0, col - 1, minrow - 1);
+-		}
+-		if (0 < col && minrow < row) {
+-			tclearregion(0, minrow, col - 1, row - 1);
+-		}
+-		tswapscreen();
+-		tcursor(CURSOR_LOAD);
+-	}
+-	term.c = c;
++	tfulldirt();
+ }
+ 
+ void
+@@ -2630,14 +2747,15 @@ resettitle(void)
+ void
+ drawregion(int x1, int y1, int x2, int y2)
+ {
+-	int y;
++	int y, L;
+ 
++	L = TLINEOFFSET(y1);
+ 	for (y = y1; y < y2; y++) {
+-		if (!term.dirty[y])
+-			continue;
+-
+-		term.dirty[y] = 0;
+-		xdrawline(term.line[y], x1, y, x2);
++		if (term.dirty[y]) {
++			term.dirty[y] = 0;
++			xdrawline(TSCREEN.buffer[L], x1, y, x2);
++		}
++		L = (L + 1) % TSCREEN.size;
+ 	}
+ }
+ 
+@@ -2652,14 +2770,15 @@ draw(void)
+ 	/* adjust cursor position */
+ 	LIMIT(term.ocx, 0, term.col-1);
+ 	LIMIT(term.ocy, 0, term.row-1);
+-	if (term.line[term.ocy][term.ocx].mode & ATTR_WDUMMY)
++	if (TLINE(term.ocy)[term.ocx].mode & ATTR_WDUMMY)
+ 		term.ocx--;
+-	if (term.line[term.c.y][cx].mode & ATTR_WDUMMY)
++	if (TLINE(term.c.y)[cx].mode & ATTR_WDUMMY)
+ 		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 (TSCREEN.off == 0)
++		xdrawcursor(cx, term.c.y, TLINE(term.c.y)[cx],
++				term.ocx, term.ocy, TLINE(term.ocy)[term.ocx]);
+ 	term.ocx = cx;
+ 	term.ocy = term.c.y;
+ 	xfinishdraw();
+diff --git a/st.h b/st.h
+index fd3b0d8..3cea73b 100644
+--- a/st.h
++++ b/st.h
+@@ -19,6 +19,7 @@
+ 
+ #define TRUECOLOR(r,g,b)	(1 << 24 | (r) << 16 | (g) << 8 | (b))
+ #define IS_TRUECOL(x)		(1 << 24 & (x))
++#define HISTSIZE            2000
+ 
+ enum glyph_attribute {
+ 	ATTR_NULL       = 0,
+diff --git a/x.c b/x.c
+index bd23686..25785a6 100644
+--- a/x.c
++++ b/x.c
+@@ -59,6 +59,8 @@ static void zoom(const Arg *);
+ static void zoomabs(const Arg *);
+ static void zoomreset(const Arg *);
+ static void ttysend(const Arg *);
++void kscrollup(const Arg *);
++void kscrolldown(const Arg *);
+ 
+ /* config.h for applying patches and the configuration. */
+ #include "config.h"

st.c

@@ -43,6 +43,10 @@
 #define ISCONTROL(c)		(ISCONTROLC0(c) || ISCONTROLC1(c))
 #define ISDELIM(u)		(u && wcschr(worddelimiters, u))
 
+#define TSCREEN term.screen[IS_SET(MODE_ALTSCREEN)]
+#define TLINEOFFSET(y) (((y) + TSCREEN.cur - TSCREEN.off + TSCREEN.size) % TSCREEN.size)
+#define TLINE(y) (TSCREEN.buffer[TLINEOFFSET(y)])
+
 enum term_mode {
 	MODE_WRAP        = 1 << 0,
 	MODE_INSERT      = 1 << 1,
@@ -109,12 +113,21 @@ typedef struct {
 	int alt;
 } Selection;
 
+/* Screen lines */
+typedef struct {
+	Line* buffer;  /* ring buffer */
+	int size;      /* size of buffer */
+	int cur;       /* start of active screen */
+	int off;       /* scrollback line offset */
+	TCursor sc;    /* saved cursor */
+} LineBuffer;
+
 /* Internal representation of the screen */
 typedef struct {
 	int row;      /* nb row */
 	int col;      /* nb col */
-	Line *line;   /* screen */
-	Line *alt;    /* alternate screen */
+	LineBuffer screen[2]; /* screen and alternate screen */
+	int linelen;  /* allocated line length */
 	int *dirty;   /* dirtyness of lines */
 	TCursor c;    /* cursor */
 	int ocx;      /* old cursor col */
@@ -203,6 +216,8 @@ static void tdeftran(char);
 static void tstrsequence(uchar);
 
 static void drawregion(int, int, int, int);
+static void clearline(Line, Glyph, int, int);
+static Line ensureline(Line);
 
 static void selnormalize(void);
 static void selscroll(int, int);
@@ -408,11 +423,12 @@ int
 tlinelen(int y)
 {
 	int i = term.col;
+	Line line = TLINE(y);
 
-	if (term.line[y][i - 1].mode & ATTR_WRAP)
+	if (line[i - 1].mode & ATTR_WRAP)
 		return i;
 
-	while (i > 0 && term.line[y][i - 1].u == ' ')
+	while (i > 0 && line[i - 1].u == ' ')
 		--i;
 
 	return i;
@@ -521,7 +537,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;
@@ -536,14 +552,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)))
@@ -564,14 +580,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;
 				}
@@ -602,13 +618,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;
 
@@ -655,15 +671,15 @@ highlighturls(void)
 	for (int i = term.top; i < term.bot; i++) {
 		int url_start = -1;
 		for (int j = 0; j < term.col; j++) {
-			if (term.line[i][j].u < 127) {
-				linestr[j] = term.line[i][j].u;
+			if (term.screen[0].buffer[i][j].u < 127) {
+				linestr[j] = term.screen[0].buffer[i][j].u;
 			}
 			linestr[term.col] = '\0';
 		}
 		while ((match = strstrany(linestr + url_start + 1, urlprefixes))) {
 			url_start = match - linestr;
 			for (int c = url_start; c < term.col && strchr(urlchars, linestr[c]); c++) {
-				term.line[i][c].mode |= ATTR_URL;
+				term.screen[0].buffer[i][c].mode |= ATTR_URL;
 				tsetdirt(i, c);
 			}
 		}
@@ -676,7 +692,7 @@ unhighlighturls(void)
 {
 	for (int i = term.top; i < term.bot; i++) {
 		for (int j = 0; j < term.col; j++) {
-			Glyph* g = &term.line[i][j];
+			Glyph* g = &term.screen[0].buffer[i][j];
 			if (g->mode & ATTR_URL) {
 				g->mode &= ~ATTR_URL;
 				tsetdirt(i, j);
@@ -691,8 +707,8 @@ followurl(int x, int y) {
 	char *linestr = calloc(sizeof(char), term.col+1); /* assume ascii */
 	char *match;
 	for (int i = 0; i < term.col; i++) {
-		if (term.line[x][i].u < 127) {
-			linestr[i] = term.line[x][i].u;
+		if (term.screen[0].buffer[x][i].u < 127) {
+			linestr[i] = term.screen[0].buffer[x][i].u;
 		}
 		linestr[term.col] = '\0';
 	}
@@ -1038,12 +1054,15 @@ int
 tattrset(int attr)
 {
 	int i, j;
+	int y = TLINEOFFSET(0);
 
 	for (i = 0; i < term.row-1; i++) {
+		Line line = TSCREEN.buffer[y];
 		for (j = 0; j < term.col-1; j++) {
-			if (term.line[i][j].mode & attr)
+			if (line[j].mode & attr)
 				return 1;
 		}
+		y = (y+1) % TSCREEN.size;
 	}
 
 	return 0;
@@ -1065,14 +1084,17 @@ void
 tsetdirtattr(int attr)
 {
 	int i, j;
+	int y = TLINEOFFSET(0);
 
 	for (i = 0; i < term.row-1; i++) {
+		Line line = TSCREEN.buffer[y];
 		for (j = 0; j < term.col-1; j++) {
-			if (term.line[i][j].mode & attr) {
+			if (line[j].mode & attr) {
 				tsetdirt(i, i);
 				break;
 			}
 		}
+		y = (y+1) % TSCREEN.size;
 	}
 }
 
@@ -1085,27 +1107,19 @@ tfulldirt(void)
 void
 tcursor(int mode)
 {
-	static TCursor c[2];
-	int alt = IS_SET(MODE_ALTSCREEN);
-
 	if (mode == CURSOR_SAVE) {
-		c[alt] = term.c;
+		TSCREEN.sc = term.c;
 	} else if (mode == CURSOR_LOAD) {
-		term.c = c[alt];
-		tmoveto(c[alt].x, c[alt].y);
+		term.c = TSCREEN.sc;
+		tmoveto(term.c.x, term.c.y);
 	}
 }
 
 void
 treset(void)
 {
-	uint i;
-
-	term.c = (TCursor){{
-		.mode = ATTR_NULL,
-		.fg = defaultfg,
-		.bg = defaultbg
-	}, .x = 0, .y = 0, .state = CURSOR_DEFAULT};
+	int i, j;
+	Glyph g = (Glyph){ .fg = defaultfg, .bg = defaultbg};
 
 	memset(term.tabs, 0, term.col * sizeof(*term.tabs));
 	for (i = tabspaces; i < term.col; i += tabspaces)
@@ -1117,17 +1131,37 @@ treset(void)
 	term.charset = 0;
 
 	for (i = 0; i < 2; i++) {
-		tmoveto(0, 0);
-		tcursor(CURSOR_SAVE);
-		tclearregion(0, 0, term.col-1, term.row-1);
-		tswapscreen();
+		term.screen[i].sc = (TCursor){{
+			.fg = defaultfg,
+			.bg = defaultbg
+		}};
+		term.screen[i].cur = 0;
+		term.screen[i].off = 0;
+		for (j = 0; j < term.row; ++j) {
+			if (term.col != term.linelen)
+				term.screen[i].buffer[j] = xrealloc(term.screen[i].buffer[j], term.col * sizeof(Glyph));
+			clearline(term.screen[i].buffer[j], g, 0, term.col);
+		}
+		for (j = term.row; j < term.screen[i].size; ++j) {
+			free(term.screen[i].buffer[j]);
+			term.screen[i].buffer[j] = NULL;
+		}
 	}
+	tcursor(CURSOR_LOAD);
+	term.linelen = term.col;
+	tfulldirt();
 }
 
 void
 tnew(int col, int row)
 {
-	term = (Term){ .c = { .attr = { .fg = defaultfg, .bg = defaultbg } } };
+	int i;
+	term = (Term){};
+	term.screen[0].buffer = xmalloc(HISTSIZE * sizeof(Line));
+	term.screen[0].size = HISTSIZE;
+	term.screen[1].buffer = NULL;
+	for (i = 0; i < HISTSIZE; ++i) term.screen[0].buffer[i] = NULL;
+
 	tresize(col, row);
 	treset();
 }
@@ -1135,14 +1169,42 @@ tnew(int col, int row)
 void
 tswapscreen(void)
 {
-	Line *tmp = term.line;
-
-	term.line = term.alt;
-	term.alt = tmp;
 	term.mode ^= MODE_ALTSCREEN;
 	tfulldirt();
 }
 
+void
+kscrollup(const Arg *a)
+{
+	float n = a->f;
+
+	if (IS_SET(MODE_ALTSCREEN))
+		return;
+
+	if (n < 0) n = MAX((-n) * term.row, 1);
+	if (n > TSCREEN.size - term.row - TSCREEN.off) n = TSCREEN.size - term.row - TSCREEN.off;
+	while (!TLINE((int)-n)) --n;
+	TSCREEN.off += n;
+	selscroll(0, n);
+	tfulldirt();
+}
+
+void
+kscrolldown(const Arg *a)
+{
+
+	float n = a->f;
+
+	if (IS_SET(MODE_ALTSCREEN))
+		return;
+
+	if (n < 0) n = MAX((-n) * term.row, 1);
+	if (n > TSCREEN.off) n = TSCREEN.off;
+	TSCREEN.off -= n;
+	selscroll(0, -n);
+	tfulldirt();
+}
+
 void
 tscrolldown(int orig, int n)
 {
@@ -1151,15 +1213,29 @@ tscrolldown(int orig, int n)
 
 	LIMIT(n, 0, term.bot-orig+1);
 
-	tsetdirt(orig, term.bot-n);
-	tclearregion(0, term.bot-n+1, term.col-1, term.bot);
-
-	for (i = term.bot; i >= orig+n; i--) {
-		temp = term.line[i];
-		term.line[i] = term.line[i-n];
-		term.line[i-n] = temp;
+	/* Ensure that lines are allocated */
+	for (i = -n; i < 0; i++) {
+		TLINE(i) = ensureline(TLINE(i));
 	}
 
+	/* Shift non-scrolling areas in ring buffer */
+	for (i = term.bot+1; i < term.row; i++) {
+		temp = TLINE(i);
+		TLINE(i) = TLINE(i-n);
+		TLINE(i-n) = temp;
+	}
+	for (i = 0; i < orig; i++) {
+		temp = TLINE(i);
+		TLINE(i) = TLINE(i-n);
+		TLINE(i-n) = temp;
+	}
+
+	/* Scroll buffer */
+	TSCREEN.cur = (TSCREEN.cur + TSCREEN.size - n) % TSCREEN.size;
+	/* Clear lines that have entered the view */
+	tclearregion(0, orig, term.linelen-1, orig+n-1);
+	/* Redraw portion of the screen that has scrolled */
+	tsetdirt(orig+n-1, term.bot);
 	selscroll(orig, n);
 }
 
@@ -1171,15 +1247,29 @@ tscrollup(int orig, int n)
 
 	LIMIT(n, 0, term.bot-orig+1);
 
-	tclearregion(0, orig, term.col-1, orig+n-1);
-	tsetdirt(orig+n, term.bot);
-
-	for (i = orig; i <= term.bot-n; i++) {
-		temp = term.line[i];
-		term.line[i] = term.line[i+n];
-		term.line[i+n] = temp;
+	/* Ensure that lines are allocated */
+	for (i = term.row; i < term.row + n; i++) {
+		TLINE(i) = ensureline(TLINE(i));
 	}
 
+	/* Shift non-scrolling areas in ring buffer */
+	for (i = orig-1; i >= 0; i--) {
+		temp = TLINE(i);
+		TLINE(i) = TLINE(i+n);
+		TLINE(i+n) = temp;
+	}
+	for (i = term.row-1; i >term.bot; i--) {
+		temp = TLINE(i);
+		TLINE(i) = TLINE(i+n);
+		TLINE(i+n) = temp;
+	}
+
+	/* Scroll buffer */
+	TSCREEN.cur = (TSCREEN.cur + n) % TSCREEN.size;
+	/* Clear lines that have entered the view */
+	tclearregion(0, term.bot-n+1, term.linelen-1, term.bot);
+	/* Redraw portion of the screen that has scrolled */
+	tsetdirt(orig, term.bot-n+1);
 	selscroll(orig, -n);
 }
 
@@ -1286,6 +1376,7 @@ tsetchar(Rune u, const Glyph *attr, int x, int y)
 		"⎻", "─", "⎼", "⎽", "├", "┤", "┴", "┬", /* p - w */
 		"│", "≤", "≥", "π", "≠", "£", "·", /* x - ~ */
 	};
+	Line line = TLINE(y);
 
 	/*
 	 * The table is proudly stolen from rxvt.
@@ -1294,25 +1385,25 @@ tsetchar(Rune u, const Glyph *attr, int x, int y)
 	   BETWEEN(u, 0x41, 0x7e) && vt100_0[u - 0x41])
 		utf8decode(vt100_0[u - 0x41], &u, UTF_SIZ);
 
-	if (term.line[y][x].mode & ATTR_WIDE) {
+	if (line[x].mode & ATTR_WIDE) {
 		if (x+1 < term.col) {
-			term.line[y][x+1].u = ' ';
-			term.line[y][x+1].mode &= ~ATTR_WDUMMY;
+			line[x+1].u = ' ';
+			line[x+1].mode &= ~ATTR_WDUMMY;
 		}
-	} else if (term.line[y][x].mode & ATTR_WDUMMY) {
-		term.line[y][x-1].u = ' ';
-		term.line[y][x-1].mode &= ~ATTR_WIDE;
+	} else if (line[x].mode & ATTR_WDUMMY) {
+		line[x-1].u = ' ';
+		line[x-1].mode &= ~ATTR_WIDE;
 	}
 
 	term.dirty[y] = 1;
-	term.line[y][x] = *attr;
-	term.line[y][x].u = u;
+	line[x] = *attr;
+	line[x].u = u;
 }
 
 void
 tclearregion(int x1, int y1, int x2, int y2)
 {
-	int x, y, temp;
+	int x, y, L, S, temp;
 	Glyph *gp;
 
 	if (x1 > x2)
@@ -1320,15 +1411,16 @@ tclearregion(int x1, int y1, int x2, int y2)
 	if (y1 > y2)
 		temp = y1, y1 = y2, y2 = temp;
 
-	LIMIT(x1, 0, term.col-1);
-	LIMIT(x2, 0, term.col-1);
+	LIMIT(x1, 0, term.linelen-1);
+	LIMIT(x2, 0, term.linelen-1);
 	LIMIT(y1, 0, term.row-1);
 	LIMIT(y2, 0, term.row-1);
 
+	L = TLINEOFFSET(y1);
 	for (y = y1; y <= y2; y++) {
 		term.dirty[y] = 1;
 		for (x = x1; x <= x2; x++) {
-			gp = &term.line[y][x];
+			gp = &TSCREEN.buffer[L][x];
 			if (selected(x, y))
 				selclear();
 			gp->fg = term.c.attr.fg;
@@ -1336,6 +1428,7 @@ tclearregion(int x1, int y1, int x2, int y2)
 			gp->mode = 0;
 			gp->u = ' ';
 		}
+		L = (L + 1) % TSCREEN.size;
 	}
 }
 
@@ -1350,7 +1443,7 @@ tdeletechar(int n)
 	dst = term.c.x;
 	src = term.c.x + n;
 	size = term.col - src;
-	line = term.line[term.c.y];
+	line = TLINE(term.c.y);
 
 	memmove(&line[dst], &line[src], size * sizeof(Glyph));
 	tclearregion(term.col-n, term.c.y, term.col-1, term.c.y);
@@ -1367,7 +1460,7 @@ tinsertblank(int n)
 	dst = term.c.x + n;
 	src = term.c.x;
 	size = term.col - dst;
-	line = term.line[term.c.y];
+	line = TLINE(term.c.y);
 
 	memmove(&line[dst], &line[src], size * sizeof(Glyph));
 	tclearregion(src, term.c.y, dst - 1, term.c.y);
@@ -2175,7 +2268,7 @@ tdumpline(int n)
 	char buf[UTF_SIZ];
 	const Glyph *bp, *end;
 
-	bp = &term.line[n][0];
+	bp = &TLINE(n)[0];
 	end = &bp[MIN(tlinelen(n), term.col) - 1];
 	if (bp != end || bp->u != ' ') {
 		for ( ; bp <= end; ++bp)
@@ -2562,11 +2655,11 @@ check_control_code:
 	if (selected(term.c.x, term.c.y))
 		selclear();
 
-	gp = &term.line[term.c.y][term.c.x];
+	gp = &TLINE(term.c.y)[term.c.x];
 	if (IS_SET(MODE_WRAP) && (term.c.state & CURSOR_WRAPNEXT)) {
 		gp->mode |= ATTR_WRAP;
 		tnewline(1);
-		gp = &term.line[term.c.y][term.c.x];
+		gp = &TLINE(term.c.y)[term.c.x];
 	}
 
 	if (IS_SET(MODE_INSERT) && term.c.x+width < term.col) {
@@ -2579,7 +2672,7 @@ check_control_code:
 			tnewline(1);
 		else
 			tmoveto(term.col - width, term.c.y);
-		gp = &term.line[term.c.y][term.c.x];
+		gp = &TLINE(term.c.y)[term.c.x];
 	}
 
 	tsetchar(u, &term.c.attr, term.c.x, term.c.y);
@@ -2610,6 +2703,11 @@ twrite(const char *buf, int buflen, int show_ctrl)
 	Rune u;
 	int n;
 
+	if (TSCREEN.off) {
+		TSCREEN.off = 0;
+		tfulldirt();
+	}
+
 	for (n = 0; n < buflen; n += charsize) {
 		if (IS_SET(MODE_UTF8)) {
 			/* process a complete utf8 char */
@@ -2636,56 +2734,85 @@ twrite(const char *buf, int buflen, int show_ctrl)
 }
 
 void
-tresize(int col, int row)
+clearline(Line line, Glyph g, int x, int xend)
 {
 	int i;
+	g.mode = 0;
+	g.u = ' ';
+	for (i = x; i < xend; ++i) {
+		line[i] = g;
+	}
+}
+
+Line
+ensureline(Line line)
+{
+	if (!line) {
+		line = xmalloc(term.linelen * sizeof(Glyph));
+	}
+	return line;
+}
+
+void
+tresize(int col, int row)
+{
+	int i, j;
 	int minrow = MIN(row, term.row);
 	int mincol = MIN(col, term.col);
+	int linelen = MAX(col, term.linelen);
 	int *bp;
-	TCursor c;
 
-	if (col < 1 || row < 1) {
+	if (col < 1 || row < 1 || row > HISTSIZE) {
 		fprintf(stderr,
 		        "tresize: error resizing to %dx%d\n", col, row);
 		return;
 	}
 
-	/*
-	 * slide screen to keep cursor where we expect it -
-	 * tscrollup would work here, but we can optimize to
-	 * memmove because we're freeing the earlier lines
-	 */
-	for (i = 0; i <= term.c.y - row; i++) {
-		free(term.line[i]);
-		free(term.alt[i]);
+	/* Shift buffer to keep the cursor where we expect it */
+	if (row <= term.c.y) {
+		term.screen[0].cur = (term.screen[0].cur - row + term.c.y + 1) % term.screen[0].size;
 	}
-	/* ensure that both src and dst are not NULL */
-	if (i > 0) {
-		memmove(term.line, term.line + i, row * sizeof(Line));
-		memmove(term.alt, term.alt + i, row * sizeof(Line));
+
+	/* Resize and clear line buffers as needed */
+	if (linelen > term.linelen) {
+		for (i = 0; i < term.screen[0].size; ++i) {
+			if (term.screen[0].buffer[i]) {
+				term.screen[0].buffer[i] = xrealloc(term.screen[0].buffer[i], linelen * sizeof(Glyph));
+				clearline(term.screen[0].buffer[i], term.c.attr, term.linelen, linelen);
+			}
+		}
+		for (i = 0; i < minrow; ++i) {
+			term.screen[1].buffer[i] = xrealloc(term.screen[1].buffer[i], linelen * sizeof(Glyph));
+			clearline(term.screen[1].buffer[i], term.c.attr, term.linelen, linelen);
+		}
 	}
-	for (i += row; i < term.row; i++) {
-		free(term.line[i]);
-		free(term.alt[i]);
+	/* Allocate all visible lines for regular line buffer */
+	for (j = term.screen[0].cur, i = 0; i < row; ++i, j = (j + 1) % term.screen[0].size)
+	{
+		if (!term.screen[0].buffer[j]) {
+			term.screen[0].buffer[j] = xmalloc(linelen * sizeof(Glyph));
+		}
+		if (i >= term.row) {
+			clearline(term.screen[0].buffer[j], term.c.attr, 0, linelen);
+		}
+	}
+	/* Resize alt screen */
+	term.screen[1].cur = 0;
+	term.screen[1].size = row;
+	for (i = row; i < term.row; ++i) {
+		free(term.screen[1].buffer[i]);
+	}
+	term.screen[1].buffer = xrealloc(term.screen[1].buffer, row * sizeof(Line));
+	for (i = term.row; i < row; ++i) {
+		term.screen[1].buffer[i] = xmalloc(linelen * sizeof(Glyph));
+		clearline(term.screen[1].buffer[i], term.c.attr, 0, linelen);
 	}
 
 	/* resize to new height */
-	term.line = xrealloc(term.line, row * sizeof(Line));
-	term.alt  = xrealloc(term.alt,  row * sizeof(Line));
 	term.dirty = xrealloc(term.dirty, row * sizeof(*term.dirty));
 	term.tabs = xrealloc(term.tabs, col * sizeof(*term.tabs));
 
-	/* 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));
-		term.alt[i]  = xrealloc(term.alt[i],  col * sizeof(Glyph));
-	}
-
-	/* allocate any new rows */
-	for (/* i = minrow */; i < row; i++) {
-		term.line[i] = xmalloc(col * sizeof(Glyph));
-		term.alt[i] = xmalloc(col * sizeof(Glyph));
-	}
+	/* fix tabstops */
 	if (col > term.col) {
 		bp = term.tabs + term.col;
 
@@ -2695,26 +2822,16 @@ tresize(int col, int row)
 		for (bp += tabspaces; bp < term.tabs + col; bp += tabspaces)
 			*bp = 1;
 	}
+
 	/* update terminal size */
 	term.col = col;
 	term.row = row;
+	term.linelen = linelen;
 	/* reset scrolling region */
 	tsetscroll(0, row-1);
 	/* make use of the LIMIT in tmoveto */
 	tmoveto(term.c.x, term.c.y);
-	/* Clearing both screens (it makes dirty all lines) */
-	c = term.c;
-	for (i = 0; i < 2; i++) {
-		if (mincol < col && 0 < minrow) {
-			tclearregion(mincol, 0, col - 1, minrow - 1);
-		}
-		if (0 < col && minrow < row) {
-			tclearregion(0, minrow, col - 1, row - 1);
-		}
-		tswapscreen();
-		tcursor(CURSOR_LOAD);
-	}
-	term.c = c;
+	tfulldirt();
 }
 
 void
@@ -2726,14 +2843,15 @@ resettitle(void)
 void
 drawregion(int x1, int y1, int x2, int y2)
 {
-	int y;
+	int y, L;
 
+	L = TLINEOFFSET(y1);
 	for (y = y1; y < y2; y++) {
-		if (!term.dirty[y])
-			continue;
-
-		term.dirty[y] = 0;
-		xdrawline(term.line[y], x1, y, x2);
+		if (term.dirty[y]) {
+			term.dirty[y] = 0;
+			xdrawline(TSCREEN.buffer[L], x1, y, x2);
+		}
+		L = (L + 1) % TSCREEN.size;
 	}
 }
 
@@ -2748,14 +2866,15 @@ draw(void)
 	/* adjust cursor position */
 	LIMIT(term.ocx, 0, term.col-1);
 	LIMIT(term.ocy, 0, term.row-1);
-	if (term.line[term.ocy][term.ocx].mode & ATTR_WDUMMY)
+	if (TLINE(term.ocy)[term.ocx].mode & ATTR_WDUMMY)
 		term.ocx--;
-	if (term.line[term.c.y][cx].mode & ATTR_WDUMMY)
+	if (TLINE(term.c.y)[cx].mode & ATTR_WDUMMY)
 		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 (TSCREEN.off == 0)
+		xdrawcursor(cx, term.c.y, TLINE(term.c.y)[cx],
+				term.ocx, term.ocy, TLINE(term.ocy)[term.ocx]);
 	term.ocx = cx;
 	term.ocy = term.c.y;
 	xfinishdraw();

st.h

@@ -19,6 +19,7 @@
 
 #define TRUECOLOR(r,g,b)	(1 << 24 | (r) << 16 | (g) << 8 | (b))
 #define IS_TRUECOL(x)		(1 << 24 & (x))
+#define HISTSIZE            2000
 
 enum glyph_attribute {
 	ATTR_NULL       = 0,

x.c

@@ -59,6 +59,8 @@ static void zoom(const Arg *);
 static void zoomabs(const Arg *);
 static void zoomreset(const Arg *);
 static void ttysend(const Arg *);
+void kscrollup(const Arg *);
+void kscrolldown(const Arg *);
 
 /* config.h for applying patches and the configuration. */
 #include "config.h"
@@ -81,6 +83,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 */
@@ -332,7 +335,7 @@ ttysend(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;
 }
@@ -340,7 +343,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;
 }
@@ -749,6 +752,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);
@@ -879,8 +885,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;
@@ -1162,8 +1168,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 + 2 * borderpx + cols * win.cw;
+	win.h = 2 * win.vborderpx + 2 * borderpx + rows * win.ch;
 	if (xw.gm & XNegative)
 		xw.l += DisplayWidth(xw.dpy, xw.scr) - win.w - 2;
 	if (xw.gm & YNegative)
@@ -1255,7 +1261,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;
@@ -1388,7 +1394,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;
@@ -1478,17 +1484,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.hborderpx,
 			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.vborderpx);
+	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. */
@@ -1582,35 +1588,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);
 	}
 }