sites

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

commit a261889499825ffb03ae78f90658e16a8e34c296
parent c35a177bfa9cb58306352c3f6e83e286ea17d8fe
Author: Ivan Tham <pickfire@riseup.net>
Date:   Tue, 18 Aug 2015 22:15:26 +0800

[st] Update scrollback mouse and bool->int

Diffstat:
Mst.suckless.org/patches/scrollback.md | 1+
Mst.suckless.org/patches/st-scrollback-shift-mouse.diff | 235+++++++++++++++++++++++++++++++++++++++++--------------------------------------
2 files changed, 122 insertions(+), 114 deletions(-)

diff --git a/st.suckless.org/patches/scrollback.md b/st.suckless.org/patches/scrollback.md @@ -16,3 +16,4 @@ Apply only one of them: * Jochen Sprickerhof - dwm @ jochen . sprickerhof . de * M Farkas-Dyck - strake888 @ gmail . com + * Ivan Tham - pickfire @ riseup . net (The gluer) diff --git a/st.suckless.org/patches/st-scrollback-shift-mouse.diff b/st.suckless.org/patches/st-scrollback-shift-mouse.diff @@ -1,5 +1,5 @@ diff --git a/config.def.h b/config.def.h -index bb5596e..cdfad57 100644 +index 930e468..0601fe5 100644 --- a/config.def.h +++ b/config.def.h @@ -7,6 +7,7 @@ @@ -7,10 +7,10 @@ index bb5596e..cdfad57 100644 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; - static char stty_args[] = "stty raw -echo -iexten echonl"; -@@ -106,10 +107,16 @@ static unsigned int defaultunderline = 7; + + /* + * What program is execed by st depends of these precedence rules: +@@ -123,10 +124,16 @@ static unsigned int defaultunderline = 7; /* Internal mouse shortcuts. */ /* Beware that overloading Button1 will disable the selection. */ @@ -30,7 +30,7 @@ index bb5596e..cdfad57 100644 }; /* Internal keyboard shortcuts. */ -@@ -128,6 +135,8 @@ static Shortcut shortcuts[] = { +@@ -145,6 +152,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} }, @@ -40,29 +40,29 @@ index bb5596e..cdfad57 100644 /* diff --git a/st.c b/st.c -index 0c6b9c3..eeb37c9 100644 +index 35a840b..bb97783 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]) +@@ -84,6 +84,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 { -@@ -231,6 +233,9 @@ typedef struct { +@@ -232,6 +234,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 */ + int *dirty; /* dirtyness of lines */ XftGlyphFontSpec *specbuf; /* font spec buffer used for rendering */ TCursor c; /* cursor */ -@@ -315,6 +320,13 @@ typedef union { +@@ -316,6 +321,13 @@ typedef union { } Arg; typedef struct { @@ -76,7 +76,7 @@ index 0c6b9c3..eeb37c9 100644 uint mod; KeySym keysym; void (*func)(const Arg *); -@@ -324,6 +336,8 @@ typedef struct { +@@ -325,6 +337,8 @@ typedef struct { /* function definitions used in config.h */ static void clipcopy(const Arg *); static void clippaste(const Arg *); @@ -85,45 +85,45 @@ index 0c6b9c3..eeb37c9 100644 static void numlock(const Arg *); static void selpaste(const Arg *); static void xzoom(const Arg *); -@@ -395,8 +409,8 @@ static void tputtab(int); +@@ -396,8 +410,8 @@ static void tputtab(int); static void tputc(Rune); static void treset(void); static void tresize(int, int); -static void tscrollup(int, int); -static void tscrolldown(int, int); -+static void tscrollup(int, int, bool); -+static void tscrolldown(int, int, bool); ++static void tscrollup(int, int, int); ++static void tscrolldown(int, int, int); static void tsetattr(int *, int); static void tsetchar(Rune, Glyph *, int, int); static void tsetscroll(int, int); -@@ -682,10 +696,10 @@ int - tlinelen(int y) { +@@ -727,10 +741,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) +- 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 == ' ') +- while (i > 0 && term.line[y][i - 1].u == ' ') ++ while (i > 0 && TLINE(y)[i - 1].u == ' ') --i; return i; -@@ -744,7 +758,7 @@ selsnap(int *x, int *y, int direction) { +@@ -792,7 +806,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(;;) { + for (;;) { newx = *x + direction; -@@ -759,14 +773,14 @@ selsnap(int *x, int *y, int direction) { +@@ -807,14 +821,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)) +- if (!(term.line[yt][xt].mode & ATTR_WRAP)) ++ if (!(TLINE(yt)[xt].mode & ATTR_WRAP)) break; } @@ -133,58 +133,60 @@ index 0c6b9c3..eeb37c9 100644 - gp = &term.line[newy][newx]; + gp = &TLINE(newy)[newx]; delim = ISDELIM(gp->u); - if(!(gp->mode & ATTR_WDUMMY) && (delim != prevdelim + if (!(gp->mode & ATTR_WDUMMY) && (delim != prevdelim || (delim && gp->u != prevgp->u))) -@@ -787,14 +801,14 @@ selsnap(int *x, int *y, int direction) { +@@ -835,14 +849,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 + 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 + } 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; } -@@ -891,19 +905,27 @@ void - bpress(XEvent *e) { +@@ -942,13 +956,14 @@ bpress(XEvent *e) + { struct timespec now; Mousekey *mk; + MouseShortcut *ms; - if(IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) { + if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) { mousereport(e); return; } -- for(mk = mshortcuts; mk < mshortcuts + LEN(mshortcuts); mk++) { -+ for(mk = mkeys; mk < mkeys + LEN(mkeys); mk++) { - if(e->xbutton.button == mk->b +- for (mk = mshortcuts; mk < mshortcuts + LEN(mshortcuts); mk++) { ++ for (mk = mkeys; mk < mkeys + LEN(mkeys); mk++) { + if (e->xbutton.button == mk->b && match(mk->mask, e->xbutton.state)) { ttysend(mk->s, strlen(mk->s)); - return; +@@ -956,6 +971,14 @@ bpress(XEvent *e) } } -+ for(ms = mshortcuts; ms < mshortcuts + LEN(mshortcuts); ms++) { -+ if(e->xbutton.button == ms->b + ++ for (ms = mshortcuts; ms < mshortcuts + LEN(mshortcuts); ms++) { ++ if (e->xbutton.button == ms->b + && match(ms->mask, e->xbutton.state)) { + ms->func(&ms->arg); + return; + } + } - - if(e->xbutton.button == Button1) { ++ + if (e->xbutton.button == Button1) { clock_gettime(CLOCK_MONOTONIC, &now); -@@ -953,13 +975,13 @@ getsel(void) { + +@@ -1005,13 +1028,13 @@ getsel(void) linelen = tlinelen(y); - if(sel.type == SEL_RECTANGULAR) { + if (sel.type == SEL_RECTANGULAR) { - gp = &term.line[y][sel.nb.x]; + gp = &TLINE(y)[sel.nb.x]; lastx = sel.ne.x; @@ -195,41 +197,44 @@ index 0c6b9c3..eeb37c9 100644 } - last = &term.line[y][MIN(lastx, linelen-1)]; + last = &TLINE(y)[MIN(lastx, linelen-1)]; - while(last >= gp && last->u == ' ') + while (last >= gp && last->u == ' ') --last; -@@ -1362,10 +1384,16 @@ ttyread(void) { +@@ -1484,6 +1507,8 @@ ttyread(void) /* keep any uncomplete utf8 char for the next call */ memmove(buf, ptr, buflen); -+ if(term.scr > 0 && term.scr < histsize-1) ++ if (term.scr > 0 && term.scr < histsize-1) + term.scr++; } void - ttywrite(const char *s, size_t n) { +@@ -1492,6 +1517,9 @@ ttywrite(const char *s, size_t n) + fd_set wfd; + struct timespec tv; + ssize_t r; + Arg arg = (Arg){ .i = term.scr }; + + kscrolldown(&arg); -+ - if(xwrite(cmdfd, s, n) == -1) - die("write error on tty: %s\n", strerror(errno)); - } -@@ -1500,13 +1528,52 @@ tswapscreen(void) { + + /* + * Remember that we are using a pty, which might be a modem line. +@@ -1682,13 +1710,53 @@ tswapscreen(void) } void --tscrolldown(int orig, int n) { -+kscrolldown(const Arg* a) { +-tscrolldown(int orig, int n) ++kscrolldown(const Arg* a) ++{ + int n = a->i; + -+ if(n < 0) ++ if (n < 0) + n = term.row + n; + -+ if(n > term.scr) ++ if (n > term.scr) + n = term.scr; + -+ if(term.scr > 0) { ++ if (term.scr > 0) { + term.scr -= n; + selscroll(0, -n); + tfulldirt(); @@ -237,13 +242,14 @@ index 0c6b9c3..eeb37c9 100644 +} + +void -+kscrollup(const Arg* a) { ++kscrollup(const Arg* a) ++{ + int n = a->i; + -+ if(n < 0) ++ if (n < 0) + n = term.row + n; + -+ if(term.scr <= histsize - n) { ++ if (term.scr <= histsize - n) { + term.scr += n; + selscroll(0, n); + tfulldirt(); @@ -251,13 +257,14 @@ index 0c6b9c3..eeb37c9 100644 +} + +void -+tscrolldown(int orig, int n, bool copyhist) { ++tscrolldown(int orig, int n, int copyhist) + { int i; Line temp; LIMIT(n, 0, term.bot-orig+1); -+ if(copyhist) { ++ if (copyhist) { + term.histi = (term.histi - 1 + histsize) % histsize; + temp = term.hist[term.histi]; + term.hist[term.histi] = term.line[term.bot]; @@ -265,22 +272,21 @@ index 0c6b9c3..eeb37c9 100644 + } + tsetdirt(orig, term.bot-n); -+ tclearregion(0, term.bot-n+1, term.col-1, term.bot); - for(i = term.bot; i >= orig+n; i--) { -@@ -1519,12 +1586,19 @@ tscrolldown(int orig, int n) { +@@ -1702,13 +1770,20 @@ tscrolldown(int orig, int n) } void --tscrollup(int orig, int n) { -+tscrollup(int orig, int n, bool copyhist) { +-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) { ++ if (copyhist) { + term.histi = (term.histi + 1) % histsize; + temp = term.hist[term.histi]; + term.hist[term.histi] = term.line[orig]; @@ -290,73 +296,74 @@ index 0c6b9c3..eeb37c9 100644 tclearregion(0, orig, term.col-1, orig+n-1); tsetdirt(orig+n, term.bot); -@@ -1571,7 +1645,7 @@ tnewline(int first_col) { +@@ -1757,7 +1832,7 @@ tnewline(int first_col) int y = term.c.y; - if(y == term.bot) { + if (y == term.bot) { - tscrollup(term.top, 1); -+ tscrollup(term.top, 1, true); ++ tscrollup(term.top, 1, 1); } else { y++; } -@@ -1728,13 +1802,13 @@ tinsertblank(int n) { - void - tinsertblankline(int n) { - if(BETWEEN(term.c.y, term.top, term.bot)) +@@ -1922,14 +1997,14 @@ void + tinsertblankline(int n) + { + if (BETWEEN(term.c.y, term.top, term.bot)) - tscrolldown(term.c.y, n); -+ tscrolldown(term.c.y, n, false); ++ tscrolldown(term.c.y, n, 0); } void - tdeleteline(int n) { - if(BETWEEN(term.c.y, term.top, term.bot)) + tdeleteline(int n) + { + if (BETWEEN(term.c.y, term.top, term.bot)) - tscrollup(term.c.y, n); -+ tscrollup(term.c.y, n, false); ++ tscrollup(term.c.y, n, 0); } int32_t -@@ -2163,11 +2237,11 @@ csihandle(void) { +@@ -2363,11 +2438,11 @@ csihandle(void) break; case 'S': /* SU -- Scroll <n> line up */ DEFAULT(csiescseq.arg[0], 1); - tscrollup(term.top, csiescseq.arg[0]); -+ tscrollup(term.top, csiescseq.arg[0], false); ++ tscrollup(term.top, csiescseq.arg[0], 0); break; case 'T': /* SD -- Scroll <n> line down */ DEFAULT(csiescseq.arg[0], 1); - tscrolldown(term.top, csiescseq.arg[0]); -+ tscrolldown(term.top, csiescseq.arg[0], false); ++ tscrolldown(term.top, csiescseq.arg[0], 0); break; case 'L': /* IL -- Insert <n> blank lines */ DEFAULT(csiescseq.arg[0], 1); -@@ -2617,7 +2691,7 @@ eschandle(uchar ascii) { +@@ -2837,7 +2912,7 @@ eschandle(uchar ascii) return 0; case 'D': /* IND -- Linefeed */ - if(term.c.y == term.bot) { + if (term.c.y == term.bot) { - tscrollup(term.top, 1); -+ tscrollup(term.top, 1, true); ++ tscrollup(term.top, 1, 1); } else { tmoveto(term.c.x, term.c.y+1); } -@@ -2630,7 +2704,7 @@ eschandle(uchar ascii) { +@@ -2850,7 +2925,7 @@ eschandle(uchar ascii) break; case 'M': /* RI -- Reverse index */ - if(term.c.y == term.top) { + if (term.c.y == term.top) { - tscrolldown(term.top, 1); -+ tscrolldown(term.top, 1, true); ++ tscrolldown(term.top, 1, 1); } else { tmoveto(term.c.x, term.c.y-1); } -@@ -2791,7 +2865,7 @@ tputc(Rune u) { - +@@ -3013,7 +3088,7 @@ tputc(Rune u) void - tresize(int col, int row) { + tresize(int col, int row) + { - int i; + int i, j; int minrow = MIN(row, term.row); int mincol = MIN(col, term.col); - bool *bp; -@@ -2828,9 +2902,18 @@ tresize(int col, int row) { + int *bp; +@@ -3050,9 +3125,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)); @@ -364,18 +371,18 @@ index 0c6b9c3..eeb37c9 100644 term.dirty = xrealloc(term.dirty, row * sizeof(*term.dirty)); term.tabs = xrealloc(term.tabs, col * sizeof(*term.tabs)); -+ for(i = 0; i < histsize; i++) { ++ for (i = 0; i < histsize; i++) { + term.hist[i] = xrealloc(term.hist[i], col * sizeof(Glyph)); -+ for(j = mincol; j < col; j++) { ++ 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++) { + for (i = 0; i < minrow; i++) { term.line[i] = xrealloc(term.line[i], col * sizeof(Glyph)); -@@ -3664,11 +3747,11 @@ drawregion(int x1, int y1, int x2, int y2) { +@@ -3924,11 +4008,11 @@ drawregion(int x1, int y1, int x2, int y2) term.dirty[y] = 0; specs = term.specbuf; @@ -383,18 +390,18 @@ index 0c6b9c3..eeb37c9 100644 + numspecs = xmakeglyphfontspecs(specs, &TLINE(y)[x1], x2 - x1, x1, y); i = ox = 0; - for(x = x1; x < x2 && i < numspecs; x++) { + for (x = x1; x < x2 && i < numspecs; x++) { - new = term.line[y][x]; + new = TLINE(y)[x]; - if(new.mode == ATTR_WDUMMY) + if (new.mode == ATTR_WDUMMY) continue; - if(ena_sel && selected(x, y)) -@@ -3688,7 +3771,8 @@ drawregion(int x1, int y1, int x2, int y2) { - if(i > 0) + if (ena_sel && selected(x, y)) +@@ -3948,7 +4032,8 @@ drawregion(int x1, int y1, int x2, int y2) + if (i > 0) xdrawglyphfontspecs(specs, base, i, ox, y); } - xdrawcursor(); -+ if(term.scr == 0) ++ if (term.scr == 0) + xdrawcursor(); }