iSupport UTF-8 characters as word delimiters - st - Simple Terminal Err gopher.r-36.net 70 i Err gopher.r-36.net 70 1Log /scm/st//log.gph gopher.r-36.net 70 1Files /scm/st//files.gph gopher.r-36.net 70 1Refs /scm/st//refs.gph gopher.r-36.net 70 1README /scm/st//file/README.gph gopher.r-36.net 70 1LICENSE /scm/st//file/LICENSE.gph gopher.r-36.net 70 i--- Err gopher.r-36.net 70 1commit caa97cc781ccf29f28c3d9e6683a66eb3f70e2bd /scm/st//commit/caa97cc781ccf29f28c3d9e6683a66eb3f70e2bd.gph gopher.r-36.net 70 1parent c03548750b2527a6ddb5edfd945c5799066a6224 /scm/st//commit/c03548750b2527a6ddb5edfd945c5799066a6224.gph gopher.r-36.net 70 hAuthor: Jan Christoph Ebersbach URL:mailto:jceb@e-jc.de gopher.r-36.net 70 iDate: Fri, 22 May 2015 16:06:57 +0200 Err gopher.r-36.net 70 i Err gopher.r-36.net 70 iSupport UTF-8 characters as word delimiters Err gopher.r-36.net 70 i Err gopher.r-36.net 70 iFor a higher usefulness of the utf8strchr function, the index of the Err gopher.r-36.net 70 iUTF-8 character could be returned in addition with a Rune instead of a Err gopher.r-36.net 70 ichar*. Since utf8strchr is currently only used by ISDELIM I didn't Err gopher.r-36.net 70 ibother to increase the complexity. Err gopher.r-36.net 70 i Err gopher.r-36.net 70 iDiffstat: Err gopher.r-36.net 70 i st.c | 18 +++++++++++++++++- Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i1 file changed, 17 insertions(+), 1 deletion(-) Err gopher.r-36.net 70 i--- Err gopher.r-36.net 70 1diff --git a/st.c b/st.c /scm/st//file/st.c.gph gopher.r-36.net 70 i@@ -71,7 +71,7 @@ char *argv0; Err gopher.r-36.net 70 i #define ISCONTROLC0(c) (BETWEEN(c, 0, 0x1f) || (c) == '\177') Err gopher.r-36.net 70 i #define ISCONTROLC1(c) (BETWEEN(c, 0x80, 0x9f)) Err gopher.r-36.net 70 i #define ISCONTROL(c) (ISCONTROLC0(c) || ISCONTROLC1(c)) Err gopher.r-36.net 70 i-#define ISDELIM(u) (BETWEEN(u, 0, 127) && strchr(worddelimiters, u) != NULL) Err gopher.r-36.net 70 i+#define ISDELIM(u) (utf8strchr(worddelimiters, u) != NULL) Err gopher.r-36.net 70 i #define LIMIT(x, a, b) (x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x) Err gopher.r-36.net 70 i #define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || (a).bg != (b).bg) Err gopher.r-36.net 70 i #define IS_SET(flag) ((term.mode & (flag)) != 0) Err gopher.r-36.net 70 i@@ -473,6 +473,7 @@ static size_t utf8decode(char *, Rune *, size_t); Err gopher.r-36.net 70 i static Rune utf8decodebyte(char, size_t *); Err gopher.r-36.net 70 i static size_t utf8encode(Rune, char *); Err gopher.r-36.net 70 i static char utf8encodebyte(Rune, size_t); Err gopher.r-36.net 70 i+static char *utf8strchr(char *s, Rune u); Err gopher.r-36.net 70 i static size_t utf8validate(Rune *, size_t); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i static ssize_t xwrite(int, const char *, size_t); Err gopher.r-36.net 70 i@@ -640,6 +641,21 @@ utf8encodebyte(Rune u, size_t i) { Err gopher.r-36.net 70 i return utfbyte[i] | (u & ~utfmask[i]); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i+char * Err gopher.r-36.net 70 i+utf8strchr(char *s, Rune u) { Err gopher.r-36.net 70 i+ Rune r; Err gopher.r-36.net 70 i+ size_t i, j, len; Err gopher.r-36.net 70 i+ Err gopher.r-36.net 70 i+ len = strlen(s); Err gopher.r-36.net 70 i+ for(i = 0, j = 0; i < len; i += j) { Err gopher.r-36.net 70 i+ if(!(j = utf8decode(&s[i], &r, len - i))) Err gopher.r-36.net 70 i+ break; Err gopher.r-36.net 70 i+ if(r == u) Err gopher.r-36.net 70 i+ return &(s[i]); Err gopher.r-36.net 70 i+ } Err gopher.r-36.net 70 i+ return NULL; Err gopher.r-36.net 70 i+} Err gopher.r-36.net 70 i+ Err gopher.r-36.net 70 i size_t Err gopher.r-36.net 70 i utf8validate(Rune *u, size_t i) { Err gopher.r-36.net 70 i if(!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF)) Err gopher.r-36.net 70 .