From d24ea821b52ab30087241873c32001f64cbbd76d Mon Sep 17 00:00:00 2001 From: Gaetan Bisson Date: Mon, 8 Jun 2015 11:31:00 -1000 Subject: initial commit --- .SRCINFO | 22 ++++ PKGBUILD | 49 ++++++++ scrollback.patch | 338 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 409 insertions(+) create mode 100644 .SRCINFO create mode 100644 PKGBUILD create mode 100644 scrollback.patch diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 0000000..00eb95c --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,22 @@ +pkgbase = st-git + pkgdesc = Simple virtual terminal emulator for X + pkgver = 20150603.71fa10f + pkgrel = 1 + url = http://git.suckless.org/st/ + arch = i686 + arch = x86_64 + arch = armv7h + license = MIT + makedepends = ncurses + makedepends = libxext + makedepends = git + depends = libxft + provides = st + conflicts = st + source = git://git.suckless.org/st + source = scrollback.patch + sha1sums = SKIP + sha1sums = 2e10ac47eb020d50c7f861f3923bb4152255a027 + +pkgname = st-git + diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 0000000..ff5e10c --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,49 @@ +# Maintainer: Gaetan Bisson +# Contributor: Scytrin dai Kinthra + +pkgname=st-git +_pkgname=st +pkgver=20150603.71fa10f +pkgrel=1 +pkgdesc='Simple virtual terminal emulator for X' +url='http://git.suckless.org/st/' +arch=('i686' 'x86_64' 'armv7h') +license=('MIT') +depends=('libxft') +makedepends=('ncurses' 'libxext' 'git') +source=('git://git.suckless.org/st' + 'scrollback.patch') +sha1sums=('SKIP' + '2e10ac47eb020d50c7f861f3923bb4152255a027') + +provides=("${_pkgname}") +conflicts=("${_pkgname}") + +pkgver() { + cd "${srcdir}/${_pkgname}" + git log -1 --format='%cd.%h' --date=short | tr -d - +} + +prepare() { + cd "${srcdir}/${_pkgname}" + patch -p1 -i ../scrollback.patch # http://st.suckless.org/patches/st-scrollback.diff + sed \ + -e '/char font/s/= .*/= "Fixed:pixelsize=13:style=SemiCondensed";/' \ + -e '/char worddelimiters/s/= .*/= " '"'"'`\\\"()[]{}<>|";/' \ + -e '/int defaultcs/s/= .*/= 1;/' \ + -i config.def.h +} + +build() { + cd "${srcdir}/${_pkgname}" + make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11 +} + +package() { + cd "${srcdir}/${_pkgname}" + export TERMINFO="${pkgdir}/usr/share/terminfo" + install -d "$TERMINFO" + make PREFIX=/usr DESTDIR="${pkgdir}" install + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 README "${pkgdir}/usr/share/doc/${pkgname}/README" +} diff --git a/scrollback.patch b/scrollback.patch new file mode 100644 index 0000000..746b83b --- /dev/null +++ b/scrollback.patch @@ -0,0 +1,338 @@ +diff --git a/config.def.h b/config.def.h +index bb5596e..2df4cbc 100644 +--- a/config.def.h ++++ b/config.def.h +@@ -7,6 +7,7 @@ + */ + static char font[] = "Liberation Mono:pixelsize=12:antialias=false:autohint=false"; + static int borderpx = 2; ++static int histsize = 2000; + static char shell[] = "/bin/sh"; + static char *utmp = NULL; + static char stty_args[] = "stty raw -echo -iexten echonl"; +@@ -128,6 +129,8 @@ static Shortcut shortcuts[] = { + { MODKEY|ShiftMask, XK_C, clipcopy, {.i = 0} }, + { MODKEY|ShiftMask, XK_V, clippaste, {.i = 0} }, + { MODKEY, XK_Num_Lock, numlock, {.i = 0} }, ++ { ShiftMask, XK_Page_Up, kscrollup, {.i = -1} }, ++ { ShiftMask, XK_Page_Down, kscrolldown, {.i = -1} }, + }; + + /* +diff --git a/st.c b/st.c +index 0c6b9c3..ab56435 100644 +--- a/st.c ++++ b/st.c +@@ -83,6 +83,8 @@ char *argv0; + #define TRUERED(x) (((x) & 0xff0000) >> 8) + #define TRUEGREEN(x) (((x) & 0xff00)) + #define TRUEBLUE(x) (((x) & 0xff) << 8) ++#define TLINE(y) ((y) < term.scr ? term.hist[((y) + term.histi - term.scr \ ++ + histsize + 1) % histsize] : term.line[(y) - term.scr]) + + + enum glyph_attribute { +@@ -231,6 +233,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 */ + XftGlyphFontSpec *specbuf; /* font spec buffer used for rendering */ + TCursor c; /* cursor */ +@@ -324,6 +329,8 @@ typedef struct { + /* function definitions used in config.h */ + static void clipcopy(const Arg *); + static void clippaste(const Arg *); ++static void kscrolldown(const Arg *); ++static void kscrollup(const Arg *); + static void numlock(const Arg *); + static void selpaste(const Arg *); + static void xzoom(const Arg *); +@@ -395,8 +402,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 tsetattr(int *, int); + static void tsetchar(Rune, Glyph *, int, int); + static void tsetscroll(int, int); +@@ -682,10 +689,10 @@ int + 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; +@@ -744,7 +751,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; +@@ -759,14 +766,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))) +@@ -787,14 +794,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; + } +@@ -953,13 +960,13 @@ getsel(void) { + linelen = tlinelen(y); + + if(sel.type == SEL_RECTANGULAR) { +- gp = &term.line[y][sel.nb.x]; ++ gp = &TLINE(y)[sel.nb.x]; + lastx = sel.ne.x; + } else { +- gp = &term.line[y][sel.nb.y == y ? sel.nb.x : 0]; ++ gp = &TLINE(y)[sel.nb.y == y ? sel.nb.x : 0]; + lastx = (sel.ne.y == y) ? sel.ne.x : term.col-1; + } +- last = &term.line[y][MIN(lastx, linelen-1)]; ++ last = &TLINE(y)[MIN(lastx, linelen-1)]; + while(last >= gp && last->u == ' ') + --last; + +@@ -1362,10 +1369,16 @@ ttyread(void) { + + /* keep any uncomplete utf8 char for the next call */ + memmove(buf, ptr, buflen); ++ if(term.scr > 0 && term.scr < histsize-1) ++ term.scr++; + } + + void + ttywrite(const char *s, size_t n) { ++ Arg arg = (Arg){ .i = term.scr }; ++ ++ kscrolldown(&arg); ++ + if(xwrite(cmdfd, s, n) == -1) + die("write error on tty: %s\n", strerror(errno)); + } +@@ -1500,13 +1513,52 @@ tswapscreen(void) { + } + + void +-tscrolldown(int orig, int n) { ++kscrolldown(const Arg* a) { ++ int n = a->i; ++ ++ if(n < 0) ++ n = term.row + n; ++ ++ if(n > term.scr) ++ n = term.scr; ++ ++ if(term.scr > 0) { ++ term.scr -= n; ++ selscroll(0, -n); ++ tfulldirt(); ++ } ++} ++ ++void ++kscrollup(const Arg* a) { ++ int n = a->i; ++ ++ if(n < 0) ++ n = term.row + n; ++ ++ if(term.scr <= histsize - n) { ++ term.scr += n; ++ selscroll(0, n); ++ tfulldirt(); ++ } ++} ++ ++void ++tscrolldown(int orig, int n, bool copyhist) { + int i; + Line temp; + + LIMIT(n, 0, term.bot-orig+1); + ++ 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); + + for(i = term.bot; i >= orig+n; i--) { +@@ -1519,12 +1571,19 @@ tscrolldown(int orig, int n) { + } + + void +-tscrollup(int orig, int n) { ++tscrollup(int orig, int n, bool copyhist) { + int i; + Line temp; + + LIMIT(n, 0, term.bot-orig+1); + ++ if(copyhist) { ++ term.histi = (term.histi + 1) % histsize; ++ temp = term.hist[term.histi]; ++ term.hist[term.histi] = term.line[orig]; ++ term.line[orig] = temp; ++ } ++ + tclearregion(0, orig, term.col-1, orig+n-1); + tsetdirt(orig+n, term.bot); + +@@ -1571,7 +1630,7 @@ tnewline(int first_col) { + int y = term.c.y; + + if(y == term.bot) { +- tscrollup(term.top, 1); ++ tscrollup(term.top, 1, true); + } else { + y++; + } +@@ -1728,13 +1787,13 @@ tinsertblank(int n) { + void + tinsertblankline(int n) { + if(BETWEEN(term.c.y, term.top, term.bot)) +- tscrolldown(term.c.y, n); ++ tscrolldown(term.c.y, n, false); + } + + void + tdeleteline(int n) { + if(BETWEEN(term.c.y, term.top, term.bot)) +- tscrollup(term.c.y, n); ++ tscrollup(term.c.y, n, false); + } + + int32_t +@@ -2163,11 +2222,11 @@ csihandle(void) { + break; + case 'S': /* SU -- Scroll line up */ + DEFAULT(csiescseq.arg[0], 1); +- tscrollup(term.top, csiescseq.arg[0]); ++ tscrollup(term.top, csiescseq.arg[0], false); + break; + case 'T': /* SD -- Scroll line down */ + DEFAULT(csiescseq.arg[0], 1); +- tscrolldown(term.top, csiescseq.arg[0]); ++ tscrolldown(term.top, csiescseq.arg[0], false); + break; + case 'L': /* IL -- Insert blank lines */ + DEFAULT(csiescseq.arg[0], 1); +@@ -2617,7 +2676,7 @@ eschandle(uchar ascii) { + return 0; + case 'D': /* IND -- Linefeed */ + if(term.c.y == term.bot) { +- tscrollup(term.top, 1); ++ tscrollup(term.top, 1, true); + } else { + tmoveto(term.c.x, term.c.y+1); + } +@@ -2630,7 +2689,7 @@ eschandle(uchar ascii) { + break; + case 'M': /* RI -- Reverse index */ + if(term.c.y == term.top) { +- tscrolldown(term.top, 1); ++ tscrolldown(term.top, 1, true); + } else { + tmoveto(term.c.x, term.c.y-1); + } +@@ -2791,7 +2850,7 @@ tputc(Rune u) { + + void + 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 +2887,18 @@ tresize(int col, int row) { + /* resize to new height */ + term.line = xrealloc(term.line, row * sizeof(Line)); + term.alt = xrealloc(term.alt, row * sizeof(Line)); ++ term.hist = xrealloc(term.hist, histsize * sizeof(Line)); + term.dirty = xrealloc(term.dirty, row * sizeof(*term.dirty)); + term.tabs = xrealloc(term.tabs, col * sizeof(*term.tabs)); + ++ for(i = 0; i < histsize; i++) { ++ term.hist[i] = xrealloc(term.hist[i], col * sizeof(Glyph)); ++ for(j = mincol; j < col; j++) { ++ term.hist[i][j] = term.c.attr; ++ 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)); +@@ -3664,11 +3732,11 @@ drawregion(int x1, int y1, int x2, int y2) { + term.dirty[y] = 0; + + specs = term.specbuf; +- numspecs = xmakeglyphfontspecs(specs, &term.line[y][x1], x2 - x1, x1, y); ++ numspecs = xmakeglyphfontspecs(specs, &TLINE(y)[x1], x2 - x1, x1, y); + + i = ox = 0; + for(x = x1; x < x2 && i < numspecs; x++) { +- new = term.line[y][x]; ++ new = TLINE(y)[x]; + if(new.mode == ATTR_WDUMMY) + continue; + if(ena_sel && selected(x, y)) +@@ -3688,7 +3756,8 @@ drawregion(int x1, int y1, int x2, int y2) { + if(i > 0) + xdrawglyphfontspecs(specs, base, i, ox, y); + } +- xdrawcursor(); ++ if(term.scr == 0) ++ xdrawcursor(); + } + + void -- cgit v1.2.3 From 7f2c13ce77da5daacac06066666dcdd73e5aac7c Mon Sep 17 00:00:00 2001 From: mar77i Date: Thu, 25 Jun 2015 10:43:54 +0200 Subject: move tic invocation from Makefile to package() --- PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index ff5e10c..fc9cf60 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -32,6 +32,7 @@ prepare() { -e '/char worddelimiters/s/= .*/= " '"'"'`\\\"()[]{}<>|";/' \ -e '/int defaultcs/s/= .*/= 1;/' \ -i config.def.h + sed '/@tic/d' -i Makefile } build() { @@ -41,9 +42,8 @@ build() { package() { cd "${srcdir}/${_pkgname}" - export TERMINFO="${pkgdir}/usr/share/terminfo" - install -d "$TERMINFO" make PREFIX=/usr DESTDIR="${pkgdir}" install install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" install -Dm644 README "${pkgdir}/usr/share/doc/${pkgname}/README" + tic -s -o "${pkgdir}/usr/share/terminfo" st.info } -- cgit v1.2.3 From 27aad93a2f5635d9ce9cebbf61b6947f90712151 Mon Sep 17 00:00:00 2001 From: mar77i Date: Thu, 25 Jun 2015 10:46:30 +0200 Subject: use += in config.mk for make variables so system config is respected --- PKGBUILD | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/PKGBUILD b/PKGBUILD index fc9cf60..b68e76f 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -32,6 +32,12 @@ prepare() { -e '/char worddelimiters/s/= .*/= " '"'"'`\\\"()[]{}<>|";/' \ -e '/int defaultcs/s/= .*/= 1;/' \ -i config.def.h + sed \ + -e 's/CPPFLAGS =/CPPFLAGS +=/g' \ + -e 's/CFLAGS =/CFLAGS +=/g' \ + -e 's/LDFLAGS =/LDFLAGS +=/g' \ + -e 's/_BSD_SOURCE/_DEFAULT_SOURCE/' \ + -i config.mk sed '/@tic/d' -i Makefile } -- cgit v1.2.3 From 0df21d831f3d16cf15fcb07b55c962e88fc85143 Mon Sep 17 00:00:00 2001 From: mar77i Date: Thu, 25 Jun 2015 10:50:01 +0200 Subject: automatically apply patches in source array --- PKGBUILD | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index b68e76f..92713c4 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -25,8 +25,8 @@ pkgver() { } prepare() { + local file cd "${srcdir}/${_pkgname}" - patch -p1 -i ../scrollback.patch # http://st.suckless.org/patches/st-scrollback.diff sed \ -e '/char font/s/= .*/= "Fixed:pixelsize=13:style=SemiCondensed";/' \ -e '/char worddelimiters/s/= .*/= " '"'"'`\\\"()[]{}<>|";/' \ @@ -39,6 +39,13 @@ prepare() { -e 's/_BSD_SOURCE/_DEFAULT_SOURCE/' \ -i config.mk sed '/@tic/d' -i Makefile + for file in "${source[@]}"; do + if [[ "$file" != *.diff ]]; then + continue + fi + # add all patches present in source array + patch -Np1 <"$SRCDEST/$file" + done } build() { -- cgit v1.2.3 From c5b97b9a4779d9307ebf9a21ded89fce9be19444 Mon Sep 17 00:00:00 2001 From: mar77i Date: Thu, 25 Jun 2015 10:50:30 +0200 Subject: add config.h if present in source array --- PKGBUILD | 3 +++ 1 file changed, 3 insertions(+) diff --git a/PKGBUILD b/PKGBUILD index 92713c4..e1995a4 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -41,6 +41,9 @@ prepare() { sed '/@tic/d' -i Makefile for file in "${source[@]}"; do if [[ "$file" != *.diff ]]; then + # add config.h if present in source array + # Note: this supersedes the above sed to config.def.h + [[ "$file" == "config.h" ]] && cp "$SRCDEST/$file" . continue fi # add all patches present in source array -- cgit v1.2.3 From 70b10beb56f25de245b7fc5331ebe6f15e95b337 Mon Sep 17 00:00:00 2001 From: mar77i Date: Thu, 25 Jun 2015 11:40:22 +0200 Subject: remove scrollback patch on the AUR branch. --- .SRCINFO | 2 - PKGBUILD | 6 +- scrollback.patch | 338 ------------------------------------------------------- 3 files changed, 2 insertions(+), 344 deletions(-) delete mode 100644 scrollback.patch diff --git a/.SRCINFO b/.SRCINFO index 00eb95c..f550831 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -14,9 +14,7 @@ pkgbase = st-git provides = st conflicts = st source = git://git.suckless.org/st - source = scrollback.patch sha1sums = SKIP - sha1sums = 2e10ac47eb020d50c7f861f3923bb4152255a027 pkgname = st-git diff --git a/PKGBUILD b/PKGBUILD index e1995a4..872f256 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -11,10 +11,8 @@ arch=('i686' 'x86_64' 'armv7h') license=('MIT') depends=('libxft') makedepends=('ncurses' 'libxext' 'git') -source=('git://git.suckless.org/st' - 'scrollback.patch') -sha1sums=('SKIP' - '2e10ac47eb020d50c7f861f3923bb4152255a027') +source=('git://git.suckless.org/st') +sha1sums=('SKIP') provides=("${_pkgname}") conflicts=("${_pkgname}") diff --git a/scrollback.patch b/scrollback.patch deleted file mode 100644 index 746b83b..0000000 --- a/scrollback.patch +++ /dev/null @@ -1,338 +0,0 @@ -diff --git a/config.def.h b/config.def.h -index bb5596e..2df4cbc 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -7,6 +7,7 @@ - */ - static char font[] = "Liberation Mono:pixelsize=12:antialias=false:autohint=false"; - static int borderpx = 2; -+static int histsize = 2000; - static char shell[] = "/bin/sh"; - static char *utmp = NULL; - static char stty_args[] = "stty raw -echo -iexten echonl"; -@@ -128,6 +129,8 @@ static Shortcut shortcuts[] = { - { MODKEY|ShiftMask, XK_C, clipcopy, {.i = 0} }, - { MODKEY|ShiftMask, XK_V, clippaste, {.i = 0} }, - { MODKEY, XK_Num_Lock, numlock, {.i = 0} }, -+ { ShiftMask, XK_Page_Up, kscrollup, {.i = -1} }, -+ { ShiftMask, XK_Page_Down, kscrolldown, {.i = -1} }, - }; - - /* -diff --git a/st.c b/st.c -index 0c6b9c3..ab56435 100644 ---- a/st.c -+++ b/st.c -@@ -83,6 +83,8 @@ char *argv0; - #define TRUERED(x) (((x) & 0xff0000) >> 8) - #define TRUEGREEN(x) (((x) & 0xff00)) - #define TRUEBLUE(x) (((x) & 0xff) << 8) -+#define TLINE(y) ((y) < term.scr ? term.hist[((y) + term.histi - term.scr \ -+ + histsize + 1) % histsize] : term.line[(y) - term.scr]) - - - enum glyph_attribute { -@@ -231,6 +233,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 */ - XftGlyphFontSpec *specbuf; /* font spec buffer used for rendering */ - TCursor c; /* cursor */ -@@ -324,6 +329,8 @@ typedef struct { - /* function definitions used in config.h */ - static void clipcopy(const Arg *); - static void clippaste(const Arg *); -+static void kscrolldown(const Arg *); -+static void kscrollup(const Arg *); - static void numlock(const Arg *); - static void selpaste(const Arg *); - static void xzoom(const Arg *); -@@ -395,8 +402,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 tsetattr(int *, int); - static void tsetchar(Rune, Glyph *, int, int); - static void tsetscroll(int, int); -@@ -682,10 +689,10 @@ int - 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; -@@ -744,7 +751,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; -@@ -759,14 +766,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))) -@@ -787,14 +794,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; - } -@@ -953,13 +960,13 @@ getsel(void) { - linelen = tlinelen(y); - - if(sel.type == SEL_RECTANGULAR) { -- gp = &term.line[y][sel.nb.x]; -+ gp = &TLINE(y)[sel.nb.x]; - lastx = sel.ne.x; - } else { -- gp = &term.line[y][sel.nb.y == y ? sel.nb.x : 0]; -+ gp = &TLINE(y)[sel.nb.y == y ? sel.nb.x : 0]; - lastx = (sel.ne.y == y) ? sel.ne.x : term.col-1; - } -- last = &term.line[y][MIN(lastx, linelen-1)]; -+ last = &TLINE(y)[MIN(lastx, linelen-1)]; - while(last >= gp && last->u == ' ') - --last; - -@@ -1362,10 +1369,16 @@ ttyread(void) { - - /* keep any uncomplete utf8 char for the next call */ - memmove(buf, ptr, buflen); -+ if(term.scr > 0 && term.scr < histsize-1) -+ term.scr++; - } - - void - ttywrite(const char *s, size_t n) { -+ Arg arg = (Arg){ .i = term.scr }; -+ -+ kscrolldown(&arg); -+ - if(xwrite(cmdfd, s, n) == -1) - die("write error on tty: %s\n", strerror(errno)); - } -@@ -1500,13 +1513,52 @@ tswapscreen(void) { - } - - void --tscrolldown(int orig, int n) { -+kscrolldown(const Arg* a) { -+ int n = a->i; -+ -+ if(n < 0) -+ n = term.row + n; -+ -+ if(n > term.scr) -+ n = term.scr; -+ -+ if(term.scr > 0) { -+ term.scr -= n; -+ selscroll(0, -n); -+ tfulldirt(); -+ } -+} -+ -+void -+kscrollup(const Arg* a) { -+ int n = a->i; -+ -+ if(n < 0) -+ n = term.row + n; -+ -+ if(term.scr <= histsize - n) { -+ term.scr += n; -+ selscroll(0, n); -+ tfulldirt(); -+ } -+} -+ -+void -+tscrolldown(int orig, int n, bool copyhist) { - int i; - Line temp; - - LIMIT(n, 0, term.bot-orig+1); - -+ 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); - - for(i = term.bot; i >= orig+n; i--) { -@@ -1519,12 +1571,19 @@ tscrolldown(int orig, int n) { - } - - void --tscrollup(int orig, int n) { -+tscrollup(int orig, int n, bool copyhist) { - int i; - Line temp; - - LIMIT(n, 0, term.bot-orig+1); - -+ if(copyhist) { -+ term.histi = (term.histi + 1) % histsize; -+ temp = term.hist[term.histi]; -+ term.hist[term.histi] = term.line[orig]; -+ term.line[orig] = temp; -+ } -+ - tclearregion(0, orig, term.col-1, orig+n-1); - tsetdirt(orig+n, term.bot); - -@@ -1571,7 +1630,7 @@ tnewline(int first_col) { - int y = term.c.y; - - if(y == term.bot) { -- tscrollup(term.top, 1); -+ tscrollup(term.top, 1, true); - } else { - y++; - } -@@ -1728,13 +1787,13 @@ tinsertblank(int n) { - void - tinsertblankline(int n) { - if(BETWEEN(term.c.y, term.top, term.bot)) -- tscrolldown(term.c.y, n); -+ tscrolldown(term.c.y, n, false); - } - - void - tdeleteline(int n) { - if(BETWEEN(term.c.y, term.top, term.bot)) -- tscrollup(term.c.y, n); -+ tscrollup(term.c.y, n, false); - } - - int32_t -@@ -2163,11 +2222,11 @@ csihandle(void) { - break; - case 'S': /* SU -- Scroll line up */ - DEFAULT(csiescseq.arg[0], 1); -- tscrollup(term.top, csiescseq.arg[0]); -+ tscrollup(term.top, csiescseq.arg[0], false); - break; - case 'T': /* SD -- Scroll line down */ - DEFAULT(csiescseq.arg[0], 1); -- tscrolldown(term.top, csiescseq.arg[0]); -+ tscrolldown(term.top, csiescseq.arg[0], false); - break; - case 'L': /* IL -- Insert blank lines */ - DEFAULT(csiescseq.arg[0], 1); -@@ -2617,7 +2676,7 @@ eschandle(uchar ascii) { - return 0; - case 'D': /* IND -- Linefeed */ - if(term.c.y == term.bot) { -- tscrollup(term.top, 1); -+ tscrollup(term.top, 1, true); - } else { - tmoveto(term.c.x, term.c.y+1); - } -@@ -2630,7 +2689,7 @@ eschandle(uchar ascii) { - break; - case 'M': /* RI -- Reverse index */ - if(term.c.y == term.top) { -- tscrolldown(term.top, 1); -+ tscrolldown(term.top, 1, true); - } else { - tmoveto(term.c.x, term.c.y-1); - } -@@ -2791,7 +2850,7 @@ tputc(Rune u) { - - void - 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 +2887,18 @@ tresize(int col, int row) { - /* resize to new height */ - term.line = xrealloc(term.line, row * sizeof(Line)); - term.alt = xrealloc(term.alt, row * sizeof(Line)); -+ term.hist = xrealloc(term.hist, histsize * sizeof(Line)); - term.dirty = xrealloc(term.dirty, row * sizeof(*term.dirty)); - term.tabs = xrealloc(term.tabs, col * sizeof(*term.tabs)); - -+ for(i = 0; i < histsize; i++) { -+ term.hist[i] = xrealloc(term.hist[i], col * sizeof(Glyph)); -+ for(j = mincol; j < col; j++) { -+ term.hist[i][j] = term.c.attr; -+ 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)); -@@ -3664,11 +3732,11 @@ drawregion(int x1, int y1, int x2, int y2) { - term.dirty[y] = 0; - - specs = term.specbuf; -- numspecs = xmakeglyphfontspecs(specs, &term.line[y][x1], x2 - x1, x1, y); -+ numspecs = xmakeglyphfontspecs(specs, &TLINE(y)[x1], x2 - x1, x1, y); - - i = ox = 0; - for(x = x1; x < x2 && i < numspecs; x++) { -- new = term.line[y][x]; -+ new = TLINE(y)[x]; - if(new.mode == ATTR_WDUMMY) - continue; - if(ena_sel && selected(x, y)) -@@ -3688,7 +3756,8 @@ drawregion(int x1, int y1, int x2, int y2) { - if(i > 0) - xdrawglyphfontspecs(specs, base, i, ox, y); - } -- xdrawcursor(); -+ if(term.scr == 0) -+ xdrawcursor(); - } - - void -- cgit v1.2.3 From 19096d1498a90a1dcce0fd39eaa74715bc0331c0 Mon Sep 17 00:00:00 2001 From: mar77i Date: Thu, 15 Oct 2015 13:43:56 +0200 Subject: remove terminfo installation, update maintainer --- PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 872f256..b206c21 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,9 +1,10 @@ -# Maintainer: Gaetan Bisson +# Maintainer: mar77i +# Past Maintainer: Gaetan Bisson # Contributor: Scytrin dai Kinthra pkgname=st-git _pkgname=st -pkgver=20150603.71fa10f +pkgver=20151011.f56c58a pkgrel=1 pkgdesc='Simple virtual terminal emulator for X' url='http://git.suckless.org/st/' @@ -59,5 +60,4 @@ package() { make PREFIX=/usr DESTDIR="${pkgdir}" install install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" install -Dm644 README "${pkgdir}/usr/share/doc/${pkgname}/README" - tic -s -o "${pkgdir}/usr/share/terminfo" st.info } -- cgit v1.2.3 From 05baa36be4daf4d131900915f21db125ce2ccbce Mon Sep 17 00:00:00 2001 From: mar77i Date: Thu, 15 Oct 2015 13:44:42 +0200 Subject: make applying of patches and inserting config.h more readable --- PKGBUILD | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index b206c21..9924c53 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -39,14 +39,15 @@ prepare() { -i config.mk sed '/@tic/d' -i Makefile for file in "${source[@]}"; do - if [[ "$file" != *.diff ]]; then + if [[ "$file" == "config.h" ]]; then # add config.h if present in source array # Note: this supersedes the above sed to config.def.h - [[ "$file" == "config.h" ]] && cp "$SRCDEST/$file" . + cp "$SRCDEST/$file" . continue + elif [[ "$file" == *.diff ]]; then + # add all patches present in source array + patch -Np1 <"$SRCDEST/$file" fi - # add all patches present in source array - patch -Np1 <"$SRCDEST/$file" done } -- cgit v1.2.3 From 96d35f72f17e971c8b0c711ea2c186d0b899a730 Mon Sep 17 00:00:00 2001 From: mar77i Date: Thu, 15 Oct 2015 13:47:42 +0200 Subject: don't use SRCDEST, thanks phillid --- PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 9924c53..349f28f 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -42,11 +42,11 @@ prepare() { if [[ "$file" == "config.h" ]]; then # add config.h if present in source array # Note: this supersedes the above sed to config.def.h - cp "$SRCDEST/$file" . + cp "$srcdir/$file" . continue elif [[ "$file" == *.diff ]]; then # add all patches present in source array - patch -Np1 <"$SRCDEST/$file" + patch -Np1 <"$srcdir/$file" fi done } -- cgit v1.2.3 From 89c41b34fbbef7e071d88d421e63ab89ef620f1b Mon Sep 17 00:00:00 2001 From: mar77i Date: Thu, 15 Oct 2015 13:48:01 +0200 Subject: remove nonstandard arches --- .SRCINFO | 3 +-- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index f550831..1134791 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,11 +1,10 @@ pkgbase = st-git pkgdesc = Simple virtual terminal emulator for X - pkgver = 20150603.71fa10f + pkgver = 20151011.f56c58a pkgrel = 1 url = http://git.suckless.org/st/ arch = i686 arch = x86_64 - arch = armv7h license = MIT makedepends = ncurses makedepends = libxext diff --git a/PKGBUILD b/PKGBUILD index 349f28f..314d143 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -8,7 +8,7 @@ pkgver=20151011.f56c58a pkgrel=1 pkgdesc='Simple virtual terminal emulator for X' url='http://git.suckless.org/st/' -arch=('i686' 'x86_64' 'armv7h') +arch=('i686' 'x86_64') license=('MIT') depends=('libxft') makedepends=('ncurses' 'libxext' 'git') -- cgit v1.2.3 From dc05f486ca8fd0bf3ef85604125ada81f28ae9d5 Mon Sep 17 00:00:00 2001 From: mar77i Date: Sat, 3 Sep 2016 13:28:48 +0200 Subject: PKGBUILD: assume $srcdir, as noted in PKGBUILD(5) --- PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 314d143..6221c6b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -19,13 +19,13 @@ provides=("${_pkgname}") conflicts=("${_pkgname}") pkgver() { - cd "${srcdir}/${_pkgname}" + cd "${_pkgname}" git log -1 --format='%cd.%h' --date=short | tr -d - } prepare() { local file - cd "${srcdir}/${_pkgname}" + cd "${_pkgname}" sed \ -e '/char font/s/= .*/= "Fixed:pixelsize=13:style=SemiCondensed";/' \ -e '/char worddelimiters/s/= .*/= " '"'"'`\\\"()[]{}<>|";/' \ @@ -52,12 +52,12 @@ prepare() { } build() { - cd "${srcdir}/${_pkgname}" + cd "${_pkgname}" make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11 } package() { - cd "${srcdir}/${_pkgname}" + cd "${_pkgname}" make PREFIX=/usr DESTDIR="${pkgdir}" install install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" install -Dm644 README "${pkgdir}/usr/share/doc/${pkgname}/README" -- cgit v1.2.3 From 278ae33272f0cafa397c5da57a29eaf4aa7f609a Mon Sep 17 00:00:00 2001 From: mar77i Date: Sat, 3 Sep 2016 13:34:17 +0200 Subject: use -lXrendr, zipman, comment the source array and simplify the source loop, thanks prash --- PKGBUILD | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 6221c6b..32caae7 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,14 +4,16 @@ pkgname=st-git _pkgname=st -pkgver=20151011.f56c58a +pkgver=20160309.3996461 pkgrel=1 pkgdesc='Simple virtual terminal emulator for X' url='http://git.suckless.org/st/' arch=('i686' 'x86_64') license=('MIT') +options=('zipman') depends=('libxft') makedepends=('ncurses' 'libxext' 'git') +# include config.h and any patches you want to have applied here source=('git://git.suckless.org/st') sha1sums=('SKIP') @@ -36,6 +38,7 @@ prepare() { -e 's/CFLAGS =/CFLAGS +=/g' \ -e 's/LDFLAGS =/LDFLAGS +=/g' \ -e 's/_BSD_SOURCE/_DEFAULT_SOURCE/' \ + -e 's/\(-lXft\)/\1 -lXrender/' \ -i config.mk sed '/@tic/d' -i Makefile for file in "${source[@]}"; do @@ -43,10 +46,9 @@ prepare() { # add config.h if present in source array # Note: this supersedes the above sed to config.def.h cp "$srcdir/$file" . - continue - elif [[ "$file" == *.diff ]]; then + elif [[ "$file" == *.diff || "$file" == *.patch ]]; then # add all patches present in source array - patch -Np1 <"$srcdir/$file" + patch -Np1 <"$srcdir/$(basename ${file})" fi done } -- cgit v1.2.3 From 01336d8de538a197c228334353fabe16c3781639 Mon Sep 17 00:00:00 2001 From: mar77i Date: Sat, 3 Sep 2016 13:52:49 +0200 Subject: drop adding -lXrender again, that's included with the alpha patch now --- PKGBUILD | 1 - 1 file changed, 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index 32caae7..b9a9f9a 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -38,7 +38,6 @@ prepare() { -e 's/CFLAGS =/CFLAGS +=/g' \ -e 's/LDFLAGS =/LDFLAGS +=/g' \ -e 's/_BSD_SOURCE/_DEFAULT_SOURCE/' \ - -e 's/\(-lXft\)/\1 -lXrender/' \ -i config.mk sed '/@tic/d' -i Makefile for file in "${source[@]}"; do -- cgit v1.2.3 From 6ee8125844b2f3ca07a84cb23b0f9d235a65e4c3 Mon Sep 17 00:00:00 2001 From: mar77i Date: Sat, 3 Sep 2016 14:14:42 +0200 Subject: update .SRCINFO --- .SRCINFO | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.SRCINFO b/.SRCINFO index 1134791..70066c3 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,8 @@ +# Generated by mksrcinfo v8 +# Sat Sep 3 12:14:11 UTC 2016 pkgbase = st-git pkgdesc = Simple virtual terminal emulator for X - pkgver = 20151011.f56c58a + pkgver = 20160811.023225e pkgrel = 1 url = http://git.suckless.org/st/ arch = i686 @@ -12,6 +14,7 @@ pkgbase = st-git depends = libxft provides = st conflicts = st + options = zipman source = git://git.suckless.org/st sha1sums = SKIP -- cgit v1.2.3 From 549b41de1c97e612195bb4c06d050009f3e09825 Mon Sep 17 00:00:00 2001 From: mar77i Date: Sat, 3 Sep 2016 14:36:01 +0200 Subject: use tags for generating pkgver, like in dwm-git --- PKGBUILD | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index b9a9f9a..1bd003d 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,10 +1,10 @@ -# Maintainer: mar77i +# Maintainer: mar77i # Past Maintainer: Gaetan Bisson # Contributor: Scytrin dai Kinthra pkgname=st-git _pkgname=st -pkgver=20160309.3996461 +pkgver=0.7.1.g023225e pkgrel=1 pkgdesc='Simple virtual terminal emulator for X' url='http://git.suckless.org/st/' @@ -13,6 +13,7 @@ license=('MIT') options=('zipman') depends=('libxft') makedepends=('ncurses' 'libxext' 'git') +epoch=1 # include config.h and any patches you want to have applied here source=('git://git.suckless.org/st') sha1sums=('SKIP') @@ -22,7 +23,7 @@ conflicts=("${_pkgname}") pkgver() { cd "${_pkgname}" - git log -1 --format='%cd.%h' --date=short | tr -d - + git describe --tags |sed 's/-/./g' } prepare() { -- cgit v1.2.3 From 41774076405dcf671a7243299035986863adb67c Mon Sep 17 00:00:00 2001 From: mar77i Date: Sat, 3 Sep 2016 14:38:49 +0200 Subject: fix package url --- PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index 1bd003d..9e924aa 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,7 +7,7 @@ _pkgname=st pkgver=0.7.1.g023225e pkgrel=1 pkgdesc='Simple virtual terminal emulator for X' -url='http://git.suckless.org/st/' +url='http://st.suckless.org/' arch=('i686' 'x86_64') license=('MIT') options=('zipman') -- cgit v1.2.3 From 3d799fa5d43a68be44d79ab3f990bd6d2290c9e8 Mon Sep 17 00:00:00 2001 From: mar77i Date: Sat, 3 Sep 2016 14:42:43 +0200 Subject: update url in .SRCINFO too --- .SRCINFO | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.SRCINFO b/.SRCINFO index 70066c3..70bd90f 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -4,7 +4,7 @@ pkgbase = st-git pkgdesc = Simple virtual terminal emulator for X pkgver = 20160811.023225e pkgrel = 1 - url = http://git.suckless.org/st/ + url = http://st.suckless.org/ arch = i686 arch = x86_64 license = MIT -- cgit v1.2.3 From a148393242d40e0d28d5f1216962c543cbcc6b1f Mon Sep 17 00:00:00 2001 From: mar77i Date: Wed, 26 Oct 2016 10:45:58 +0200 Subject: update .SRCINFO and tag checksum --- .SRCINFO | 5 +++-- PKGBUILD | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 70bd90f..d2bd346 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,9 +1,10 @@ # Generated by mksrcinfo v8 -# Sat Sep 3 12:14:11 UTC 2016 +# Wed Oct 26 08:45:07 UTC 2016 pkgbase = st-git pkgdesc = Simple virtual terminal emulator for X - pkgver = 20160811.023225e + pkgver = 0.7.9.g8c99915 pkgrel = 1 + epoch = 1 url = http://st.suckless.org/ arch = i686 arch = x86_64 diff --git a/PKGBUILD b/PKGBUILD index 9e924aa..7d9b4df 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ pkgname=st-git _pkgname=st -pkgver=0.7.1.g023225e +pkgver=0.7.9.g8c99915 pkgrel=1 pkgdesc='Simple virtual terminal emulator for X' url='http://st.suckless.org/' -- cgit v1.2.3