From e2aa4d8e8467c0cf53bcc2fd31bfe4586658a899 Mon Sep 17 00:00:00 2001 From: Jason Woofenden Date: Thu, 9 Apr 2015 23:41:36 -0400 Subject: [PATCH] applied st-scrollback.diff --- config.def.h | 3 ++ config.h | 3 ++ st.c | 119 +++++++++++++++++++++++++++++++++++++++++++++------------- 3 files changed, 99 insertions(+), 26 deletions(-) diff --git a/config.def.h b/config.def.h index 56bae2d..9005fe7 100644 --- a/config.def.h +++ b/config.def.h @@ -7,6 +7,7 @@ */ static char font[] = "Liberation Mono:pixelsize=12:antialias=false:autohint=false"; static int borderpx = 2; +static int histsize = 2000; static char shell[] = "/bin/sh"; static char *utmp = NULL; @@ -122,6 +123,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/config.h b/config.h index 7d8d959..5c656b1 100644 --- a/config.h +++ b/config.h @@ -7,6 +7,7 @@ */ static char font[] = "Fantasque Sans Mono:pixelsize=16:antialias=true:autohint=false"; static int borderpx = 1; +static int histsize = 2000; static char shell[] = "/bin/sh"; static char *utmp = NULL; @@ -121,6 +122,8 @@ static Shortcut shortcuts[] = { { ShiftMask, XK_Insert, selpaste, {.i = 0} }, { MODKEY|ShiftMask, XK_Insert, 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 ce8c5c9..088df02 100644 --- a/st.c +++ b/st.c @@ -83,6 +83,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 { @@ -223,6 +225,9 @@ typedef struct { int col; /* nb col */ Line *line; /* screen */ Line *alt; /* alternate screen */ + Line *hist; /* history buffer */ + int histi; /* history index */ + int scr; /* scroll back */ bool *dirty; /* dirtyness of lines */ TCursor c; /* cursor */ int top; /* top scroll limit */ @@ -315,6 +320,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 *); @@ -385,8 +392,8 @@ static void tputtab(int); static void tputc(char *, int); static void treset(void); static void tresize(int, int); -static void tscrollup(int, int); -static void tscrolldown(int, int); +static void tscrollup(int, int, bool); +static void tscrolldown(int, int, bool); static void tsetattr(int *, int); static void tsetchar(char *, Glyph *, int, int); static void tsetscroll(int, int); @@ -672,10 +679,10 @@ y2row(int y) { static int tlinelen(int y) { int i = term.col; - if(term.line[y][i - 1].mode & ATTR_WRAP) - return i; + if(TLINE(y)[i - 1].mode & ATTR_WRAP) + return i; - while(i > 0 && term.line[y][i - 1].c[0] == ' ') + while(i > 0 && TLINE(y)[i - 1].c[0] == ' ') --i; return i; @@ -731,7 +738,7 @@ selsnap(int mode, 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 = strchr(worddelimiters, prevgp->c[0]) != NULL; for(;;) { newx = *x + direction; @@ -746,14 +753,14 @@ selsnap(int mode, 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 = strchr(worddelimiters, gp->c[0]) != NULL; if(!(gp->mode & ATTR_WDUMMY) && (delim != prevdelim || (delim && gp->c[0] != prevgp->c[0]))) @@ -774,14 +781,14 @@ selsnap(int mode, int *x, int *y, int direction) { *x = (direction < 0) ? 0 : term.col - 1; if(direction < 0 && *y > 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 && *y < term.row-1) { for(; *y < term.row; *y += direction) { - if(!(term.line[*y][term.col-1].mode + if(!(TLINE(*y)[term.col-1].mode & ATTR_WRAP)) { break; } @@ -946,13 +953,13 @@ 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->c[0] == ' ') --last; @@ -1314,10 +1321,15 @@ 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++; } void ttywrite(const char *s, size_t n) { + Arg arg = (Arg){ .i = term.scr }; + + kscrolldown(&arg); + if(xwrite(cmdfd, s, n) == -1) die("write error on tty: %s\n", strerror(errno)); } @@ -1445,13 +1457,51 @@ 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, bool copyhist) { int i; Line temp; LIMIT(n, 0, term.bot-orig+1); tsetdirt(orig, term.bot-n); + 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; + } + tclearregion(0, term.bot-n+1, term.col-1, term.bot); for(i = term.bot; i >= orig+n; i--) { @@ -1464,12 +1514,19 @@ tscrolldown(int orig, int n) { } void -tscrollup(int orig, int n) { +tscrollup(int orig, int n, bool 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); @@ -1516,7 +1573,7 @@ tnewline(int first_col) { int y = term.c.y; if(y == term.bot) { - tscrollup(term.top, 1); + tscrollup(term.top, 1, true); } else { y++; } @@ -1677,13 +1734,13 @@ 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, false); } void tdeleteline(int n) { if(BETWEEN(term.c.y, term.top, term.bot)) - tscrollup(term.c.y, n); + tscrollup(term.c.y, n, false); } int32_t @@ -2112,11 +2169,11 @@ csihandle(void) { break; case 'S': /* SU -- Scroll line up */ DEFAULT(csiescseq.arg[0], 1); - tscrollup(term.top, csiescseq.arg[0]); + tscrollup(term.top, csiescseq.arg[0], false); break; case 'T': /* SD -- Scroll line down */ DEFAULT(csiescseq.arg[0], 1); - tscrolldown(term.top, csiescseq.arg[0]); + tscrolldown(term.top, csiescseq.arg[0], false); break; case 'L': /* IL -- Insert blank lines */ DEFAULT(csiescseq.arg[0], 1); @@ -2581,7 +2638,7 @@ eschandle(uchar ascii) { return 0; case 'D': /* IND -- Linefeed */ if(term.c.y == term.bot) { - tscrollup(term.top, 1); + tscrollup(term.top, 1, true); } else { tmoveto(term.c.x, term.c.y+1); } @@ -2594,7 +2651,7 @@ eschandle(uchar ascii) { break; case 'M': /* RI -- Reverse index */ if(term.c.y == term.top) { - tscrolldown(term.top, 1); + tscrolldown(term.top, 1, true); } else { tmoveto(term.c.x, term.c.y-1); } @@ -2765,7 +2822,7 @@ tputc(char *c, int len) { void tresize(int col, int row) { - int i; + int i, j; int minrow = MIN(row, term.row); int mincol = MIN(col, term.col); int slide = term.c.y - row + 1; @@ -2801,9 +2858,18 @@ tresize(int col, int row) { /* resize to new height */ term.line = xrealloc(term.line, row * sizeof(Line)); term.alt = xrealloc(term.alt, row * sizeof(Line)); + term.hist = xrealloc(term.hist, histsize * sizeof(Line)); 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; + memcpy(term.hist[i][j].c, " ", 2); + } + } + /* 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)); @@ -3680,10 +3746,10 @@ drawregion(int x1, int y1, int x2, int y2) { xtermclear(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)) @@ -3706,7 +3772,8 @@ drawregion(int x1, int y1, int x2, int y2) { if(ib > 0) xdraws(buf, base, ox, y, ic, ib); } - xdrawcursor(); + if(term.scr == 0) + xdrawcursor(); } void -- 1.7.10.4