sites

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs

commit 2c7889c5d39f22df70d4a9cdae72180f625a2442
parent eed2aff42fb3fecacdc7c5d0473f739cb9fa16e9
Author: Joshua Haase (xihh) <hahj87@gmail.com>
Date:   Sat, 21 Mar 2015 14:18:31 -0600

update st-scrollback patch to work on master.

Diffstat:
Mst.suckless.org/patches/st-scrollback.diff | 96+++++++++++++++++++++++++------------------------------------------------------
1 file changed, 30 insertions(+), 66 deletions(-)

diff --git a/st.suckless.org/patches/st-scrollback.diff b/st.suckless.org/patches/st-scrollback.diff @@ -1,22 +1,3 @@ -diff --git a/FAQ b/FAQ -index 3502c60..62a0a6c 100644 ---- a/FAQ -+++ b/FAQ -@@ -22,12 +22,9 @@ you a list of available terminals, but you’ll most likely switch between xterm - st or st-256color. The default value for TERM can be changed in config.h - (TNAME). - --## How do I scroll back up? -+## How to scroll? - --Using a terminal multiplexer. -- --* `st -e tmux` using C-b [ --* `st -e screen` using C-a ESC -+By default, use Shift-PgUp and Shift-PgDn. - - ## Why doesn't the Del key work in some programs? - diff --git a/config.def.h b/config.def.h index 56bae2d..9005fe7 100644 --- a/config.def.h @@ -39,14 +20,14 @@ index 56bae2d..9005fe7 100644 /* diff --git a/st.c b/st.c -index 836ae21..22ca1e1 100644 +index 39d3fee..0b72aaa 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 \ ++#define TLINE(y) ((y) < term.scr ? term.hist[((y) + term.histi - term.scr \ + + histsize + 1) % histsize] : term.line[(y) - term.scr]) @@ -61,7 +42,7 @@ index 836ae21..22ca1e1 100644 bool *dirty; /* dirtyness of lines */ TCursor c; /* cursor */ int top; /* top scroll limit */ -@@ -314,6 +319,8 @@ typedef struct { +@@ -315,6 +320,8 @@ typedef struct { /* function definitions used in config.h */ static void clipcopy(const Arg *); static void clippaste(const Arg *); @@ -70,7 +51,7 @@ index 836ae21..22ca1e1 100644 static void numlock(const Arg *); static void selpaste(const Arg *); static void xzoom(const Arg *); -@@ -384,8 +391,8 @@ static void tputtab(int); +@@ -385,8 +392,8 @@ static void tputtab(int); static void tputc(char *, int); static void treset(void); static void tresize(int, int); @@ -81,37 +62,21 @@ index 836ae21..22ca1e1 100644 static void tsetattr(int *, int); static void tsetchar(char *, Glyph *, int, int); static void tsetscroll(int, int); -@@ -566,6 +573,16 @@ xrealloc(void *p, size_t len) { - return p; - } - -+void * -+xcalloc(size_t n, size_t l) { -+ void *p; -+ -+ if ((p = calloc(n, l)) == NULL) -+ die("Out of memory\n"); -+ -+ return p; -+} -+ - char * - xstrdup(char *s) { - if((s = strdup(s)) == NULL) -@@ -671,10 +688,10 @@ y2row(int y) { +@@ -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; ++ return i; - while(i > 0 && term.line[y][i - 1].c[0] == ' ') + while(i > 0 && TLINE(y)[i - 1].c[0] == ' ') --i; return i; -@@ -730,7 +747,7 @@ selsnap(int mode, int *x, int *y, int direction) { +@@ -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. */ @@ -120,7 +85,7 @@ index 836ae21..22ca1e1 100644 prevdelim = strchr(worddelimiters, prevgp->c[0]) != NULL; for(;;) { newx = *x + direction; -@@ -745,14 +762,14 @@ selsnap(int mode, int *x, int *y, int direction) { +@@ -746,14 +753,14 @@ selsnap(int mode, int *x, int *y, int direction) { yt = *y, xt = *x; else yt = newy, xt = newx; @@ -137,7 +102,7 @@ index 836ae21..22ca1e1 100644 delim = strchr(worddelimiters, gp->c[0]) != NULL; if(!(gp->mode & ATTR_WDUMMY) && (delim != prevdelim || (delim && gp->c[0] != prevgp->c[0]))) -@@ -773,14 +790,14 @@ selsnap(int mode, int *x, int *y, int direction) { +@@ -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) { @@ -154,7 +119,7 @@ index 836ae21..22ca1e1 100644 & ATTR_WRAP)) { break; } -@@ -945,13 +962,13 @@ getsel(void) { +@@ -946,13 +953,13 @@ getsel(void) { linelen = tlinelen(y); if(sel.type == SEL_RECTANGULAR) { @@ -171,12 +136,11 @@ index 836ae21..22ca1e1 100644 while(last >= gp && last->c[0] == ' ') --last; -@@ -1313,10 +1330,16 @@ ttyread(void) { +@@ -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++; ++ if(term.scr > 0 && term.scr < histsize-1) term.scr++; } void @@ -188,7 +152,7 @@ index 836ae21..22ca1e1 100644 if(xwrite(cmdfd, s, n) == -1) die("write error on tty: %s\n", strerror(errno)); } -@@ -1444,13 +1467,53 @@ tswapscreen(void) { +@@ -1445,13 +1457,51 @@ tswapscreen(void) { } void @@ -218,8 +182,6 @@ index 836ae21..22ca1e1 100644 + + if(term.scr <= histsize - n) { + term.scr += n; -+ if (term.scr > term.histi) -+ term.scr = term.histi; + selscroll(0, n); + tfulldirt(); + } @@ -243,7 +205,7 @@ index 836ae21..22ca1e1 100644 tclearregion(0, term.bot-n+1, term.col-1, term.bot); for(i = term.bot; i >= orig+n; i--) { -@@ -1463,12 +1526,19 @@ tscrolldown(int orig, int n) { +@@ -1464,12 +1514,19 @@ tscrolldown(int orig, int n) { } void @@ -264,7 +226,7 @@ index 836ae21..22ca1e1 100644 tclearregion(0, orig, term.col-1, orig+n-1); tsetdirt(orig+n, term.bot); -@@ -1515,7 +1585,7 @@ tnewline(int first_col) { +@@ -1516,7 +1573,7 @@ tnewline(int first_col) { int y = term.c.y; if(y == term.bot) { @@ -273,7 +235,7 @@ index 836ae21..22ca1e1 100644 } else { y++; } -@@ -1675,13 +1745,13 @@ tinsertblank(int n) { +@@ -1677,13 +1734,13 @@ tinsertblank(int n) { void tinsertblankline(int n) { if(BETWEEN(term.c.y, term.top, term.bot)) @@ -289,7 +251,7 @@ index 836ae21..22ca1e1 100644 } int32_t -@@ -2110,11 +2180,11 @@ csihandle(void) { +@@ -2112,11 +2169,11 @@ csihandle(void) { break; case 'S': /* SU -- Scroll <n> line up */ DEFAULT(csiescseq.arg[0], 1); @@ -303,7 +265,7 @@ index 836ae21..22ca1e1 100644 break; case 'L': /* IL -- Insert <n> blank lines */ DEFAULT(csiescseq.arg[0], 1); -@@ -2555,7 +2625,7 @@ eschandle(uchar ascii) { +@@ -2581,7 +2638,7 @@ eschandle(uchar ascii) { return 0; case 'D': /* IND -- Linefeed */ if(term.c.y == term.bot) { @@ -312,7 +274,7 @@ index 836ae21..22ca1e1 100644 } else { tmoveto(term.c.x, term.c.y+1); } -@@ -2568,7 +2638,7 @@ eschandle(uchar ascii) { +@@ -2594,7 +2651,7 @@ eschandle(uchar ascii) { break; case 'M': /* RI -- Reverse index */ if(term.c.y == term.top) { @@ -321,7 +283,7 @@ index 836ae21..22ca1e1 100644 } else { tmoveto(term.c.x, term.c.y-1); } -@@ -2739,7 +2809,7 @@ tputc(char *c, int len) { +@@ -2765,7 +2822,7 @@ tputc(char *c, int len) { void tresize(int col, int row) { @@ -330,13 +292,14 @@ index 836ae21..22ca1e1 100644 int minrow = MIN(row, term.row); int mincol = MIN(col, term.col); int slide = term.c.y - row + 1; -@@ -2777,6 +2847,16 @@ tresize(int col, int row) { +@@ -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)); -+ if(!term.hist) -+ term.hist = xcalloc(histsize, sizeof(Line)); -+ + + for(i = 0; i < histsize; i++) { + term.hist[i] = xrealloc(term.hist[i], col * sizeof(Glyph)); + for(j = mincol; j < col; j++) { @@ -344,10 +307,11 @@ index 836ae21..22ca1e1 100644 + memcpy(term.hist[i][j].c, " ", 2); + } + } - ++ /* resize each row to new width, zero-pad if needed */ for(i = 0; i < minrow; i++) { -@@ -3634,10 +3714,10 @@ drawregion(int x1, int y1, int x2, int y2) { + 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; @@ -360,7 +324,7 @@ index 836ae21..22ca1e1 100644 if(new.mode == ATTR_WDUMMY) continue; if(ena_sel && selected(x, y)) -@@ -3660,7 +3740,8 @@ drawregion(int x1, int y1, int x2, int y2) { +@@ -3706,7 +3772,8 @@ drawregion(int x1, int y1, int x2, int y2) { if(ib > 0) xdraws(buf, base, ox, y, ic, ib); }