Re: [hackers] [st] st-scrollback update 1/2

From: Gary Allen Vollink <gary_AT_vollink.com>
Date: Sun, 11 Mar 2018 22:10:34 -0400

Sorry, just got back to this. I pushed the sites change a few minutes
ago. Hopefully I did it right. :)

Thank you,
Gary

On Sun, Mar 11, 2018 at 6:57 AM, Hiltjo Posthuma <hiltjo_AT_codemadness.org> wrote:
> On Sun, Mar 11, 2018 at 03:40:39AM -0400, Gary Allen Vollink wrote:
>> I took a few hours to get st-scrollback and st-scrollback-mouse working
>> again after the 9 March 2018 patches. I did NOT update
>> st-scrollback-mouse-altscreen.
>>
>> Following, st-scrollback-20180311-c5ba9c0.diff
>>
>> I hope this is helpful to someone.
>>
>> Sincerely,
>> Gary Allen Vollink
>>
>>
>>
>>
>> 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
>> _AT_@ -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
>> _AT_@ -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 */
>> _AT_@ -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);
>> _AT_@ -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;
>> _AT_@ -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;
>> _AT_@ -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)))
>> _AT_@ -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;
>> }
>> _AT_@ -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;
>>
>> _AT_@ -836,6 +839,9 @@
>> if (buflen > 0)
>> memmove(buf, buf + written, buflen);
>>
>> + if (term.scr > 0 && term.scr < HISTSIZE-1)
>> + term.scr++;
>> +
>> return ret;
>> }
>>
>> _AT_@ -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);
>> _AT_@ -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);
>>
>> _AT_@ -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);
>>
>> _AT_@ -1129,7 +1186,7 @@
>> int y = term.c.y;
>>
>> if (y == term.bot) {
>> - tscrollup(term.top, 1);
>> + tscrollup(term.top, 1, 1);
>> } else {
>> y++;
>> }
>> _AT_@ -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
>> _AT_@ -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);
>> _AT_@ -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);
>> }
>> _AT_@ -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);
>> }
>> _AT_@ -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;
>> _AT_@ -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));
>> _AT_@ -2584,7 +2649,7 @@
>> continue;
>>
>> term.dirty[y] = 0;
>> - xdrawline(term.line[y], x1, y, x2);
>> + xdrawline(TLINE(y), x1, y, x2);
>> }
>> }
>>
>> _AT_@ -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
>> _AT_@ -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))
>> _AT_@ -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,
>> _AT_@ -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;
>>
>>
>
> Please update them on the wiki.
>
> Thanks,
>
> --
> Kind regards,
> Hiltjo
>
Received on Mon Mar 12 2018 - 03:10:34 CET