commit 995fad00267636d321220b6ffae90942089d416d
Author: Gary Allen Vollink <g...@vollink.com>
Date: Sun Mar 11 22:06:41 2018 -0400
Scrollback and Scrollback-mouse patches reworked post refactoring on 2018
Mar 9.
diff --git a/st.suckless.org/patches/scrollback/index.md
b/st.suckless.org/patches/scrollback/index.md
index b7a57741..a72fce35 100644
--- a/st.suckless.org/patches/scrollback/index.md
+++ b/st.suckless.org/patches/scrollback/index.md
@@ -11,11 +11,13 @@ Download
* [st-scrollback-0.7.diff](st-scrollback-0.7.diff)
* [st-scrollback-20170329-149c0d3.diff](st-scrollback-20170329-149c0d3.diff)
+* [st-scrollback-20180311-c5ba9c0.diff](st-scrollback-20180311-c5ba9c0.diff)
Apply the following patch on top of the previous to allow scrolling
using `Shift+MouseWheel`.
*
[st-scrollback-mouse-20170427-5a10aca.diff](st-scrollback-mouse-20170427-5a10aca.diff)
+*
[st-scrollback-mouse-20180311-c5ba9c0.diff](st-scrollback-mouse-20180311-c5ba9c0.diff)
Apply the following patch on top of the previous two to allow scrollback using
mouse wheel only when not in `MODE_ALTSCREEN`. For example the content is being
diff --git
a/st.suckless.org/patches/scrollback/st-scrollback-20180311-c5ba9c0.diff
b/st.suckless.org/patches/scrollback/st-scrollback-20180311-c5ba9c0.diff
new file mode 100755
index 00000000..f690d92d
--- /dev/null
+++ b/st.suckless.org/patches/scrollback/st-scrollback-20180311-c5ba9c0.diff
@@ -0,0 +1,345 @@
+diff -U 3 a/config.def.h b/config.def.h
+--- a/config.def.h 2018-03-10 17:55:12.445254900 -0500
++++ b/config.def.h 2018-03-10 23:55:54.468236300 -0500
+@@ -178,6 +178,8 @@
+ { 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 -U 3 a/st.c b/st.c
+--- a/st.c 2018-03-10 17:55:12.449266800 -0500
++++ b/st.c 2018-03-11 00:36:36.437966200 -0500
+@@ -121,6 +121,9 @@
+ 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 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 @@
+ {
+ 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 @@
+ * 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 @@
+ 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 @@
+ *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 @@
+ }
+
+ 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 @@
+ if (buflen > 0)
+ memmove(buf, buf + written, buflen);
+
++ if (term.scr > 0 && term.scr < HISTSIZE-1)
++ term.scr++;
++
+ return ret;
+ }
+
+@@ -843,6 +849,9 @@
+ 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 @@
+ }
+
+ 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 @@
+ }
+
+ 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 @@
+ int y = term.c.y;
+
+ if (y == term.bot) {
+- tscrollup(term.top, 1);
++ tscrollup(term.top, 1, 1);
+ } else {
+ y++;
+ }
+@@ -1294,14 +1351,14 @@
+ 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 @@
+ 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 @@
+ 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 @@
+ 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 @@
+ 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 @@
+ 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 @@
+ continue;
+
+ term.dirty[y] = 0;
+- xdrawline(term.line[y], x1, y, x2);
++ xdrawline(TLINE(y), x1, y, x2);
+ }
+ }
+
+@@ -2605,8 +2670,10 @@
+ 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 -U 3 a/st.h b/st.h
+--- a/st.h 2018-03-10 17:55:12.453776400 -0500
++++ b/st.h 2018-03-11 00:25:11.590522500 -0500
+@@ -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 *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-mouse-20180311-c5ba9c0.diff
b/st.suckless.org/patches/scrollback/st-scrollback-mouse-20180311-c5ba9c0.diff
new file mode 100755
index 00000000..232be0fb
--- /dev/null
+++
b/st.suckless.org/patches/scrollback/st-scrollback-mouse-20180311-c5ba9c0.diff
@@ -0,0 +1,69 @@
+diff -U 3 b/config.def.h n/config.def.h
+--- b/config.def.h 2018-03-11 01:28:05.373079100 -0500
++++ n/config.def.h 2018-03-11 01:28:33.915179100 -0500
+@@ -156,8 +156,14 @@
+ */
+ static MouseShortcut mshortcuts[] = {
+ /* button mask string */
+- { Button4, XK_ANY_MOD, "" },
+- { Button5, XK_ANY_MOD, "" },
++ { Button4, XK_NO_MOD, "" },
++ { Button5, XK_NO_MOD, "" },
++};
++
++MouseKey mkeys[] = {
++ /* button mask function argument */
++ { Button4, ShiftMask, kscrollup, {.i = 1} },
++ { Button5, ShiftMask, kscrolldown, {.i = 1} },
+ };
+
+ /* Internal keyboard shortcuts. */
+diff -U 3 b/st.h n/st.h
+--- b/st.h 2018-03-11 01:28:05.382581000 -0500
++++ n/st.h 2018-03-11 01:28:33.918187000 -0500
+@@ -81,6 +81,13 @@
+ const void *v;
+ } Arg;
+
++typedef struct {
++ uint b;
++ uint mask;
++ void (*func)(const Arg *);
++ const Arg arg;
++} MouseKey;
++
+ void die(const char *, ...);
+ void redraw(void);
+ void draw(void);
+@@ -129,3 +136,4 @@
+ extern unsigned int tabspaces;
+ extern unsigned int defaultfg;
+ extern unsigned int defaultbg;
++extern MouseKey mkeys[];
+Only in n/: st.h.orig
+diff -U 3 b/x.c n/x.c
+--- b/x.c 2018-03-11 01:28:05.240708700 -0500
++++ n/x.c 2018-03-11 01:28:33.923701700 -0500
+@@ -409,6 +409,7 @@
+ {
+ struct timespec now;
+ MouseShortcut *ms;
++ MouseKey *mk;
+ int snap;
+
+ if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) {
+@@ -423,6 +424,14 @@
+ return;
+ }
+ }
++
++ for (mk = mkeys; mk < mkeys + LEN(mkeys); mk++) {
++ if (e->xbutton.button == mk->b
++ && match(mk->mask, e->xbutton.state)) {
++ mk->func(&mk->arg);
++ return;
++ }
++ }
+
+ if (e->xbutton.button == Button1) {
+ /*
