aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Nazaryev <sergey@nazaryev.ru>2020-07-19 14:28:15 +0000
committerSergey Nazaryev <sergey@nazaryev.ru>2020-08-01 14:47:29 +0000
commit5e0c749d4b9dcbe064bdc4fd48dee563b3aff599 (patch)
treeb283ed43ccc28ed234bc6ff119c02ba746d3e19a
parentff864b736982727717886f7623b54fa43f95116f (diff)
downloadwterm-5e0c749d4b9dcbe064bdc4fd48dee563b3aff599.zip
wterm-5e0c749d4b9dcbe064bdc4fd48dee563b3aff599.tar.gz
wterm-5e0c749d4b9dcbe064bdc4fd48dee563b3aff599.tar.bz2
st-scrollback-20200419-72e3f6c.diff
-rw-r--r--config.def.h2
-rw-r--r--src/wterm.c126
2 files changed, 102 insertions, 26 deletions
diff --git a/config.def.h b/config.def.h
index f0dd482..16b9ec1 100644
--- a/config.def.h
+++ b/config.def.h
@@ -150,6 +150,8 @@ static Shortcut shortcuts[] = {
{ MODKEY|MOD_MASK_SHIFT, XKB_KEY_Home, wlzoomreset, {.f = 0} },
{ MOD_MASK_SHIFT, XKB_KEY_Insert, selpaste, {.i = 0} },
{ MODKEY, XKB_KEY_Num_Lock, numlock, {.i = 0} },
+ { MOD_MASK_SHIFT, XKB_KEY_Prior, kscrollup, {.i = -1} },
+ { MOD_MASK_SHIFT, XKB_KEY_Next, kscrolldown, {.i = -1} },
};
/*
diff --git a/src/wterm.c b/src/wterm.c
index d9ec02e..5870837 100644
--- a/src/wterm.c
+++ b/src/wterm.c
@@ -51,6 +51,7 @@ char *argv0;
#define ESC_ARG_SIZ 16
#define STR_BUF_SIZ ESC_BUF_SIZ
#define STR_ARG_SIZ ESC_ARG_SIZ
+#define HISTSIZE 2000
#define DRAW_BUF_SIZ 20 * 1024
#define XK_ANY_MOD UINT_MAX
#define XK_NO_MOD 0
@@ -76,6 +77,9 @@ char *argv0;
#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])
#define LIMIT(x, a, b) (x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x)
#define ATTRCMP(a, b) \
((a).mode != (b).mode || (a).fg != (b).fg || (a).bg != (b).bg)
@@ -217,6 +221,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 top; /* top scroll limit */
@@ -357,6 +364,8 @@ static void wlzoomreset(const Arg *);
static void printsel(const Arg *);
static void printscreen(const Arg *);
static void toggleprinter(const Arg *);
+static void kscrolldown(const Arg *);
+static void kscrollup(const Arg *);
/* Config.h for applying patches and the configuration. */
#include "config.h"
@@ -420,8 +429,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);
@@ -735,10 +744,10 @@ int y2row(int y) {
int 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;
@@ -792,7 +801,7 @@ void 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;
@@ -807,14 +816,14 @@ void 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)))
@@ -835,13 +844,13 @@ void 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 & ATTR_WRAP)) {
+ 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 & ATTR_WRAP)) {
+ if (!(TLINE(*y)[term.col-1].mode & ATTR_WRAP)) {
break;
}
}
@@ -958,13 +967,13 @@ char *getsel(void) {
linelen = tlinelen(y);
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;
@@ -1233,6 +1242,9 @@ void ttywrite(const char *s, size_t n) {
fd_set wfd;
struct timespec tv;
ssize_t r;
+ Arg arg = (Arg) { .i = term.scr };
+
+ kscrolldown(&arg);
/*
* Remember that we are using a pty, which might be a modem line.
@@ -1400,12 +1412,52 @@ void tswapscreen(void) {
tfulldirt();
}
-void tscrolldown(int orig, int n) {
+void
+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);
@@ -1415,15 +1467,26 @@ void 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) {
+void 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);
@@ -1434,6 +1497,8 @@ void tscrollup(int orig, int n) {
}
selscroll(orig, -n);
+ if (term.scr == 0)
+ selscroll(orig, -n);
}
void selscroll(int orig, int n) {
@@ -1468,7 +1533,7 @@ void tnewline(int first_col) {
int y = term.c.y;
if (y == term.bot) {
- tscrollup(term.top, 1);
+ tscrollup(term.top, 1, 1);
} else {
y++;
}
@@ -1618,12 +1683,12 @@ void tinsertblank(int n) {
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);
}
uint32_t tdefcolor(int *attr, int *npar, int l) {
@@ -2025,11 +2090,11 @@ void 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);
@@ -2450,7 +2515,7 @@ int 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);
}
@@ -2463,7 +2528,7 @@ int 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);
}
@@ -2620,7 +2685,7 @@ void 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;
@@ -2656,6 +2721,14 @@ void 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));
@@ -3362,10 +3435,10 @@ void drawregion(int x1, int y1, int x2, int y2) {
wltermclear(0, y, term.col, y);
term.dirty[y] = 0;
- base = term.line[y][0];
+ base = TLINE(y)[0];
ic = ib = ox = 0;
for (x = x1; x < x2; x++) {
- new = term.line[y][x];
+ new = TLINE(y)[x];
if (new.mode == ATTR_WDUMMY)
continue;
if (ena_sel && selected(x, y))
@@ -3385,7 +3458,8 @@ void drawregion(int x1, int y1, int x2, int y2) {
if (ib > 0)
wldraws(buf, base, ox, y, ic, ib);
}
- wldrawcursor();
+ if (term.scr == 0)
+ wldrawcursor();
}
void wlseturgency(int add) { /* XXX: no urgency equivalent yet in wayland */