diff --git a/.gitignore b/.gitignore index 3c4902e..768f1c5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ config.h *.o st +patches diff --git a/patches/notapplied/st-meta-vim-full-20200607-9ba7ecf.diff b/patches/notapplied/st-meta-vim-full-20200607-9ba7ecf.diff deleted file mode 100644 index 9da4e2e..0000000 --- a/patches/notapplied/st-meta-vim-full-20200607-9ba7ecf.diff +++ /dev/null @@ -1,1056 +0,0 @@ -From f4395dba32882d927cc359e4fbb91bb577f70031 Mon Sep 17 00:00:00 2001 -From: Julius Huelsmann -Date: Sun, 7 Jun 2020 18:15:30 +0200 -Subject: [PATCH] repatch - ---- - Makefile | 2 +- - config.def.h | 14 +++ - normalMode.c | 279 +++++++++++++++++++++++++++++++++++++++++ - normalMode.h | 7 ++ - st.c | 348 +++++++++++++++++++++++++++------------------------ - st.h | 1 + - utils.h | 23 ++++ - win.h | 1 + - x.c | 16 ++- - 9 files changed, 521 insertions(+), 170 deletions(-) - create mode 100644 normalMode.c - create mode 100644 normalMode.h - create mode 100644 utils.h - -diff --git a/Makefile b/Makefile -index 470ac86..6688a58 100644 ---- a/Makefile -+++ b/Makefile -@@ -21,7 +21,7 @@ config.h: - .c.o: - $(CC) $(STCFLAGS) -c $< - --st.o: config.h st.h win.h -+st.o: config.h st.h win.h normalMode.h normalMode.c utils.h - x.o: arg.h config.h st.h win.h - - $(OBJ): config.h config.mk -diff --git a/config.def.h b/config.def.h -index 6f05dce..b6c2457 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -131,6 +131,19 @@ unsigned int defaultfg = 7; - unsigned int defaultbg = 0; - static unsigned int defaultcs = 256; - static unsigned int defaultrcs = 257; -+unsigned int const currentBg = 6, buffSize = 2048; -+/// [Vim Browse] Colors for search results currently on screen. -+unsigned int const highlightBg = 160, highlightFg = 15; -+char const wDelS[] = "!\"#$%&'()*+,-./:;<=>?@[\\]^`{|}~", wDelL[] = " \t"; -+char *nmKeys [] = { ///< Shortcusts executed in normal mode -+ "R/Building\nN", "r/Building\n", "X/juli@machine\nN", "x/juli@machine\n", -+ "Q?[Leaving vim, starting execution]\n","F/: error:\nN", "f/: error:\n", "DQf" -+}; -+unsigned int const amountNmKeys = sizeof(nmKeys) / sizeof(*nmKeys); -+/// Style of the {command, search} string shown in the right corner (y,v,V,/) -+Glyph styleSearch = {' ', ATTR_ITALIC | ATTR_BOLD_FAINT, 7, 16}; -+Glyph style[] = {{' ',ATTR_ITALIC|ATTR_FAINT,15,16}, {' ',ATTR_ITALIC,232,11}, -+ {' ', ATTR_ITALIC, 232, 4}, {' ', ATTR_ITALIC, 232, 12}}; - - /* - * Default shape of cursor -@@ -199,6 +212,7 @@ static Shortcut shortcuts[] = { - { TERMMOD, XK_Y, selpaste, {.i = 0} }, - { ShiftMask, XK_Insert, selpaste, {.i = 0} }, - { TERMMOD, XK_Num_Lock, numlock, {.i = 0} }, -+ { MODKEY, XK_c, normalMode, {.i = 0} }, - }; - - /* -diff --git a/normalMode.c b/normalMode.c -new file mode 100644 -index 0000000..24a3fb2 ---- /dev/null -+++ b/normalMode.c -@@ -0,0 +1,279 @@ -+#include -+#include -+ -+#include "normalMode.h" -+#include "utils.h" -+ -+extern Glyph const styleSearch, style[]; -+extern char const wDelS[], wDelL[], *nmKeys[]; -+extern unsigned int bg[], fg, currentBg, highlightBg, highlightFg, amountNmKeys; -+ -+typedef struct { int p[3]; } Pos; -+struct NormalModeState { -+ struct OperationState { -+ enum Op {noop=0, visual='v', visualLine='V', yank = 'y'} op; -+ enum Infix {infix_none=0, infix_i='i', infix_a='a'} infix; -+ } cmd; -+ struct MotionState { -+ uint32_t c; int active; Pos searchPos; -+ enum Search {none=0, fw='/', bw='?'} search; -+ } m; -+} defaultNormalMode, state; -+DynamicArray searchStr=UTF8_ARRAY, cCmd=UTF8_ARRAY, lCmd=UTF8_ARRAY; -+Glyph styleCmd; -+char posBuffer[10], brack[6][2] = { {"()"}, {"<>"}, {"{}"}, {"[]"}, {"\"\""}, {"''"}}; -+int exited=1, overlay=1; -+static inline uint32_t cchar() { return term.line[term.c.y][term.c.x].u; } -+static inline int pos(int p, int h) {return IS_SET(MODE_ALTSCREEN)?p:rangeY(p+h*histOff-insertOff);} -+static inline int contains(char c, char const * values, uint32_t memSize) { -+ for (uint32_t i = 0; i < memSize; ++i) if (c == values[i]) return 1; -+ return 0; -+} -+static inline void decodeTo(char const *cs, int len, DynamicArray *darr) { -+ char *var = expand(darr); -+ if (!var) empty(darr); else utf8decode(cs, (Rune*)(var), len); -+} -+static inline void applyPos(Pos p) { -+ term.c.x = p.p[0], term.c.y = p.p[1]; -+ if (!IS_SET(MODE_ALTSCREEN) && histOp) term.line = &buf[histOff = p.p[2]]; -+} -+/// Find string in history buffer, and provide string-match-lookup for highlighting matches -+static int highlighted(int x, int y) { -+ int const s=term.row*term.col, i=y*term.col+x, sz=size(&searchStr); -+ return sz && i0)==cchar())?widx+1:0; -+ if (wi && !widx) historyMove(-s*wi, 0, 0); -+ } -+ if (widx == strSz && widx) historyMove(-s * strSz, 0, 0); -+ else applyPos(p); -+ markSearchMatches(all); -+ return widx == strSz; -+} -+/// Execute series of normal-mode commands from char array / decoded from dynamic array -+static ExitState pressKeys(char const* s, size_t e) { -+ ExitState x=succ; -+ for (size_t i=0; iu = *((Rune*)(st->content + (size(st)+x-xEnd)*st->elSize)); -+} -+/// Expand "infix" expression: for instance (w =>) l b | | v e | | y -+static ExitState expandExpression(char c) { // ({ =>) l ? { \n | l | v / } \n | h | y -+ int a=state.cmd.infix==infix_a, yank=state.cmd.op=='y', lc=tolower(c), found=1; -+ state.cmd.infix = infix_none; -+ if(!yank && state.cmd.op!=visual && state.cmd.op!=visualLine) return failed; -+ char mot[11] = {'l', 0, 'b', 0, 0, 'v', 0, 'e', 0, 0, yank ? 'y' : 0}; -+ if (lc == 'w') mot[2] = 'b' - lc + c, mot[7] = (a ? 'w' : 'e') - lc + c, mot[9]=a?'h':0; -+ else { -+ mot[1]='?', mot[3]=mot[8]='\n', mot[6]='/', mot[4]=a?0:'l', mot[9]=a?0:'h'; -+ for (int i=found=0; !found && i < 6; ++i) -+ if ((found=contains(c,brack[i],2))) mot[2]=brack[i][0], mot[7]=brack[i][1]; -+ } -+ if (!found) return failed; -+ assign(&lCmd, &cCmd); -+ empty(&cCmd); -+ state.cmd = defaultNormalMode.cmd; -+ return pressKeys(mot, 11); -+} -+ -+int executeMotion(char const cs, int len, KeySym const *const ks) { -+ state.m.c = max(state.m.c, 1); -+ if (ks && *ks == XK_d) historyMove(0, 0, term.row / 2); -+ else if (ks && *ks == XK_u) historyMove(0, 0, -term.row / 2); -+ else if (ks && *ks == XK_f) historyMove(0, 0, term.row-1+(term.c.y=0)); -+ else if (ks && *ks == XK_b) historyMove(0, 0, -(term.c.y=term.row-1)); -+ else if (ks && *ks == XK_h) overlay = !overlay; -+ else if (!len) return failed; -+ else if (cs == 'K') historyMove(0, 0, -state.m.c); -+ else if (cs == 'J') historyMove(0, 0, state.m.c); -+ else if (cs == 'k') historyMove(0, -state.m.c, 0); -+ else if (cs == 'j') historyMove(0, state.m.c, 0); -+ else if (cs == 'h') historyMove(-state.m.c, 0, 0); -+ else if (cs == 'l') historyMove( state.m.c, 0, 0); -+ else if (cs == 'H') term.c.y = 0; -+ else if (cs == 'M') term.c.y = term.bot / 2; -+ else if (cs == 'L') term.c.y = term.bot; -+ else if (cs == 's' || cs == 'S') altToggle = cs == 's' ? !altToggle : 1; -+ else if (cs == 'G' || cs == 'g') { -+ if (cs == 'G') term.c = c[0] = c[IS_SET(MODE_ALTSCREEN)+1]; -+ if (!IS_SET(MODE_ALTSCREEN)) term.line = &buf[histOff=insertOff]; -+ } else if (cs == '0') term.c.x = 0; -+ else if (cs == '$') term.c.x = term.col-1; -+ else if (cs == 't') sel.type = sel.type==SEL_REGULAR ? SEL_RECTANGULAR : SEL_REGULAR; -+ else if (cs == 'n' || cs == 'N') { -+ int const d = ((cs=='N')!=(state.m.search==bw))?-1:1; -+ for (int i = state.m.c; i && findString(d, 0); --i); -+ } else if (contains(cs, "wWeEbB", 6)) { -+ int const low=cs<=90, off=tolower(cs)!='w', sgn=(tolower(cs)=='b')?-1:1, -+ l=strlen(wDelL), s=strlen(wDelS), mit=rows()*term.col; -+ for (int it=0, on=0; state.m.c > 0; ++it) { -+ if (off || it) if (!historyMove(sgn, 0, 0)) it = mit; //< offset move -+ int n = 1<<(contains(cchar(),wDelS,s) ?(2-low) :!contains(cchar(),wDelL,l)), -+ found = (on|=n)^n && ((off ?on^n :n)!=1); //< state change &letter state -+ if (found && off) historyMove(-sgn, 0, 0); //< offset move if required -+ if (found || it>mit) it=-1, on=0, --state.m.c; //< terminate iteration -+ } -+ } else return failed; -+ state.m.c = 0; -+ return state.cmd.op == yank ? exitMotion : succ; -+} -+ -+ExitState kpressHist(char const *cs, int len, int ctrl, KeySym const *ksym) { -+ historyOpToggle(1, 1); -+ int const prevYOff=IS_SET(MODE_ALTSCREEN)?0:histOff, search=state.m.search&&state.m.active, -+ prevAltToggle=altToggle, prevOverlay=overlay; -+ int const noOp=!state.cmd.op&&!state.cmd.infix, num=len==1&&BETWEEN(cs[0],48,57), -+ esc=ksym&&*ksym==XK_Escape, ret=(ksym&&*ksym==XK_Return)||(len==1&&cs[0]=='\n'), -+ quantifier=num&&(cs[0]!='0'||state.m.c), ins=!search &&noOp &&len &&cs[0]=='i'; -+ exited = 0; -+ ExitState result = succ; -+ if (esc || ret || ins) { result = exitMotion, len = 0; -+ } else if (ksym && *ksym == XK_BackSpace) { -+ if ((search || state.m.c) && size(&cCmd)) pop(&cCmd); -+ if (search) { -+ if (size(&searchStr)) pop(&searchStr); -+ else result = exitMotion; -+ if (!size(&searchStr)) tfulldirt(); -+ applyPos(state.m.searchPos); -+ findString(state.m.search==fw ? 1 : -1, 1); -+ } else if (state.m.c) state.m.c /= 10; -+ len = 0; -+ } else if (search) { -+ if (len >= 1) decodeTo(cs, len, &searchStr); -+ applyPos(state.m.searchPos); -+ findString(state.m.search==fw ? 1 : -1, 1); -+ } else if (len == 0) { result = failed; -+ } else if (quantifier) { state.m.c = min(SHRT_MAX, state.m.c*10+cs[0]-48); -+ } else if (state.cmd.infix && state.cmd.op && (result = expandExpression(cs[0]), len=0)) { -+ } else if (cs[0] == '.') { -+ if (size(&cCmd)) assign(&lCmd, &cCmd); -+ empty(&cCmd); -+ executeCommand((uint32_t*) lCmd.content, size(&lCmd)); -+ empty(&cCmd); -+ len = 0; -+ } else if (cs[0] == 'r') { tfulldirt(); -+ } else if (cs[0] == 'c') { -+ empty(&lCmd); -+ empty(&cCmd); -+ empty(&searchStr); -+ tfulldirt(); -+ len = 0; -+ } else if (cs[0] == fw || cs[0] == bw) { -+ empty(&searchStr); -+ state.m.search = cs[0]; -+ state.m.searchPos = (Pos){.p={term.c.x, term.c.y, prevYOff}}; -+ state.m.active = 1; -+ } else if (cs[0]==infix_i || cs[0]==infix_a) { state.cmd.infix=cs[0]; -+ } else if (cs[0] == 'y') { -+ if (state.cmd.op) { -+ result = (state.cmd.op == yank) ? exitOp : exitMotion; -+ if (state.cmd.op == yank) selstart(0, term.c.y, 0); -+ } else selstart(term.c.x, term.c.y, 0); -+ state.cmd.op = yank; -+ } else if (cs[0] == visual || cs[0] == visualLine) { -+ if (state.cmd.op != (unsigned char) cs[0]) { -+ state.cmd = defaultNormalMode.cmd; -+ state.cmd.op = cs[0]; -+ selstart(cs[0] == visualLine ?0 :term.c.x, term.c.y, 0); -+ } else result = exitOp; -+ } else if (!(result =executeMotion(len?cs[0]:0, len, ctrl?ksym:NULL))) { -+ result=failed; -+ for (size_t i = 0; !ctrl && i < amountNmKeys; ++i) -+ if (cs[0]==nmKeys[i][0] && -+ failed!=(result=pressKeys(&nmKeys[i][1], strlen(nmKeys[i])-1))) goto end; -+ } // Operation/Motion finished if valid: update cmd string, extend selection, update search -+ if (result != failed) { -+ if (len == 1 && !ctrl) decodeTo(cs, len, &cCmd); -+ if ((state.cmd.op == visualLine) || ((state.cmd.op == yank) && (result == exitOp))) { -+ int const off = pos(term.c.y, 1) < pos(sel.ob.y, 0); -+ sel.ob.x = off ? term.col - 1 : 0; -+ selextend(off ? 0 : term.col-1, term.c.y, sel.type, 0); -+ } else if (sel.oe.x != -1) selextend(term.c.x, term.c.y, sel.type, 0); -+ } // Set repaint for motion or status bar -+ if (!IS_SET(MODE_ALTSCREEN) && prevYOff != histOff) tfulldirt(); -+ // Terminate Motion / operation if thus indicated -+ if (result == exitMotion) { -+ if (!state.m.active) result = (exited=noOp) ? finished : exitOp; -+ state.m.active = state.m.c = 0; -+ } -+ if (result == exitOp || result == finished) { -+ if (state.cmd.op == yank) { -+ xsetsel(getsel()); -+ xclipcopy(); -+ } -+ state = defaultNormalMode; -+ selclear(); -+ if (!esc) assign(&lCmd, &cCmd); -+ empty(&cCmd); -+ } // Update the content displayed in the history overlay -+ styleCmd = style[state.cmd.op==yank ? 1 : (state.cmd.op==visual ? 2 : -+ (state.cmd.op==visualLine ? 3 :0))]; -+ int const posLin = !IS_SET(MODE_ALTSCREEN) ? rangeY(insertOff-histOff):0, h=rows()-term.row; -+ if (!posLin || posLin==h || !h) strcpy(posBuffer, posLin ? " [BOT] " : " [TOP] "); -+ else sprintf(posBuffer, " % 3d%c ", min(100, max(0, .5 + posLin * 100. / h)),'%'); -+ if ((overlay || overlay!=prevOverlay) && term.col>9 && term.row>4) { -+ if (!term.dirty[term.row-1]) xdrawline(term.line[term.row-1], term.col*2/3, term.row-1, term.col-1); -+ if (!term.dirty[term.row-2]) xdrawline(term.line[term.row-2], term.col*2/3, term.row-2, term.col-1); -+ } -+ if (result==finished) altToggle = 0; -+ if (altToggle != prevAltToggle) tswapscreen(); -+end: -+ historyOpToggle(-1, 1); -+ return result; -+} -+ -+void historyOverlay(int x, int y, Glyph* g) { -+ if (!histMode) return; -+ TCursor const *cHist = histOp ? &term.c : &c[0]; -+ if(overlay && term.col > 9 && term.row > 4 && (x > (2*term.col/3)) && (y >= (term.row-2))) { -+ *g = (y == term.row - 2) ? styleSearch : styleCmd; -+ if (y == term.row-2) getChar(&searchStr, g, term.row-2, term.col-2, term.col/3, x); -+ else if (x > term.col - 7) g->u = posBuffer[x - term.col + 7]; -+ else getChar(size(&cCmd) ?&cCmd :&lCmd, g, term.row-1, term.col-7, term.col/3-6, x); -+ } else if (highlighted(x, y)) g->bg = highlightBg, g->fg = highlightFg; -+ else if ((x==cHist->x) ^ (y==cHist->y)) g->bg = currentBg; -+ else if (x==cHist->x) g->mode^=ATTR_REVERSE; -+} -+void historyPreDraw() { -+ static Pos op = {.p={0, 0, 0}}; -+ historyOpToggle(1, 0); -+ // Draw the cursor cross if changed -+ if (term.c.y >= term.row || op.p[1] >= term.row) tfulldirt(); -+ else if (exited || (op.p[1] != term.c.y)) term.dirty[term.c.y] = term.dirty[op.p[1]] = 1; -+ for (int i=0; (exited || term.c.x != op.p[0]) && i - #include - #include - #include -@@ -42,6 +43,8 @@ - #define ISCONTROLC1(c) (BETWEEN(c, 0x80, 0x9f)) - #define ISCONTROL(c) (ISCONTROLC0(c) || ISCONTROLC1(c)) - #define ISDELIM(u) (u && wcschr(worddelimiters, u)) -+static inline int max(int a, int b) { return a > b ? a : b; } -+static inline int min(int a, int b) { return a < b ? a : b; } - - enum term_mode { - MODE_WRAP = 1 << 0, -@@ -97,6 +100,7 @@ typedef struct { - int mode; - int type; - int snap; -+ int swap; - /* - * Selection variables: - * nb – normalized coordinates of the beginning of the selection -@@ -205,9 +209,8 @@ static void tstrsequence(uchar); - - static void drawregion(int, int, int, int); - --static void selnormalize(void); - static void selscroll(int, int); --static void selsnap(int *, int *, int); -+static void selnormalize(void); - - static size_t utf8decode(const char *, Rune *, size_t); - static Rune utf8decodebyte(char, size_t *); -@@ -233,6 +236,14 @@ static uchar utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8}; - static Rune utfmin[UTF_SIZ + 1] = { 0, 0, 0x80, 0x800, 0x10000}; - static Rune utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF}; - -+int buffCols; -+extern int const buffSize; -+int histOp, histMode, histOff, histOffX, insertOff, altToggle, *mark; -+Line *buf = NULL; -+static TCursor c[3]; -+static inline int rows() { return IS_SET(MODE_ALTSCREEN) ? term.row : buffSize;} -+static inline int rangeY(int i) { while (i < 0) i += rows(); return i % rows();} -+ - ssize_t - xwrite(int fd, const char *s, size_t len) - { -@@ -425,6 +436,114 @@ tlinelen(int y) - return i; - } - -+void historyOpToggle(int start, int paint) { -+ if (!histOp == !(histOp + start)) if ((histOp += start) || 1) return; -+ if (histMode && paint && (!IS_SET(MODE_ALTSCREEN) || altToggle)) draw(); -+ tcursor(CURSOR_SAVE); -+ histOp += start; -+ if (histMode && altToggle) { -+ tswapscreen(); -+ memset(term.dirty,0,sizeof(*term.dirty)*term.row); -+ } -+ tcursor(CURSOR_LOAD); -+ *(!IS_SET(MODE_ALTSCREEN)?&term.line:&term.alt)=&buf[histOp?histOff:insertOff]; -+} -+ -+void historyModeToggle(int start) { -+ if (!(histMode = (histOp = !!start))) { -+ selnormalize(); -+ tfulldirt(); -+ } else { -+ tcursor(CURSOR_SAVE); -+ histOp = 0; -+ histOff = insertOff; -+ } -+} -+ -+int historyBufferScroll(int n) { -+ if (IS_SET(MODE_ALTSCREEN) || !n) return histOp; -+ int p=abs(n=(n<0) ? max(n,-term.row) : min(n,term.row)), r=term.row-p, -+ s=sizeof(*term.dirty), *ptr=histOp?&histOff:&insertOff; -+ if (!histMode || histOp) tfulldirt(); else { -+ memmove(&term.dirty[-min(n,0)], &term.dirty[max(n,0)], s*r); -+ memset(&term.dirty[n>0 ? r : 0], 0, s * p); -+ } -+ int const prevOffBuf = sel.alt ? 0 : insertOff + term.row; -+ term.line = &buf[*ptr = (buffSize+*ptr+n) % buffSize]; -+ // Cut part of selection removed from buffer, and update sel.ne/b. -+ if (sel.ob.x != -1 && !histOp && n) { -+ int const offBuf = sel.alt ? 0 : insertOff + term.row, -+ pb = rangeY(sel.ob.y - prevOffBuf), -+ pe = rangeY(sel.oe.y - prevOffBuf); -+ int const b = rangeY(sel.ob.y - offBuf), nln = n < 0, -+ e = rangeY(sel.oe.y - offBuf), last = offBuf - nln; -+ if (pb != b && ((pb < b) != nln)) sel.ob.y = last; -+ if (pe != e && ((pe < e) != nln)) sel.oe.y = last; -+ if (sel.oe.y == last && sel.ob.y == last) selclear(); -+ } -+ selnormalize(); -+ // Clear the new region exposed by the shift. -+ if (!histOp) tclearregion(0, n>0?r+1:0, buffCols-1, n>0?term.row:p-1); -+ return 1; -+} -+ -+int historyMove(int x, int y, int ly) { -+ historyOpToggle(1, 1); -+ y += ((term.c.x += x) < 0 ?term.c.x-term.col :term.c.x) / term.col;//< x -+ if ((term.c.x %= term.col) < 0) term.c.x += term.col; -+ if ((term.c.y += y) >= term.row) ly += term.c.y - term.row + 1; //< y -+ else if (term.c.y < 0) ly += term.c.y; -+ term.c.y = MIN(MAX(term.c.y, 0), term.row - 1); -+ int off=insertOff-histOff, bot=rangeY(off), top=-rangeY(-term.row-off), -+ pTop = (-ly>-top), pBot = (ly > bot), fin=histMode&&(pTop||pBot); -+ if (fin && (x||y)) term.c.x = pBot ? term.col-1 : 0; -+ historyBufferScroll(fin ? (pBot ? bot : top) : ly); -+ historyOpToggle(-1, 1); -+ return fin; -+} -+ -+#include "normalMode.c" -+ -+void selnormalize(void) { -+ historyOpToggle(1, 1); -+ -+ int const oldb = sel.nb.y, olde = sel.ne.y; -+ if (sel.ob.x == -1) { -+ sel.ne.y = sel.nb.y = -1; -+ } else { -+ int const offsetBuffer = sel.alt ? 0 : insertOff + term.row; -+ int const off = sel.alt ? 0 : (histMode ? histOff : insertOff); -+ int const nby = rangeY(sel.ob.y - off), -+ ney = rangeY(sel.oe.y - off); -+ sel.swap = rangeY(sel.ob.y - offsetBuffer) -+ > rangeY(sel.oe.y - offsetBuffer); -+ sel.nb.y = sel.swap ? ney : nby; -+ sel.ne.y = !sel.swap ? ney : nby; -+ int const cnb = sel.nb.y < term.row, cne = sel.ne.y < term.row; -+ if (sel.type == SEL_REGULAR && sel.ob.y != sel.oe.y) { -+ if (cnb) sel.nb.x = (!sel.swap) ? sel.ob.x : sel.oe.x; -+ if (cne) sel.ne.x = (!sel.swap) ? sel.oe.x : sel.ob.x; -+ } else { -+ if (cnb) sel.nb.x = MIN(sel.ob.x, sel.oe.x); -+ if (cne) sel.ne.x = MAX(sel.ob.x, sel.oe.x); -+ } -+ } -+ int const nBet=sel.nb.y<=sel.ne.y, oBet=oldb<=olde; -+ for (int i = 0; i < term.row; ++i) { -+ int const n = nBet ? BETWEEN(i, sel.nb.y, sel.ne.y) -+ : OUT(i, sel.nb.y, sel.ne.y); -+ term.dirty[i] |= (sel.type == SEL_RECTANGULAR && n) || -+ (n != (oBet ? BETWEEN(i,oldb,olde) : OUT(i,oldb,olde))); -+ -+ } -+ if (BETWEEN(oldb, 0, term.row - 1)) term.dirty[oldb] = 1; -+ if (BETWEEN(olde, 0, term.row - 1)) term.dirty[olde] = 1; -+ if (BETWEEN(sel.nb.y, 0, term.row - 1)) term.dirty[sel.nb.y] = 1; -+ if (BETWEEN(sel.ne.y, 0, term.row - 1)) term.dirty[sel.ne.y] = 1; -+ -+ historyOpToggle(-1, 1); -+} -+ - void - selstart(int col, int row, int snap) - { -@@ -434,19 +553,14 @@ selstart(int col, int row, int snap) - sel.alt = IS_SET(MODE_ALTSCREEN); - sel.snap = snap; - sel.oe.x = sel.ob.x = col; -- sel.oe.y = sel.ob.y = row; -+ sel.oe.y = sel.ob.y = row + !sel.alt * (histMode ? histOff : insertOff); -+ if (sel.snap != 0) sel.mode = SEL_READY; - selnormalize(); -- -- if (sel.snap != 0) -- sel.mode = SEL_READY; -- tsetdirt(sel.nb.y, sel.ne.y); - } - - void - selextend(int col, int row, int type, int done) - { -- int oldey, oldex, oldsby, oldsey, oldtype; -- - if (sel.mode == SEL_IDLE) - return; - if (done && sel.mode == SEL_EMPTY) { -@@ -454,51 +568,13 @@ selextend(int col, int row, int type, int done) - return; - } - -- oldey = sel.oe.y; -- oldex = sel.oe.x; -- oldsby = sel.nb.y; -- oldsey = sel.ne.y; -- oldtype = sel.type; -- - sel.oe.x = col; -- sel.oe.y = row; -+ sel.oe.y = row + (sel.alt ? 0 : (histMode ? histOff : insertOff)); - selnormalize(); - sel.type = type; -- -- if (oldey != sel.oe.y || oldex != sel.oe.x || oldtype != sel.type || sel.mode == SEL_EMPTY) -- tsetdirt(MIN(sel.nb.y, oldsby), MAX(sel.ne.y, oldsey)); -- - sel.mode = done ? SEL_IDLE : SEL_READY; - } - --void --selnormalize(void) --{ -- int i; -- -- if (sel.type == SEL_REGULAR && sel.ob.y != sel.oe.y) { -- sel.nb.x = sel.ob.y < sel.oe.y ? sel.ob.x : sel.oe.x; -- sel.ne.x = sel.ob.y < sel.oe.y ? sel.oe.x : sel.ob.x; -- } else { -- sel.nb.x = MIN(sel.ob.x, sel.oe.x); -- sel.ne.x = MAX(sel.ob.x, sel.oe.x); -- } -- sel.nb.y = MIN(sel.ob.y, sel.oe.y); -- sel.ne.y = MAX(sel.ob.y, sel.oe.y); -- -- selsnap(&sel.nb.x, &sel.nb.y, -1); -- selsnap(&sel.ne.x, &sel.ne.y, +1); -- -- /* expand selection over line breaks */ -- if (sel.type == SEL_RECTANGULAR) -- return; -- i = tlinelen(sel.nb.y); -- if (i < sel.nb.x) -- sel.nb.x = i; -- if (tlinelen(sel.ne.y) <= sel.ne.x) -- sel.ne.x = term.col - 1; --} -- - int - selected(int x, int y) - { -@@ -510,119 +586,47 @@ selected(int x, int y) - return BETWEEN(y, sel.nb.y, sel.ne.y) - && BETWEEN(x, sel.nb.x, sel.ne.x); - -- return BETWEEN(y, sel.nb.y, sel.ne.y) -- && (y != sel.nb.y || x >= sel.nb.x) -- && (y != sel.ne.y || x <= sel.ne.x); --} -- --void --selsnap(int *x, int *y, int direction) --{ -- int newx, newy, xt, yt; -- int delim, prevdelim; -- Glyph *gp, *prevgp; -- -- switch (sel.snap) { -- case SNAP_WORD: -- /* -- * Snap around if the word wraps around at the end or -- * beginning of a line. -- */ -- prevgp = &term.line[*y][*x]; -- prevdelim = ISDELIM(prevgp->u); -- for (;;) { -- newx = *x + direction; -- newy = *y; -- if (!BETWEEN(newx, 0, term.col - 1)) { -- newy += direction; -- newx = (newx + term.col) % term.col; -- if (!BETWEEN(newy, 0, term.row - 1)) -- break; -- -- if (direction > 0) -- yt = *y, xt = *x; -- else -- yt = newy, xt = newx; -- if (!(term.line[yt][xt].mode & ATTR_WRAP)) -- break; -- } -- -- if (newx >= tlinelen(newy)) -- break; -- -- gp = &term.line[newy][newx]; -- delim = ISDELIM(gp->u); -- if (!(gp->mode & ATTR_WDUMMY) && (delim != prevdelim -- || (delim && gp->u != prevgp->u))) -- break; -- -- *x = newx; -- *y = newy; -- prevgp = gp; -- prevdelim = delim; -- } -- break; -- case SNAP_LINE: -- /* -- * Snap around if the the previous line or the current one -- * has set ATTR_WRAP at its end. Then the whole next or -- * previous line will be selected. -- */ -- *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)) { -- break; -- } -- } -- } else if (direction > 0) { -- for (; *y < term.row-1; *y += direction) { -- if (!(term.line[*y][term.col-1].mode -- & ATTR_WRAP)) { -- break; -- } -- } -- } -- break; -- } -+ return ((sel.nb.y > sel.ne.y) ? OUT(y, sel.nb.y, sel.ne.y) -+ : BETWEEN(y, sel.nb.y, sel.ne.y)) && -+ (y != sel.nb.y || x >= sel.nb.x) && -+ (y != sel.ne.y || x <= sel.ne.x); - } - - char * - getsel(void) - { - char *str, *ptr; -- int y, bufsize, lastx, linelen; -+ int y, yy, bufsize, lastx; - Glyph *gp, *last; - - if (sel.ob.x == -1) - return NULL; - -- bufsize = (term.col+1) * (sel.ne.y-sel.nb.y+1) * UTF_SIZ; -+ int const start = sel.swap ? sel.oe.y : sel.ob.y, h = rows(); -+ int endy = (sel.swap ? sel.ob.y : sel.oe.y); -+ for (; endy < start; endy += h); -+ Line * const cbuf = IS_SET(MODE_ALTSCREEN) ? term.line : buf; -+ bufsize = (term.col+1) * (endy-start+1 ) * UTF_SIZ; -+ assert(bufsize > 0); - ptr = str = xmalloc(bufsize); - - /* append every set & selected glyph to the selection */ -- for (y = sel.nb.y; y <= sel.ne.y; y++) { -- if ((linelen = tlinelen(y)) == 0) { -- *ptr++ = '\n'; -- continue; -- } -+ for (y = start; y <= endy; y++) { -+ yy = y % h; - - if (sel.type == SEL_RECTANGULAR) { -- gp = &term.line[y][sel.nb.x]; -+ gp = &cbuf[yy][sel.nb.x]; - lastx = sel.ne.x; - } else { -- gp = &term.line[y][sel.nb.y == y ? sel.nb.x : 0]; -- lastx = (sel.ne.y == y) ? sel.ne.x : term.col-1; -+ gp = &cbuf[yy][start == y ? sel.nb.x : 0]; -+ lastx = (endy == y) ? sel.ne.x : term.col-1; - } -- last = &term.line[y][MIN(lastx, linelen-1)]; -- while (last >= gp && last->u == ' ') -- --last; -+ last = &cbuf[yy][lastx]; -+ if (!(cbuf[yy][term.col - 1].mode & ATTR_WRAP)) -+ while (last > gp && last->u == ' ') --last; - - for ( ; gp <= last; ++gp) { -- if (gp->mode & ATTR_WDUMMY) -- continue; -- -+ if (gp->mode & ATTR_WDUMMY) continue; - ptr += utf8encode(gp->u, ptr); - } - -@@ -635,7 +639,7 @@ getsel(void) - * st. - * FIXME: Fix the computer world. - */ -- if ((y < sel.ne.y || lastx >= linelen) && -+ if ((y < endy || lastx == term.col - 1) && - (!(last->mode & ATTR_WRAP) || sel.type == SEL_RECTANGULAR)) - *ptr++ = '\n'; - } -@@ -650,7 +654,7 @@ selclear(void) - return; - sel.mode = SEL_IDLE; - sel.ob.x = -1; -- tsetdirt(sel.nb.y, sel.ne.y); -+ selnormalize(); - } - - void -@@ -1002,8 +1006,7 @@ tfulldirt(void) - void - tcursor(int mode) - { -- static TCursor c[2]; -- int alt = IS_SET(MODE_ALTSCREEN); -+ int alt = (histOp) ? 0 : (IS_SET(MODE_ALTSCREEN) + 1); - - if (mode == CURSOR_SAVE) { - c[alt] = term.c; -@@ -1063,6 +1066,7 @@ tswapscreen(void) - void - tscrolldown(int orig, int n) - { -+ if (historyBufferScroll(-n)) return; - int i; - Line temp; - -@@ -1083,6 +1087,7 @@ tscrolldown(int orig, int n) - void - tscrollup(int orig, int n) - { -+ if (historyBufferScroll(n)) return; - int i; - Line temp; - -@@ -1234,8 +1239,8 @@ tclearregion(int x1, int y1, int x2, int y2) - if (y1 > y2) - temp = y1, y1 = y2, y2 = temp; - -- LIMIT(x1, 0, term.col-1); -- LIMIT(x2, 0, term.col-1); -+ LIMIT(x1, 0, buffCols-1); -+ LIMIT(x2, 0, buffCols-1); - LIMIT(y1, 0, term.row-1); - LIMIT(y2, 0, term.row-1); - -@@ -1243,8 +1248,6 @@ tclearregion(int x1, int y1, int x2, int y2) - term.dirty[y] = 1; - for (x = x1; x <= x2; x++) { - gp = &term.line[y][x]; -- if (selected(x, y)) -- selclear(); - gp->fg = term.c.attr.fg; - gp->bg = term.c.attr.bg; - gp->mode = 0; -@@ -2411,8 +2414,6 @@ check_control_code: - */ - return; - } -- if (selected(term.c.x, term.c.y)) -- selclear(); - - gp = &term.line[term.c.y][term.c.x]; - if (IS_SET(MODE_WRAP) && (term.c.state & CURSOR_WRAPNEXT)) { -@@ -2482,8 +2483,10 @@ void - tresize(int col, int row) - { - int i; -- int minrow = MIN(row, term.row); -- int mincol = MIN(col, term.col); -+ int const colSet = col, alt = IS_SET(MODE_ALTSCREEN), ini = buf == NULL; -+ col = MAX(col, buffCols); -+ row = MIN(row, buffSize); -+ int const minrow = MIN(row, term.row), mincol = MIN(col, buffCols); - int *bp; - TCursor c; - -@@ -2492,6 +2495,7 @@ tresize(int col, int row) - "tresize: error resizing to %dx%d\n", col, row); - return; - } -+ if (alt) tswapscreen(); - - /* - * slide screen to keep cursor where we expect it - -@@ -2499,48 +2503,54 @@ tresize(int col, int row) - * memmove because we're freeing the earlier lines - */ - for (i = 0; i <= term.c.y - row; i++) { -- free(term.line[i]); - free(term.alt[i]); - } - /* ensure that both src and dst are not NULL */ - if (i > 0) { -- memmove(term.line, term.line + i, row * sizeof(Line)); - memmove(term.alt, term.alt + i, row * sizeof(Line)); - } - for (i += row; i < term.row; i++) { -- free(term.line[i]); - free(term.alt[i]); - } - - /* resize to new height */ -- term.line = xrealloc(term.line, row * sizeof(Line)); -+ buf = xrealloc(buf, (buffSize + row) * sizeof(Line)); - term.alt = xrealloc(term.alt, row * sizeof(Line)); - term.dirty = xrealloc(term.dirty, row * sizeof(*term.dirty)); -+ mark = xrealloc(mark, col * row * sizeof(*mark)); - term.tabs = xrealloc(term.tabs, col * sizeof(*term.tabs)); - - /* 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)); - term.alt[i] = xrealloc(term.alt[i], col * sizeof(Glyph)); - } - - /* allocate any new rows */ - for (/* i = minrow */; i < row; i++) { -- term.line[i] = xmalloc(col * sizeof(Glyph)); - term.alt[i] = xmalloc(col * sizeof(Glyph)); - } -- if (col > term.col) { -- bp = term.tabs + term.col; -+ if (col > buffCols) { -+ bp = term.tabs + buffCols; - -- memset(bp, 0, sizeof(*term.tabs) * (col - term.col)); -+ memset(bp, 0, sizeof(*term.tabs) * (col - buffCols)); - while (--bp > term.tabs && !*bp) - /* nothing */ ; - for (bp += tabspaces; bp < term.tabs + col; bp += tabspaces) - *bp = 1; - } -+ Glyph g=(Glyph){.bg=term.c.attr.bg, .fg=term.c.attr.fg, .u=' ', .mode=0}; -+ for (i = 0; i < buffSize; ++i) { -+ buf[i] = xrealloc(ini ? NULL : buf[i], col*sizeof(Glyph)); -+ for (int j = ini ? 0 : buffCols; j < col; ++j) buf[i][j] = g; -+ } -+ for (i = 0; i < row; ++i) buf[buffSize + i] = buf[i]; -+ term.line = &buf[*(histOp?&histOff:&insertOff) +=MAX(term.c.y-row+1,0)]; -+ memset(mark, 0, col * row * sizeof(*mark)); - /* update terminal size */ -- term.col = col; -+ term.col = colSet; -+ buffCols = col; - term.row = row; -+ if (alt) tswapscreen(); - /* reset scrolling region */ - tsetscroll(0, row-1); - /* make use of the LIMIT in tmoveto */ -@@ -2569,15 +2579,17 @@ resettitle(void) - void - drawregion(int x1, int y1, int x2, int y2) - { -+ if (altToggle && histMode && !histOp) -+ memset(term.dirty, 0, sizeof(*term.dirty) * term.row); -+ int const o = !IS_SET(MODE_ALTSCREEN) && histMode && !histOp, h =rows(); - int y; - - for (y = y1; y < y2; y++) { -- if (!term.dirty[y]) -- continue; -- -- term.dirty[y] = 0; -- xdrawline(term.line[y], x1, y, x2); -+ int const oy = o ? (y + insertOff - histOff + h) % h : y; -+ if (!BETWEEN(oy, 0, term.row-1) || !term.dirty[y]) continue; -+ xdrawline(term.line[y], x1, oy, x2); - } -+ memset(&term.dirty[y1], 0, sizeof(*term.dirty) * (y2 - y1)); - } - - void -@@ -2596,7 +2608,9 @@ draw(void) - if (term.line[term.c.y][cx].mode & ATTR_WDUMMY) - cx--; - -+ if (histMode) historyPreDraw(); - drawregion(0, 0, term.col, term.row); -+ if (!histMode) - xdrawcursor(cx, term.c.y, term.line[term.c.y][cx], - term.ocx, term.ocy, term.line[term.ocy][term.ocx]); - term.ocx = cx; -diff --git a/st.h b/st.h -index 3d351b6..b79ac2f 100644 ---- a/st.h -+++ b/st.h -@@ -8,6 +8,7 @@ - #define MAX(a, b) ((a) < (b) ? (b) : (a)) - #define LEN(a) (sizeof(a) / sizeof(a)[0]) - #define BETWEEN(x, a, b) ((a) <= (x) && (x) <= (b)) -+#define OUT(x, a, b) ((a) <= (x) || (x) <= (b)) - #define DIVCEIL(n, d) (((n) + ((d) - 1)) / (d)) - #define DEFAULT(a, b) (a) = (a) ? (a) : (b) - #define LIMIT(x, a, b) (x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x) -diff --git a/utils.h b/utils.h -new file mode 100644 -index 0000000..ca435e6 ---- /dev/null -+++ b/utils.h -@@ -0,0 +1,23 @@ -+/// Dynamic memory-chunk, with (1) datatype size, (2/3) initialized / allocated chunk, (4) content -+typedef struct { uint8_t const elSize; uint32_t init, alloc; char* content; } DynamicArray; -+#define UTF8_ARRAY {4, 0, 0, NULL} -+ -+static inline int p_alloc(DynamicArray *s, uint32_t amount) { -+ uint32_t const diff=s->init+s->elSize*amount-s->alloc, nas=s->alloc+max(diff,15)*s->elSize; -+ if (s->alloc < s->init + s->elSize * amount) { -+ char* tmp = realloc(s->content, nas); -+ if (!tmp) return 0; -+ s->alloc = nas, s->content = tmp; -+ } -+ return 1; -+} -+static inline char *view(DynamicArray * s, uint32_t i) { return s->content + i*s->elSize; } -+static inline char *end(DynamicArray *s, uint32_t i) { return s->content +s->init-(i+1)*s->elSize; } -+static inline uint32_t getU32(DynamicArray* s, uint32_t i, int b) { return *((uint32_t*) (b ?view(s,i) :end(s,i))); } -+static char *expand(DynamicArray *s) { if (!p_alloc(s, 1)) return NULL; s->init += s->elSize; return end(s, 0); } -+static inline void pop(DynamicArray* s) { s->init -= s->elSize; } -+static inline void empty(DynamicArray* s) { s->init = 0; } -+static inline int size(DynamicArray const * s) { return s->init / s->elSize; } -+static inline void assign(DynamicArray* s, DynamicArray const *o) { -+ if (p_alloc(s, size(o))) memcpy(s->content, o->content, (s->init=o->init)); -+} -diff --git a/win.h b/win.h -index a6ef1b9..cea19f3 100644 ---- a/win.h -+++ b/win.h -@@ -19,6 +19,7 @@ enum win_mode { - MODE_MOUSEMANY = 1 << 15, - MODE_BRCKTPASTE = 1 << 16, - MODE_NUMLOCK = 1 << 17, -+ MODE_NORMAL = 1 << 18, - MODE_MOUSE = MODE_MOUSEBTN|MODE_MOUSEMOTION|MODE_MOUSEX10\ - |MODE_MOUSEMANY, - }; -diff --git a/x.c b/x.c -index 210f184..da9e773 100644 ---- a/x.c -+++ b/x.c -@@ -19,6 +19,7 @@ char *argv0; - #include "arg.h" - #include "st.h" - #include "win.h" -+#include "normalMode.h" - - /* types used in config.h */ - typedef struct { -@@ -261,6 +262,7 @@ clipcopy(const Arg *dummy) - - free(xsel.clipboard); - xsel.clipboard = NULL; -+ xsetsel(getsel()); - - if (xsel.primary != NULL) { - xsel.clipboard = xstrdup(xsel.primary); -@@ -772,6 +774,8 @@ xloadcolor(int i, const char *name, Color *ncolor) - return XftColorAllocName(xw.dpy, xw.vis, xw.cmap, name, ncolor); - } - -+void normalMode() { historyModeToggle((win.mode ^=MODE_NORMAL) & MODE_NORMAL); } -+ - void - xloadcols(void) - { -@@ -1225,8 +1229,10 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x - - for (i = 0, xp = winx, yp = winy + font->ascent; i < len; ++i) { - /* Fetch rune and mode for current glyph. */ -- rune = glyphs[i].u; -- mode = glyphs[i].mode; -+ Glyph g = glyphs[i]; -+ historyOverlay(x+i, y, &g); -+ rune = g.u; -+ mode = g.mode; - - /* Skip dummy wide-character spacing. */ - if (mode == ATTR_WDUMMY) -@@ -1609,6 +1615,7 @@ xdrawline(Line line, int x1, int y1, int x2) - i = ox = 0; - for (x = x1; x < x2 && i < numspecs; x++) { - new = line[x]; -+ historyOverlay(x, y1, &new); - if (new.mode == ATTR_WDUMMY) - continue; - if (selected(x, y1)) -@@ -1800,6 +1807,11 @@ kpress(XEvent *ev) - len = XmbLookupString(xw.ime.xic, e, buf, sizeof buf, &ksym, &status); - else - len = XLookupString(e, buf, sizeof buf, &ksym, NULL); -+ if (IS_SET(MODE_NORMAL)) { -+ if (kpressHist(buf, len, match(ControlMask, e->state), &ksym) -+ == finished) normalMode(); -+ return; -+ } - /* 1. shortcuts */ - for (bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) { - if (ksym == bp->keysym && match(bp->mod, e->state)) { --- -2.27.0 - diff --git a/patches/st-anysize-0.8.1.diff b/patches/st-anysize-0.8.1.diff deleted file mode 100644 index 1eaf2ba..0000000 --- a/patches/st-anysize-0.8.1.diff +++ /dev/null @@ -1,152 +0,0 @@ -diff --git a/x.c b/x.c -index 00cb6b1..8f87c0f 100644 ---- a/x.c -+++ b/x.c -@@ -78,6 +78,7 @@ typedef XftGlyphFontSpec GlyphFontSpec; - typedef struct { - int tw, th; /* tty width and height */ - int w, h; /* window width and height */ -+ int hborderpx, vborderpx; - int ch; /* char height */ - int cw; /* char width */ - int mode; /* window state/mode flags */ -@@ -311,7 +312,7 @@ zoomreset(const Arg *arg) - int - evcol(XEvent *e) - { -- int x = e->xbutton.x - borderpx; -+ int x = e->xbutton.x - win.hborderpx; - LIMIT(x, 0, win.tw - 1); - return x / win.cw; - } -@@ -319,7 +320,7 @@ evcol(XEvent *e) - int - evrow(XEvent *e) - { -- int y = e->xbutton.y - borderpx; -+ int y = e->xbutton.y - win.vborderpx; - LIMIT(y, 0, win.th - 1); - return y / win.ch; - } -@@ -675,6 +676,9 @@ cresize(int width, int height) - col = MAX(1, col); - row = MAX(1, row); - -+ win.hborderpx = (win.w - col * win.cw) / 2; -+ win.vborderpx = (win.h - row * win.ch) / 2; -+ - tresize(col, row); - xresize(col, row); - ttyresize(win.tw, win.th); -@@ -793,8 +797,8 @@ xhints(void) - sizeh->flags = PSize | PResizeInc | PBaseSize | PMinSize; - sizeh->height = win.h; - sizeh->width = win.w; -- sizeh->height_inc = win.ch; -- sizeh->width_inc = win.cw; -+ sizeh->height_inc = 1; -+ sizeh->width_inc = 1; - sizeh->base_height = 2 * borderpx; - sizeh->base_width = 2 * borderpx; - sizeh->min_height = win.ch + 2 * borderpx; -@@ -1022,8 +1026,8 @@ xinit(int cols, int rows) - xloadcols(); - - /* adjust fixed window geometry */ -- win.w = 2 * borderpx + cols * win.cw; -- win.h = 2 * borderpx + rows * win.ch; -+ win.w = 2 * win.hborderpx + cols * win.cw; -+ win.h = 2 * win.vborderpx + rows * win.ch; - if (xw.gm & XNegative) - xw.l += DisplayWidth(xw.dpy, xw.scr) - win.w - 2; - if (xw.gm & YNegative) -@@ -1123,7 +1127,7 @@ xinit(int cols, int rows) - int - xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x, int y) - { -- float winx = borderpx + x * win.cw, winy = borderpx + y * win.ch, xp, yp; -+ float winx = win.hborderpx + x * win.cw, winy = win.vborderpx + y * win.ch, xp, yp; - ushort mode, prevmode = USHRT_MAX; - Font *font = &dc.font; - int frcflags = FRC_NORMAL; -@@ -1259,7 +1263,7 @@ void - xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, int y) - { - int charlen = len * ((base.mode & ATTR_WIDE) ? 2 : 1); -- int winx = borderpx + x * win.cw, winy = borderpx + y * win.ch, -+ int winx = win.hborderpx + x * win.cw, winy = win.vborderpx + y * win.ch, - width = charlen * win.cw; - Color *fg, *bg, *temp, revfg, revbg, truefg, truebg; - XRenderColor colfg, colbg; -@@ -1349,17 +1353,17 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i - - /* Intelligent cleaning up of the borders. */ - if (x == 0) { -- xclear(0, (y == 0)? 0 : winy, borderpx, -+ xclear(0, (y == 0)? 0 : winy, win.vborderpx, - winy + win.ch + -- ((winy + win.ch >= borderpx + win.th)? win.h : 0)); -+ ((winy + win.ch >= win.vborderpx + win.th)? win.h : 0)); - } -- if (winx + width >= borderpx + win.tw) { -+ if (winx + width >= win.hborderpx + win.tw) { - xclear(winx + width, (y == 0)? 0 : winy, win.w, -- ((winy + win.ch >= borderpx + win.th)? win.h : (winy + win.ch))); -+ ((winy + win.ch >= win.vborderpx + win.th)? win.h : (winy + win.ch))); - } - if (y == 0) -- xclear(winx, 0, winx + width, borderpx); -- if (winy + win.ch >= borderpx + win.th) -+ xclear(winx, 0, winx + width, win.hborderpx); -+ if (winy + win.ch >= win.vborderpx + win.th) - xclear(winx, winy + win.ch, winx + width, win.h); - - /* Clean up the region we want to draw to. */ -@@ -1452,35 +1456,35 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og) - case 3: /* Blinking Underline */ - case 4: /* Steady Underline */ - XftDrawRect(xw.draw, &drawcol, -- borderpx + cx * win.cw, -- borderpx + (cy + 1) * win.ch - \ -+ win.hborderpx + cx * win.cw, -+ win.vborderpx + (cy + 1) * win.ch - \ - cursorthickness, - win.cw, cursorthickness); - break; - case 5: /* Blinking bar */ - case 6: /* Steady bar */ - XftDrawRect(xw.draw, &drawcol, -- borderpx + cx * win.cw, -- borderpx + cy * win.ch, -+ win.hborderpx + cx * win.cw, -+ win.vborderpx + cy * win.ch, - cursorthickness, win.ch); - break; - } - } else { - XftDrawRect(xw.draw, &drawcol, -- borderpx + cx * win.cw, -- borderpx + cy * win.ch, -+ win.hborderpx + cx * win.cw, -+ win.vborderpx + cy * win.ch, - win.cw - 1, 1); - XftDrawRect(xw.draw, &drawcol, -- borderpx + cx * win.cw, -- borderpx + cy * win.ch, -+ win.hborderpx + cx * win.cw, -+ win.vborderpx + cy * win.ch, - 1, win.ch - 1); - XftDrawRect(xw.draw, &drawcol, -- borderpx + (cx + 1) * win.cw - 1, -- borderpx + cy * win.ch, -+ win.hborderpx + (cx + 1) * win.cw - 1, -+ win.vborderpx + cy * win.ch, - 1, win.ch - 1); - XftDrawRect(xw.draw, &drawcol, -- borderpx + cx * win.cw, -- borderpx + (cy + 1) * win.ch - 1, -+ win.hborderpx + cx * win.cw, -+ win.vborderpx + (cy + 1) * win.ch - 1, - win.cw, 1); - } - } diff --git a/patches/st-blinking_cursor-20200531-a2a7044.diff b/patches/st-blinking_cursor-20200531-a2a7044.diff deleted file mode 100644 index d544f74..0000000 --- a/patches/st-blinking_cursor-20200531-a2a7044.diff +++ /dev/null @@ -1,150 +0,0 @@ -From bff176133618854676bbdc74c0099f184d3da365 Mon Sep 17 00:00:00 2001 -From: Steve Ward -Date: Sun, 31 May 2020 22:48:25 -0400 -Subject: [PATCH] Allow blinking cursor - ---- - config.def.h | 19 +++++++++++++------ - x.c | 42 ++++++++++++++++++++++++++++++++---------- - 2 files changed, 45 insertions(+), 16 deletions(-) - -diff --git a/config.def.h b/config.def.h -index 6f05dce..3dbe915 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -133,13 +133,20 @@ static unsigned int defaultcs = 256; - static unsigned int defaultrcs = 257; - - /* -- * Default shape of cursor -- * 2: Block ("█") -- * 4: Underline ("_") -- * 6: Bar ("|") -- * 7: Snowman ("☃") -+ * https://invisible-island.net/xterm/ctlseqs/ctlseqs.html#h4-Functions-using-CSI-_-ordered-by-the-final-character-lparen-s-rparen:CSI-Ps-SP-q.1D81 -+ * Default style of cursor -+ * 0: Blinking block -+ * 1: Blinking block (default) -+ * 2: Steady block ("█") -+ * 3: Blinking underline -+ * 4: Steady underline ("_") -+ * 5: Blinking bar -+ * 6: Steady bar ("|") -+ * 7: Blinking st cursor -+ * 8: Steady st cursor - */ --static unsigned int cursorshape = 2; -+static unsigned int cursorstyle = 1; -+static Rune stcursor = 0x2603; /* snowman (U+2603) */ - - /* - * Default columns and rows numbers -diff --git a/x.c b/x.c -index 210f184..bd80a5e 100644 ---- a/x.c -+++ b/x.c -@@ -253,6 +253,7 @@ static char *opt_name = NULL; - static char *opt_title = NULL; - - static int oldbutton = 3; /* button event on startup: 3 = release */ -+static int cursorblinks = 0; - - void - clipcopy(const Arg *dummy) -@@ -1526,16 +1527,19 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og) - /* draw the new one */ - if (IS_SET(MODE_FOCUSED)) { - switch (win.cursor) { -- case 7: /* st extension */ -- g.u = 0x2603; /* snowman (U+2603) */ -+ case 0: /* Blinking block */ -+ case 1: /* Blinking block (default) */ -+ if (IS_SET(MODE_BLINK)) -+ break; - /* FALLTHROUGH */ -- case 0: /* Blinking Block */ -- case 1: /* Blinking Block (Default) */ -- case 2: /* Steady Block */ -+ case 2: /* Steady block */ - xdrawglyph(g, cx, cy); - break; -- case 3: /* Blinking Underline */ -- case 4: /* Steady Underline */ -+ case 3: /* Blinking underline */ -+ if (IS_SET(MODE_BLINK)) -+ break; -+ /* FALLTHROUGH */ -+ case 4: /* Steady underline */ - XftDrawRect(xw.draw, &drawcol, - borderpx + cx * win.cw, - borderpx + (cy + 1) * win.ch - \ -@@ -1543,12 +1547,23 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og) - win.cw, cursorthickness); - break; - case 5: /* Blinking bar */ -+ if (IS_SET(MODE_BLINK)) -+ break; -+ /* FALLTHROUGH */ - case 6: /* Steady bar */ - XftDrawRect(xw.draw, &drawcol, - borderpx + cx * win.cw, - borderpx + cy * win.ch, - cursorthickness, win.ch); - break; -+ case 7: /* Blinking st cursor */ -+ if (IS_SET(MODE_BLINK)) -+ break; -+ /* FALLTHROUGH */ -+ case 8: /* Steady st cursor */ -+ g.u = stcursor; -+ xdrawglyph(g, cx, cy); -+ break; - } - } else { - XftDrawRect(xw.draw, &drawcol, -@@ -1690,9 +1705,12 @@ xsetmode(int set, unsigned int flags) - int - xsetcursor(int cursor) - { -- if (!BETWEEN(cursor, 0, 7)) /* 7: st extension */ -+ if (!BETWEEN(cursor, 0, 8)) /* 7-8: st extensions */ - return 1; - win.cursor = cursor; -+ cursorblinks = win.cursor == 0 || win.cursor == 1 || -+ win.cursor == 3 || win.cursor == 5 || -+ win.cursor == 7; - return 0; - } - -@@ -1936,6 +1954,10 @@ run(void) - if (FD_ISSET(ttyfd, &rfd) || xev) { - if (!drawing) { - trigger = now; -+ if (IS_SET(MODE_BLINK)) { -+ win.mode ^= MODE_BLINK; -+ } -+ lastblink = now; - drawing = 1; - } - timeout = (maxlatency - TIMEDIFF(now, trigger)) \ -@@ -1946,7 +1968,7 @@ run(void) - - /* idle detected or maxlatency exhausted -> draw */ - timeout = -1; -- if (blinktimeout && tattrset(ATTR_BLINK)) { -+ if (blinktimeout && (cursorblinks || tattrset(ATTR_BLINK))) { - timeout = blinktimeout - TIMEDIFF(now, lastblink); - if (timeout <= 0) { - if (-timeout > blinktimeout) /* start visible */ -@@ -1982,7 +2004,7 @@ main(int argc, char *argv[]) - { - xw.l = xw.t = 0; - xw.isfixed = False; -- xsetcursor(cursorshape); -+ xsetcursor(cursorstyle); - - ARGBEGIN { - case 'a': --- -2.20.1 - diff --git a/patches/st-font2-20190326-f64c2f8.diff b/patches/st-font2-20190326-f64c2f8.diff deleted file mode 100644 index fdb6efe..0000000 --- a/patches/st-font2-20190326-f64c2f8.diff +++ /dev/null @@ -1,126 +0,0 @@ -From f64c2f83a2e3ee349fe11100526110dfdf47067a Mon Sep 17 00:00:00 2001 -From: Kirill Bugaev -Date: Wed, 27 Mar 2019 01:28:56 +0800 -Subject: [PATCH] Some glyphs can be not present in font defined by default. - For this glyphs st uses font-config and try to find them in font cache first. - This patch append font defined in `font2` variable to the beginning of font - cache. So it will be used as spare font. - ---- - config.def.h | 1 + - x.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 67 insertions(+) - -diff --git a/config.def.h b/config.def.h -index 482901e..88eee0f 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -6,6 +6,7 @@ - * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html - */ - static char *font = "Liberation Mono:pixelsize=12:antialias=true:autohint=true"; -+static char *font2 = "Roboto Mono for Powerline:pixelsize=12:antialias=true:autohint=true"; - static int borderpx = 2; - - /* -diff --git a/x.c b/x.c -index 5828a3b..052b10b 100644 ---- a/x.c -+++ b/x.c -@@ -149,6 +149,7 @@ static void xhints(void); - static int xloadcolor(int, const char *, Color *); - static int xloadfont(Font *, FcPattern *); - static void xloadfonts(char *, double); -+static void xloadsparefont(); - static void xunloadfont(Font *); - static void xunloadfonts(void); - static void xsetenv(void); -@@ -296,6 +297,7 @@ zoomabs(const Arg *arg) - { - xunloadfonts(); - xloadfonts(usedfont, arg->f); -+ xloadsparefont(); - cresize(0, 0); - redraw(); - xhints(); -@@ -977,6 +979,67 @@ xloadfonts(char *fontstr, double fontsize) - FcPatternDestroy(pattern); - } - -+void -+xloadsparefont() -+{ -+ FcPattern *fontpattern, *match; -+ FcResult result; -+ -+ /* add font2 to font cache as first 4 entries */ -+ if ( font2[0] == '-' ) -+ fontpattern = XftXlfdParse(font2, False, False); -+ else -+ fontpattern = FcNameParse((FcChar8 *)font2); -+ if ( fontpattern ) { -+ /* Allocate memory for the new cache entries. */ -+ frccap += 4; -+ frc = xrealloc(frc, frccap * sizeof(Fontcache)); -+ /* add Normal */ -+ match = FcFontMatch(NULL, fontpattern, &result); -+ if ( match ) -+ frc[frclen].font = XftFontOpenPattern(xw.dpy, match); -+ if ( frc[frclen].font ) { -+ frc[frclen].flags = FRC_NORMAL; -+ frclen++; -+ } else -+ FcPatternDestroy(match); -+ /* add Italic */ -+ FcPatternDel(fontpattern, FC_SLANT); -+ FcPatternAddInteger(fontpattern, FC_SLANT, FC_SLANT_ITALIC); -+ match = FcFontMatch(NULL, fontpattern, &result); -+ if ( match ) -+ frc[frclen].font = XftFontOpenPattern(xw.dpy, match); -+ if ( frc[frclen].font ) { -+ frc[frclen].flags = FRC_ITALIC; -+ frclen++; -+ } else -+ FcPatternDestroy(match); -+ /* add Italic Bold */ -+ FcPatternDel(fontpattern, FC_WEIGHT); -+ FcPatternAddInteger(fontpattern, FC_WEIGHT, FC_WEIGHT_BOLD); -+ match = FcFontMatch(NULL, fontpattern, &result); -+ if ( match ) -+ frc[frclen].font = XftFontOpenPattern(xw.dpy, match); -+ if ( frc[frclen].font ) { -+ frc[frclen].flags = FRC_ITALICBOLD; -+ frclen++; -+ } else -+ FcPatternDestroy(match); -+ /* add Bold */ -+ FcPatternDel(fontpattern, FC_SLANT); -+ FcPatternAddInteger(fontpattern, FC_SLANT, FC_SLANT_ROMAN); -+ match = FcFontMatch(NULL, fontpattern, &result); -+ if ( match ) -+ frc[frclen].font = XftFontOpenPattern(xw.dpy, match); -+ if ( frc[frclen].font ) { -+ frc[frclen].flags = FRC_BOLD; -+ frclen++; -+ } else -+ FcPatternDestroy(match); -+ FcPatternDestroy(fontpattern); -+ } -+} -+ - void - xunloadfont(Font *f) - { -@@ -1057,6 +1120,9 @@ xinit(int cols, int rows) - usedfont = (opt_font == NULL)? font : opt_font; - xloadfonts(usedfont, 0); - -+ /* spare font (font2) */ -+ xloadsparefont(); -+ - /* colors */ - xw.cmap = XDefaultColormap(xw.dpy, xw.scr); - xloadcols(); --- -2.21.0 - diff --git a/patches/st-gruvbox-dark-0.8.2.diff b/patches/st-gruvbox-dark-0.8.2.diff deleted file mode 100644 index c8390f0..0000000 --- a/patches/st-gruvbox-dark-0.8.2.diff +++ /dev/null @@ -1,70 +0,0 @@ -diff --git a/config.def.h b/config.def.h -index 877afab..6a1699f 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -84,41 +84,35 @@ static unsigned int tabspaces = 8; - - /* Terminal colors (16 first used in escape sequence) */ - static const char *colorname[] = { -- /* 8 normal colors */ -- "black", -- "red3", -- "green3", -- "yellow3", -- "blue2", -- "magenta3", -- "cyan3", -- "gray90", -- -- /* 8 bright colors */ -- "gray50", -- "red", -- "green", -- "yellow", -- "#5c5cff", -- "magenta", -- "cyan", -- "white", -- -- [255] = 0, -- -- /* more colors can be added after 255 to use with DefaultXX */ -- "#cccccc", -- "#555555", --}; - -+ /* 8 normal colors */ -+ [0] = "#282828", /* hard contrast: #1d2021 / soft contrast: #32302f */ -+ [1] = "#cc241d", /* red */ -+ [2] = "#98971a", /* green */ -+ [3] = "#d79921", /* yellow */ -+ [4] = "#458588", /* blue */ -+ [5] = "#b16286", /* magenta */ -+ [6] = "#689d6a", /* cyan */ -+ [7] = "#a89984", /* white */ -+ -+ /* 8 bright colors */ -+ [8] = "#928374", /* black */ -+ [9] = "#fb4934", /* red */ -+ [10] = "#b8bb26", /* green */ -+ [11] = "#fabd2f", /* yellow */ -+ [12] = "#83a598", /* blue */ -+ [13] = "#d3869b", /* magenta */ -+ [14] = "#8ec07c", /* cyan */ -+ [15] = "#ebdbb2", /* white */ -+}; - - /* - * Default colors (colorname index) -- * foreground, background, cursor, reverse cursor -+ * foreground, background, cursor - */ --unsigned int defaultfg = 7; --unsigned int defaultbg = 0; --static unsigned int defaultcs = 256; -+unsigned int defaultfg = 15; -+unsigned int defaultbg = 0; -+static unsigned int defaultcs = 15; - static unsigned int defaultrcs = 257; - - /* diff --git a/patches/st-newterm-orphan-20210712-4536f46.diff b/patches/st-newterm-orphan-20210712-4536f46.diff deleted file mode 100644 index 06540fe..0000000 --- a/patches/st-newterm-orphan-20210712-4536f46.diff +++ /dev/null @@ -1,105 +0,0 @@ -From e6ac257f362f8b879b62225bedca9e8aafef4f3b Mon Sep 17 00:00:00 2001 -From: bakkeby -Date: Mon, 12 Jul 2021 09:35:04 +0200 -Subject: [PATCH] Add shortcut to spawn new terminal in the current dir - -Ctrl-Shift-Return now creates a new ST terminal, whose CWD is the same -as the parent st's CWD. - -This version of the patch does a double fork, a technique commonly used -by daemons to spawn orphan processes. - -This solution is specific to the swallow patch for dwm which traverses -the process tree to determine if the new window is a decendant of a -terminal window, in which case the new window should take the place of -the terminal window. - -The way the original newterm patch worked the new st terminal would be -a direct decendant of the parent st terminal process, which could lead -to the wrong terminal window being swallowed. - -The double fork method avoids this by leaving all new st terminals as -orphans, i.e. they will have no parent process. ---- - config.def.h | 1 + - st.c | 32 ++++++++++++++++++++++++++++++++ - st.h | 1 + - 3 files changed, 34 insertions(+) - -diff --git a/config.def.h b/config.def.h -index 6f05dce..9029e8d 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -199,6 +199,7 @@ static Shortcut shortcuts[] = { - { TERMMOD, XK_Y, selpaste, {.i = 0} }, - { ShiftMask, XK_Insert, selpaste, {.i = 0} }, - { TERMMOD, XK_Num_Lock, numlock, {.i = 0} }, -+ { TERMMOD, XK_Return, newterm, {.i = 0} }, - }; - - /* -diff --git a/st.c b/st.c -index ebdf360..cb79bc0 100644 ---- a/st.c -+++ b/st.c -@@ -153,6 +153,7 @@ typedef struct { - } STREscape; - - static void execsh(char *, char **); -+static char *getcwd_by_pid(pid_t pid); - static void stty(char **); - static void sigchld(int); - static void ttywriteraw(const char *, size_t); -@@ -1060,6 +1061,37 @@ tswapscreen(void) - tfulldirt(); - } - -+void -+newterm(const Arg* a) -+{ -+ int res; -+ switch (fork()) { -+ case -1: -+ die("fork failed: %s\n", strerror(errno)); -+ break; -+ case 0: -+ switch (fork()) { -+ case -1: -+ die("fork failed: %s\n", strerror(errno)); -+ break; -+ case 0: -+ res = chdir(getcwd_by_pid(pid)); -+ execlp("st", "./st", NULL); -+ break; -+ default: -+ exit(0); -+ } -+ default: -+ wait(NULL); -+ } -+} -+ -+static char *getcwd_by_pid(pid_t pid) { -+ char buf[32]; -+ snprintf(buf, sizeof buf, "/proc/%d/cwd", pid); -+ return realpath(buf, NULL); -+} -+ - void - tscrolldown(int orig, int n) - { -diff --git a/st.h b/st.h -index fa2eddf..b13399b 100644 ---- a/st.h -+++ b/st.h -@@ -81,6 +81,7 @@ void die(const char *, ...); - void redraw(void); - void draw(void); - -+void newterm(const Arg *); - void printscreen(const Arg *); - void printsel(const Arg *); - void sendbreak(const Arg *); --- -2.32.0 - diff --git a/patches/st-scrollback-20200419-72e3f6c.diff b/patches/st-scrollback-20200419-72e3f6c.diff deleted file mode 100644 index e72999c..0000000 --- a/patches/st-scrollback-20200419-72e3f6c.diff +++ /dev/null @@ -1,351 +0,0 @@ -diff --git a/config.def.h b/config.def.h -index 0895a1f..eef24df 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -188,6 +188,8 @@ static Shortcut shortcuts[] = { - { TERMMOD, XK_Y, selpaste, {.i = 0} }, - { ShiftMask, XK_Insert, 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 0ce6ac2..641edc0 100644 ---- a/st.c -+++ b/st.c -@@ -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) -@@ -42,6 +43,9 @@ - #define ISCONTROLC1(c) (BETWEEN(c, 0x80, 0x9f)) - #define ISCONTROL(c) (ISCONTROLC0(c) || ISCONTROLC1(c)) - #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]) - - enum term_mode { - MODE_WRAP = 1 << 0, -@@ -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 */ -@@ -185,8 +192,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); -@@ -415,10 +422,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; -@@ -527,7 +534,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; -@@ -542,14 +549,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))) -@@ -570,14 +577,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; - } -@@ -608,13 +615,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; - -@@ -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); -@@ -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); - -@@ -1076,17 +1126,28 @@ 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) -+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); - -@@ -1096,7 +1157,8 @@ tscrollup(int orig, int n) - term.line[i+n] = temp; - } - -- selscroll(orig, -n); -+ if (term.scr == 0) -+ selscroll(orig, -n); - } - - void -@@ -1135,7 +1197,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++; - } -@@ -1300,14 +1362,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 -@@ -1738,11 +1800,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], 0); - break; - case 'T': /* SD -- Scroll 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 blank lines */ - DEFAULT(csiescseq.arg[0], 1); -@@ -2248,7 +2310,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); - } -@@ -2261,7 +2323,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); - } -@@ -2482,7 +2544,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; -@@ -2519,6 +2581,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)); -@@ -2577,7 +2647,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); - } - } - -@@ -2598,8 +2668,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 d978458..b9a4eeb 100644 ---- a/st.h -+++ b/st.h -@@ -81,6 +81,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/patches/st-scrollback-mouse-20191024-a2c479c.diff b/patches/st-scrollback-mouse-20191024-a2c479c.diff deleted file mode 100644 index 49eba8e..0000000 --- a/patches/st-scrollback-mouse-20191024-a2c479c.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/config.def.h b/config.def.h -index ec1b576..4b3bf15 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -163,6 +163,8 @@ static uint forcemousemod = ShiftMask; - */ - static MouseShortcut mshortcuts[] = { - /* mask button function argument release */ -+ { ShiftMask, Button4, kscrollup, {.i = 1} }, -+ { ShiftMask, Button5, kscrolldown, {.i = 1} }, - { XK_ANY_MOD, Button2, selpaste, {.i = 0}, 1 }, - { XK_ANY_MOD, Button4, ttysend, {.s = "\031"} }, - { XK_ANY_MOD, Button5, ttysend, {.s = "\005"} }, diff --git a/patches/st-scrollback-mouse-altscreen-20200416-5703aa0.diff b/patches/st-scrollback-mouse-altscreen-20200416-5703aa0.diff deleted file mode 100644 index fbade29..0000000 --- a/patches/st-scrollback-mouse-altscreen-20200416-5703aa0.diff +++ /dev/null @@ -1,63 +0,0 @@ -diff --git a/config.def.h b/config.def.h -index 4b3bf15..1986316 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -163,8 +163,8 @@ static uint forcemousemod = ShiftMask; - */ - static MouseShortcut mshortcuts[] = { - /* mask button function argument release */ -- { ShiftMask, Button4, kscrollup, {.i = 1} }, -- { ShiftMask, Button5, kscrolldown, {.i = 1} }, -+ { XK_ANY_MOD, Button4, kscrollup, {.i = 1}, 0, /* !alt */ -1 }, -+ { XK_ANY_MOD, Button5, kscrolldown, {.i = 1}, 0, /* !alt */ -1 }, - { XK_ANY_MOD, Button2, selpaste, {.i = 0}, 1 }, - { XK_ANY_MOD, Button4, ttysend, {.s = "\031"} }, - { XK_ANY_MOD, Button5, ttysend, {.s = "\005"} }, -diff --git a/st.c b/st.c -index f8b6f67..dd4cb31 100644 ---- st.c -+++ st.c -@@ -1045,6 +1045,11 @@ tnew(int col, int row) - treset(); - } - -+int tisaltscr(void) -+{ -+ return IS_SET(MODE_ALTSCREEN); -+} -+ - void - tswapscreen(void) - { -diff --git a/st.h b/st.h -index 1332cf1..f9ad815 100644 ---- st.h -+++ st.h -@@ -89,6 +89,7 @@ void sendbreak(const Arg *); - void toggleprinter(const Arg *); - - int tattrset(int); -+int tisaltscr(void); - void tnew(int, int); - void tresize(int, int); - void tsetdirtattr(int); -diff --git a/x.c b/x.c -index e5f1737..b8fbd7b 100644 ---- x.c -+++ x.c -@@ -34,6 +34,7 @@ typedef struct { - void (*func)(const Arg *); - const Arg arg; - uint release; -+ int altscrn; /* 0: don't care, -1: not alt screen, 1: alt screen */ - } MouseShortcut; - - typedef struct { -@@ -446,6 +447,7 @@ mouseaction(XEvent *e, uint release) - for (ms = mshortcuts; ms < mshortcuts + LEN(mshortcuts); ms++) { - if (ms->release == release && - ms->button == e->xbutton.button && -+ (!ms->altscrn || (ms->altscrn == (tisaltscr() ? 1 : -1))) && - (match(ms->mod, state) || /* exact or forced */ - match(ms->mod, state & ~forcemousemod))) { - ms->func(&(ms->arg)); diff --git a/patches/st-scrollback-mouse-increment-0.8.2.diff b/patches/st-scrollback-mouse-increment-0.8.2.diff deleted file mode 100644 index 9556a9d..0000000 --- a/patches/st-scrollback-mouse-increment-0.8.2.diff +++ /dev/null @@ -1,34 +0,0 @@ -From 63e717e51dcd2f59c7a3aa75b659926aa92e08f3 Mon Sep 17 00:00:00 2001 -From: Jacob Louis Prosser -Date: Mon, 5 Aug 2019 18:20:25 +1000 -Subject: [st] [patch] Exposed variable to easily change mouse scroll increment. - ---- - config.def.h | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/config.def.h b/config.def.h -index ad20c4c..47e4b66 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -154,6 +154,7 @@ static unsigned int defaultattr = 11; - * Internal mouse shortcuts. - * Beware that overloading Button1 will disable the selection. - */ -+const unsigned int mousescrollincrement = 1; - static MouseShortcut mshortcuts[] = { - /* button mask string */ - { Button4, XK_NO_MOD, "\031" }, -@@ -162,8 +163,8 @@ static MouseShortcut mshortcuts[] = { - - MouseKey mkeys[] = { - /* button mask function argument */ -- { Button4, ShiftMask, kscrollup, {.i = 1} }, -- { Button5, ShiftMask, kscrolldown, {.i = 1} }, -+ { Button4, ShiftMask, kscrollup, {.i = mousescrollincrement} }, -+ { Button5, ShiftMask, kscrolldown, {.i = mousescrollincrement} }, - }; - - /* Internal keyboard shortcuts. */ --- -2.22.0 diff --git a/patches/st-universcroll-0.8.4.diff b/patches/st-universcroll-0.8.4.diff deleted file mode 100644 index 6a33813..0000000 --- a/patches/st-universcroll-0.8.4.diff +++ /dev/null @@ -1,90 +0,0 @@ -From 9726b1e58352126252412e101432e64d46fc51ca Mon Sep 17 00:00:00 2001 -From: Dennis Lee -Date: Sun, 28 Jun 2020 23:01:03 -0700 -Subject: [PATCH] universcroll: mouse wheel only scroll in all modes - -Scroll normally via scroll(1), without Shift, when outside of -`MODE_ALTSCREEN`. Inside an alt screen, continue to scroll normally -without Shift; in this mode, your scrolling is automatically translated -into ^Y and ^E. It just werks! - -Based on the existing mouse-altscreen patch -https://st.suckless.org/patches/scrollback/ -adapted for st(1) 0.8.4 and scroll(1). ---- - config.def.h | 10 +++++----- - st.c | 5 +++++ - st.h | 1 + - x.c | 2 ++ - 4 files changed, 13 insertions(+), 5 deletions(-) - -diff --git a/config.def.h b/config.def.h -index 6f05dce..62e87da 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -173,11 +173,11 @@ static uint forcemousemod = ShiftMask; - * Beware that overloading Button1 will disable the selection. - */ - static MouseShortcut mshortcuts[] = { -- /* mask button function argument release */ -- { XK_ANY_MOD, Button2, selpaste, {.i = 0}, 1 }, -- { ShiftMask, Button4, ttysend, {.s = "\033[5;2~"} }, -+ /* mask button function argument release alt */ -+ { XK_ANY_MOD, Button2, selpaste, {.i = 0}, 1 }, -+ { XK_ANY_MOD, Button4, ttysend, {.s = "\033[5;2~"}, 0, -1 }, - { XK_ANY_MOD, Button4, ttysend, {.s = "\031"} }, -- { ShiftMask, Button5, ttysend, {.s = "\033[6;2~"} }, -+ { XK_ANY_MOD, Button5, ttysend, {.s = "\033[6;2~"}, 0, -1 }, - { XK_ANY_MOD, Button5, ttysend, {.s = "\005"} }, - }; - -diff --git a/st.c b/st.c -index 76b7e0d..1f65453 100644 ---- a/st.c -+++ b/st.c -@@ -1047,6 +1047,11 @@ tnew(int col, int row) - treset(); - } - -+int tisaltscr(void) -+{ -+ return IS_SET(MODE_ALTSCREEN); -+} -+ - void - tswapscreen(void) - { -diff --git a/st.h b/st.h -index 3d351b6..39cc054 100644 ---- a/st.h -+++ b/st.h -@@ -87,6 +87,7 @@ void sendbreak(const Arg *); - void toggleprinter(const Arg *); - - int tattrset(int); -+int tisaltscr(void); - void tnew(int, int); - void tresize(int, int); - void tsetdirtattr(int); -diff --git a/x.c b/x.c -index 210f184..210dde9 100644 ---- a/x.c -+++ b/x.c -@@ -34,6 +34,7 @@ typedef struct { - void (*func)(const Arg *); - const Arg arg; - uint release; -+ int altscrn; /* 0: don't care, -1: not alt screen, 1: alt screen */ - } MouseShortcut; - - typedef struct { -@@ -446,6 +447,7 @@ mouseaction(XEvent *e, uint release) - for (ms = mshortcuts; ms < mshortcuts + LEN(mshortcuts); ms++) { - if (ms->release == release && - ms->button == e->xbutton.button && -+ (!ms->altscrn || (ms->altscrn == (tisaltscr() ? 1 : -1))) && - (match(ms->mod, state) || /* exact or forced */ - match(ms->mod, state & ~forcemousemod))) { - ms->func(&(ms->arg)); --- -2.27.0