update 2026HEADmaster

13 files changed, 3422 insertions, 0 deletions

diff --git a/patches/x11-misc/dmenu/0001-synchronous-over-async.patch b/patches/x11-misc/dmenu/0001-synchronous-over-async.patch
new file mode 100644
index 0000000..f7ecbb7
--- /dev/null
+++ b/patches/x11-misc/dmenu/0001-synchronous-over-async.patch
@@ -0,0 +1,8 @@
+diff --git a/dmenu_run b/dmenu_run
+index 834ede5..56fc654 100755
+--- a/dmenu_run
++++ b/dmenu_run
+@@ -1,2 +1,2 @@
+ #!/bin/sh
+-dmenu_path | dmenu "$@" | ${SHELL:-"/bin/sh"} &
++dmenu_path | dmenu "$@" | ${SHELL:-"/bin/sh"}
diff --git a/patches/x11-misc/xscreensaver/0005-xscreensaver-systemd-no-systemd.diff b/patches/x11-misc/xscreensaver/0005-xscreensaver-systemd-no-systemd.diff
new file mode 100644
index 0000000..fced70c
--- /dev/null
+++ b/patches/x11-misc/xscreensaver/0005-xscreensaver-systemd-no-systemd.diff
@@ -0,0 +1,116 @@
+diff --git a/driver/xscreensaver-systemd.c b/driver/xscreensaver-systemd.c
+index f9998f7..7433900 100644
+--- a/driver/xscreensaver-systemd.c
++++ b/driver/xscreensaver-systemd.c
+@@ -471,7 +471,7 @@ xscreensaver_command (const char *cmd)
+   if (rc == -1)
+     fprintf (stderr, "%s: exec failed: %s\n", blurb(), buf);
+   else if (WEXITSTATUS(rc) != 0)
+-    fprintf (stderr, "%s: exec: \"%s\" exited with status %d\n", 
++    fprintf (stderr, "%s: exec: \"%s\" exited with status %d\n",
+              blurb(), buf, WEXITSTATUS(rc));
+ }
+ 
+@@ -501,14 +501,14 @@ dbus_send (sd_bus *bus, const char *dest, const char *path,
+ 
+   rc = sd_bus_call (bus, m, -1, &error, &reply);
+   if (rc < 0) {
+-    fprintf (stderr, "%s: dbus_send: call failed: %s.%s: %s\n", 
++    fprintf (stderr, "%s: dbus_send: call failed: %s.%s: %s\n",
+              blurb(), interface, msg, strerror(-rc));
+     return 0;
+   }
+ 
+   rc = sd_bus_message_read (reply, "s", &ret);
+   if (rc < 0) {
+-    fprintf (stderr, "%s: dbus_send: failed to read reply: %s.%s: %s\n", 
++    fprintf (stderr, "%s: dbus_send: failed to read reply: %s.%s: %s\n",
+              blurb(), interface, msg, strerror(-rc));
+     return 0;
+   }
+@@ -531,12 +531,12 @@ xscreensaver_register_sleep_lock (struct handler_ctx *ctx)
+                                DBUS_SD_METHOD_WHAT, DBUS_SD_METHOD_WHO,
+                                DBUS_SD_METHOD_WHY, DBUS_SD_METHOD_MODE);
+   if (rc < 0) {
+-    fprintf (stderr, "%s: inhibit sleep failed: %s\n", 
++    fprintf (stderr, "%s: inhibit sleep failed: %s\n",
+              blurb(), error.message);
+     goto DONE;
+   }
+ 
+-  /* Save the lock fd and explicitly take a ref to the lock message. */
++  // Save the lock fd and explicitly take a ref to the lock message.
+   rc = sd_bus_message_read (reply, "h", &fd);
+   if (rc < 0 || fd < 0) {
+     fprintf (stderr, "%s: inhibit sleep failed: no lock fd: %s\n",
+@@ -550,7 +550,7 @@ xscreensaver_register_sleep_lock (struct handler_ctx *ctx)
+  DONE:
+   sd_bus_error_free (&error);
+ 
+-  return rc;
++  return 0;
+ }
+ 
+ 
+@@ -984,7 +984,7 @@ xscreensaver_kde_inhibitor_changed_cb (sd_bus_message *m, void *arg,
+ 
+   rc = sd_bus_call (bus, m, -1, &error, &reply);
+   if (rc < 0) {
+-    fprintf (stderr, "%s: KDE: call failed: %s.%s: %s\n", 
++    fprintf (stderr, "%s: KDE: call failed: %s.%s: %s\n",
+              blurb(), interface, msg, strerror(-rc));
+     return rc;
+   }
+@@ -994,7 +994,7 @@ xscreensaver_kde_inhibitor_changed_cb (sd_bus_message *m, void *arg,
+   /* It's an array of an arbitrary number of structs of 2 strings each. */
+   rc = sd_bus_message_enter_container (m, 'a', "(ss)");
+   if (rc < 0) {
+-    fprintf (stderr, "%s: KDE: enter container failed: %s.%s: %s\n", 
++    fprintf (stderr, "%s: KDE: enter container failed: %s.%s: %s\n",
+              blurb(), interface, msg, strerror(-rc));
+     return rc;
+   }
+@@ -1019,7 +1019,7 @@ xscreensaver_kde_inhibitor_changed_cb (sd_bus_message *m, void *arg,
+ 
+     rc = sd_bus_message_read (m, "(ss)", &appname, &reason);
+     if (rc < 0) {
+-      fprintf (stderr, "%s: KDE: message read failed: %s.%s: %s\n", 
++      fprintf (stderr, "%s: KDE: message read failed: %s.%s: %s\n",
+                blurb(), interface, msg, strerror(-rc));
+       return rc;
+     }
+@@ -1179,14 +1179,14 @@ service_exists_p (sd_bus *bus, const char *name)
+ 
+   rc = sd_bus_call (bus, m, -1, &error, &reply);
+   if (rc < 0) {
+-    fprintf (stderr, "%s: dbus_send: call failed: %s.%s: %s\n", 
++    fprintf (stderr, "%s: dbus_send: call failed: %s.%s: %s\n",
+              blurb(), interface, msg, strerror(-rc));
+     return 0;
+   }
+ 
+   rc = sd_bus_message_read (reply, "b", &ret);
+   if (rc < 0) {
+-    fprintf (stderr, "%s: dbus_send: failed to read reply: %s.%s: %s\n", 
++    fprintf (stderr, "%s: dbus_send: failed to read reply: %s.%s: %s\n",
+              blurb(), interface, msg, strerror(-rc));
+     return 0;
+   }
+@@ -1274,7 +1274,7 @@ xscreensaver_systemd_loop (void)
+     }
+   }
+ 
+-    
++
+   /* Register ourselves as "org.freedesktop.ScreenSaver" if possible.
+      If "org.gnome.SessionManager" or "org.kde.Solid.PowerManagement.
+      PolicyAgent" are registered, this is optional; otherwise it is
+@@ -1333,7 +1333,7 @@ xscreensaver_systemd_loop (void)
+       now = time ((time_t *) 0);
+       if (now >= start + timeout)
+         break;
+-      
++
+       retries++;
+       sleep (3);
+     }
diff --git a/patches/x11-terms/st/00-st-scrollback.diff b/patches/x11-terms/st/00-st-scrollback.diff
new file mode 100644
index 0000000..f9782e8
--- /dev/null
+++ b/patches/x11-terms/st/00-st-scrollback.diff
@@ -0,0 +1,351 @@
+diff --git a/config.def.h b/config.def.h
+index 2cd740a..40b7d93 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..2478942 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 */
+@@ -185,8 +192,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);
+@@ -409,10 +416,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;
+@@ -521,7 +528,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 +543,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 +571,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 +609,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;
+ 
+@@ -844,6 +851,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);
+@@ -1055,13 +1065,53 @@ 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);
+ 
+@@ -1071,17 +1121,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);
+ 
+@@ -1091,7 +1152,8 @@ tscrollup(int orig, int n)
+ 		term.line[i+n] = temp;
+ 	}
+ 
+-	selscroll(orig, -n);
++	if (term.scr == 0)
++		selscroll(orig, -n);
+ }
+ 
+ void
+@@ -1120,7 +1182,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++;
+ 	}
+@@ -1285,14 +1347,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
+@@ -1730,11 +1792,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]);
++		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);
+@@ -2306,7 +2368,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);
+ 		}
+@@ -2319,7 +2381,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);
+ 		}
+@@ -2542,7 +2604,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;
+@@ -2579,6 +2641,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));
+@@ -2637,7 +2707,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);
+ 	}
+ }
+ 
+@@ -2658,8 +2728,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 fd3b0d8..818a6f8 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/patches/x11-terms/st/01-st-scrollback-reflow.diff b/patches/x11-terms/st/01-st-scrollback-reflow.diff
new file mode 100644
index 0000000..bfd3d0d
--- /dev/null
+++ b/patches/x11-terms/st/01-st-scrollback-reflow.diff
@@ -0,0 +1,1626 @@
+diff --git a/st.c b/st.c
+index 2478942..2b86d23 100644
+--- a/st.c
++++ b/st.c
+@@ -36,6 +36,7 @@
+ #define STR_BUF_SIZ   ESC_BUF_SIZ
+ #define STR_ARG_SIZ   ESC_ARG_SIZ
+ #define HISTSIZE      2000
++#define RESIZEBUFFER  1000
+ 
+ /* macros */
+ #define IS_SET(flag)		((term.mode & (flag)) != 0)
+@@ -43,9 +44,21 @@
+ #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])
++#define TLINE(y) ( \
++	(y) < term.scr ? term.hist[(term.histi + (y) - term.scr + 1 + HISTSIZE) % HISTSIZE] \
++	               : term.line[(y) - term.scr] \
++)
++
++#define TLINEABS(y) ( \
++	(y) < 0 ? term.hist[(term.histi + (y) + 1 + HISTSIZE) % HISTSIZE] : term.line[(y)] \
++)
++
++#define UPDATEWRAPNEXT(alt, col) do { \
++	if ((term.c.state & CURSOR_WRAPNEXT) && term.c.x + term.wrapcwidth[alt] < col) { \
++		term.c.x += term.wrapcwidth[alt]; \
++		term.c.state &= ~CURSOR_WRAPNEXT; \
++	} \
++} while (0);
+ 
+ enum term_mode {
+ 	MODE_WRAP        = 1 << 0,
+@@ -57,6 +70,12 @@ enum term_mode {
+ 	MODE_UTF8        = 1 << 6,
+ };
+ 
++enum scroll_mode {
++	SCROLL_RESIZE = -1,
++	SCROLL_NOSAVEHIST = 0,
++	SCROLL_SAVEHIST = 1
++};
++
+ enum cursor_movement {
+ 	CURSOR_SAVE,
+ 	CURSOR_LOAD
+@@ -118,10 +137,11 @@ typedef struct {
+ 	int row;      /* nb row */
+ 	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 histi;           /* history index */
++	int histf;           /* nb history available */
++	int scr;             /* scroll back */
++	int wrapcwidth[2];   /* used in updating WRAPNEXT when resizing */
+ 	int *dirty;   /* dirtyness of lines */
+ 	TCursor c;    /* cursor */
+ 	int ocx;      /* old cursor col */
+@@ -179,26 +199,37 @@ static void tprinter(char *, size_t);
+ static void tdumpsel(void);
+ static void tdumpline(int);
+ static void tdump(void);
+-static void tclearregion(int, int, int, int);
++static void tclearregion(int, int, int, int, int);
+ static void tcursor(int);
++static void tclearglyph(Glyph *, int);
++static void tresetcursor(void);
+ static void tdeletechar(int);
+ static void tdeleteline(int);
+ static void tinsertblank(int);
+ static void tinsertblankline(int);
+-static int tlinelen(int);
++static int tlinelen(Line len);
++static int tiswrapped(Line line);
++static char *tgetglyphs(char *, const Glyph *, const Glyph *);
++static size_t tgetline(char *, const Glyph *);
+ static void tmoveto(int, int);
+ static void tmoveato(int, int);
+ 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, int, int);
++static void tscrolldown(int, int);
++static void treflow(int, int);
++static void rscrolldown(int);
++static void tresizedef(int, int);
++static void tresizealt(int, int);
+ static void tsetattr(const int *, int);
+ static void tsetchar(Rune, const Glyph *, int, int);
+ static void tsetdirt(int, int);
+ static void tsetscroll(int, int);
+ static void tswapscreen(void);
++static void tloaddefscreen(int, int);
++static void tloadaltscreen(int, int);
+ static void tsetmode(int, int, const int *, int);
+ static int twrite(const char *, int, int);
+ static void tfulldirt(void);
+@@ -212,7 +243,10 @@ static void tstrsequence(uchar);
+ static void drawregion(int, int, int, int);
+ 
+ static void selnormalize(void);
+-static void selscroll(int, int);
++static void selscroll(int, int, int);
++static void selmove(int);
++static void selremove(void);
++static int regionselected(int, int, int, int);
+ static void selsnap(int *, int *, int);
+ 
+ static size_t utf8decode(const char *, Rune *, size_t);
+@@ -412,17 +446,46 @@ selinit(void)
+ }
+ 
+ int
+-tlinelen(int y)
++tlinelen(Line line)
+ {
+-	int i = term.col;
++	int i = term.col - 1;
+ 
+-	if (TLINE(y)[i - 1].mode & ATTR_WRAP)
+-		return i;
++	for (; i >= 0 && !(line[i].mode & (ATTR_SET | ATTR_WRAP)); i--);
++	return i + 1;
++}
+ 
+-	while (i > 0 && TLINE(y)[i - 1].u == ' ')
+-		--i;
++int
++tiswrapped(Line line)
++{
++	int len = tlinelen(line);
+ 
+-	return i;
++	return len > 0 && (line[len - 1].mode & ATTR_WRAP);
++}
++
++char *
++tgetglyphs(char *buf, const Glyph *gp, const Glyph *lgp)
++{
++	while (gp <= lgp)
++		if (gp->mode & ATTR_WDUMMY) {
++			gp++;
++		} else {
++			buf += utf8encode((gp++)->u, buf);
++		}
++	return buf;
++}
++
++size_t
++tgetline(char *buf, const Glyph *fgp)
++{
++	char *ptr;
++	const Glyph *lgp = &fgp[term.col - 1];
++
++	while (lgp > fgp && !(lgp->mode & (ATTR_SET | ATTR_WRAP)))
++		lgp--;
++	ptr = tgetglyphs(buf, fgp, lgp);
++	if (!(lgp->mode & ATTR_WRAP))
++		*(ptr++) = '\n';
++	return ptr - buf;
+ }
+ 
+ void
+@@ -462,10 +525,11 @@ selextend(int col, int row, int type, int done)
+ 
+ 	sel.oe.x = col;
+ 	sel.oe.y = row;
+-	selnormalize();
+ 	sel.type = type;
++	selnormalize();
+ 
+-	if (oldey != sel.oe.y || oldex != sel.oe.x || oldtype != sel.type || sel.mode == SEL_EMPTY)
++	if (oldey != sel.oe.y || oldex != sel.oe.x ||
++	    oldtype != sel.type || sel.mode == SEL_EMPTY)
+ 		tsetdirt(MIN(sel.nb.y, oldsby), MAX(sel.ne.y, oldsey));
+ 
+ 	sel.mode = done ? SEL_IDLE : SEL_READY;
+@@ -474,54 +538,62 @@ selextend(int col, int row, int type, int done)
+ void
+ selnormalize(void)
+ {
+-	int i;
++    int i;
+ 
+-	if (sel.type == SEL_REGULAR && sel.ob.y != sel.oe.y) {
+-		sel.nb.x = sel.ob.y < sel.oe.y ? sel.ob.x : sel.oe.x;
+-		sel.ne.x = sel.ob.y < sel.oe.y ? sel.oe.x : sel.ob.x;
+-	} else {
+-		sel.nb.x = MIN(sel.ob.x, sel.oe.x);
+-		sel.ne.x = MAX(sel.ob.x, sel.oe.x);
+-	}
+-	sel.nb.y = MIN(sel.ob.y, sel.oe.y);
+-	sel.ne.y = MAX(sel.ob.y, sel.oe.y);
++    if (sel.type == SEL_REGULAR && sel.ob.y != sel.oe.y) {
++        sel.nb.x = sel.ob.y < sel.oe.y ? sel.ob.x : sel.oe.x;
++        sel.ne.x = sel.ob.y < sel.oe.y ? sel.oe.x : sel.ob.x;
++    } else {
++        sel.nb.x = MIN(sel.ob.x, sel.oe.x);
++        sel.ne.x = MAX(sel.ob.x, sel.oe.x);
++    }
++    sel.nb.y = MIN(sel.ob.y, sel.oe.y);
++    sel.ne.y = MAX(sel.ob.y, sel.oe.y);
+ 
+-	selsnap(&sel.nb.x, &sel.nb.y, -1);
+-	selsnap(&sel.ne.x, &sel.ne.y, +1);
++    selsnap(&sel.nb.x, &sel.nb.y, -1);
++    selsnap(&sel.ne.x, &sel.ne.y, +1);
+ 
+-	/* expand selection over line breaks */
+-	if (sel.type == SEL_RECTANGULAR)
+-		return;
+-	i = tlinelen(sel.nb.y);
+-	if (i < sel.nb.x)
+-		sel.nb.x = i;
+-	if (tlinelen(sel.ne.y) <= sel.ne.x)
+-		sel.ne.x = term.col - 1;
++    /* expand selection over line breaks */
++    if (sel.type == SEL_RECTANGULAR)
++        return;
++
++    i = tlinelen(TLINE(sel.nb.y));
++    if (sel.nb.x > i)
++        sel.nb.x = i;
++    if (sel.ne.x >= tlinelen(TLINE(sel.ne.y)))
++        sel.ne.x = term.col - 1;
+ }
+ 
+-int
+-selected(int x, int y)
++    int
++regionselected(int x1, int y1, int x2, int y2)
+ {
+-	if (sel.mode == SEL_EMPTY || sel.ob.x == -1 ||
+-			sel.alt != IS_SET(MODE_ALTSCREEN))
+-		return 0;
++    if (sel.ob.x == -1 || sel.mode == SEL_EMPTY ||
++            sel.alt != IS_SET(MODE_ALTSCREEN) || sel.nb.y > y2 || sel.ne.y < y1)
++        return 0;
+ 
+-	if (sel.type == SEL_RECTANGULAR)
+-		return BETWEEN(y, sel.nb.y, sel.ne.y)
+-		    && BETWEEN(x, sel.nb.x, sel.ne.x);
++    return (sel.type == SEL_RECTANGULAR) ? sel.nb.x <= x2 && sel.ne.x >= x1
++        : (sel.nb.y != y2 || sel.nb.x <= x2) &&
++        (sel.ne.y != y1 || sel.ne.x >= x1);
++}
+ 
+-	return BETWEEN(y, sel.nb.y, sel.ne.y)
+-	    && (y != sel.nb.y || x >= sel.nb.x)
+-	    && (y != sel.ne.y || x <= sel.ne.x);
++    int
++selected(int x, int y)
++{
++    return regionselected(x, y, x, y);
+ }
+ 
++
+ void
+ selsnap(int *x, int *y, int direction)
+ {
+ 	int newx, newy, xt, yt;
++	int rtop = 0, rbot = term.row - 1;
+ 	int delim, prevdelim;
+ 	const Glyph *gp, *prevgp;
+ 
++	if (!IS_SET(MODE_ALTSCREEN))
++		rtop += -term.histf + term.scr, rbot += term.scr;
++
+ 	switch (sel.snap) {
+ 	case SNAP_WORD:
+ 		/*
+@@ -536,7 +608,7 @@ selsnap(int *x, int *y, int direction)
+ 			if (!BETWEEN(newx, 0, term.col - 1)) {
+ 				newy += direction;
+ 				newx = (newx + term.col) % term.col;
+-				if (!BETWEEN(newy, 0, term.row - 1))
++				if (!BETWEEN(newy, rtop, rbot))
+ 					break;
+ 
+ 				if (direction > 0)
+@@ -547,13 +619,13 @@ selsnap(int *x, int *y, int direction)
+ 					break;
+ 			}
+ 
+-			if (newx >= tlinelen(newy))
++            if (newx >= tlinelen(TLINE(newy)))
+ 				break;
+ 
+ 			gp = &TLINE(newy)[newx];
+ 			delim = ISDELIM(gp->u);
+-			if (!(gp->mode & ATTR_WDUMMY) && (delim != prevdelim
+-					|| (delim && gp->u != prevgp->u)))
++			if (!(gp->mode & ATTR_WDUMMY) && (delim != prevdelim ||
++			    (delim && !(gp->u == ' ' && prevgp->u == ' '))))
+ 				break;
+ 
+ 			*x = newx;
+@@ -568,20 +640,16 @@ selsnap(int *x, int *y, int direction)
+ 		 * has set ATTR_WRAP at its end. Then the whole next or
+ 		 * previous line will be selected.
+ 		 */
+-		*x = (direction < 0) ? 0 : term.col - 1;
+-		if (direction < 0) {
+-			for (; *y > 0; *y += direction) {
+-				if (!(TLINE(*y-1)[term.col-1].mode
+-						& ATTR_WRAP)) {
+-					break;
+-				}
++        *x = (direction < 0) ? 0 : term.col - 1;
++        if (direction < 0) {
++            for (; *y > rtop; *y -= 1) {
++                if (!tiswrapped(TLINE(*y-1)))
++                        break;
+ 			}
+ 		} else if (direction > 0) {
+-			for (; *y < term.row-1; *y += direction) {
+-				if (!(TLINE(*y)[term.col-1].mode
+-						& ATTR_WRAP)) {
++			for (; *y < rbot; *y += 1) {
++				if (!tiswrapped(TLINE(*y)))
+ 					break;
+-				}
+ 			}
+ 		}
+ 		break;
+@@ -592,39 +660,34 @@ char *
+ getsel(void)
+ {
+ 	char *str, *ptr;
+-	int y, bufsize, lastx, linelen;
+-	const Glyph *gp, *last;
++	int y, lastx, linelen;
++	const Glyph *gp, *lgp;
+ 
+-	if (sel.ob.x == -1)
++	if (sel.ob.x == -1 || sel.alt != IS_SET(MODE_ALTSCREEN))
+ 		return NULL;
+ 
+-	bufsize = (term.col+1) * (sel.ne.y-sel.nb.y+1) * UTF_SIZ;
+-	ptr = str = xmalloc(bufsize);
++	str = xmalloc((term.col + 1) * (sel.ne.y - sel.nb.y + 1) * UTF_SIZ);
++	ptr = str;
+ 
+ 	/* append every set & selected glyph to the selection */
+ 	for (y = sel.nb.y; y <= sel.ne.y; y++) {
+-		if ((linelen = tlinelen(y)) == 0) {
++		Line line = TLINE(y);
++
++		if ((linelen = tlinelen(line)) == 0) {
+ 			*ptr++ = '\n';
+ 			continue;
+ 		}
+ 
+ 		if (sel.type == SEL_RECTANGULAR) {
+-			gp = &TLINE(y)[sel.nb.x];
++			gp = &line[sel.nb.x];
+ 			lastx = sel.ne.x;
+ 		} else {
+-			gp = &TLINE(y)[sel.nb.y == y ? sel.nb.x : 0];
++			gp = &line[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)];
+-		while (last >= gp && last->u == ' ')
+-			--last;
++		lgp = &line[MIN(lastx, linelen-1)];
+ 
+-		for ( ; gp <= last; ++gp) {
+-			if (gp->mode & ATTR_WDUMMY)
+-				continue;
+-
+-			ptr += utf8encode(gp->u, ptr);
+-		}
++		ptr = tgetglyphs(ptr, gp, lgp);
+ 
+ 		/*
+ 		 * Copy and pasting of line endings is inconsistent
+@@ -636,10 +699,10 @@ getsel(void)
+ 		 * FIXME: Fix the computer world.
+ 		 */
+ 		if ((y < sel.ne.y || lastx >= linelen) &&
+-		    (!(last->mode & ATTR_WRAP) || sel.type == SEL_RECTANGULAR))
++		    (!(lgp->mode & ATTR_WRAP) || sel.type == SEL_RECTANGULAR))
+ 			*ptr++ = '\n';
+ 	}
+-	*ptr = 0;
++	*ptr = '\0';
+ 	return str;
+ }
+ 
+@@ -648,9 +711,15 @@ selclear(void)
+ {
+ 	if (sel.ob.x == -1)
+ 		return;
++	selremove();
++	tsetdirt(sel.nb.y, sel.ne.y);
++}
++
++void
++selremove(void)
++{
+ 	sel.mode = SEL_IDLE;
+ 	sel.ob.x = -1;
+-	tsetdirt(sel.nb.y, sel.ne.y);
+ }
+ 
+ void
+@@ -851,9 +920,8 @@ void
+ ttywrite(const char *s, size_t n, int may_echo)
+ {
+ 	const char *next;
+-	Arg arg = (Arg) { .i = term.scr };
+ 
+-	kscrolldown(&arg);
++    kscrolldown(&((Arg){ .i = term.scr }));
+ 
+ 	if (may_echo && IS_SET(MODE_ECHO))
+ 		twrite(s, n, 1);
+@@ -990,7 +1058,7 @@ tsetdirtattr(int attr)
+ 	for (i = 0; i < term.row-1; i++) {
+ 		for (j = 0; j < term.col-1; j++) {
+ 			if (term.line[i][j].mode & attr) {
+-				tsetdirt(i, i);
++				term.dirty[i] = 1;
+ 				break;
+ 			}
+ 		}
+@@ -1000,7 +1068,8 @@ tsetdirtattr(int attr)
+ void
+ tfulldirt(void)
+ {
+-	tsetdirt(0, term.row-1);
++    for (int i = 0; i < term.row; i++)
++        term.dirty[i] = 1;
+ }
+ 
+ void
+@@ -1017,162 +1086,261 @@ tcursor(int mode)
+ 	}
+ }
+ 
++void
++tresetcursor(void)
++{
++	term.c = (TCursor){ { .mode = ATTR_NULL, .fg = defaultfg, .bg = defaultbg },
++	                    .x = 0, .y = 0, .state = CURSOR_DEFAULT };
++}
++
+ void
+ treset(void)
+ {
+ 	uint i;
++    int x, y;
+ 
+-	term.c = (TCursor){{
+-		.mode = ATTR_NULL,
+-		.fg = defaultfg,
+-		.bg = defaultbg
+-	}, .x = 0, .y = 0, .state = CURSOR_DEFAULT};
++	tresetcursor();
+ 
+ 	memset(term.tabs, 0, term.col * sizeof(*term.tabs));
+ 	for (i = tabspaces; i < term.col; i += tabspaces)
+ 		term.tabs[i] = 1;
+ 	term.top = 0;
++	term.histf = 0;
++	term.scr = 0;
+ 	term.bot = term.row - 1;
+ 	term.mode = MODE_WRAP|MODE_UTF8;
+ 	memset(term.trantbl, CS_USA, sizeof(term.trantbl));
+ 	term.charset = 0;
+ 
++    selremove();
+ 	for (i = 0; i < 2; i++) {
+-		tmoveto(0, 0);
+-		tcursor(CURSOR_SAVE);
+-		tclearregion(0, 0, term.col-1, term.row-1);
+-		tswapscreen();
++        tcursor(CURSOR_SAVE); /* reset saved cursor */
++        for (y = 0; y < term.row; y++)
++            for (x = 0; x < term.col; x++)
++                tclearglyph(&term.line[y][x], 0);
++        tswapscreen();
+ 	}
++    tfulldirt();
+ }
+ 
+ void
+ tnew(int col, int row)
+ {
+-	term = (Term){ .c = { .attr = { .fg = defaultfg, .bg = defaultbg } } };
+-	tresize(col, row);
+-	treset();
++    int i, j;
++
++    for (i = 0; i < 2; i++) {
++        term.line = xmalloc(row * sizeof(Line));
++        for (j = 0; j < row; j++)
++            term.line[j] = xmalloc(col * sizeof(Glyph));
++        term.col = col, term.row = row;
++        tswapscreen();
++    }
++    term.dirty = xmalloc(row * sizeof(*term.dirty));
++    term.tabs = xmalloc(col * sizeof(*term.tabs));
++    for (i = 0; i < HISTSIZE; i++)
++        term.hist[i] = xmalloc(col * sizeof(Glyph));
++    treset();
+ }
+ 
++/* handle it with care */
+ void
+ tswapscreen(void)
+ {
+-	Line *tmp = term.line;
++	static Line *altline;
++	static int altcol, altrow;
++	Line *tmpline = term.line;
++	int tmpcol = term.col, tmprow = term.row;
+ 
+-	term.line = term.alt;
+-	term.alt = tmp;
++	term.line = altline;
++	term.col = altcol, term.row = altrow;
++	altline = tmpline;
++	altcol = tmpcol, altrow = tmprow;
+ 	term.mode ^= MODE_ALTSCREEN;
+-	tfulldirt();
+ }
+ 
+ void
+-kscrolldown(const Arg* a)
++tloaddefscreen(int clear, int loadcursor)
+ {
+-	int n = a->i;
++	int col, row, alt = IS_SET(MODE_ALTSCREEN);
+ 
+-	if (n < 0)
+-		n = term.row + n;
++	if (alt) {
++		if (clear)
++			tclearregion(0, 0, term.col-1, term.row-1, 1);
++		col = term.col, row = term.row;
++		tswapscreen();
++	}
++	if (loadcursor)
++		tcursor(CURSOR_LOAD);
++	if (alt)
++		tresizedef(col, row);
++}
+ 
+-	if (n > term.scr)
+-		n = term.scr;
++void
++tloadaltscreen(int clear, int savecursor)
++{
++	int col, row, def = !IS_SET(MODE_ALTSCREEN);
+ 
+-	if (term.scr > 0) {
+-		term.scr -= n;
+-		selscroll(0, -n);
+-		tfulldirt();
++	if (savecursor)
++		tcursor(CURSOR_SAVE);
++	if (def) {
++		col = term.col, row = term.row;
++		tswapscreen();
++		term.scr = 0;
++		tresizealt(col, row);
+ 	}
++	if (clear)
++		tclearregion(0, 0, term.col-1, term.row-1, 1);
+ }
+ 
++int
++tisaltscreen(void)
++{
++	return IS_SET(MODE_ALTSCREEN);
++}
++
++
+ void
+-kscrollup(const Arg* a)
++kscrolldown(const Arg* a)
+ {
+-	int n = a->i;
++    int n = a->i;
+ 
+-	if (n < 0)
+-		n = term.row + n;
++    if (!term.scr || IS_SET(MODE_ALTSCREEN))
++        return;
+ 
+-	if (term.scr <= HISTSIZE-n) {
+-		term.scr += n;
+-		selscroll(0, n);
+-		tfulldirt();
+-	}
++    if (n < 0)
++        n = MAX(term.row / -n, 1);
++
++    if (n <= term.scr) {
++        term.scr -= n;
++    } else {
++        n = term.scr;
++        term.scr = 0;
++    }
++	if (sel.ob.x != -1 && !sel.alt)
++		selmove(-n); /* negate change in term.scr */
++	tfulldirt();
+ }
+ 
++
++
+ void
+-tscrolldown(int orig, int n, int copyhist)
++kscrollup(const Arg* a)
+ {
+-	int i;
+-	Line temp;
++    int n = a->i;
+ 
+-	LIMIT(n, 0, term.bot-orig+1);
++    if (!term.histf || IS_SET(MODE_ALTSCREEN))
++        return;
+ 
+-	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;
+-	}
++    if (n < 0)
++        n = MAX(term.row / -n, 1);
+ 
+-	tsetdirt(orig, term.bot-n);
+-	tclearregion(0, term.bot-n+1, term.col-1, term.bot);
++    if (term.scr + n <= term.histf) {
++        term.scr += n;
++    } else {
++        n = term.histf - term.scr;
++        term.scr = term.histf;
++    }
+ 
+-	for (i = term.bot; i >= orig+n; i--) {
+-		temp = term.line[i];
+-		term.line[i] = term.line[i-n];
+-		term.line[i-n] = temp;
+-	}
++    if (sel.ob.x != -1 && !sel.alt)
++        selmove(n); /* negate change in term.scr */
++    tfulldirt();
+ 
+-	if (term.scr == 0)
+-		selscroll(orig, n);
+ }
+ 
+ void
+-tscrollup(int orig, int n, int copyhist)
++tscrolldown(int top, int n)
+ {
+-	int i;
+-	Line temp;
++    int i, bot = term.bot;
++    Line temp;
+ 
+-	LIMIT(n, 0, term.bot-orig+1);
++    if (n <= 0)
++        return;
++    n = MIN(n, bot-top+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;
+-	}
++    tsetdirt(top, bot-n);
++    tclearregion(0, bot-n+1, term.col-1, bot, 1);
+ 
+-	if (term.scr > 0 && term.scr < HISTSIZE)
+-		term.scr = MIN(term.scr + n, HISTSIZE-1);
++    for (i = bot; i >= top+n; i--) {
++        temp = term.line[i];
++        term.line[i] = term.line[i-n];
++        term.line[i-n] = temp;
++    }
+ 
+-	tclearregion(0, orig, term.col-1, orig+n-1);
+-	tsetdirt(orig+n, term.bot);
++    if (sel.ob.x != -1 && sel.alt == IS_SET(MODE_ALTSCREEN))
++        selscroll(top, bot, n);
++}
+ 
+-	for (i = orig; i <= term.bot-n; i++) {
+-		temp = term.line[i];
+-		term.line[i] = term.line[i+n];
+-		term.line[i+n] = temp;
+-	}
++void
++tscrollup(int top, int bot, int n, int mode)
++{
++    int i, j, s;
++    int alt = IS_SET(MODE_ALTSCREEN);
++    int savehist = !alt && top == 0 && mode != SCROLL_NOSAVEHIST;
++    Line temp;
++
++    if (n <= 0)
++        return;
++    n = MIN(n, bot-top+1);
+ 
+-	if (term.scr == 0)
+-		selscroll(orig, -n);
++    if (savehist) {
++        for (i = 0; i < n; i++) {
++            term.histi = (term.histi + 1) % HISTSIZE;
++            temp = term.hist[term.histi];
++            for (j = 0; j < term.col; j++)
++                tclearglyph(&temp[j], 1);
++            term.hist[term.histi] = term.line[i];
++            term.line[i] = temp;
++        }
++        term.histf = MIN(term.histf + n, HISTSIZE);
++        s = n;
++        if (term.scr) {
++            j = term.scr;
++            term.scr = MIN(j + n, HISTSIZE);
++            s = j + n - term.scr;
++        }
++        if (mode != SCROLL_RESIZE)
++            tfulldirt();
++    } else {
++        tclearregion(0, top, term.col-1, top+n-1, 1);
++        tsetdirt(top+n, bot);
++    }
++
++    for (i = top; i <= bot-n; i++) {
++        temp = term.line[i];
++        term.line[i] = term.line[i+n];
++        term.line[i+n] = temp;
++    }
++
++    if (sel.ob.x != -1 && sel.alt == alt) {
++        if (!savehist) {
++            selscroll(top, bot, -n);
++        } else if (s > 0) {
++            selmove(-s);
++            if (-term.scr + sel.nb.y < -term.histf)
++                selremove();
++        }
++    }
+ }
+ 
+ void
+-selscroll(int orig, int n)
++selmove(int n)
++ {
++	sel.ob.y += n, sel.nb.y += n;
++	sel.oe.y += n, sel.ne.y += n;
++}
++
++void
++selscroll(int top, int bot, int n)
+ {
+-	if (sel.ob.x == -1 || sel.alt != IS_SET(MODE_ALTSCREEN))
+-		return;
++    /* turn absolute coordinates into relative */
++    top += term.scr, bot += term.scr;
+ 
+-	if (BETWEEN(sel.nb.y, orig, term.bot) != BETWEEN(sel.ne.y, orig, term.bot)) {
+-		selclear();
+-	} else if (BETWEEN(sel.nb.y, orig, term.bot)) {
+-		sel.ob.y += n;
+-		sel.oe.y += n;
+-		if (sel.ob.y < term.top || sel.ob.y > term.bot ||
+-		    sel.oe.y < term.top || sel.oe.y > term.bot) {
+-			selclear();
+-		} else {
+-			selnormalize();
+-		}
++    if (BETWEEN(sel.nb.y, top, bot) != BETWEEN(sel.ne.y, top, bot)) {
++        selclear();
++    } else if (BETWEEN(sel.nb.y, top, bot)) {
++        selmove(n);
++        if (sel.nb.y < top || sel.ne.y > bot)
++            selclear();
+ 	}
+ }
+ 
+@@ -1182,7 +1350,7 @@ tnewline(int first_col)
+ 	int y = term.c.y;
+ 
+ 	if (y == term.bot) {
+-		tscrollup(term.top, 1, 1);
++		tscrollup(term.top, term.bot, 1, SCROLL_SAVEHIST);
+ 	} else {
+ 		y++;
+ 	}
+@@ -1246,115 +1414,126 @@ tmoveto(int x, int y)
+ void
+ tsetchar(Rune u, const Glyph *attr, int x, int y)
+ {
+-	static const char *vt100_0[62] = { /* 0x41 - 0x7e */
+-		"↑", "↓", "→", "←", "█", "▚", "☃", /* A - G */
+-		0, 0, 0, 0, 0, 0, 0, 0, /* H - O */
+-		0, 0, 0, 0, 0, 0, 0, 0, /* P - W */
+-		0, 0, 0, 0, 0, 0, 0, " ", /* X - _ */
+-		"◆", "▒", "␉", "␌", "␍", "␊", "°", "±", /* ` - g */
+-		"␤", "␋", "┘", "┐", "┌", "└", "┼", "⎺", /* h - o */
+-		"⎻", "─", "⎼", "⎽", "├", "┤", "┴", "┬", /* p - w */
+-		"│", "≤", "≥", "π", "≠", "£", "·", /* x - ~ */
+-	};
++    static const char *vt100_0[62] = { /* 0x41 - 0x7e */
++        "↑", "↓", "→", "←", "█", "▚", "☃", /* A - G */
++        0, 0, 0, 0, 0, 0, 0, 0, /* H - O */
++        0, 0, 0, 0, 0, 0, 0, 0, /* P - W */
++        0, 0, 0, 0, 0, 0, 0, " ", /* X - _ */
++        "◆", "▒", "␉", "␌", "␍", "␊", "°", "±", /* ` - g */
++        "␤", "␋", "┘", "┐", "┌", "└", "┼", "⎺", /* h - o */
++        "⎻", "─", "⎼", "⎽", "├", "┤", "┴", "┬", /* p - w */
++        "│", "≤", "≥", "π", "≠", "£", "·", /* x - ~ */
++    };
+ 
+-	/*
+-	 * The table is proudly stolen from rxvt.
+-	 */
+-	if (term.trantbl[term.charset] == CS_GRAPHIC0 &&
+-	   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 (x+1 < term.col) {
+-			term.line[y][x+1].u = ' ';
+-			term.line[y][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;
+-	}
++    /*
++     * The table is proudly stolen from rxvt.
++     */
++    if (term.trantbl[term.charset] == CS_GRAPHIC0 &&
++            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 (x+1 < term.col) {
++            term.line[y][x+1].u = ' ';
++            term.line[y][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;
++    }
+ 
+-	term.dirty[y] = 1;
+-	term.line[y][x] = *attr;
+-	term.line[y][x].u = u;
++    term.dirty[y] = 1;
++    term.line[y][x] = *attr;
++    term.line[y][x].u = u;
++    term.line[y][x].mode |= ATTR_SET;
+ }
+ 
++
++
+ void
+-tclearregion(int x1, int y1, int x2, int y2)
++tclearglyph(Glyph *gp, int usecurattr)
+ {
+-	int x, y, temp;
+-	Glyph *gp;
++	if (usecurattr) {
++		gp->fg = term.c.attr.fg;
++		gp->bg = term.c.attr.bg;
++	} else {
++		gp->fg = defaultfg;
++		gp->bg = defaultbg;
++	}
++	gp->mode = ATTR_NULL;
++	gp->u = ' ';
++}
+ 
+-	if (x1 > x2)
+-		temp = x1, x1 = x2, x2 = temp;
+-	if (y1 > y2)
+-		temp = y1, y1 = y2, y2 = temp;
+ 
+-	LIMIT(x1, 0, term.col-1);
+-	LIMIT(x2, 0, term.col-1);
+-	LIMIT(y1, 0, term.row-1);
+-	LIMIT(y2, 0, term.row-1);
+ 
+-	for (y = y1; y <= y2; y++) {
++void
++tclearregion(int x1, int y1, int x2, int y2, int usecurattr)
++{
++	int x, y;
++	/* regionselected() takes relative coordinates */
++	if (regionselected(x1+term.scr, y1+term.scr, x2+term.scr, y2+term.scr))
++		selremove();
++
++    for (y = y1; y <= y2; y++) {
+ 		term.dirty[y] = 1;
+-		for (x = x1; x <= x2; x++) {
+-			gp = &term.line[y][x];
+-			if (selected(x, y))
+-				selclear();
+-			gp->fg = term.c.attr.fg;
+-			gp->bg = term.c.attr.bg;
+-			gp->mode = 0;
+-			gp->u = ' ';
+-		}
++		for (x = x1; x <= x2; x++)
++			tclearglyph(&term.line[y][x], usecurattr);
+ 	}
+ }
+ 
+ void
+ tdeletechar(int n)
+ {
+-	int dst, src, size;
+-	Glyph *line;
+-
+-	LIMIT(n, 0, term.col - term.c.x);
++    int src, dst, size;
++    Line line;
+ 
+-	dst = term.c.x;
+-	src = term.c.x + n;
+-	size = term.col - src;
+-	line = term.line[term.c.y];
++    if (n <= 0)
++        return;
+ 
+-	memmove(&line[dst], &line[src], size * sizeof(Glyph));
+-	tclearregion(term.col-n, term.c.y, term.col-1, term.c.y);
++    dst = term.c.x;
++    src = MIN(term.c.x + n, term.col);
++    size = term.col - src;
++    if (size > 0) {
++        /*
++         * otherwise src would point beyond the array
++         * https://stackoverflow.com/questions/29844298
++         */
++        line = term.line[term.c.y];
++        memmove(&line[dst], &line[src], size * sizeof(Glyph));
++    }
++    tclearregion(dst + size, term.c.y, term.col - 1, term.c.y, 1);
+ }
+ 
+ void
+ tinsertblank(int n)
+ {
+-	int dst, src, size;
+-	Glyph *line;
+-
+-	LIMIT(n, 0, term.col - term.c.x);
+-
+-	dst = term.c.x + n;
+-	src = term.c.x;
+-	size = term.col - dst;
+-	line = term.line[term.c.y];
++    int src, dst, size;
++    Line line;
+ 
+-	memmove(&line[dst], &line[src], size * sizeof(Glyph));
+-	tclearregion(src, term.c.y, dst - 1, term.c.y);
++    if (n <= 0)
++        return;
++    dst = MIN(term.c.x + n, term.col);
++    src = term.c.x;
++    size = term.col - dst;
++    if (size > 0) { /* otherwise dst would point beyond the array */
++        line = term.line[term.c.y];
++        memmove(&line[dst], &line[src], size * sizeof(Glyph));
++    }
++    tclearregion(src, term.c.y, dst - 1, term.c.y, 1);
+ }
+ 
+ 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, term.bot, n, SCROLL_NOSAVEHIST);
+ }
+ 
+ int32_t
+@@ -1528,7 +1707,7 @@ tsetscroll(int t, int b)
+ void
+ tsetmode(int priv, int set, const int *args, int narg)
+ {
+-	int alt; const int *lim;
++	const int *lim;
+ 
+ 	for (lim = args + narg; args < lim; ++args) {
+ 		if (priv) {
+@@ -1589,26 +1768,20 @@ tsetmode(int priv, int set, const int *args, int narg)
+ 				xsetmode(set, MODE_8BIT);
+ 				break;
+ 			case 1049: /* swap screen & set/restore cursor as xterm */
+-				if (!allowaltscreen)
+-					break;
+-				tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD);
+-				/* FALLTHROUGH */
+ 			case 47: /* swap screen */
+-			case 1047:
++			case 1047: /*swap screen, clearing alternate screen */
+ 				if (!allowaltscreen)
+ 					break;
+-				alt = IS_SET(MODE_ALTSCREEN);
+-				if (alt) {
+-					tclearregion(0, 0, term.col-1,
+-							term.row-1);
+-				}
+-				if (set ^ alt) /* set is always 1 or 0 */
+-					tswapscreen();
+-				if (*args != 1049)
+-					break;
++				if (set)
++					tloadaltscreen(*args == 1049, *args == 1049);
++				else
++					tloaddefscreen(*args == 1047, *args == 1049);
++				break;
+ 				/* FALLTHROUGH */
+-			case 1048:
+-				tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD);
++            case 1048:
++                if (!allowaltscreen)
++                    break;
++                tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD);
+ 				break;
+ 			case 2004: /* 2004: bracketed paste mode */
+ 				xsetmode(set, MODE_BRCKTPASTE);
+@@ -1659,7 +1832,7 @@ void
+ csihandle(void)
+ {
+ 	char buf[40];
+-	int len;
++	int n, x;
+ 
+ 	switch (csiescseq.mode[0]) {
+ 	default:
+@@ -1757,19 +1930,29 @@ csihandle(void)
+ 	case 'J': /* ED -- Clear screen */
+ 		switch (csiescseq.arg[0]) {
+ 		case 0: /* below */
+-			tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
++			tclearregion(term.c.x, term.c.y, term.col-1, term.c.y, 1);
+ 			if (term.c.y < term.row-1) {
+-				tclearregion(0, term.c.y+1, term.col-1,
+-						term.row-1);
++				tclearregion(0, term.c.y+1, term.col-1, term.row-1, 1);
+ 			}
+ 			break;
+ 		case 1: /* above */
+-			if (term.c.y > 1)
+-				tclearregion(0, 0, term.col-1, term.c.y-1);
+-			tclearregion(0, term.c.y, term.c.x, term.c.y);
++			if (term.c.y >= 1)
++				tclearregion(0, 0, term.col-1, term.c.y-1, 1);
++			tclearregion(0, term.c.y, term.c.x, term.c.y, 1);
+ 			break;
+-		case 2: /* all */
+-			tclearregion(0, 0, term.col-1, term.row-1);
++        case 2: /* all */
++            if (IS_SET(MODE_ALTSCREEN)) {
++                tclearregion(0, 0, term.col-1, term.row-1, 1);
++                break;
++            }
++            /* vte does this:
++               tscrollup(0, term.row-1, term.row, SCROLL_SAVEHIST); */
++
++            /* alacritty does this: */
++            for (n = term.row-1; n >= 0 && tlinelen(term.line[n]) == 0; n--);
++            if (n >= 0)
++                tscrollup(0, term.row-1, n+1, SCROLL_SAVEHIST);
++            tscrollup(0, term.row-1, term.row-n-1, SCROLL_NOSAVEHIST);
+ 			break;
+ 		default:
+ 			goto unknown;
+@@ -1778,25 +1961,25 @@ csihandle(void)
+ 	case 'K': /* EL -- Clear line */
+ 		switch (csiescseq.arg[0]) {
+ 		case 0: /* right */
+-			tclearregion(term.c.x, term.c.y, term.col-1,
+-					term.c.y);
++			tclearregion(term.c.x, term.c.y, term.col-1, term.c.y, 1);
+ 			break;
+ 		case 1: /* left */
+-			tclearregion(0, term.c.y, term.c.x, term.c.y);
++			tclearregion(0, term.c.y, term.c.x, term.c.y, 1);
+ 			break;
+ 		case 2: /* all */
+-			tclearregion(0, term.c.y, term.col-1, term.c.y);
++			tclearregion(0, term.c.y, term.col-1, term.c.y, 1);
+ 			break;
+ 		}
+ 		break;
+ 	case 'S': /* SU -- Scroll <n> line up */
+ 		if (csiescseq.priv) break;
+ 		DEFAULT(csiescseq.arg[0], 1);
+-		tscrollup(term.top, csiescseq.arg[0], 0);
++		/* xterm, urxvt, alacritty save this in history */
++		tscrollup(term.top, term.bot, csiescseq.arg[0], SCROLL_SAVEHIST);
+ 		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);
+@@ -1810,9 +1993,11 @@ csihandle(void)
+ 		tdeleteline(csiescseq.arg[0]);
+ 		break;
+ 	case 'X': /* ECH -- Erase <n> char */
++		if (csiescseq.arg[0] < 0)
++			return;
+ 		DEFAULT(csiescseq.arg[0], 1);
+-		tclearregion(term.c.x, term.c.y,
+-				term.c.x + csiescseq.arg[0] - 1, term.c.y);
++		x = MIN(term.c.x + csiescseq.arg[0], term.col) - 1;
++		tclearregion(term.c.x, term.c.y, x, term.c.y, 1);
+ 		break;
+ 	case 'P': /* DCH -- Delete <n> char */
+ 		DEFAULT(csiescseq.arg[0], 1);
+@@ -1838,9 +2023,9 @@ csihandle(void)
+ 			ttywrite("\033[0n", sizeof("\033[0n") - 1, 0);
+ 			break;
+ 		case 6: /* Report Cursor Position (CPR) "<row>;<column>R" */
+-			len = snprintf(buf, sizeof(buf), "\033[%i;%iR",
++			n = snprintf(buf, sizeof(buf), "\033[%i;%iR",
+ 			               term.c.y+1, term.c.x+1);
+-			ttywrite(buf, len, 0);
++			ttywrite(buf, n, 0);
+ 			break;
+ 		default:
+ 			goto unknown;
+@@ -2138,16 +2323,8 @@ tdumpsel(void)
+ void
+ tdumpline(int n)
+ {
+-	char buf[UTF_SIZ];
+-	const Glyph *bp, *end;
+-
+-	bp = &term.line[n][0];
+-	end = &bp[MIN(tlinelen(n), term.col) - 1];
+-	if (bp != end || bp->u != ' ') {
+-		for ( ; bp <= end; ++bp)
+-			tprinter(buf, utf8encode(bp->u, buf));
+-	}
+-	tprinter("\n", 1);
++    char str[(term.col + 1) * UTF_SIZ];
++    tprinter(str, tgetline(str, &term.line[n][0]));
+ }
+ 
+ void
+@@ -2368,7 +2545,7 @@ eschandle(uchar ascii)
+ 		return 0;
+ 	case 'D': /* IND -- Linefeed */
+ 		if (term.c.y == term.bot) {
+-			tscrollup(term.top, 1, 1);
++			tscrollup(term.top, term.bot, 1, SCROLL_SAVEHIST);
+ 		} else {
+ 			tmoveto(term.c.x, term.c.y+1);
+ 		}
+@@ -2381,7 +2558,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);
+ 		}
+@@ -2525,7 +2702,9 @@ check_control_code:
+ 		 */
+ 		return;
+ 	}
+-	if (selected(term.c.x, term.c.y))
++
++    /* selected() takes relative coordinates */
++	if (selected(term.c.x + term.scr, term.c.y + term.scr))
+ 		selclear();
+ 
+ 	gp = &term.line[term.c.y][term.c.x];
+@@ -2565,6 +2744,7 @@ check_control_code:
+ 	if (term.c.x+width < term.col) {
+ 		tmoveto(term.c.x+width, term.c.y);
+ 	} else {
++		term.wrapcwidth[IS_SET(MODE_ALTSCREEN)] = width;
+ 		term.c.state |= CURSOR_WRAPNEXT;
+ 	}
+ }
+@@ -2601,94 +2781,285 @@ twrite(const char *buf, int buflen, int show_ctrl)
+ 	return n;
+ }
+ 
++void
++rscrolldown(int n)
++{
++    int i;
++    Line temp;
++
++    /* can never be true as of now
++       if (IS_SET(MODE_ALTSCREEN))
++       return; */
++
++    if ((n = MIN(n, term.histf)) <= 0)
++        return;
++
++    for (i = term.c.y + n; i >= n; i--) {
++        temp = term.line[i];
++        term.line[i] = term.line[i-n];
++        term.line[i-n] = temp;
++    }
++    for (/*i = n - 1 */; i >= 0; i--) {
++        temp = term.line[i];
++        term.line[i] = term.hist[term.histi];
++        term.hist[term.histi] = temp;
++        term.histi = (term.histi - 1 + HISTSIZE) % HISTSIZE;
++    }
++    term.c.y += n;
++    term.histf -= n;
++    if ((i = term.scr - n) >= 0) {
++        term.scr = i;
++    } else {
++        term.scr = 0;
++        if (sel.ob.x != -1 && !sel.alt)
++            selmove(-i);
++    }
++}
++
++
++
+ void
+ tresize(int col, int row)
+ {
+-	int i, j;
+-	int minrow = MIN(row, term.row);
+-	int mincol = MIN(col, term.col);
+ 	int *bp;
+-	TCursor c;
+ 
++	/* col and row are always MAX(_, 1)
+ 	if (col < 1 || row < 1) {
+-		fprintf(stderr,
+-		        "tresize: error resizing to %dx%d\n", col, row);
++		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]);
+-	}
+-	/* 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));
+-	}
+-	for (i += row; i < term.row; i++) {
+-		free(term.line[i]);
+-		free(term.alt[i]);
+-	}
+-
+-	/* 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));
++ 	if (col > term.col) {
++ 		bp = term.tabs + term.col;
++ 		memset(bp, 0, sizeof(*term.tabs) * (col - term.col));
++ 		while (--bp > term.tabs && !*bp)
++ 			/* nothing */ ;
++ 		for (bp += tabspaces; bp < term.tabs + col; bp += tabspaces)
++ 			*bp = 1;
++ 	}
+ 
+-	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 = ' ';
+-		}
+-	}
++	if (IS_SET(MODE_ALTSCREEN))
++		tresizealt(col, row);
++	else
++		tresizedef(col, row);
++}
+ 
+-	/* 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));
++void
++tresizedef(int col, int row)
++{
++	int i, j;
++
++	/* return if dimensions haven't changed */
++	if (term.col == col && term.row == row) {
++		tfulldirt();
++		return;
+ 	}
+-	if (col > term.col) {
+-		bp = term.tabs + term.col;
+-
+-		memset(bp, 0, sizeof(*term.tabs) * (col - term.col));
+-		while (--bp > term.tabs && !*bp)
+-			/* nothing */ ;
+-		for (bp += tabspaces; bp < term.tabs + col; bp += tabspaces)
+-			*bp = 1;
++	if (col != term.col) {
++		if (!sel.alt)
++			selremove();
++		treflow(col, row);
++	} else {
++		/* slide screen up if otherwise cursor would get out of the screen */
++		if (term.c.y >= row) {
++			tscrollup(0, term.row - 1, term.c.y - row + 1, SCROLL_RESIZE);
++			term.c.y = row - 1;
++ 		}
++		for (i = row; i < term.row; i++)
++			free(term.line[i]);
++
++		/* resize to new height */
++		term.line = xrealloc(term.line, row * sizeof(Line));
++		/* allocate any new rows */
++		for (i = term.row; i < row; i++) {
++			term.line[i] = xmalloc(col * sizeof(Glyph));
++			for (j = 0; j < col; j++)
++				tclearglyph(&term.line[i][j], 0);
++ 		}
++		/* scroll down as much as height has increased */
++		rscrolldown(row - term.row);
+ 	}
+ 	/* update terminal size */
+-	term.col = col;
+-	term.row = row;
++	term.col = col, term.row = row;
+ 	/* 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;
++	term.top = 0, term.bot = row - 1;
++	/* dirty all lines */
++	tfulldirt();
++}
++
++
++
++void
++tresizealt(int col, int row)
++{
++    int i, j;
++
++    /* return if dimensions haven't changed */
++    if (term.col == col && term.row == row) {
++        tfulldirt();
++        return;
++    }
++    if (sel.alt)
++        selremove();
++    /* slide screen up if otherwise cursor would get out of the screen */
++    for (i = 0; i <= term.c.y - row; i++)
++        free(term.line[i]);
++    if (i > 0) {
++        /* ensure that both src and dst are not NULL */
++        memmove(term.line, term.line + i, row * sizeof(Line));
++        term.c.y = row - 1;
++    }
++    for (i += row; i < term.row; i++)
++        free(term.line[i]);
++    /* resize to new height */
++    term.line = xrealloc(term.line, row * sizeof(Line));
++    /* resize to new width */
++    for (i = 0; i < MIN(row, term.row); i++) {
++        term.line[i] = xrealloc(term.line[i], col * sizeof(Glyph));
++        for (j = term.col; j < col; j++)
++            tclearglyph(&term.line[i][j], 0);
++    }
++    /* allocate any new rows */
++    for (/*i = MIN(row, term.row) */; i < row; i++) {
++        term.line[i] = xmalloc(col * sizeof(Glyph));
++        for (j = 0; j < col; j++)
++            tclearglyph(&term.line[i][j], 0);
++    }
++    /* update cursor */
++    if (term.c.x >= col) {
++        term.c.state &= ~CURSOR_WRAPNEXT;
++        term.c.x = col - 1;
++    } else {
++        UPDATEWRAPNEXT(1, col);
++    }
++    /* update terminal size */
++    term.col = col, term.row = row;
++    /* reset scrolling region */
++    term.top = 0, term.bot = row - 1;
++    /* dirty all lines */
++    tfulldirt();
++ }
++
++
++
++
++
++void
++treflow(int col, int row)
++{
++    int i, j;
++    int oce, nce, bot, scr;
++    int ox = 0, oy = -term.histf, nx = 0, ny = -1, len;
++    int cy = -1; /* proxy for new y coordinate of cursor */
++    int nlines;
++    Line *buf, line;
++
++    /* y coordinate of cursor line end */
++    for (oce = term.c.y; oce < term.row - 1 &&
++            tiswrapped(term.line[oce]); oce++);
++
++    nlines = term.histf + oce + 1;
++    if (col < term.col) {
++        /* each line can take this many lines after reflow */
++        j = (term.col + col - 1) / col;
++        nlines = j * nlines;
++        if (nlines > HISTSIZE + RESIZEBUFFER + row) {
++            nlines = HISTSIZE + RESIZEBUFFER + row;
++            oy = -(nlines / j - oce - 1);
++        }
++    }
++    buf = xmalloc(nlines * sizeof(Line));
++    do {
++        if (!nx)
++            buf[++ny] = xmalloc(col * sizeof(Glyph));
++        if (!ox) {
++            line = TLINEABS(oy);
++            len = tlinelen(line);
++        }
++        if (oy == term.c.y) {
++            if (!ox)
++                len = MAX(len, term.c.x + 1);
++            /* update cursor */
++            if (cy < 0 && term.c.x - ox < col - nx) {
++                term.c.x = nx + term.c.x - ox, cy = ny;
++                UPDATEWRAPNEXT(0, col);
++            }
++        }
++        /* get reflowed lines in buf */
++        if (col - nx > len - ox) {
++            memcpy(&buf[ny][nx], &line[ox], (len-ox) * sizeof(Glyph));
++            nx += len - ox;
++            if (len == 0 || !(line[len - 1].mode & ATTR_WRAP)) {
++                for (j = nx; j < col; j++)
++                    tclearglyph(&buf[ny][j], 0);
++                nx = 0;
++            } else if (nx > 0) {
++                buf[ny][nx - 1].mode &= ~ATTR_WRAP;
++            }
++            ox = 0, oy++;
++        } else if (col - nx == len - ox) {
++            memcpy(&buf[ny][nx], &line[ox], (col-nx) * sizeof(Glyph));
++            ox = 0, oy++, nx = 0;
++        } else/* if (col - nx < len - ox) */ {
++            memcpy(&buf[ny][nx], &line[ox], (col-nx) * sizeof(Glyph));
++            ox += col - nx;
++            buf[ny][col - 1].mode |= ATTR_WRAP;
++            nx = 0;
++        }
++    } while (oy <= oce);
++    if (nx)
++        for (j = nx; j < col; j++)
++            tclearglyph(&buf[ny][j], 0);
++
++    /* free extra lines */
++    for (i = row; i < term.row; i++)
++        free(term.line[i]);
++    /* resize to new height */
++    term.line = xrealloc(term.line, row * sizeof(Line));
++
++    bot = MIN(ny, row - 1);
++    scr = MAX(row - term.row, 0);
++    /* update y coordinate of cursor line end */
++    nce = MIN(oce + scr, bot);
++    /* update cursor y coordinate */
++    term.c.y = nce - (ny - cy);
++    if (term.c.y < 0) {
++        j = nce, nce = MIN(nce + -term.c.y, bot);
++        term.c.y += nce - j;
++        while (term.c.y < 0) {
++            free(buf[ny--]);
++            term.c.y++;
++        }
++    }
++    /* allocate new rows */
++    for (i = row - 1; i > nce; i--) {
++        term.line[i] = xmalloc(col * sizeof(Glyph));
++        for (j = 0; j < col; j++)
++            tclearglyph(&term.line[i][j], 0);
++    }
++    /* fill visible area */
++    for (/*i = nce */; i >= term.row; i--, ny--)
++        term.line[i] = buf[ny];
++    for (/*i = term.row - 1 */; i >= 0; i--, ny--) {
++        free(term.line[i]);
++        term.line[i] = buf[ny];
++    }
++    /* fill lines in history buffer and update term.histf */
++    for (/*i = -1 */; ny >= 0 && i >= -HISTSIZE; i--, ny--) {
++        j = (term.histi + i + 1 + HISTSIZE) % HISTSIZE;
++        free(term.hist[j]);
++        term.hist[j] = buf[ny];
++    }
++    term.histf = -i - 1;
++    term.scr = MIN(term.scr, term.histf);
++    /* resize rest of the history lines */
++    for (/*i = -term.histf - 1 */; i >= -HISTSIZE; i--) {
++        j = (term.histi + i + 1 + HISTSIZE) % HISTSIZE;
++        term.hist[j] = xrealloc(term.hist[j], col * sizeof(Glyph));
++    }
++    free(buf);
+ }
+ 
+ void
+@@ -2728,9 +3099,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();
+diff --git a/st.h b/st.h
+index 818a6f8..514ec08 100644
+--- a/st.h
++++ b/st.h
+@@ -22,17 +22,19 @@
+ 
+ enum glyph_attribute {
+ 	ATTR_NULL       = 0,
+-	ATTR_BOLD       = 1 << 0,
+-	ATTR_FAINT      = 1 << 1,
+-	ATTR_ITALIC     = 1 << 2,
+-	ATTR_UNDERLINE  = 1 << 3,
+-	ATTR_BLINK      = 1 << 4,
+-	ATTR_REVERSE    = 1 << 5,
+-	ATTR_INVISIBLE  = 1 << 6,
+-	ATTR_STRUCK     = 1 << 7,
+-	ATTR_WRAP       = 1 << 8,
+-	ATTR_WIDE       = 1 << 9,
+-	ATTR_WDUMMY     = 1 << 10,
++	ATTR_SET        = 1 << 0,
++	ATTR_BOLD       = 1 << 1,
++	ATTR_FAINT      = 1 << 2,
++	ATTR_ITALIC     = 1 << 3,
++	ATTR_UNDERLINE  = 1 << 4,
++	ATTR_BLINK      = 1 << 5,
++	ATTR_REVERSE    = 1 << 6,
++	ATTR_INVISIBLE  = 1 << 7,
++	ATTR_STRUCK     = 1 << 8,
++	ATTR_WRAP       = 1 << 9,
++	ATTR_WIDE       = 1 << 10,
++	ATTR_WDUMMY     = 1 << 11,
++	ATTR_SELECTED   = 1 << 12,
+ 	ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT,
+ };
+ 
+@@ -90,6 +92,7 @@ void toggleprinter(const Arg *);
+ 
+ int tattrset(int);
+ void tnew(int, int);
++int tisaltscreen(void);
+ void tresize(int, int);
+ void tsetdirtattr(int);
+ void ttyhangup(void);
diff --git a/patches/x11-terms/st/02-st-scrollback-mouse.diff b/patches/x11-terms/st/02-st-scrollback-mouse.diff
new file mode 100644
index 0000000..a956d2b
--- /dev/null
+++ b/patches/x11-terms/st/02-st-scrollback-mouse.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
+
diff --git a/patches/x11-terms/st/st-boxdraw_v2-0.8.5.diff b/patches/x11-terms/st/st-boxdraw_v2-0.8.5.diff
new file mode 100644
index 0000000..43301df
--- /dev/null
+++ b/patches/x11-terms/st/st-boxdraw_v2-0.8.5.diff
@@ -0,0 +1,583 @@
+From 46a1124957b8de5e7f827656b64bfc3baeaa097f Mon Sep 17 00:00:00 2001
+From: wael <40663@protonmail.com>
+Date: Mon, 11 Apr 2022 17:04:30 +0300
+Subject: [PATCH] [st][patch][boxdraw] update to 0.8.5
+
+---
+ Makefile       |   3 +-
+ boxdraw.c      | 194 ++++++++++++++++++++++++++++++++++++++++++++
+ boxdraw_data.h | 214 +++++++++++++++++++++++++++++++++++++++++++++++++
+ config.def.h   |  12 +++
+ st.c           |   3 +
+ st.h           |  10 +++
+ x.c            |  21 +++--
+ 7 files changed, 451 insertions(+), 6 deletions(-)
+ create mode 100644 boxdraw.c
+ create mode 100644 boxdraw_data.h
+
+diff --git a/Makefile b/Makefile
+index 470ac86..6dfa212 100644
+--- a/Makefile
++++ b/Makefile
+@@ -4,7 +4,7 @@
+ 
+ include config.mk
+ 
+-SRC = st.c x.c
++SRC = st.c x.c boxdraw.c
+ OBJ = $(SRC:.c=.o)
+ 
+ all: options st
+@@ -23,6 +23,7 @@ config.h:
+ 
+ st.o: config.h st.h win.h
+ x.o: arg.h config.h st.h win.h
++boxdraw.o: config.h st.h boxdraw_data.h
+ 
+ $(OBJ): config.h config.mk
+ 
+diff --git a/boxdraw.c b/boxdraw.c
+new file mode 100644
+index 0000000..28a92d0
+--- /dev/null
++++ b/boxdraw.c
+@@ -0,0 +1,194 @@
++/*
++ * Copyright 2018 Avi Halachmi (:avih) avihpit@yahoo.com https://github.com/avih
++ * MIT/X Consortium License
++ */
++
++#include <X11/Xft/Xft.h>
++#include "st.h"
++#include "boxdraw_data.h"
++
++/* Rounded non-negative integers division of n / d  */
++#define DIV(n, d) (((n) + (d) / 2) / (d))
++
++static Display *xdpy;
++static Colormap xcmap;
++static XftDraw *xd;
++static Visual *xvis;
++
++static void drawbox(int, int, int, int, XftColor *, XftColor *, ushort);
++static void drawboxlines(int, int, int, int, XftColor *, ushort);
++
++/* public API */
++
++void
++boxdraw_xinit(Display *dpy, Colormap cmap, XftDraw *draw, Visual *vis)
++{
++	xdpy = dpy; xcmap = cmap; xd = draw, xvis = vis;
++}
++
++int
++isboxdraw(Rune u)
++{
++	Rune block = u & ~0xff;
++	return (boxdraw && block == 0x2500 && boxdata[(uint8_t)u]) ||
++	       (boxdraw_braille && block == 0x2800);
++}
++
++/* the "index" is actually the entire shape data encoded as ushort */
++ushort
++boxdrawindex(const Glyph *g)
++{
++	if (boxdraw_braille && (g->u & ~0xff) == 0x2800)
++		return BRL | (uint8_t)g->u;
++	if (boxdraw_bold && (g->mode & ATTR_BOLD))
++		return BDB | boxdata[(uint8_t)g->u];
++	return boxdata[(uint8_t)g->u];
++}
++
++void
++drawboxes(int x, int y, int cw, int ch, XftColor *fg, XftColor *bg,
++          const XftGlyphFontSpec *specs, int len)
++{
++	for ( ; len-- > 0; x += cw, specs++)
++		drawbox(x, y, cw, ch, fg, bg, (ushort)specs->glyph);
++}
++
++/* implementation */
++
++void
++drawbox(int x, int y, int w, int h, XftColor *fg, XftColor *bg, ushort bd)
++{
++	ushort cat = bd & ~(BDB | 0xff);  /* mask out bold and data */
++	if (bd & (BDL | BDA)) {
++		/* lines (light/double/heavy/arcs) */
++		drawboxlines(x, y, w, h, fg, bd);
++
++	} else if (cat == BBD) {
++		/* lower (8-X)/8 block */
++		int d = DIV((uint8_t)bd * h, 8);
++		XftDrawRect(xd, fg, x, y + d, w, h - d);
++
++	} else if (cat == BBU) {
++		/* upper X/8 block */
++		XftDrawRect(xd, fg, x, y, w, DIV((uint8_t)bd * h, 8));
++
++	} else if (cat == BBL) {
++		/* left X/8 block */
++		XftDrawRect(xd, fg, x, y, DIV((uint8_t)bd * w, 8), h);
++
++	} else if (cat == BBR) {
++		/* right (8-X)/8 block */
++		int d = DIV((uint8_t)bd * w, 8);
++		XftDrawRect(xd, fg, x + d, y, w - d, h);
++
++	} else if (cat == BBQ) {
++		/* Quadrants */
++		int w2 = DIV(w, 2), h2 = DIV(h, 2);
++		if (bd & TL)
++			XftDrawRect(xd, fg, x, y, w2, h2);
++		if (bd & TR)
++			XftDrawRect(xd, fg, x + w2, y, w - w2, h2);
++		if (bd & BL)
++			XftDrawRect(xd, fg, x, y + h2, w2, h - h2);
++		if (bd & BR)
++			XftDrawRect(xd, fg, x + w2, y + h2, w - w2, h - h2);
++
++	} else if (bd & BBS) {
++		/* Shades - data is 1/2/3 for 25%/50%/75% alpha, respectively */
++		int d = (uint8_t)bd;
++		XftColor xfc;
++		XRenderColor xrc = { .alpha = 0xffff };
++
++		xrc.red = DIV(fg->color.red * d + bg->color.red * (4 - d), 4);
++		xrc.green = DIV(fg->color.green * d + bg->color.green * (4 - d), 4);
++		xrc.blue = DIV(fg->color.blue * d + bg->color.blue * (4 - d), 4);
++
++		XftColorAllocValue(xdpy, xvis, xcmap, &xrc, &xfc);
++		XftDrawRect(xd, &xfc, x, y, w, h);
++		XftColorFree(xdpy, xvis, xcmap, &xfc);
++
++	} else if (cat == BRL) {
++		/* braille, each data bit corresponds to one dot at 2x4 grid */
++		int w1 = DIV(w, 2);
++		int h1 = DIV(h, 4), h2 = DIV(h, 2), h3 = DIV(3 * h, 4);
++
++		if (bd & 1)   XftDrawRect(xd, fg, x, y, w1, h1);
++		if (bd & 2)   XftDrawRect(xd, fg, x, y + h1, w1, h2 - h1);
++		if (bd & 4)   XftDrawRect(xd, fg, x, y + h2, w1, h3 - h2);
++		if (bd & 8)   XftDrawRect(xd, fg, x + w1, y, w - w1, h1);
++		if (bd & 16)  XftDrawRect(xd, fg, x + w1, y + h1, w - w1, h2 - h1);
++		if (bd & 32)  XftDrawRect(xd, fg, x + w1, y + h2, w - w1, h3 - h2);
++		if (bd & 64)  XftDrawRect(xd, fg, x, y + h3, w1, h - h3);
++		if (bd & 128) XftDrawRect(xd, fg, x + w1, y + h3, w - w1, h - h3);
++
++	}
++}
++
++void
++drawboxlines(int x, int y, int w, int h, XftColor *fg, ushort bd)
++{
++	/* s: stem thickness. width/8 roughly matches underscore thickness. */
++	/* We draw bold as 1.5 * normal-stem and at least 1px thicker.      */
++	/* doubles draw at least 3px, even when w or h < 3. bold needs 6px. */
++	int mwh = MIN(w, h);
++	int base_s = MAX(1, DIV(mwh, 8));
++	int bold = (bd & BDB) && mwh >= 6;  /* possibly ignore boldness */
++	int s = bold ? MAX(base_s + 1, DIV(3 * base_s, 2)) : base_s;
++	int w2 = DIV(w - s, 2), h2 = DIV(h - s, 2);
++	/* the s-by-s square (x + w2, y + h2, s, s) is the center texel.    */
++	/* The base length (per direction till edge) includes this square.  */
++
++	int light = bd & (LL | LU | LR | LD);
++	int double_ = bd & (DL | DU | DR | DD);
++
++	if (light) {
++		/* d: additional (negative) length to not-draw the center   */
++		/* texel - at arcs and avoid drawing inside (some) doubles  */
++		int arc = bd & BDA;
++		int multi_light = light & (light - 1);
++		int multi_double = double_ & (double_ - 1);
++		/* light crosses double only at DH+LV, DV+LH (ref. shapes)  */
++		int d = arc || (multi_double && !multi_light) ? -s : 0;
++
++		if (bd & LL)
++			XftDrawRect(xd, fg, x, y + h2, w2 + s + d, s);
++		if (bd & LU)
++			XftDrawRect(xd, fg, x + w2, y, s, h2 + s + d);
++		if (bd & LR)
++			XftDrawRect(xd, fg, x + w2 - d, y + h2, w - w2 + d, s);
++		if (bd & LD)
++			XftDrawRect(xd, fg, x + w2, y + h2 - d, s, h - h2 + d);
++	}
++
++	/* double lines - also align with light to form heavy when combined */
++	if (double_) {
++		/*
++		* going clockwise, for each double-ray: p is additional length
++		* to the single-ray nearer to the previous direction, and n to
++		* the next. p and n adjust from the base length to lengths
++		* which consider other doubles - shorter to avoid intersections
++		* (p, n), or longer to draw the far-corner texel (n).
++		*/
++		int dl = bd & DL, du = bd & DU, dr = bd & DR, dd = bd & DD;
++		if (dl) {
++			int p = dd ? -s : 0, n = du ? -s : dd ? s : 0;
++			XftDrawRect(xd, fg, x, y + h2 + s, w2 + s + p, s);
++			XftDrawRect(xd, fg, x, y + h2 - s, w2 + s + n, s);
++		}
++		if (du) {
++			int p = dl ? -s : 0, n = dr ? -s : dl ? s : 0;
++			XftDrawRect(xd, fg, x + w2 - s, y, s, h2 + s + p);
++			XftDrawRect(xd, fg, x + w2 + s, y, s, h2 + s + n);
++		}
++		if (dr) {
++			int p = du ? -s : 0, n = dd ? -s : du ? s : 0;
++			XftDrawRect(xd, fg, x + w2 - p, y + h2 - s, w - w2 + p, s);
++			XftDrawRect(xd, fg, x + w2 - n, y + h2 + s, w - w2 + n, s);
++		}
++		if (dd) {
++			int p = dr ? -s : 0, n = dl ? -s : dr ? s : 0;
++			XftDrawRect(xd, fg, x + w2 + s, y + h2 - p, s, h - h2 + p);
++			XftDrawRect(xd, fg, x + w2 - s, y + h2 - n, s, h - h2 + n);
++		}
++	}
++}
+diff --git a/boxdraw_data.h b/boxdraw_data.h
+new file mode 100644
+index 0000000..7890500
+--- /dev/null
++++ b/boxdraw_data.h
+@@ -0,0 +1,214 @@
++/*
++ * Copyright 2018 Avi Halachmi (:avih) avihpit@yahoo.com https://github.com/avih
++ * MIT/X Consortium License
++ */
++
++/*
++ * U+25XX codepoints data
++ *
++ * References:
++ *   http://www.unicode.org/charts/PDF/U2500.pdf
++ *   http://www.unicode.org/charts/PDF/U2580.pdf
++ *
++ * Test page:
++ *   https://github.com/GNOME/vte/blob/master/doc/boxes.txt
++ */
++
++/* Each shape is encoded as 16-bits. Higher bits are category, lower are data */
++/* Categories (mutually exclusive except BDB): */
++/* For convenience, BDL/BDA/BBS/BDB are 1 bit each, the rest are enums */
++#define BDL (1<<8)   /* Box Draw Lines (light/double/heavy) */
++#define BDA (1<<9)   /* Box Draw Arc (light) */
++
++#define BBD (1<<10)  /* Box Block Down (lower) X/8 */
++#define BBL (2<<10)  /* Box Block Left X/8 */
++#define BBU (3<<10)  /* Box Block Upper X/8 */
++#define BBR (4<<10)  /* Box Block Right X/8 */
++#define BBQ (5<<10)  /* Box Block Quadrants */
++#define BRL (6<<10)  /* Box Braille (data is lower byte of U28XX) */
++
++#define BBS (1<<14)  /* Box Block Shades */
++#define BDB (1<<15)  /* Box Draw is Bold */
++
++/* (BDL/BDA) Light/Double/Heavy x Left/Up/Right/Down/Horizontal/Vertical      */
++/* Heavy is light+double (literally drawing light+double align to form heavy) */
++#define LL (1<<0)
++#define LU (1<<1)
++#define LR (1<<2)
++#define LD (1<<3)
++#define LH (LL+LR)
++#define LV (LU+LD)
++
++#define DL (1<<4)
++#define DU (1<<5)
++#define DR (1<<6)
++#define DD (1<<7)
++#define DH (DL+DR)
++#define DV (DU+DD)
++
++#define HL (LL+DL)
++#define HU (LU+DU)
++#define HR (LR+DR)
++#define HD (LD+DD)
++#define HH (HL+HR)
++#define HV (HU+HD)
++
++/* (BBQ) Quadrants Top/Bottom x Left/Right */
++#define TL (1<<0)
++#define TR (1<<1)
++#define BL (1<<2)
++#define BR (1<<3)
++
++/* Data for U+2500 - U+259F except dashes/diagonals */
++static const unsigned short boxdata[256] = {
++	/* light lines */
++	[0x00] = BDL + LH,       /* light horizontal */
++	[0x02] = BDL + LV,       /* light vertical */
++	[0x0c] = BDL + LD + LR,  /* light down and right */
++	[0x10] = BDL + LD + LL,  /* light down and left */
++	[0x14] = BDL + LU + LR,  /* light up and right */
++	[0x18] = BDL + LU + LL,  /* light up and left */
++	[0x1c] = BDL + LV + LR,  /* light vertical and right */
++	[0x24] = BDL + LV + LL,  /* light vertical and left */
++	[0x2c] = BDL + LH + LD,  /* light horizontal and down */
++	[0x34] = BDL + LH + LU,  /* light horizontal and up */
++	[0x3c] = BDL + LV + LH,  /* light vertical and horizontal */
++	[0x74] = BDL + LL,       /* light left */
++	[0x75] = BDL + LU,       /* light up */
++	[0x76] = BDL + LR,       /* light right */
++	[0x77] = BDL + LD,       /* light down */
++
++	/* heavy [+light] lines */
++	[0x01] = BDL + HH,
++	[0x03] = BDL + HV,
++	[0x0d] = BDL + HR + LD,
++	[0x0e] = BDL + HD + LR,
++	[0x0f] = BDL + HD + HR,
++	[0x11] = BDL + HL + LD,
++	[0x12] = BDL + HD + LL,
++	[0x13] = BDL + HD + HL,
++	[0x15] = BDL + HR + LU,
++	[0x16] = BDL + HU + LR,
++	[0x17] = BDL + HU + HR,
++	[0x19] = BDL + HL + LU,
++	[0x1a] = BDL + HU + LL,
++	[0x1b] = BDL + HU + HL,
++	[0x1d] = BDL + HR + LV,
++	[0x1e] = BDL + HU + LD + LR,
++	[0x1f] = BDL + HD + LR + LU,
++	[0x20] = BDL + HV + LR,
++	[0x21] = BDL + HU + HR + LD,
++	[0x22] = BDL + HD + HR + LU,
++	[0x23] = BDL + HV + HR,
++	[0x25] = BDL + HL + LV,
++	[0x26] = BDL + HU + LD + LL,
++	[0x27] = BDL + HD + LU + LL,
++	[0x28] = BDL + HV + LL,
++	[0x29] = BDL + HU + HL + LD,
++	[0x2a] = BDL + HD + HL + LU,
++	[0x2b] = BDL + HV + HL,
++	[0x2d] = BDL + HL + LD + LR,
++	[0x2e] = BDL + HR + LL + LD,
++	[0x2f] = BDL + HH + LD,
++	[0x30] = BDL + HD + LH,
++	[0x31] = BDL + HD + HL + LR,
++	[0x32] = BDL + HR + HD + LL,
++	[0x33] = BDL + HH + HD,
++	[0x35] = BDL + HL + LU + LR,
++	[0x36] = BDL + HR + LU + LL,
++	[0x37] = BDL + HH + LU,
++	[0x38] = BDL + HU + LH,
++	[0x39] = BDL + HU + HL + LR,
++	[0x3a] = BDL + HU + HR + LL,
++	[0x3b] = BDL + HH + HU,
++	[0x3d] = BDL + HL + LV + LR,
++	[0x3e] = BDL + HR + LV + LL,
++	[0x3f] = BDL + HH + LV,
++	[0x40] = BDL + HU + LH + LD,
++	[0x41] = BDL + HD + LH + LU,
++	[0x42] = BDL + HV + LH,
++	[0x43] = BDL + HU + HL + LD + LR,
++	[0x44] = BDL + HU + HR + LD + LL,
++	[0x45] = BDL + HD + HL + LU + LR,
++	[0x46] = BDL + HD + HR + LU + LL,
++	[0x47] = BDL + HH + HU + LD,
++	[0x48] = BDL + HH + HD + LU,
++	[0x49] = BDL + HV + HL + LR,
++	[0x4a] = BDL + HV + HR + LL,
++	[0x4b] = BDL + HV + HH,
++	[0x78] = BDL + HL,
++	[0x79] = BDL + HU,
++	[0x7a] = BDL + HR,
++	[0x7b] = BDL + HD,
++	[0x7c] = BDL + HR + LL,
++	[0x7d] = BDL + HD + LU,
++	[0x7e] = BDL + HL + LR,
++	[0x7f] = BDL + HU + LD,
++
++	/* double [+light] lines */
++	[0x50] = BDL + DH,
++	[0x51] = BDL + DV,
++	[0x52] = BDL + DR + LD,
++	[0x53] = BDL + DD + LR,
++	[0x54] = BDL + DR + DD,
++	[0x55] = BDL + DL + LD,
++	[0x56] = BDL + DD + LL,
++	[0x57] = BDL + DL + DD,
++	[0x58] = BDL + DR + LU,
++	[0x59] = BDL + DU + LR,
++	[0x5a] = BDL + DU + DR,
++	[0x5b] = BDL + DL + LU,
++	[0x5c] = BDL + DU + LL,
++	[0x5d] = BDL + DL + DU,
++	[0x5e] = BDL + DR + LV,
++	[0x5f] = BDL + DV + LR,
++	[0x60] = BDL + DV + DR,
++	[0x61] = BDL + DL + LV,
++	[0x62] = BDL + DV + LL,
++	[0x63] = BDL + DV + DL,
++	[0x64] = BDL + DH + LD,
++	[0x65] = BDL + DD + LH,
++	[0x66] = BDL + DD + DH,
++	[0x67] = BDL + DH + LU,
++	[0x68] = BDL + DU + LH,
++	[0x69] = BDL + DH + DU,
++	[0x6a] = BDL + DH + LV,
++	[0x6b] = BDL + DV + LH,
++	[0x6c] = BDL + DH + DV,
++
++	/* (light) arcs */
++	[0x6d] = BDA + LD + LR,
++	[0x6e] = BDA + LD + LL,
++	[0x6f] = BDA + LU + LL,
++	[0x70] = BDA + LU + LR,
++
++	/* Lower (Down) X/8 block (data is 8 - X) */
++	[0x81] = BBD + 7, [0x82] = BBD + 6, [0x83] = BBD + 5, [0x84] = BBD + 4,
++	[0x85] = BBD + 3, [0x86] = BBD + 2, [0x87] = BBD + 1, [0x88] = BBD + 0,
++
++	/* Left X/8 block (data is X) */
++	[0x89] = BBL + 7, [0x8a] = BBL + 6, [0x8b] = BBL + 5, [0x8c] = BBL + 4,
++	[0x8d] = BBL + 3, [0x8e] = BBL + 2, [0x8f] = BBL + 1,
++
++	/* upper 1/2 (4/8), 1/8 block (X), right 1/2, 1/8 block (8-X) */
++	[0x80] = BBU + 4, [0x94] = BBU + 1,
++	[0x90] = BBR + 4, [0x95] = BBR + 7,
++
++	/* Quadrants */
++	[0x96] = BBQ + BL,
++	[0x97] = BBQ + BR,
++	[0x98] = BBQ + TL,
++	[0x99] = BBQ + TL + BL + BR,
++	[0x9a] = BBQ + TL + BR,
++	[0x9b] = BBQ + TL + TR + BL,
++	[0x9c] = BBQ + TL + TR + BR,
++	[0x9d] = BBQ + TR,
++	[0x9e] = BBQ + BL + TR,
++	[0x9f] = BBQ + BL + TR + BR,
++
++	/* Shades, data is an alpha value in 25% units (1/4, 1/2, 3/4) */
++	[0x91] = BBS + 1, [0x92] = BBS + 2, [0x93] = BBS + 3,
++
++	/* U+2504 - U+250B, U+254C - U+254F: unsupported (dashes) */
++	/* U+2571 - U+2573: unsupported (diagonals) */
++};
+diff --git a/config.def.h b/config.def.h
+index 91ab8ca..7bb3ff7 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -67,6 +67,18 @@ static unsigned int blinktimeout = 800;
+  */
+ static unsigned int cursorthickness = 2;
+ 
++/*
++ * 1: render most of the lines/blocks characters without using the font for
++ *    perfect alignment between cells (U2500 - U259F except dashes/diagonals).
++ *    Bold affects lines thickness if boxdraw_bold is not 0. Italic is ignored.
++ * 0: disable (render all U25XX glyphs normally from the font).
++ */
++const int boxdraw = 0;
++const int boxdraw_bold = 0;
++
++/* braille (U28XX):  1: render as adjacent "pixels",  0: use font */
++const int boxdraw_braille = 0;
++
+ /*
+  * bell volume. It must be a value between -100 and 100. Use 0 for disabling
+  * it
+diff --git a/st.c b/st.c
+index f43cfd3..baa2bed 100644
+--- a/st.c
++++ b/st.c
+@@ -1446,6 +1446,9 @@
+     term.line[y][x] = *attr;
+     term.line[y][x].u = u;
+     term.line[y][x].mode |= ATTR_SET;
++
++    if (isboxdraw(u))
++       term.line[y][x].mode |= ATTR_BOXDRAW;
+ }
+ 
+  
+diff --git a/st.h b/st.h
+index 519b9bd..07a7c66 100644
+--- a/st.h
++++ b/st.h
+@@ -33,6 +33,7 @@ enum glyph_attribute {
+	ATTR_WIDE       = 1 << 10,
+ 	ATTR_WDUMMY     = 1 << 11,
+	ATTR_SELECTED   = 1 << 12,
++	ATTR_BOXDRAW    = 1 << 13,
+ 	ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT,
+ };
+ 
+@@ -113,6 +114,14 @@ char *xstrdup(const char *);
+ 
+ int xgetcolor(int x, unsigned char *r, unsigned char *g, unsigned char *b);
+ 
++int isboxdraw(Rune);
++ushort boxdrawindex(const Glyph *);
++#ifdef XFT_VERSION
++/* only exposed to x.c, otherwise we'll need Xft.h for the types */
++void boxdraw_xinit(Display *, Colormap, XftDraw *, Visual *);
++void drawboxes(int, int, int, int, XftColor *, XftColor *, const XftGlyphFontSpec *, int);
++#endif
++
+ /* config.h globals */
+ extern char *utmp;
+ extern char *scroll;
+@@ -126,3 +135,4 @@ extern unsigned int tabspaces;
+ extern unsigned int defaultfg;
+ extern unsigned int defaultbg;
+ extern unsigned int defaultcs;
++extern const int boxdraw, boxdraw_bold, boxdraw_braille;
+diff --git a/x.c b/x.c
+index 2a3bd38..bf6bbf9 100644
+--- a/x.c
++++ b/x.c
+@@ -1237,6 +1237,8 @@ xinit(int cols, int rows)
+ 	xsel.xtarget = XInternAtom(xw.dpy, "UTF8_STRING", 0);
+ 	if (xsel.xtarget == None)
+ 		xsel.xtarget = XA_STRING;
++
++	boxdraw_xinit(xw.dpy, xw.cmap, xw.draw, xw.vis);
+ }
+ 
+ int
+@@ -1283,8 +1285,13 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
+ 			yp = winy + font->ascent;
+ 		}
+ 
+-		/* Lookup character index with default font. */
+-		glyphidx = XftCharIndex(xw.dpy, font->match, rune);
++		if (mode & ATTR_BOXDRAW) {
++			/* minor shoehorning: boxdraw uses only this ushort */
++			glyphidx = boxdrawindex(&glyphs[i]);
++		} else {
++			/* Lookup character index with default font. */
++			glyphidx = XftCharIndex(xw.dpy, font->match, rune);
++		}
+ 		if (glyphidx) {
+ 			specs[numspecs].font = font->match;
+ 			specs[numspecs].glyph = glyphidx;
+@@ -1488,8 +1495,12 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
+ 	r.width = width;
+ 	XftDrawSetClipRectangles(xw.draw, winx, winy, &r, 1);
+ 
+-	/* Render the glyphs. */
+-	XftDrawGlyphFontSpec(xw.draw, fg, specs, len);
++	if (base.mode & ATTR_BOXDRAW) {
++		drawboxes(winx, winy, width / len, win.ch, fg, bg, specs, len);
++	} else {
++		/* Render the glyphs. */
++		XftDrawGlyphFontSpec(xw.draw, fg, specs, len);
++	}
+ 
+ 	/* Render underline and strikethrough. */
+ 	if (base.mode & ATTR_UNDERLINE) {
+@@ -1532,7 +1543,7 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
+ 	/*
+ 	 * Select the right color for the right mode.
+ 	 */
+-	g.mode &= ATTR_BOLD|ATTR_ITALIC|ATTR_UNDERLINE|ATTR_STRUCK|ATTR_WIDE;
++	g.mode &= ATTR_BOLD|ATTR_ITALIC|ATTR_UNDERLINE|ATTR_STRUCK|ATTR_WIDE|ATTR_BOXDRAW;
+ 
+ 	if (IS_SET(MODE_REVERSE)) {
+ 		g.mode |= ATTR_REVERSE;
+-- 
+2.35.1
+
diff --git a/patches/x11-terms/st/st-csi_22_23-0.8.5.diff b/patches/x11-terms/st/st-csi_22_23-0.8.5.diff
new file mode 100644
index 0000000..c49aa30
--- /dev/null
+++ b/patches/x11-terms/st/st-csi_22_23-0.8.5.diff
@@ -0,0 +1,208 @@
+From c90af45228c1100377d64ad021fa3f0cff9a1df4 Mon Sep 17 00:00:00 2001
+From: wael <40663@protonmail.com>
+Date: Mon, 11 Apr 2022 21:28:43 +0300
+Subject: [PATCH] [st][patch][csi 22 23] update to 0.8.5
+
+---
+ st.c    | 36 ++++++++++++++++++++++++++++++++----
+ st.info |  4 ++--
+ win.h   |  4 +++-
+ x.c     | 41 ++++++++++++++++++++++++++++++++++++++---
+ 4 files changed, 75 insertions(+), 10 deletions(-)
+
+diff --git a/st.c b/st.c
+index f43cfd3..2802381 100644
+--- a/st.c
++++ b/st.c
+@@ -1801,6 +1801,33 @@ csihandle(void)
+ 			goto unknown;
+ 		}
+ 		break;
++	case 't': /* title stack operations */
++		switch (csiescseq.arg[0]) {
++		case 22: /* pust current title on stack */
++			switch (csiescseq.arg[1]) {
++			case 0:
++			case 1:
++			case 2:
++				xpushtitle();
++				break;
++			default:
++				goto unknown;
++			}
++			break;
++		case 23: /* pop last title from stack */
++			switch (csiescseq.arg[1]) {
++			case 0:
++			case 1:
++			case 2:
++				xsettitle(NULL, 1);
++				break;
++			default:
++				goto unknown;
++			}
++			break;
++		default:
++			goto unknown;
++		}
+ 	}
+ }
+ 
+@@ -1885,7 +1912,7 @@ strhandle(void)
+ 		switch (par) {
+ 		case 0:
+ 			if (narg > 1) {
+-				xsettitle(strescseq.args[1]);
++				xsettitle(strescseq.args[1], 0);
+ 				xseticontitle(strescseq.args[1]);
+ 			}
+ 			return;
+@@ -1895,7 +1922,7 @@ strhandle(void)
+ 			return;
+ 		case 2:
+ 			if (narg > 1)
+-				xsettitle(strescseq.args[1]);
++				xsettitle(strescseq.args[1], 0);
+ 			return;
+ 		case 52:
+ 			if (narg > 2 && allowwindowops) {
+@@ -1973,7 +2000,7 @@ strhandle(void)
+ 		}
+ 		break;
+ 	case 'k': /* old title set compatibility */
+-		xsettitle(strescseq.args[0]);
++		xsettitle(strescseq.args[0], 0);
+ 		return;
+ 	case 'P': /* DCS -- Device Control String */
+ 	case '_': /* APC -- Application Program Command */
+@@ -2345,6 +2372,7 @@ eschandle(uchar ascii)
+ 		break;
+ 	case 'c': /* RIS -- Reset to initial state */
+ 		treset();
++		xfreetitlestack();
+ 		resettitle();
+ 		xloadcols();
+ 		break;
+@@ -2631,7 +2659,7 @@ tresize(int col, int row)
+ void
+ resettitle(void)
+ {
+-	xsettitle(NULL);
++	xsettitle(NULL, 0);
+ }
+ 
+ void
+diff --git a/st.info b/st.info
+index 8201ad6..aeef606 100644
+--- a/st.info
++++ b/st.info
+@@ -161,7 +161,7 @@ st-mono| simpleterm monocolor,
+ 	rin=\E[%p1%dT,
+ 	ritm=\E[23m,
+ 	rmacs=\E(B,
+-	rmcup=\E[?1049l,
++	rmcup=\E[?1049l\E[23;0;0t,
+ 	rmir=\E[4l,
+ 	rmkx=\E[?1l\E>,
+ 	rmso=\E[27m,
+@@ -172,7 +172,7 @@ st-mono| simpleterm monocolor,
+ 	sitm=\E[3m,
+ 	sgr0=\E[0m,
+ 	smacs=\E(0,
+-	smcup=\E[?1049h,
++	smcup=\E[?1049h\E[22;0;0t,
+ 	smir=\E[4h,
+ 	smkx=\E[?1h\E=,
+ 	smso=\E[7m,
+diff --git a/win.h b/win.h
+index e6e4369..ef67fd6 100644
+--- a/win.h
++++ b/win.h
+@@ -31,7 +31,9 @@ void xfinishdraw(void);
+ void xloadcols(void);
+ int xsetcolorname(int, const char *);
+ void xseticontitle(char *);
+-void xsettitle(char *);
++void xfreetitlestack(void);
++void xsettitle(char *, int);
++void xpushtitle(void);
+ int xsetcursor(int);
+ void xsetmode(int, unsigned int);
+ void xsetpointermotion(int);
+diff --git a/x.c b/x.c
+index 2a3bd38..babb04c 100644
+--- a/x.c
++++ b/x.c
+@@ -63,6 +63,9 @@ static void ttysend(const Arg *);
+ /* config.h for applying patches and the configuration. */
+ #include "config.h"
+ 
++/* size of title stack */
++#define TITLESTACKSIZE 8
++
+ /* XEMBED messages */
+ #define XEMBED_FOCUS_IN  4
+ #define XEMBED_FOCUS_OUT 5
+@@ -220,6 +223,8 @@ static DC dc;
+ static XWindow xw;
+ static XSelection xsel;
+ static TermWindow win;
++static int tstki; /* title stack index */
++static char *titlestack[TITLESTACKSIZE]; /* title stack */
+ 
+ /* Font Ring Cache */
+ enum {
+@@ -1626,10 +1631,30 @@ xseticontitle(char *p)
+ }
+ 
+ void
+-xsettitle(char *p)
++xfreetitlestack(void)
+ {
+-	XTextProperty prop;
+-	DEFAULT(p, opt_title);
++	for (int i = 0; i < LEN(titlestack); i++) {
++		free(titlestack[i]);
++		titlestack[i] = NULL;
++	}
++}
++
++void
++xsettitle(char *p, int pop)
++{
++ 	XTextProperty prop;
++ 
++	free(titlestack[tstki]);
++	if (pop) {
++		titlestack[tstki] = NULL;
++		tstki = (tstki - 1 + TITLESTACKSIZE) % TITLESTACKSIZE;
++		p = titlestack[tstki] ? titlestack[tstki] : opt_title;
++	} else if (p) {
++		titlestack[tstki] = xstrdup(p);
++	} else {
++		titlestack[tstki] = NULL;
++		p = opt_title;
++	}
+ 
+ 	if (Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
+ 	                                &prop) != Success)
+@@ -1639,6 +1664,16 @@ xsettitle(char *p)
+ 	XFree(prop.value);
+ }
+ 
++void
++xpushtitle(void)
++{
++	int tstkin = (tstki + 1) % TITLESTACKSIZE;
++
++	free(titlestack[tstkin]);
++	titlestack[tstkin] = titlestack[tstki] ? xstrdup(titlestack[tstki]) : NULL;
++	tstki = tstkin;
++}
++
+ int
+ xstartdraw(void)
+ {
+-- 
+2.35.1
+
diff --git a/patches/x11-terms/st/st-visualbell2-basic-2020-05-13-045a0fa.diff b/patches/x11-terms/st/st-visualbell2-basic-2020-05-13-045a0fa.diff
new file mode 100644
index 0000000..a87e243
--- /dev/null
+++ b/patches/x11-terms/st/st-visualbell2-basic-2020-05-13-045a0fa.diff
@@ -0,0 +1,105 @@
+From 18fc7793b0bb2f9a93d39fe69a72d40122e151eb Mon Sep 17 00:00:00 2001
+From: "Avi Halachmi (:avih)" <avihpit@yahoo.com>
+Date: Mon, 15 Oct 2018 01:06:01 +0300
+Subject: [PATCH] add visual bell with few rendering modes
+
+- Inverse the whole terminal - "standard" visual-bell, a bit jarring.
+- Inverse outer (border) cells - much less jarring, yet plenty visible.
+- Inverse the bottom-right corner only.
+- Inverse cells according to custom logic.
+---
+ config.def.h |  8 ++++++++
+ x.c          | 35 +++++++++++++++++++++++++++++++++++
+ 2 files changed, 43 insertions(+)
+
+diff --git a/config.def.h b/config.def.h
+index fdbacfd..fe07204 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -69,6 +69,14 @@ static unsigned int cursorthickness = 2;
+  */
+ static int bellvolume = 0;
+ 
++/* visual-bell timeout in ms (0 to disable visual-bell) */
++static int vbelltimeout = 150;
++
++/* choose predefined visual-bell cells to inverse, or define your own logic */
++#define VBCELL x==0 || x==right || y==0 || y==bottom  /* border */
++// #define VBCELL 1  /* all cells - whole screen */
++// #define VBCELL y==bottom && x>right-2  /* bottom-right */
++
+ /* default TERM value */
+ char *termname = "st-256color";
+ 
+diff --git a/x.c b/x.c
+index 1dc44d6..44d5a8d 100644
+--- a/x.c
++++ b/x.c
+@@ -1592,6 +1592,27 @@ xsettitle(char *p)
+ 	XFree(prop.value);
+ }
+ 
++
++static int vbellset = 0; /* 1 during visual bell, 0 otherwise */
++static struct timespec lastvbell = {0};
++
++static int
++isvbellcell(int x, int y)
++{
++	int right = win.tw / win.cw - 1, bottom = win.th / win.ch - 1;
++	return VBCELL;  /* logic condition defined at config.h */
++}
++
++static void
++vbellbegin() {
++	clock_gettime(CLOCK_MONOTONIC, &lastvbell);
++	if (vbellset)
++		return;
++	vbellset = 1;
++	redraw();
++	XFlush(xw.dpy);
++}
++
+ int
+ xstartdraw(void)
+ {
+@@ -1613,6 +1634,8 @@ xdrawline(Line line, int x1, int y1, int x2)
+ 			continue;
+ 		if (selected(x, y1))
+ 			new.mode ^= ATTR_REVERSE;
++		if (vbellset && isvbellcell(x, y1))
++			new.mode ^= ATTR_REVERSE;
+ 		if (i > 0 && ATTRCMP(base, new)) {
+ 			xdrawglyphfontspecs(specs, base, i, ox, y1);
+ 			specs += i;
+@@ -1714,6 +1737,8 @@ xbell(void)
+ 		xseturgency(1);
+ 	if (bellvolume)
+ 		XkbBell(xw.dpy, xw.win, bellvolume, (Atom)NULL);
++	if (vbelltimeout)
++		vbellbegin();
+ }
+ 
+ void
+@@ -1959,6 +1984,16 @@ run(void)
+ 			}
+ 		}
+ 
++		if (vbellset) {
++			double remain = vbelltimeout - TIMEDIFF(now, lastvbell);
++			if (remain <= 0) {
++				vbellset = 0;
++				redraw();
++			} else if (timeout < 0 || remain < timeout) {
++				timeout = remain;
++			}
++		}
++
+ 		draw();
+ 		XFlush(xw.dpy);
+ 		drawing = 0;
+
+base-commit: 045a0fab4f80b57f4a982ae6bc5f33fe21d66111
+-- 
+2.17.1
+
diff --git a/patches/x11-wm/dwm/0000-dwm-noborderselfflickerfix.diff b/patches/x11-wm/dwm/0000-dwm-noborderselfflickerfix.diff
new file mode 100644
index 0000000..5abc6f7
--- /dev/null
+++ b/patches/x11-wm/dwm/0000-dwm-noborderselfflickerfix.diff
@@ -0,0 +1,52 @@
+diff --git a/dwm.c b/dwm.c
+index 0fc328a..4a767bd 100644
+--- a/dwm.c
++++ b/dwm.c
+@@ -206,5 +206,6 @@ static void setup(void);
+ static void seturgent(Client *c, int urg);
+ static void showhide(Client *c);
++static int solitary(Client *c);
+ static void spawn(const Arg *arg);
+ static void tag(const Arg *arg);
+ static void tagmon(const Arg *arg);
+@@ -802,7 +803,11 @@ focus(Client *c)
+ 		detachstack(c);
+ 		attachstack(c);
+ 		grabbuttons(c, 1);
+-		XSetWindowBorder(dpy, c->win, scheme[SchemeSel][ColBorder].pixel);
++		/* Avoid flickering when another client appears and the border
++		 * is restored */
++		if (!solitary(c)) {
++			XSetWindowBorder(dpy, c->win, scheme[SchemeSel][ColBorder].pixel);
++		}
+ 		setfocus(c);
+ 	} else {
+ 		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+@@ -1288,6 +1293,11 @@ resizeclient(Client *c, int x, int y, int w, int h)
+ 	c->oldw = c->w; c->w = wc.width = w;
+ 	c->oldh = c->h; c->h = wc.height = h;
+ 	wc.border_width = c->bw;
++	if (solitary(c)) {
++		c->w = wc.width += c->bw * 2;
++		c->h = wc.height += c->bw * 2;
++		wc.border_width = 0;
++	}
+ 	XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
+ 	configure(c);
+ 	XSync(dpy, False);
+@@ -1642,6 +1652,15 @@ sigchld(int unused)
+ 	while (0 < waitpid(-1, NULL, WNOHANG));
+ }
+ 
++int
++solitary(Client *c)
++{
++	return ((nexttiled(c->mon->clients) == c && !nexttiled(c->next))
++	    || &monocle == c->mon->lt[c->mon->sellt]->arrange)
++	    && !c->isfullscreen && !c->isfloating
++	    && NULL != c->mon->lt[c->mon->sellt]->arrange;
++}
++
+ void
+ spawn(const Arg *arg)
+ {
diff --git a/patches/x11-wm/dwm/0001-set-solitary-if-fullscreen-ignore-floating-status.patch b/patches/x11-wm/dwm/0001-set-solitary-if-fullscreen-ignore-floating-status.patch
new file mode 100644
index 0000000..9fa999d
--- /dev/null
+++ b/patches/x11-wm/dwm/0001-set-solitary-if-fullscreen-ignore-floating-status.patch
@@ -0,0 +1,25 @@
+From 118741953e1eba532c08adf418605757ba8a17c9 Mon Sep 17 00:00:00 2001
+From: turret <turret@duck.com>
+Date: Thu, 1 Jan 2026 21:03:52 -0600
+Subject: [PATCH] set solitary if fullscreen, ignore floating status
+
+---
+ dwm.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dwm.c b/dwm.c
+index 24f2ec3..4b00eab 100644
+--- a/dwm.c
++++ b/dwm.c
+@@ -1667,7 +1667,7 @@ solitary(Client *c)
+ {
+ 	return ((nexttiled(c->mon->clients) == c && !nexttiled(c->next))
+ 	    || &monocle == c->mon->lt[c->mon->sellt]->arrange)
+-	    && !c->isfullscreen && !c->isfloating
++	    || c->isfullscreen
+ 	    && NULL != c->mon->lt[c->mon->sellt]->arrange;
+ }
+ 
+-- 
+2.51.2
+
diff --git a/patches/x11-wm/dwm/dwm-fakefullscreen-20210714-138b405.diff b/patches/x11-wm/dwm/dwm-fakefullscreen-20210714-138b405.diff
new file mode 100644
index 0000000..eac5270
--- /dev/null
+++ b/patches/x11-wm/dwm/dwm-fakefullscreen-20210714-138b405.diff
@@ -0,0 +1,107 @@
+From 33c7811ca7280be7890851f5a83fa8d1a3313374 Mon Sep 17 00:00:00 2001
+From: Sebastian LaVine <mail@smlavine.com>
+Date: Wed, 14 Jul 2021 11:22:34 -0400
+Subject: [PATCH] Set new lockfullscreen variable to 0
+
+This more properly fixes the problem introduced by 67d76bd than the
+previous patch revision does.
+---
+ config.def.h |  2 +-
+ dwm.c        | 28 ++--------------------------
+ 2 files changed, 3 insertions(+), 27 deletions(-)
+
+diff --git a/dwm.c b/dwm.c
+index 5e4d494..968e256 100644
+--- a/dwm.c
++++ b/dwm.c
+@@ -522,7 +522,7 @@ clientmessage(XEvent *e)
+ 		if (cme->data.l[1] == netatom[NetWMFullscreen]
+ 		|| cme->data.l[2] == netatom[NetWMFullscreen])
+ 			setfullscreen(c, (cme->data.l[0] == 1 /* _NET_WM_STATE_ADD    */
+-				|| (cme->data.l[0] == 2 /* _NET_WM_STATE_TOGGLE */ && !c->isfullscreen)));
++				|| cme->data.l[0] == 2 /* _NET_WM_STATE_TOGGLE */));
+ 	} else if (cme->message_type == netatom[NetActiveWindow]) {
+ 		if (c != selmon->sel && !c->isurgent)
+ 			seturgent(c, 1);
+@@ -552,7 +552,6 @@ void
+ configurenotify(XEvent *e)
+ {
+ 	Monitor *m;
+-	Client *c;
+ 	XConfigureEvent *ev = &e->xconfigure;
+ 	int dirty;
+ 
+@@ -565,9 +564,6 @@ configurenotify(XEvent *e)
+ 			drw_resize(drw, sw, bh);
+ 			updatebars();
+ 			for (m = mons; m; m = m->next) {
+-				for (c = m->clients; c; c = c->next)
+-					if (c->isfullscreen)
+-						resizeclient(c, m->mx, m->my, m->mw, m->mh);
+ 				XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, m->ww, bh);
+ 			}
+ 			focus(NULL);
+@@ -1144,8 +1140,6 @@ movemouse(const Arg *arg)
+ 
+ 	if (!(c = selmon->sel))
+ 		return;
+-	if (c->isfullscreen) /* no support moving fullscreen windows by mouse */
+-		return;
+ 	restack(selmon);
+ 	ocx = c->x;
+ 	ocy = c->y;
+@@ -1299,8 +1293,6 @@ resizemouse(const Arg *arg)
+ 
+ 	if (!(c = selmon->sel))
+ 		return;
+-	if (c->isfullscreen) /* no support resizing fullscreen windows by mouse */
+-		return;
+ 	restack(selmon);
+ 	ocx = c->x;
+ 	ocy = c->y;
+@@ -1477,24 +1469,10 @@ setfullscreen(Client *c, int fullscreen)
+ 		XChangeProperty(dpy, c->win, netatom[NetWMState], XA_ATOM, 32,
+ 			PropModeReplace, (unsigned char*)&netatom[NetWMFullscreen], 1);
+ 		c->isfullscreen = 1;
+-		c->oldstate = c->isfloating;
+-		c->oldbw = c->bw;
+-		c->bw = 0;
+-		c->isfloating = 1;
+-		resizeclient(c, c->mon->mx, c->mon->my, c->mon->mw, c->mon->mh);
+-		XRaiseWindow(dpy, c->win);
+ 	} else if (!fullscreen && c->isfullscreen){
+ 		XChangeProperty(dpy, c->win, netatom[NetWMState], XA_ATOM, 32,
+ 			PropModeReplace, (unsigned char*)0, 0);
+ 		c->isfullscreen = 0;
+-		c->isfloating = c->oldstate;
+-		c->bw = c->oldbw;
+-		c->x = c->oldx;
+-		c->y = c->oldy;
+-		c->w = c->oldw;
+-		c->h = c->oldh;
+-		resizeclient(c, c->x, c->y, c->w, c->h);
+-		arrange(c->mon);
+ 	}
+ }
+ 
+@@ -1619,7 +1597,7 @@ showhide(Client *c)
+ 	if (ISVISIBLE(c)) {
+ 		/* show clients top down */
+ 		XMoveWindow(dpy, c->win, c->x, c->y);
+-		if ((!c->mon->lt[c->mon->sellt]->arrange || c->isfloating) && !c->isfullscreen)
++		if (!c->mon->lt[c->mon->sellt]->arrange || c->isfloating)
+ 			resize(c, c->x, c->y, c->w, c->h, 0);
+ 		showhide(c->snext);
+ 	} else {
+@@ -1713,8 +1691,6 @@ togglefloating(const Arg *arg)
+ {
+ 	if (!selmon->sel)
+ 		return;
+-	if (selmon->sel->isfullscreen) /* no support for fullscreen windows */
+-		return;
+ 	selmon->sel->isfloating = !selmon->sel->isfloating || selmon->sel->isfixed;
+ 	if (selmon->sel->isfloating)
+ 		resize(selmon->sel, selmon->sel->x, selmon->sel->y,
+-- 
+2.32.0
+
diff --git a/patches/x11-wm/dwm/dwm-hide_vacant_tags-6.3.diff b/patches/x11-wm/dwm/dwm-hide_vacant_tags-6.3.diff
new file mode 100644
index 0000000..0ccc7fc
--- /dev/null
+++ b/patches/x11-wm/dwm/dwm-hide_vacant_tags-6.3.diff
@@ -0,0 +1,39 @@
+diff --git a/dwm.c b/dwm.c
+index a96f33c..f2da729 100644
+--- a/dwm.c
++++ b/dwm.c
+@@ -432,9 +432,15 @@ buttonpress(XEvent *e)
+ 	}
+ 	if (ev->window == selmon->barwin) {
+ 		i = x = 0;
+-		do
++		unsigned int occ = 0;
++		for(c = m->clients; c; c=c->next)
++			occ |= c->tags;
++		do {
++			/* Do not reserve space for vacant tags */
++			if (!(occ & 1 << i || m->tagset[m->seltags] & 1 << i))
++				continue;
+ 			x += TEXTW(tags[i]);
+-		while (ev->x >= x && ++i < LENGTH(tags));
++		} while (ev->x >= x && ++i < LENGTH(tags));
+ 		if (i < LENGTH(tags)) {
+ 			click = ClkTagBar;
+ 			arg.ui = 1 << i;
+@@ -719,13 +725,12 @@ drawbar(Monitor *m)
+ 	}
+ 	x = 0;
+ 	for (i = 0; i < LENGTH(tags); i++) {
++		/* Do not draw vacant tags */
++		if(!(occ & 1 << i || m->tagset[m->seltags] & 1 << i))
++			continue;
+ 		w = TEXTW(tags[i]);
+ 		drw_setscheme(drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeSel : SchemeNorm]);
+ 		drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], urg & 1 << i);
+-		if (occ & 1 << i)
+-			drw_rect(drw, x + boxs, boxs, boxw, boxw,
+-				m == selmon && selmon->sel && selmon->sel->tags & 1 << i,
+-				urg & 1 << i);
+ 		x += w;
+ 	}
+ 	w = blw = TEXTW(m->ltsymbol);
diff --git a/patches/x11-wm/dwm/dwm-pertag-20200914-61bb8b2.diff b/patches/x11-wm/dwm/dwm-pertag-20200914-61bb8b2.diff
new file mode 100644
index 0000000..c8d7fbc
--- /dev/null
+++ b/patches/x11-wm/dwm/dwm-pertag-20200914-61bb8b2.diff
@@ -0,0 +1,177 @@
+diff --git a/dwm.c b/dwm.c
+index 664c527..ac8e4ec 100644
+--- a/dwm.c
++++ b/dwm.c
+@@ -111,6 +111,7 @@ typedef struct {
+ 	void (*arrange)(Monitor *);
+ } Layout;
+ 
++typedef struct Pertag Pertag;
+ struct Monitor {
+ 	char ltsymbol[16];
+ 	float mfact;
+@@ -130,6 +131,7 @@ struct Monitor {
+ 	Monitor *next;
+ 	Window barwin;
+ 	const Layout *lt[2];
++	Pertag *pertag;
+ };
+ 
+ typedef struct {
+@@ -272,6 +274,15 @@ static Window root, wmcheckwin;
+ /* configuration, allows nested code to access above variables */
+ #include "config.h"
+ 
++struct Pertag {
++	unsigned int curtag, prevtag; /* current and previous tag */
++	int nmasters[LENGTH(tags) + 1]; /* number of windows in master area */
++	float mfacts[LENGTH(tags) + 1]; /* mfacts per tag */
++	unsigned int sellts[LENGTH(tags) + 1]; /* selected layouts */
++	const Layout *ltidxs[LENGTH(tags) + 1][2]; /* matrix of tags and layouts indexes  */
++	int showbars[LENGTH(tags) + 1]; /* display bar for the current tag */
++};
++
+ /* compile-time check if all tags fit into an unsigned int bit array. */
+ struct NumTags { char limitexceeded[LENGTH(tags) > 31 ? -1 : 1]; };
+ 
+@@ -632,6 +643,7 @@ Monitor *
+ createmon(void)
+ {
+ 	Monitor *m;
++	unsigned int i;
+ 
+ 	m = ecalloc(1, sizeof(Monitor));
+ 	m->tagset[0] = m->tagset[1] = 1;
+@@ -642,6 +654,20 @@ createmon(void)
+ 	m->lt[0] = &layouts[0];
+ 	m->lt[1] = &layouts[1 % LENGTH(layouts)];
+ 	strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol);
++	m->pertag = ecalloc(1, sizeof(Pertag));
++	m->pertag->curtag = m->pertag->prevtag = 1;
++
++	for (i = 0; i <= LENGTH(tags); i++) {
++		m->pertag->nmasters[i] = m->nmaster;
++		m->pertag->mfacts[i] = m->mfact;
++
++		m->pertag->ltidxs[i][0] = m->lt[0];
++		m->pertag->ltidxs[i][1] = m->lt[1];
++		m->pertag->sellts[i] = m->sellt;
++
++		m->pertag->showbars[i] = m->showbar;
++	}
++
+ 	return m;
+ }
+ 
+@@ -967,7 +993,7 @@ grabkeys(void)
+ void
+ incnmaster(const Arg *arg)
+ {
+-	selmon->nmaster = MAX(selmon->nmaster + arg->i, 0);
++	selmon->nmaster = selmon->pertag->nmasters[selmon->pertag->curtag] = MAX(selmon->nmaster + arg->i, 0);
+ 	arrange(selmon);
+ }
+ 
+@@ -1502,9 +1528,9 @@ void
+ setlayout(const Arg *arg)
+ {
+ 	if (!arg || !arg->v || arg->v != selmon->lt[selmon->sellt])
+-		selmon->sellt ^= 1;
++		selmon->sellt = selmon->pertag->sellts[selmon->pertag->curtag] ^= 1;
+ 	if (arg && arg->v)
+-		selmon->lt[selmon->sellt] = (Layout *)arg->v;
++		selmon->lt[selmon->sellt] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt] = (Layout *)arg->v;
+ 	strncpy(selmon->ltsymbol, selmon->lt[selmon->sellt]->symbol, sizeof selmon->ltsymbol);
+ 	if (selmon->sel)
+ 		arrange(selmon);
+@@ -1523,7 +1549,7 @@ setmfact(const Arg *arg)
+ 	f = arg->f < 1.0 ? arg->f + selmon->mfact : arg->f - 1.0;
+ 	if (f < 0.05 || f > 0.95)
+ 		return;
+-	selmon->mfact = f;
++	selmon->mfact = selmon->pertag->mfacts[selmon->pertag->curtag] = f;
+ 	arrange(selmon);
+ }
+ 
+@@ -1702,7 +1728,7 @@ tile(Monitor *m)
+ void
+ togglebar(const Arg *arg)
+ {
+-	selmon->showbar = !selmon->showbar;
++	selmon->showbar = selmon->pertag->showbars[selmon->pertag->curtag] = !selmon->showbar;
+ 	updatebarpos(selmon);
+ 	XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh);
+ 	arrange(selmon);
+@@ -1741,9 +1767,33 @@ void
+ toggleview(const Arg *arg)
+ {
+ 	unsigned int newtagset = selmon->tagset[selmon->seltags] ^ (arg->ui & TAGMASK);
++	int i;
+ 
+ 	if (newtagset) {
+ 		selmon->tagset[selmon->seltags] = newtagset;
++
++		if (newtagset == ~0) {
++			selmon->pertag->prevtag = selmon->pertag->curtag;
++			selmon->pertag->curtag = 0;
++		}
++
++		/* test if the user did not select the same tag */
++		if (!(newtagset & 1 << (selmon->pertag->curtag - 1))) {
++			selmon->pertag->prevtag = selmon->pertag->curtag;
++			for (i = 0; !(newtagset & 1 << i); i++) ;
++			selmon->pertag->curtag = i + 1;
++		}
++
++		/* apply settings for this view */
++		selmon->nmaster = selmon->pertag->nmasters[selmon->pertag->curtag];
++		selmon->mfact = selmon->pertag->mfacts[selmon->pertag->curtag];
++		selmon->sellt = selmon->pertag->sellts[selmon->pertag->curtag];
++		selmon->lt[selmon->sellt] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt];
++		selmon->lt[selmon->sellt^1] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt^1];
++
++		if (selmon->showbar != selmon->pertag->showbars[selmon->pertag->curtag])
++			togglebar(NULL);
++
+ 		focus(NULL);
+ 		arrange(selmon);
+ 	}
+@@ -2038,11 +2088,37 @@ updatewmhints(Client *c)
+ void
+ view(const Arg *arg)
+ {
++	int i;
++	unsigned int tmptag;
++
+ 	if ((arg->ui & TAGMASK) == selmon->tagset[selmon->seltags])
+ 		return;
+ 	selmon->seltags ^= 1; /* toggle sel tagset */
+-	if (arg->ui & TAGMASK)
++	if (arg->ui & TAGMASK) {
+ 		selmon->tagset[selmon->seltags] = arg->ui & TAGMASK;
++		selmon->pertag->prevtag = selmon->pertag->curtag;
++
++		if (arg->ui == ~0)
++			selmon->pertag->curtag = 0;
++		else {
++			for (i = 0; !(arg->ui & 1 << i); i++) ;
++			selmon->pertag->curtag = i + 1;
++		}
++	} else {
++		tmptag = selmon->pertag->prevtag;
++		selmon->pertag->prevtag = selmon->pertag->curtag;
++		selmon->pertag->curtag = tmptag;
++	}
++
++	selmon->nmaster = selmon->pertag->nmasters[selmon->pertag->curtag];
++	selmon->mfact = selmon->pertag->mfacts[selmon->pertag->curtag];
++	selmon->sellt = selmon->pertag->sellts[selmon->pertag->curtag];
++	selmon->lt[selmon->sellt] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt];
++	selmon->lt[selmon->sellt^1] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt^1];
++
++	if (selmon->showbar != selmon->pertag->showbars[selmon->pertag->curtag])
++		togglebar(NULL);
++
+ 	focus(NULL);
+ 	arrange(selmon);
+ }