commit aaee8d1c7d0c426b67725aa01ef86297df6689e6
Author: Jochen Sprickerhof <[email protected]>
Date: Sat Dec 5 14:14:58 2020 +0100
[st][scrollback] Update for latest release and git
diff --git a/st.suckless.org/patches/scrollback/index.md
b/st.suckless.org/patches/scrollback/index.md
index 8f154408..bd0276ea 100644
--- a/st.suckless.org/patches/scrollback/index.md
+++ b/st.suckless.org/patches/scrollback/index.md
@@ -7,11 +7,8 @@ Scroll back through terminal output using Shift+{PageUp,
PageDown}.
Download
--------
-* [st-scrollback-0.7.diff](st-scrollback-0.7.diff)
-* [st-scrollback-0.8.diff](st-scrollback-0.8.diff)
-* [st-scrollback-0.8.1.diff](st-scrollback-0.8.1.diff)
-* [st-scrollback-0.8.2.diff](st-scrollback-0.8.2.diff)
-* [st-scrollback-20200419-72e3f6c.diff](st-scrollback-20200419-72e3f6c.diff)
+* [st-scrollback-0.8.4.diff](st-scrollback-0.8.4.diff)
+* [st-scrollback-20201205-4ef0cbd.diff](st-scrollback-20201205-4ef0cbd.diff)
Apply the following patch on top of the previous to allow scrolling
using `Shift+MouseWheel`.
diff --git a/st.suckless.org/patches/scrollback/st-scrollback-0.7.diff
b/st.suckless.org/patches/scrollback/st-scrollback-0.7.diff
deleted file mode 100644
index 3f23f872..00000000
--- a/st.suckless.org/patches/scrollback/st-scrollback-0.7.diff
+++ /dev/null
@@ -1,387 +0,0 @@
-diff --git a/config.def.h b/config.def.h
-index b41747f..eae969e 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -7,6 +7,7 @@
- */
- static char font[] = "Liberation
Mono:pixelsize=12:antialias=true:autohint=true";
- static int borderpx = 2;
-+#define histsize 2000
-
- /*
- * What program is execed by st depends of these precedence rules:
-@@ -172,6 +173,8 @@ static Shortcut shortcuts[] = {
- { MODKEY|ShiftMask, XK_C, clipcopy, {.i = 0} },
- { MODKEY|ShiftMask, XK_V, clippaste, {.i = 0} },
- { MODKEY, 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 2594c65..233d301 100644
---- a/st.c
-+++ b/st.c
-@@ -86,6 +86,8 @@ char *argv0;
- #define TRUERED(x) (((x) & 0xff0000) >> 8)
- #define TRUEGREEN(x) (((x) & 0xff00))
- #define TRUEBLUE(x) (((x) & 0xff) << 8)
-+#define TLINE(y) ((y) < term.scr ? term.hist[((y) + term.histi -
term.scr \
-+ + histsize + 1) % histsize] : term.line[(y) -
term.scr])
-
-
- enum glyph_attribute {
-@@ -228,26 +230,6 @@ typedef struct {
- int narg; /* nb of args */
- } STREscape;
-
--/* Internal representation of the screen */
--typedef struct {
-- int row; /* nb row */
-- int col; /* nb col */
-- Line *line; /* screen */
-- Line *alt; /* alternate screen */
-- int *dirty; /* dirtyness of lines */
-- XftGlyphFontSpec *specbuf; /* font spec buffer used for rendering */
-- TCursor c; /* cursor */
-- int top; /* top scroll limit */
-- int bot; /* bottom scroll limit */
-- int mode; /* terminal mode flags */
-- int esc; /* escape state flags */
-- char trantbl[4]; /* charset table translation */
-- int charset; /* current charset */
-- int icharset; /* selected charset for sequence */
-- int numlock; /* lock numbers in keyboard */
-- int *tabs;
--} Term;
--
- /* Purely graphic info */
- typedef struct {
- Display *dpy;
-@@ -327,6 +309,8 @@ typedef struct {
- /* function definitions used in config.h */
- static void clipcopy(const Arg *);
- static void clippaste(const Arg *);
-+static void kscrolldown(const Arg *);
-+static void kscrollup(const Arg *);
- static void numlock(const Arg *);
- static void selpaste(const Arg *);
- static void xzoom(const Arg *);
-@@ -340,6 +324,29 @@ static void sendbreak(const Arg *);
- /* Config.h for applying patches and the configuration. */
- #include "config.h"
-
-+/* Internal representation of the screen */
-+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 *dirty; /* dirtyness of lines */
-+ XftGlyphFontSpec *specbuf; /* font spec buffer used for rendering */
-+ TCursor c; /* cursor */
-+ int top; /* top scroll limit */
-+ int bot; /* bottom scroll limit */
-+ int mode; /* terminal mode flags */
-+ int esc; /* escape state flags */
-+ char trantbl[4]; /* charset table translation */
-+ int charset; /* current charset */
-+ int icharset; /* selected charset for sequence */
-+ int numlock; /* lock numbers in keyboard */
-+ int *tabs;
-+} Term;
-+
- /* Font structure */
- typedef struct {
- int height;
-@@ -399,8 +406,8 @@ static void tputtab(int);
- static void tputc(Rune);
- static void treset(void);
- static void tresize(int, int);
--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(int *, int);
- static void tsetchar(Rune, Glyph *, int, int);
- static void tsetscroll(int, int);
-@@ -731,10 +738,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;
-@@ -796,7 +803,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;
-@@ -811,14 +818,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)))
-@@ -839,14 +846,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;
- }
-@@ -1012,13 +1019,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;
-
-@@ -1490,6 +1497,9 @@ ttyread(void)
- /* keep any uncomplete utf8 char for the next call */
- memmove(buf, ptr, buflen);
-
-+ if (term.scr > 0 && term.scr < histsize-1)
-+ term.scr++;
-+
- return ret;
- }
-
-@@ -1499,6 +1509,9 @@ ttywrite(const char *s, size_t n)
- fd_set wfd, rfd;
- ssize_t r;
- size_t lim = 256;
-+ Arg arg = (Arg){ .i = term.scr };
-+
-+ kscrolldown(&arg);
-
- /*
- * Remember that we are using a pty, which might be a modem line.
-@@ -1690,13 +1703,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);
-
-@@ -1710,13 +1763,20 @@ tscrolldown(int orig, int 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;
-+ }
-+
- tclearregion(0, orig, term.col-1, orig+n-1);
- tsetdirt(orig+n, term.bot);
-
-@@ -1765,7 +1825,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++;
- }
-@@ -1930,14 +1990,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
-@@ -2371,11 +2431,11 @@ csihandle(void)
- break;
- case 'S': /* SU -- Scroll <n> line up */
- DEFAULT(csiescseq.arg[0], 1);
-- tscrollup(term.top, csiescseq.arg[0]);
-+ tscrollup(term.top, csiescseq.arg[0], 0);
- break;
- case 'T': /* SD -- Scroll <n> line down */
- DEFAULT(csiescseq.arg[0], 1);
-- tscrolldown(term.top, csiescseq.arg[0]);
-+ tscrolldown(term.top, csiescseq.arg[0], 0);
- break;
- case 'L': /* IL -- Insert <n> blank lines */
- DEFAULT(csiescseq.arg[0], 1);
-@@ -2871,7 +2931,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);
- }
-@@ -2884,7 +2944,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);
- }
-@@ -3047,7 +3107,7 @@ tputc(Rune u)
- 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;
-@@ -3087,6 +3147,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));
-@@ -3976,11 +4044,11 @@ drawregion(int x1, int y1, int x2, int y2)
- term.dirty[y] = 0;
-
- specs = term.specbuf;
-- numspecs = xmakeglyphfontspecs(specs, &term.line[y][x1], x2 -
x1, x1, y);
-+ numspecs = xmakeglyphfontspecs(specs, &TLINE(y)[x1], x2 - x1,
x1, y);
-
- i = ox = 0;
- for (x = x1; x < x2 && i < numspecs; x++) {
-- new = term.line[y][x];
-+ new = TLINE(y)[x];
- if (new.mode == ATTR_WDUMMY)
- continue;
- if (ena_sel && selected(x, y))
-@@ -4000,7 +4068,8 @@ drawregion(int x1, int y1, int x2, int y2)
- if (i > 0)
- xdrawglyphfontspecs(specs, base, i, ox, y);
- }
-- xdrawcursor();
-+ if (term.scr == 0)
-+ xdrawcursor();
- }
-
- void
diff --git a/st.suckless.org/patches/scrollback/st-scrollback-0.8.1.diff
b/st.suckless.org/patches/scrollback/st-scrollback-0.8.1.diff
deleted file mode 100644
index face2d9b..00000000
--- a/st.suckless.org/patches/scrollback/st-scrollback-0.8.1.diff
+++ /dev/null
@@ -1,349 +0,0 @@
-From f2d5975051daf2b4496a0b0193381e0d6c55a80b Mon Sep 17 00:00:00 2001
-From: Jordan Cran <[email protected]>
-Date: Sun, 17 Feb 2019 11:57:35 +1100
-Subject: [PATCH] Add scrollback (4000 line history default) for 0.8.1
-
----
- config.def.h | 2 +
- st.c | 119 ++++++++++++++++++++++++++++++++++++++++-----------
- st.h | 2 +
- 3 files changed, 98 insertions(+), 25 deletions(-)
-
-diff --git a/config.def.h b/config.def.h
-index 82b1b09..27d42ca 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -178,6 +178,8 @@ static Shortcut shortcuts[] = {
- { TERMMOD, XK_Y, selpaste, {.i = 0} },
- { TERMMOD, XK_Num_Lock, numlock, {.i = 0} },
- { TERMMOD, XK_I, iso14755, {.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 46c954b..a6a0ba0 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)
-@@ -43,6 +44,9 @@
- #define ISCONTROLC1(c) (BETWEEN(c, 0x80, 0x9f))
- #define ISCONTROL(c) (ISCONTROLC0(c) || ISCONTROLC1(c))
- #define ISDELIM(u) (utf8strchr(worddelimiters, u) != NULL)
-+#define TLINE(y) ((y) < term.scr ? term.hist[((y) + term.histi -
\
-+ term.scr + HISTSIZE + 1) % HISTSIZE] : \
-+ term.line[(y) - term.scr])
-
- /* constants */
- #define ISO14755CMD "dmenu -w \"$WINDOWID\" -p codepoint:
</dev/null"
-@@ -121,6 +125,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 */
-@@ -188,8 +195,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(int *, int);
- static void tsetchar(Rune, Glyph *, int, int);
- static void tsetdirt(int, int);
-@@ -431,10 +438,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;
-@@ -543,7 +550,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;
-@@ -558,14 +565,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)))
-@@ -586,14 +593,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;
- }
-@@ -624,13 +631,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;
-
-@@ -842,6 +849,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);
-@@ -1053,13 +1063,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);
-
-@@ -1073,13 +1123,23 @@ tscrolldown(int orig, int 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);
-
-@@ -1128,7 +1188,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++;
- }
-@@ -1293,14 +1353,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
-@@ -1729,11 +1789,11 @@ csihandle(void)
- break;
- case 'S': /* SU -- Scroll <n> line up */
- DEFAULT(csiescseq.arg[0], 1);
-- tscrollup(term.top, csiescseq.arg[0]);
-+ tscrollup(term.top, csiescseq.arg[0], 0);
- break;
- case 'T': /* SD -- Scroll <n> line down */
- DEFAULT(csiescseq.arg[0], 1);
-- tscrolldown(term.top, csiescseq.arg[0]);
-+ tscrolldown(term.top, csiescseq.arg[0], 0);
- break;
- case 'L': /* IL -- Insert <n> blank lines */
- DEFAULT(csiescseq.arg[0], 1);
-@@ -2257,7 +2317,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);
- }
-@@ -2270,7 +2330,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);
- }
-@@ -2489,7 +2549,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;
-@@ -2526,6 +2586,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));
-@@ -2583,7 +2651,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);
- }
- }
-
-@@ -2604,8 +2672,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 dac64d8..d47e5fd 100644
---- a/st.h
-+++ b/st.h
-@@ -80,6 +80,8 @@ void die(const char *, ...);
- void redraw(void);
- void draw(void);
-
-+void kscrolldown(const Arg *);
-+void kscrollup(const Arg *);
- void iso14755(const Arg *);
- void printscreen(const Arg *);
- void printsel(const Arg *);
---
-2.18.1
-
diff --git
a/st.suckless.org/patches/scrollback/st-scrollback-20200419-72e3f6c.diff
b/st.suckless.org/patches/scrollback/st-scrollback-0.8.4.diff
similarity index 88%
rename from
st.suckless.org/patches/scrollback/st-scrollback-20200419-72e3f6c.diff
rename to st.suckless.org/patches/scrollback/st-scrollback-0.8.4.diff
index e72999c1..88e0c794 100644
--- a/st.suckless.org/patches/scrollback/st-scrollback-20200419-72e3f6c.diff
+++ b/st.suckless.org/patches/scrollback/st-scrollback-0.8.4.diff
@@ -1,8 +1,8 @@
diff --git a/config.def.h b/config.def.h
-index 0895a1f..eef24df 100644
+index 6f05dce..93cbcc0 100644
--- a/config.def.h
+++ b/config.def.h
-@@ -188,6 +188,8 @@ static Shortcut shortcuts[] = {
+@@ -199,6 +199,8 @@ static Shortcut shortcuts[] = {
{ TERMMOD, XK_Y, selpaste, {.i = 0} },
{ ShiftMask, XK_Insert, selpaste, {.i = 0} },
{ TERMMOD, XK_Num_Lock, numlock, {.i = 0} },
@@ -12,7 +12,7 @@ index 0895a1f..eef24df 100644
/*
diff --git a/st.c b/st.c
-index 0ce6ac2..641edc0 100644
+index 76b7e0d..edec064 100644
--- a/st.c
+++ b/st.c
@@ -35,6 +35,7 @@
@@ -33,7 +33,7 @@ index 0ce6ac2..641edc0 100644
enum term_mode {
MODE_WRAP = 1 << 0,
-@@ -117,6 +121,9 @@ typedef struct {
+@@ -115,6 +119,9 @@ typedef struct {
int col; /* nb col */
Line *line; /* screen */
Line *alt; /* alternate screen */
@@ -43,7 +43,7 @@ index 0ce6ac2..641edc0 100644
int *dirty; /* dirtyness of lines */
TCursor c; /* cursor */
int ocx; /* old cursor col */
-@@ -185,8 +192,8 @@ static void tnewline(int);
+@@ -184,8 +191,8 @@ static void tnewline(int);
static void tputtab(int);
static void tputc(Rune);
static void treset(void);
@@ -54,7 +54,7 @@ index 0ce6ac2..641edc0 100644
static void tsetattr(int *, int);
static void tsetchar(Rune, Glyph *, int, int);
static void tsetdirt(int, int);
-@@ -415,10 +422,10 @@ tlinelen(int y)
+@@ -414,10 +421,10 @@ tlinelen(int y)
{
int i = term.col;
@@ -67,7 +67,7 @@ index 0ce6ac2..641edc0 100644
--i;
return i;
-@@ -527,7 +534,7 @@ selsnap(int *x, int *y, int direction)
+@@ -526,7 +533,7 @@ selsnap(int *x, int *y, int direction)
* Snap around if the word wraps around at the end or
* beginning of a line.
*/
@@ -76,7 +76,7 @@ index 0ce6ac2..641edc0 100644
prevdelim = ISDELIM(prevgp->u);
for (;;) {
newx = *x + direction;
-@@ -542,14 +549,14 @@ selsnap(int *x, int *y, int direction)
+@@ -541,14 +548,14 @@ selsnap(int *x, int *y, int direction)
yt = *y, xt = *x;
else
yt = newy, xt = newx;
@@ -93,7 +93,7 @@ index 0ce6ac2..641edc0 100644
delim = ISDELIM(gp->u);
if (!(gp->mode & ATTR_WDUMMY) && (delim != prevdelim
|| (delim && gp->u != prevgp->u)))
-@@ -570,14 +577,14 @@ selsnap(int *x, int *y, int direction)
+@@ -569,14 +576,14 @@ selsnap(int *x, int *y, int direction)
*x = (direction < 0) ? 0 : term.col - 1;
if (direction < 0) {
for (; *y > 0; *y += direction) {
@@ -110,7 +110,7 @@ index 0ce6ac2..641edc0 100644
& ATTR_WRAP)) {
break;
}
-@@ -608,13 +615,13 @@ getsel(void)
+@@ -607,13 +614,13 @@ getsel(void)
}
if (sel.type == SEL_RECTANGULAR) {
@@ -127,7 +127,7 @@ index 0ce6ac2..641edc0 100644
while (last >= gp && last->u == ' ')
--last;
-@@ -849,6 +856,9 @@ void
+@@ -848,6 +855,9 @@ void
ttywrite(const char *s, size_t n, int may_echo)
{
const char *next;
@@ -137,7 +137,7 @@ index 0ce6ac2..641edc0 100644
if (may_echo && IS_SET(MODE_ECHO))
twrite(s, n, 1);
-@@ -1060,13 +1070,53 @@ tswapscreen(void)
+@@ -1059,13 +1069,53 @@ tswapscreen(void)
}
void
@@ -192,7 +192,7 @@ index 0ce6ac2..641edc0 100644
tsetdirt(orig, term.bot-n);
tclearregion(0, term.bot-n+1, term.col-1, term.bot);
-@@ -1076,17 +1126,28 @@ tscrolldown(int orig, int n)
+@@ -1075,17 +1125,28 @@ tscrolldown(int orig, int n)
term.line[i-n] = temp;
}
@@ -223,7 +223,7 @@ index 0ce6ac2..641edc0 100644
tclearregion(0, orig, term.col-1, orig+n-1);
tsetdirt(orig+n, term.bot);
-@@ -1096,7 +1157,8 @@ tscrollup(int orig, int n)
+@@ -1095,7 +1156,8 @@ tscrollup(int orig, int n)
term.line[i+n] = temp;
}
@@ -233,7 +233,7 @@ index 0ce6ac2..641edc0 100644
}
void
-@@ -1135,7 +1197,7 @@ tnewline(int first_col)
+@@ -1124,7 +1186,7 @@ tnewline(int first_col)
int y = term.c.y;
if (y == term.bot) {
@@ -242,7 +242,7 @@ index 0ce6ac2..641edc0 100644
} else {
y++;
}
-@@ -1300,14 +1362,14 @@ void
+@@ -1289,14 +1351,14 @@ void
tinsertblankline(int n)
{
if (BETWEEN(term.c.y, term.top, term.bot))
@@ -259,7 +259,7 @@ index 0ce6ac2..641edc0 100644
}
int32_t
-@@ -1738,11 +1800,11 @@ csihandle(void)
+@@ -1733,11 +1795,11 @@ csihandle(void)
break;
case 'S': /* SU -- Scroll <n> line up */
DEFAULT(csiescseq.arg[0], 1);
@@ -273,7 +273,7 @@ index 0ce6ac2..641edc0 100644
break;
case 'L': /* IL -- Insert <n> blank lines */
DEFAULT(csiescseq.arg[0], 1);
-@@ -2248,7 +2310,7 @@ eschandle(uchar ascii)
+@@ -2241,7 +2303,7 @@ eschandle(uchar ascii)
return 0;
case 'D': /* IND -- Linefeed */
if (term.c.y == term.bot) {
@@ -282,7 +282,7 @@ index 0ce6ac2..641edc0 100644
} else {
tmoveto(term.c.x, term.c.y+1);
}
-@@ -2261,7 +2323,7 @@ eschandle(uchar ascii)
+@@ -2254,7 +2316,7 @@ eschandle(uchar ascii)
break;
case 'M': /* RI -- Reverse index */
if (term.c.y == term.top) {
@@ -291,7 +291,7 @@ index 0ce6ac2..641edc0 100644
} else {
tmoveto(term.c.x, term.c.y-1);
}
-@@ -2482,7 +2544,7 @@ twrite(const char *buf, int buflen, int show_ctrl)
+@@ -2464,7 +2526,7 @@ twrite(const char *buf, int buflen, int show_ctrl)
void
tresize(int col, int row)
{
@@ -300,7 +300,7 @@ index 0ce6ac2..641edc0 100644
int minrow = MIN(row, term.row);
int mincol = MIN(col, term.col);
int *bp;
-@@ -2519,6 +2581,14 @@ tresize(int col, int row)
+@@ -2501,6 +2563,14 @@ tresize(int col, int row)
term.dirty = xrealloc(term.dirty, row * sizeof(*term.dirty));
term.tabs = xrealloc(term.tabs, col * sizeof(*term.tabs));
@@ -315,7 +315,7 @@ index 0ce6ac2..641edc0 100644
/* 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));
-@@ -2577,7 +2647,7 @@ drawregion(int x1, int y1, int x2, int y2)
+@@ -2559,7 +2629,7 @@ drawregion(int x1, int y1, int x2, int y2)
continue;
term.dirty[y] = 0;
@@ -324,7 +324,7 @@ index 0ce6ac2..641edc0 100644
}
}
-@@ -2598,8 +2668,9 @@ draw(void)
+@@ -2580,8 +2650,9 @@ draw(void)
cx--;
drawregion(0, 0, term.col, term.row);
@@ -337,7 +337,7 @@ index 0ce6ac2..641edc0 100644
term.ocy = term.c.y;
xfinishdraw();
diff --git a/st.h b/st.h
-index d978458..b9a4eeb 100644
+index 3d351b6..f44e1d3 100644
--- a/st.h
+++ b/st.h
@@ -81,6 +81,8 @@ void die(const char *, ...);
diff --git a/st.suckless.org/patches/scrollback/st-scrollback-0.8.diff
b/st.suckless.org/patches/scrollback/st-scrollback-0.8.diff
deleted file mode 100644
index bd71589b..00000000
--- a/st.suckless.org/patches/scrollback/st-scrollback-0.8.diff
+++ /dev/null
@@ -1,348 +0,0 @@
-diff --git a/config.def.h b/config.def.h
-index 82b1b09..27d42ca 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -178,6 +178,8 @@ static Shortcut shortcuts[] = {
- { TERMMOD, XK_Y, selpaste, {.i = 0} },
- { TERMMOD, XK_Num_Lock, numlock, {.i = 0} },
- { TERMMOD, XK_I, iso14755, {.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 65a0cb6..1d8c12a 100644
---- a/st.c
-+++ b/st.c
-@@ -121,6 +121,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 */
-@@ -188,8 +191,8 @@ static void tnewline(int);
- static void tputtab(int);
- static void tputc(Rune);
- static void treset(void);
--static void tscrollup(int, int);
--static void tscrolldown(int, int);
-+static void tscrollup(int, int, int);
-+static void tscrolldown(int, int, int);
- static void tsetattr(int *, int);
- static void tsetchar(Rune, Glyph *, int, int);
- static void tsetdirt(int, int);
-@@ -431,10 +434,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;
-@@ -543,7 +546,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;
-@@ -558,14 +561,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)))
-@@ -586,14 +589,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;
- }
-@@ -624,13 +627,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;
-
-@@ -836,6 +839,9 @@ ttyread(void)
- if (buflen > 0)
- memmove(buf, buf + written, buflen);
-
-+ if (term.scr > 0 && term.scr < HISTSIZE-1)
-+ term.scr++;
-+
- return ret;
- }
-
-@@ -843,6 +849,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);
-@@ -1054,13 +1063,54 @@ 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);
-
-@@ -1074,13 +1124,20 @@ tscrolldown(int orig, int 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;
-+ }
-+
- tclearregion(0, orig, term.col-1, orig+n-1);
- tsetdirt(orig+n, term.bot);
-
-@@ -1129,7 +1186,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++;
- }
-@@ -1294,14 +1351,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 +1787,11 @@ csihandle(void)
- break;
- case 'S': /* SU -- Scroll <n> line up */
- DEFAULT(csiescseq.arg[0], 1);
-- tscrollup(term.top, csiescseq.arg[0]);
-+ tscrollup(term.top, csiescseq.arg[0], 0);
- break;
- case 'T': /* SD -- Scroll <n> line down */
- DEFAULT(csiescseq.arg[0], 1);
-- tscrolldown(term.top, csiescseq.arg[0]);
-+ tscrolldown(term.top, csiescseq.arg[0], 0);
- break;
- case 'L': /* IL -- Insert <n> blank lines */
- DEFAULT(csiescseq.arg[0], 1);
-@@ -2258,7 +2315,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);
- }
-@@ -2271,7 +2328,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);
- }
-@@ -2490,7 +2547,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;
-@@ -2527,7 +2584,15 @@ tresize(int col, int row)
- term.dirty = xrealloc(term.dirty, row * sizeof(*term.dirty));
- term.tabs = xrealloc(term.tabs, col * sizeof(*term.tabs));
-
-- /* resize each row to new width, zero-pad if needed */
-+ for (i = 0; i < 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 r w 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));
-@@ -2584,7 +2649,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);
- }
- }
-
-@@ -2605,8 +2670,10 @@ 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 dac64d8..628e876 100644
---- a/st.h
-+++ b/st.h
-@@ -3,6 +3,9 @@
- #include <stdint.h>
- #include <sys/types.h>
-
-+/* Arbitrary size */
-+#define HISTSIZE 2000
-+
- /* macros */
- #define MIN(a, b) ((a) < (b) ? (a) : (b))
- #define MAX(a, b) ((a) < (b) ? (b) : (a))
-@@ -19,6 +22,8 @@
-
- #define TRUECOLOR(r,g,b) (1 << 24 | (r) << 16 | (g) << 8 | (b))
- #define IS_TRUECOL(x) (1 << 24 & (x))
-+#define TLINE(y) ((y) < term.scr ? term.hist[((y) + term.histi -
term.scr \
-+ + HISTSIZE + 1) % HISTSIZE] : term.line[(y) - term.scr])
-
- enum glyph_attribute {
- ATTR_NULL = 0,
-@@ -111,6 +116,9 @@ void *xmalloc(size_t);
- void *xrealloc(void *, size_t);
- char *xstrdup(char *);
-
-+void kscrolldown(const Arg *);
-+void kscrollup(const Arg *);
-+
- /* config.h globals */
- extern char *utmp;
- extern char *stty_args;
diff --git a/st.suckless.org/patches/scrollback/st-scrollback-0.8.2.diff
b/st.suckless.org/patches/scrollback/st-scrollback-20201205-4ef0cbd.diff
similarity index 80%
rename from st.suckless.org/patches/scrollback/st-scrollback-0.8.2.diff
rename to st.suckless.org/patches/scrollback/st-scrollback-20201205-4ef0cbd.diff
index c961fd28..863306e1 100644
--- a/st.suckless.org/patches/scrollback/st-scrollback-0.8.2.diff
+++ b/st.suckless.org/patches/scrollback/st-scrollback-20201205-4ef0cbd.diff
@@ -1,29 +1,18 @@
-From aecdff3915abe3e8b41275ea7f13f3ac6c54eb4a Mon Sep 17 00:00:00 2001
-From: Jacob Prosser <[email protected]>
-Date: Thu, 25 Apr 2019 12:55:32 +1000
-Subject: [PATCH] Scrollback w/ mouse
-
----
- config.def.h | 2 +
- st.c | 115 ++++++++++++++++++++++++++++++++++++++++-----------
- st.h | 2 +
- 3 files changed, 95 insertions(+), 24 deletions(-)
-
diff --git a/config.def.h b/config.def.h
-index 0e01717..7326a74 100644
+index 6f05dce..93cbcc0 100644
--- a/config.def.h
+++ b/config.def.h
-@@ -176,6 +176,8 @@ static Shortcut shortcuts[] = {
- { TERMMOD, XK_C, clipcopy, {.i = 0} },
- { TERMMOD, XK_V, clippaste, {.i = 0} },
+@@ -199,6 +199,8 @@ static Shortcut shortcuts[] = {
{ TERMMOD, XK_Y, selpaste, {.i = 0} },
-+ { ShiftMask, XK_Page_Up, kscrollup, {.i = -1} },
-+ { ShiftMask, XK_Page_Down, kscrolldown, {.i = -1} },
{ 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 b8e6077..07e71e1 100644
+index abbbe4b..e2dd722 100644
--- a/st.c
+++ b/st.c
@@ -35,6 +35,7 @@
@@ -37,14 +26,14 @@ index b8e6077..07e71e1 100644
@@ -42,6 +43,9 @@
#define ISCONTROLC1(c) (BETWEEN(c, 0x80, 0x9f))
#define ISCONTROL(c) (ISCONTROLC0(c) || ISCONTROLC1(c))
- #define ISDELIM(u) (utf8strchr(worddelimiters, u) != NULL)
+ #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,
-@@ -117,6 +121,9 @@ typedef struct {
+@@ -115,6 +119,9 @@ typedef struct {
int col; /* nb col */
Line *line; /* screen */
Line *alt; /* alternate screen */
@@ -65,7 +54,7 @@ index b8e6077..07e71e1 100644
static void tsetattr(int *, int);
static void tsetchar(Rune, Glyph *, int, int);
static void tsetdirt(int, int);
-@@ -427,10 +434,10 @@ tlinelen(int y)
+@@ -414,10 +421,10 @@ tlinelen(int y)
{
int i = term.col;
@@ -78,7 +67,7 @@ index b8e6077..07e71e1 100644
--i;
return i;
-@@ -539,7 +546,7 @@ selsnap(int *x, int *y, int direction)
+@@ -526,7 +533,7 @@ selsnap(int *x, int *y, int direction)
* Snap around if the word wraps around at the end or
* beginning of a line.
*/
@@ -87,7 +76,7 @@ index b8e6077..07e71e1 100644
prevdelim = ISDELIM(prevgp->u);
for (;;) {
newx = *x + direction;
-@@ -554,14 +561,14 @@ selsnap(int *x, int *y, int direction)
+@@ -541,14 +548,14 @@ selsnap(int *x, int *y, int direction)
yt = *y, xt = *x;
else
yt = newy, xt = newx;
@@ -104,7 +93,7 @@ index b8e6077..07e71e1 100644
delim = ISDELIM(gp->u);
if (!(gp->mode & ATTR_WDUMMY) && (delim != prevdelim
|| (delim && gp->u != prevgp->u)))
-@@ -582,14 +589,14 @@ selsnap(int *x, int *y, int direction)
+@@ -569,14 +576,14 @@ selsnap(int *x, int *y, int direction)
*x = (direction < 0) ? 0 : term.col - 1;
if (direction < 0) {
for (; *y > 0; *y += direction) {
@@ -121,7 +110,7 @@ index b8e6077..07e71e1 100644
& ATTR_WRAP)) {
break;
}
-@@ -620,13 +627,13 @@ getsel(void)
+@@ -607,13 +614,13 @@ getsel(void)
}
if (sel.type == SEL_RECTANGULAR) {
@@ -138,7 +127,7 @@ index b8e6077..07e71e1 100644
while (last >= gp && last->u == ' ')
--last;
-@@ -849,6 +856,9 @@ void
+@@ -848,6 +855,9 @@ void
ttywrite(const char *s, size_t n, int may_echo)
{
const char *next;
@@ -148,11 +137,11 @@ index b8e6077..07e71e1 100644
if (may_echo && IS_SET(MODE_ECHO))
twrite(s, n, 1);
-@@ -1058,15 +1068,53 @@ tswapscreen(void)
- term.mode ^= MODE_ALTSCREEN;
- tfulldirt();
+@@ -1059,13 +1069,53 @@ tswapscreen(void)
}
-+void
+
+ void
+-tscrolldown(int orig, int n)
+kscrolldown(const Arg* a)
+{
+ int n = a->i;
@@ -174,6 +163,7 @@ index b8e6077..07e71e1 100644
+kscrollup(const Arg* a)
+{
+ int n = a->i;
++
+ if (n < 0)
+ n = term.row + n;
+
@@ -183,9 +173,8 @@ index b8e6077..07e71e1 100644
+ tfulldirt();
+ }
+}
-
- void
--tscrolldown(int orig, int n)
++
++void
+tscrolldown(int orig, int n, int copyhist)
{
int i;
@@ -203,7 +192,13 @@ index b8e6077..07e71e1 100644
tsetdirt(orig, term.bot-n);
tclearregion(0, term.bot-n+1, term.col-1, term.bot);
-@@ -1080,13 +1128,23 @@ tscrolldown(int orig, int n)
+@@ -1075,17 +1125,28 @@ tscrolldown(int orig, int n)
+ term.line[i-n] = temp;
+ }
+
+- selscroll(orig, n);
++ if (term.scr == 0)
++ selscroll(orig, n);
}
void
@@ -228,7 +223,17 @@ index b8e6077..07e71e1 100644
tclearregion(0, orig, term.col-1, orig+n-1);
tsetdirt(orig+n, term.bot);
-@@ -1135,7 +1193,7 @@ tnewline(int first_col)
+@@ -1095,7 +1156,8 @@ tscrollup(int orig, int n)
+ term.line[i+n] = temp;
+ }
+
+- selscroll(orig, -n);
++ if (term.scr == 0)
++ selscroll(orig, -n);
+ }
+
+ void
+@@ -1124,7 +1186,7 @@ tnewline(int first_col)
int y = term.c.y;
if (y == term.bot) {
@@ -237,7 +242,7 @@ index b8e6077..07e71e1 100644
} else {
y++;
}
-@@ -1300,14 +1358,14 @@ void
+@@ -1289,14 +1351,14 @@ void
tinsertblankline(int n)
{
if (BETWEEN(term.c.y, term.top, term.bot))
@@ -254,7 +259,7 @@ index b8e6077..07e71e1 100644
}
int32_t
-@@ -1737,11 +1795,11 @@ csihandle(void)
+@@ -1733,11 +1795,11 @@ csihandle(void)
break;
case 'S': /* SU -- Scroll <n> line up */
DEFAULT(csiescseq.arg[0], 1);
@@ -268,7 +273,7 @@ index b8e6077..07e71e1 100644
break;
case 'L': /* IL -- Insert <n> blank lines */
DEFAULT(csiescseq.arg[0], 1);
-@@ -2243,7 +2301,7 @@ eschandle(uchar ascii)
+@@ -2249,7 +2311,7 @@ eschandle(uchar ascii)
return 0;
case 'D': /* IND -- Linefeed */
if (term.c.y == term.bot) {
@@ -277,7 +282,7 @@ index b8e6077..07e71e1 100644
} else {
tmoveto(term.c.x, term.c.y+1);
}
-@@ -2256,7 +2314,7 @@ eschandle(uchar ascii)
+@@ -2262,7 +2324,7 @@ eschandle(uchar ascii)
break;
case 'M': /* RI -- Reverse index */
if (term.c.y == term.top) {
@@ -286,7 +291,7 @@ index b8e6077..07e71e1 100644
} else {
tmoveto(term.c.x, term.c.y-1);
}
-@@ -2475,7 +2533,7 @@ twrite(const char *buf, int buflen, int show_ctrl)
+@@ -2472,7 +2534,7 @@ twrite(const char *buf, int buflen, int show_ctrl)
void
tresize(int col, int row)
{
@@ -295,7 +300,7 @@ index b8e6077..07e71e1 100644
int minrow = MIN(row, term.row);
int mincol = MIN(col, term.col);
int *bp;
-@@ -2512,6 +2570,14 @@ tresize(int col, int row)
+@@ -2509,6 +2571,14 @@ tresize(int col, int row)
term.dirty = xrealloc(term.dirty, row * sizeof(*term.dirty));
term.tabs = xrealloc(term.tabs, col * sizeof(*term.tabs));
@@ -310,7 +315,7 @@ index b8e6077..07e71e1 100644
/* 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));
-@@ -2569,7 +2635,7 @@ drawregion(int x1, int y1, int x2, int y2)
+@@ -2567,7 +2637,7 @@ drawregion(int x1, int y1, int x2, int y2)
continue;
term.dirty[y] = 0;
@@ -319,21 +324,23 @@ index b8e6077..07e71e1 100644
}
}
-@@ -2590,7 +2656,8 @@ draw(void)
+@@ -2588,8 +2658,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;
++ 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 38c61c4..17a79e0 100644
+index 3d351b6..f44e1d3 100644
--- a/st.h
+++ b/st.h
-@@ -80,6 +80,8 @@ void die(const char *, ...);
+@@ -81,6 +81,8 @@ void die(const char *, ...);
void redraw(void);
void draw(void);
@@ -342,6 +349,3 @@ index 38c61c4..17a79e0 100644
void printscreen(const Arg *);
void printsel(const Arg *);
void sendbreak(const Arg *);
---
-2.21.0
-
