{"owner":"removewingman","repo":"hihi-setup","channel":"main","channels":["main"],"can_delete":true,"inode":{"File":{"path":[{"basename":"st","pos":"SQCD7TXWK2YH4.YTAAC","meta":576},{"basename":"patches","pos":"SQCD7TXWK2YH4.JKLQG","meta":576},{"basename":"st-scrollback-0.8.4.diff","pos":"SQCD7TXWK2YH4.L6LQG","meta":0}],"file":"diff --git a/config.def.h b/config.def.h\nindex 6f05dce..93cbcc0 100644\n--- a/config.def.h\n+++ b/config.def.h\n@@ -199,6 +199,8 @@ static Shortcut shortcuts[] = {\n \t{ TERMMOD, XK_Y, selpaste, {.i = 0} },\n \t{ ShiftMask, XK_Insert, selpaste, {.i = 0} },\n \t{ TERMMOD, XK_Num_Lock, numlock, {.i = 0} },\n+\t{ ShiftMask, XK_Page_Up, kscrollup, {.i = -1} },\n+\t{ ShiftMask, XK_Page_Down, kscrolldown, {.i = -1} },\n };\n \n /*\ndiff --git a/st.c b/st.c\nindex 76b7e0d..edec064 100644\n--- a/st.c\n+++ b/st.c\n@@ -35,6 +35,7 @@\n #define ESC_ARG_SIZ 16\n #define STR_BUF_SIZ ESC_BUF_SIZ\n #define STR_ARG_SIZ ESC_ARG_SIZ\n+#define HISTSIZE 2000\n \n /* macros */\n #define IS_SET(flag)\t\t((term.mode & (flag)) != 0)\n@@ -42,6 +43,9 @@\n #define ISCONTROLC1(c)\t\t(BETWEEN(c, 0x80, 0x9f))\n #define ISCONTROL(c)\t\t(ISCONTROLC0(c) || ISCONTROLC1(c))\n #define ISDELIM(u)\t\t(u && wcschr(worddelimiters, u))\n+#define TLINE(y)\t\t((y) < term.scr ? term.hist[((y) + term.histi - \\\n+\t\t\t\tterm.scr + HISTSIZE + 1) % HISTSIZE] : \\\n+\t\t\t\tterm.line[(y) - term.scr])\n \n enum term_mode {\n \tMODE_WRAP = 1 << 0,\n@@ -115,6 +119,9 @@ typedef struct {\n \tint col; /* nb col */\n \tLine *line; /* screen */\n \tLine *alt; /* alternate screen */\n+\tLine hist[HISTSIZE]; /* history buffer */\n+\tint histi; /* history index */\n+\tint scr; /* scroll back */\n \tint *dirty; /* dirtyness of lines */\n \tTCursor c; /* cursor */\n \tint ocx; /* old cursor col */\n@@ -184,8 +191,8 @@ static void tnewline(int);\n static void tputtab(int);\n static void tputc(Rune);\n static void treset(void);\n-static void tscrollup(int, int);\n-static void tscrolldown(int, int);\n+static void tscrollup(int, int, int);\n+static void tscrolldown(int, int, int);\n static void tsetattr(int *, int);\n static void tsetchar(Rune, Glyph *, int, int);\n static void tsetdirt(int, int);\n@@ -414,10 +421,10 @@ tlinelen(int y)\n {\n \tint i = term.col;\n \n-\tif (term.line[y][i - 1].mode & ATTR_WRAP)\n+\tif (TLINE(y)[i - 1].mode & ATTR_WRAP)\n \t\treturn i;\n \n-\twhile (i > 0 && term.line[y][i - 1].u == ' ')\n+\twhile (i > 0 && TLINE(y)[i - 1].u == ' ')\n \t\t--i;\n \n \treturn i;\n@@ -526,7 +533,7 @@ selsnap(int *x, int *y, int direction)\n \t\t * Snap around if the word wraps around at the end or\n \t\t * beginning of a line.\n \t\t */\n-\t\tprevgp = &term.line[*y][*x];\n+\t\tprevgp = &TLINE(*y)[*x];\n \t\tprevdelim = ISDELIM(prevgp->u);\n \t\tfor (;;) {\n \t\t\tnewx = *x + direction;\n@@ -541,14 +548,14 @@ selsnap(int *x, int *y, int direction)\n \t\t\t\t\tyt = *y, xt = *x;\n \t\t\t\telse\n \t\t\t\t\tyt = newy, xt = newx;\n-\t\t\t\tif (!(term.line[yt][xt].mode & ATTR_WRAP))\n+\t\t\t\tif (!(TLINE(yt)[xt].mode & ATTR_WRAP))\n \t\t\t\t\tbreak;\n \t\t\t}\n \n \t\t\tif (newx >= tlinelen(newy))\n \t\t\t\tbreak;\n \n-\t\t\tgp = &term.line[newy][newx];\n+\t\t\tgp = &TLINE(newy)[newx];\n \t\t\tdelim = ISDELIM(gp->u);\n \t\t\tif (!(gp->mode & ATTR_WDUMMY) && (delim != prevdelim\n \t\t\t\t\t|| (delim && gp->u != prevgp->u)))\n@@ -569,14 +576,14 @@ selsnap(int *x, int *y, int direction)\n \t\t*x = (direction < 0) ? 0 : term.col - 1;\n \t\tif (direction < 0) {\n \t\t\tfor (; *y > 0; *y += direction) {\n-\t\t\t\tif (!(term.line[*y-1][term.col-1].mode\n+\t\t\t\tif (!(TLINE(*y-1)[term.col-1].mode\n \t\t\t\t\t\t& ATTR_WRAP)) {\n \t\t\t\t\tbreak;\n \t\t\t\t}\n \t\t\t}\n \t\t} else if (direction > 0) {\n \t\t\tfor (; *y < term.row-1; *y += direction) {\n-\t\t\t\tif (!(term.line[*y][term.col-1].mode\n+\t\t\t\tif (!(TLINE(*y)[term.col-1].mode\n \t\t\t\t\t\t& ATTR_WRAP)) {\n \t\t\t\t\tbreak;\n \t\t\t\t}\n@@ -607,13 +614,13 @@ getsel(void)\n \t\t}\n \n \t\tif (sel.type == SEL_RECTANGULAR) {\n-\t\t\tgp = &term.line[y][sel.nb.x];\n+\t\t\tgp = &TLINE(y)[sel.nb.x];\n \t\t\tlastx = sel.ne.x;\n \t\t} else {\n-\t\t\tgp = &term.line[y][sel.nb.y == y ? sel.nb.x : 0];\n+\t\t\tgp = &TLINE(y)[sel.nb.y == y ? sel.nb.x : 0];\n \t\t\tlastx = (sel.ne.y == y) ? sel.ne.x : term.col-1;\n \t\t}\n-\t\tlast = &term.line[y][MIN(lastx, linelen-1)];\n+\t\tlast = &TLINE(y)[MIN(lastx, linelen-1)];\n \t\twhile (last >= gp && last->u == ' ')\n \t\t\t--last;\n \n@@ -848,6 +855,9 @@ void\n ttywrite(const char *s, size_t n, int may_echo)\n {\n \tconst char *next;\n+\tArg arg = (Arg) { .i = term.scr };\n+\n+\tkscrolldown(&arg);\n \n \tif (may_echo && IS_SET(MODE_ECHO))\n \t\ttwrite(s, n, 1);\n@@ -1059,13 +1069,53 @@ tswapscreen(void)\n }\n \n void\n-tscrolldown(int orig, int n)\n+kscrolldown(const Arg* a)\n+{\n+\tint n = a->i;\n+\n+\tif (n < 0)\n+\t\tn = term.row + n;\n+\n+\tif (n > term.scr)\n+\t\tn = term.scr;\n+\n+\tif (term.scr > 0) {\n+\t\tterm.scr -= n;\n+\t\tselscroll(0, -n);\n+\t\ttfulldirt();\n+\t}\n+}\n+\n+void\n+kscrollup(const Arg* a)\n+{\n+\tint n = a->i;\n+\n+\tif (n < 0)\n+\t\tn = term.row + n;\n+\n+\tif (term.scr <= HISTSIZE-n) {\n+\t\tterm.scr += n;\n+\t\tselscroll(0, n);\n+\t\ttfulldirt();\n+\t}\n+}\n+\n+void\n+tscrolldown(int orig, int n, int copyhist)\n {\n \tint i;\n \tLine temp;\n \n \tLIMIT(n, 0, term.bot-orig+1);\n \n+\tif (copyhist) {\n+\t\tterm.histi = (term.histi - 1 + HISTSIZE) % HISTSIZE;\n+\t\ttemp = term.hist[term.histi];\n+\t\tterm.hist[term.histi] = term.line[term.bot];\n+\t\tterm.line[term.bot] = temp;\n+\t}\n+\n \ttsetdirt(orig, term.bot-n);\n \ttclearregion(0, term.bot-n+1, term.col-1, term.bot);\n \n@@ -1075,17 +1125,28 @@ tscrolldown(int orig, int n)\n \t\tterm.line[i-n] = temp;\n \t}\n \n-\tselscroll(orig, n);\n+\tif (term.scr == 0)\n+\t\tselscroll(orig, n);\n }\n \n void\n-tscrollup(int orig, int n)\n+tscrollup(int orig, int n, int copyhist)\n {\n \tint i;\n \tLine temp;\n \n \tLIMIT(n, 0, term.bot-orig+1);\n \n+\tif (copyhist) {\n+\t\tterm.histi = (term.histi + 1) % HISTSIZE;\n+\t\ttemp = term.hist[term.histi];\n+\t\tterm.hist[term.histi] = term.line[orig];\n+\t\tterm.line[orig] = temp;\n+\t}\n+\n+\tif (term.scr > 0 && term.scr < HISTSIZE)\n+\t\tterm.scr = MIN(term.scr + n, HISTSIZE-1);\n+\n \ttclearregion(0, orig, term.col-1, orig+n-1);\n \ttsetdirt(orig+n, term.bot);\n \n@@ -1095,7 +1156,8 @@ tscrollup(int orig, int n)\n \t\tterm.line[i+n] = temp;\n \t}\n \n-\tselscroll(orig, -n);\n+\tif (term.scr == 0)\n+\t\tselscroll(orig, -n);\n }\n \n void\n@@ -1124,7 +1186,7 @@ tnewline(int first_col)\n \tint y = term.c.y;\n \n \tif (y == term.bot) {\n-\t\ttscrollup(term.top, 1);\n+\t\ttscrollup(term.top, 1, 1);\n \t} else {\n \t\ty++;\n \t}\n@@ -1289,14 +1351,14 @@ void\n tinsertblankline(int n)\n {\n \tif (BETWEEN(term.c.y, term.top, term.bot))\n-\t\ttscrolldown(term.c.y, n);\n+\t\ttscrolldown(term.c.y, n, 0);\n }\n \n void\n tdeleteline(int n)\n {\n \tif (BETWEEN(term.c.y, term.top, term.bot))\n-\t\ttscrollup(term.c.y, n);\n+\t\ttscrollup(term.c.y, n, 0);\n }\n \n int32_t\n@@ -1733,11 +1795,11 @@ csihandle(void)\n \t\tbreak;\n \tcase 'S': /* SU -- Scroll line up */\n \t\tDEFAULT(csiescseq.arg[0], 1);\n-\t\ttscrollup(term.top, csiescseq.arg[0]);\n+\t\ttscrollup(term.top, csiescseq.arg[0], 0);\n \t\tbreak;\n \tcase 'T': /* SD -- Scroll line down */\n \t\tDEFAULT(csiescseq.arg[0], 1);\n-\t\ttscrolldown(term.top, csiescseq.arg[0]);\n+\t\ttscrolldown(term.top, csiescseq.arg[0], 0);\n \t\tbreak;\n \tcase 'L': /* IL -- Insert blank lines */\n \t\tDEFAULT(csiescseq.arg[0], 1);\n@@ -2241,7 +2303,7 @@ eschandle(uchar ascii)\n \t\treturn 0;\n \tcase 'D': /* IND -- Linefeed */\n \t\tif (term.c.y == term.bot) {\n-\t\t\ttscrollup(term.top, 1);\n+\t\t\ttscrollup(term.top, 1, 1);\n \t\t} else {\n \t\t\ttmoveto(term.c.x, term.c.y+1);\n \t\t}\n@@ -2254,7 +2316,7 @@ eschandle(uchar ascii)\n \t\tbreak;\n \tcase 'M': /* RI -- Reverse index */\n \t\tif (term.c.y == term.top) {\n-\t\t\ttscrolldown(term.top, 1);\n+\t\t\ttscrolldown(term.top, 1, 1);\n \t\t} else {\n \t\t\ttmoveto(term.c.x, term.c.y-1);\n \t\t}\n@@ -2464,7 +2526,7 @@ twrite(const char *buf, int buflen, int show_ctrl)\n void\n tresize(int col, int row)\n {\n-\tint i;\n+\tint i, j;\n \tint minrow = MIN(row, term.row);\n \tint mincol = MIN(col, term.col);\n \tint *bp;\n@@ -2501,6 +2563,14 @@ tresize(int col, int row)\n \tterm.dirty = xrealloc(term.dirty, row * sizeof(*term.dirty));\n \tterm.tabs = xrealloc(term.tabs, col * sizeof(*term.tabs));\n \n+\tfor (i = 0; i < HISTSIZE; i++) {\n+\t\tterm.hist[i] = xrealloc(term.hist[i], col * sizeof(Glyph));\n+\t\tfor (j = mincol; j < col; j++) {\n+\t\t\tterm.hist[i][j] = term.c.attr;\n+\t\t\tterm.hist[i][j].u = ' ';\n+\t\t}\n+\t}\n+\n \t/* resize each row to new width, zero-pad if needed */\n \tfor (i = 0; i < minrow; i++) {\n \t\tterm.line[i] = xrealloc(term.line[i], col * sizeof(Glyph));\n@@ -2559,7 +2629,7 @@ drawregion(int x1, int y1, int x2, int y2)\n \t\t\tcontinue;\n \n \t\tterm.dirty[y] = 0;\n-\t\txdrawline(term.line[y], x1, y, x2);\n+\t\txdrawline(TLINE(y), x1, y, x2);\n \t}\n }\n \n@@ -2580,8 +2650,9 @@ draw(void)\n \t\tcx--;\n \n \tdrawregion(0, 0, term.col, term.row);\n-\txdrawcursor(cx, term.c.y, term.line[term.c.y][cx],\n-\t\t\tterm.ocx, term.ocy, term.line[term.ocy][term.ocx]);\n+\tif (term.scr == 0)\n+\t\txdrawcursor(cx, term.c.y, term.line[term.c.y][cx],\n+\t\t\t\tterm.ocx, term.ocy, term.line[term.ocy][term.ocx]);\n \tterm.ocx = cx;\n \tterm.ocy = term.c.y;\n \txfinishdraw();\ndiff --git a/st.h b/st.h\nindex 3d351b6..f44e1d3 100644\n--- a/st.h\n+++ b/st.h\n@@ -81,6 +81,8 @@ void die(const char *, ...);\n void redraw(void);\n void draw(void);\n \n+void kscrolldown(const Arg *);\n+void kscrollup(const Arg *);\n void printscreen(const Arg *);\n void printsel(const Arg *);\n void sendbreak(const Arg *);\n"}},"token":"SGcAM3aBLwC+nrhN+Y2+5+Rpx4uCDs3nU9XkQ737G0k=","login":null}