[wiki] [sites] [st][patch] scrollback: Update base patch || Tarmo Heiskanen
commit c2ec27a458098f4d73d6c1e01eed52c65d506e97
Author: Tarmo Heiskanen <turskii_AT_gmail.com>
Date: Sun Mar 31 14:42:02 2019 +0300
[st][patch] scrollback: Update base patch
diff --git a/st.suckless.org/patches/scrollback/index.md b/st.suckless.org/patches/scrollback/index.md
index 5658844f..2e57d946 100644
--- a/st.suckless.org/patches/scrollback/index.md
+++ b/st.suckless.org/patches/scrollback/index.md
_AT_@ -10,8 +10,7 @@ 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-20181224-096b125.diff](st-scrollback-20181224-096b125.diff)
-* [st-scrollback-20190122-3be4cf1.diff](st-scrollback-20190122-3be4cf1.diff)
+* [st-scrollback-20190331-21367a0.diff](st-scrollback-20190331-21367a0.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-20181224-096b125.diff b/st.suckless.org/patches/scrollback/st-scrollback-20181224-096b125.diff
deleted file mode 100644
index 98e0e2ab..00000000
--- a/st.suckless.org/patches/scrollback/st-scrollback-20181224-096b125.diff
+++ /dev/null
_AT_@ -1,335 +0,0 @@
-diff --git a/config.def.h b/config.def.h
-index 823e79f..f6278a3 100644
---- a/config.def.h
-+++ b/config.def.h
-_AT_@ -177,6 +177,8 @@ static Shortcut shortcuts[] = {
- { TERMMOD, XK_V, clippaste, {.i = 0} },
- { TERMMOD, XK_Y, 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..218ae73 100644
---- a/st.c
-+++ b/st.c
-_AT_@ -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)
-_AT_@ -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 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,
-_AT_@ -117,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 */
-_AT_@ -184,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);
-_AT_@ -427,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;
-_AT_@ -539,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;
-_AT_@ -554,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)))
-_AT_@ -582,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;
- }
-_AT_@ -620,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;
-
-_AT_@ -849,6 +856,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);
-_AT_@ -1060,13 +1070,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);
-
-_AT_@ -1080,13 +1130,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);
-
-_AT_@ -1135,7 +1195,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++;
- }
-_AT_@ -1300,14 +1360,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
-_AT_@ -1737,11 +1797,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);
-_AT_@ -2243,7 +2303,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);
- }
-_AT_@ -2256,7 +2316,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);
- }
-_AT_@ -2475,7 +2535,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;
-_AT_@ -2512,6 +2572,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));
-_AT_@ -2569,7 +2637,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);
- }
- }
-
-_AT_@ -2590,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;
- xfinishdraw();
- }
-diff --git a/st.h b/st.h
-index 38c61c4..17a79e0 100644
---- a/st.h
-+++ b/st.h
-_AT_@ -80,6 +80,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/st.suckless.org/patches/scrollback/st-scrollback-20190122-3be4cf1.diff b/st.suckless.org/patches/scrollback/st-scrollback-20190331-21367a0.diff
similarity index 88%
rename from st.suckless.org/patches/scrollback/st-scrollback-20190122-3be4cf1.diff
rename to st.suckless.org/patches/scrollback/st-scrollback-20190331-21367a0.diff
index adf522a7..3abdecef 100644
--- a/st.suckless.org/patches/scrollback/st-scrollback-20190122-3be4cf1.diff
+++ b/st.suckless.org/patches/scrollback/st-scrollback-20190331-21367a0.diff
_AT_@ -1,5 +1,5 @@
diff --git a/config.def.h b/config.def.h
-index 823e79f..f6278a3 100644
+index 482901e..5352f43 100644
--- a/config.def.h
+++ b/config.def.h
_AT_@ -178,6 +178,8 @@ static Shortcut shortcuts[] = {
_AT_@ -12,7 +12,7 @@ index 823e79f..f6278a3 100644
/*
diff --git a/st.c b/st.c
-index b8e6077..218ae73 100644
+index 8e6ccb5..2599333 100644
--- a/st.c
+++ b/st.c
_AT_@ -35,6 +35,7 @@
_AT_@ -26,7 +26,7 @@ index b8e6077..218ae73 100644
_AT_@ -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])
_AT_@ -54,7 +54,7 @@ index b8e6077..218ae73 100644
static void tsetattr(int *, int);
static void tsetchar(Rune, Glyph *, int, int);
static void tsetdirt(int, int);
-_AT_@ -427,10 +434,10 @@ tlinelen(int y)
+_AT_@ -409,10 +416,10 @@ tlinelen(int y)
{
int i = term.col;
_AT_@ -67,7 +67,7 @@ index b8e6077..218ae73 100644
--i;
return i;
-_AT_@ -539,7 +546,7 @@ selsnap(int *x, int *y, int direction)
+_AT_@ -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.
*/
_AT_@ -76,7 +76,7 @@ index b8e6077..218ae73 100644
prevdelim = ISDELIM(prevgp->u);
for (;;) {
newx = *x + direction;
-_AT_@ -554,14 +561,14 @@ selsnap(int *x, int *y, int direction)
+_AT_@ -536,14 +543,14 @@ selsnap(int *x, int *y, int direction)
yt = *y, xt = *x;
else
yt = newy, xt = newx;
_AT_@ -93,7 +93,7 @@ index b8e6077..218ae73 100644
delim = ISDELIM(gp->u);
if (!(gp->mode & ATTR_WDUMMY) && (delim != prevdelim
|| (delim && gp->u != prevgp->u)))
-_AT_@ -582,14 +589,14 @@ selsnap(int *x, int *y, int direction)
+_AT_@ -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) {
_AT_@ -110,7 +110,7 @@ index b8e6077..218ae73 100644
& ATTR_WRAP)) {
break;
}
-_AT_@ -620,13 +627,13 @@ getsel(void)
+_AT_@ -602,13 +609,13 @@ getsel(void)
}
if (sel.type == SEL_RECTANGULAR) {
_AT_@ -127,7 +127,7 @@ index b8e6077..218ae73 100644
while (last >= gp && last->u == ' ')
--last;
-_AT_@ -849,6 +856,9 @@ void
+_AT_@ -831,6 +838,9 @@ void
ttywrite(const char *s, size_t n, int may_echo)
{
const char *next;
_AT_@ -137,7 +137,7 @@ index b8e6077..218ae73 100644
if (may_echo && IS_SET(MODE_ECHO))
twrite(s, n, 1);
-_AT_@ -1060,13 +1070,53 @@ tswapscreen(void)
+_AT_@ -1042,13 +1052,53 @@ tswapscreen(void)
}
void
_AT_@ -192,7 +192,7 @@ index b8e6077..218ae73 100644
tsetdirt(orig, term.bot-n);
tclearregion(0, term.bot-n+1, term.col-1, term.bot);
-_AT_@ -1080,13 +1130,23 @@ tscrolldown(int orig, int n)
+_AT_@ -1062,13 +1112,23 @@ tscrolldown(int orig, int n)
}
void
_AT_@ -217,7 +217,7 @@ index b8e6077..218ae73 100644
tclearregion(0, orig, term.col-1, orig+n-1);
tsetdirt(orig+n, term.bot);
-_AT_@ -1135,7 +1195,7 @@ tnewline(int first_col)
+_AT_@ -1117,7 +1177,7 @@ tnewline(int first_col)
int y = term.c.y;
if (y == term.bot) {
_AT_@ -226,7 +226,7 @@ index b8e6077..218ae73 100644
} else {
y++;
}
-_AT_@ -1300,14 +1360,14 @@ void
+_AT_@ -1282,14 +1342,14 @@ void
tinsertblankline(int n)
{
if (BETWEEN(term.c.y, term.top, term.bot))
_AT_@ -243,7 +243,7 @@ index b8e6077..218ae73 100644
}
int32_t
-_AT_@ -1737,11 +1797,11 @@ csihandle(void)
+_AT_@ -1720,11 +1780,11 @@ csihandle(void)
break;
case 'S': /* SU -- Scroll <n> line up */
DEFAULT(csiescseq.arg[0], 1);
_AT_@ -257,7 +257,7 @@ index b8e6077..218ae73 100644
break;
case 'L': /* IL -- Insert <n> blank lines */
DEFAULT(csiescseq.arg[0], 1);
-_AT_@ -2243,7 +2303,7 @@ eschandle(uchar ascii)
+_AT_@ -2227,7 +2287,7 @@ eschandle(uchar ascii)
return 0;
case 'D': /* IND -- Linefeed */
if (term.c.y == term.bot) {
_AT_@ -266,7 +266,7 @@ index b8e6077..218ae73 100644
} else {
tmoveto(term.c.x, term.c.y+1);
}
-_AT_@ -2256,7 +2316,7 @@ eschandle(uchar ascii)
+_AT_@ -2240,7 +2300,7 @@ eschandle(uchar ascii)
break;
case 'M': /* RI -- Reverse index */
if (term.c.y == term.top) {
_AT_@ -275,7 +275,7 @@ index b8e6077..218ae73 100644
} else {
tmoveto(term.c.x, term.c.y-1);
}
-_AT_@ -2475,7 +2535,7 @@ twrite(const char *buf, int buflen, int show_ctrl)
+_AT_@ -2458,7 +2518,7 @@ twrite(const char *buf, int buflen, int show_ctrl)
void
tresize(int col, int row)
{
_AT_@ -284,7 +284,7 @@ index b8e6077..218ae73 100644
int minrow = MIN(row, term.row);
int mincol = MIN(col, term.col);
int *bp;
-_AT_@ -2512,6 +2572,14 @@ tresize(int col, int row)
+_AT_@ -2495,6 +2555,14 @@ tresize(int col, int row)
term.dirty = xrealloc(term.dirty, row * sizeof(*term.dirty));
term.tabs = xrealloc(term.tabs, col * sizeof(*term.tabs));
_AT_@ -299,7 +299,7 @@ index b8e6077..218ae73 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));
-_AT_@ -2569,7 +2637,7 @@ drawregion(int x1, int y1, int x2, int y2)
+_AT_@ -2552,7 +2620,7 @@ drawregion(int x1, int y1, int x2, int y2)
continue;
term.dirty[y] = 0;
_AT_@ -308,7 +308,7 @@ index b8e6077..218ae73 100644
}
}
-_AT_@ -2590,8 +2658,9 @@ draw(void)
+_AT_@ -2573,8 +2641,9 @@ draw(void)
cx--;
drawregion(0, 0, term.col, term.row);
_AT_@ -319,9 +319,9 @@ index b8e6077..218ae73 100644
+ term.ocx, term.ocy, term.line[term.ocy][term.ocx]);
term.ocx = cx, term.ocy = term.c.y;
xfinishdraw();
- }
+ xximspot(term.ocx, term.ocy);
diff --git a/st.h b/st.h
-index 38c61c4..17a79e0 100644
+index 4da3051..f11685d 100644
--- a/st.h
+++ b/st.h
_AT_@ -80,6 +80,8 @@ void die(const char *, ...);
Received on Sun Mar 31 2019 - 13:42:44 CEST
This archive was generated by hypermail 2.3.0
: Sun Mar 31 2019 - 13:48:28 CEST