dzwdz
/
catboy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix line wrapping in various ways 

Never split a codepoint, don't set wrapping point unless we're not
already wrapping, wrap on any unicode whitespace, only clear rest of
line if still on the same line...
master
C. McEnroe 2020-09-02 01:55:44 -04:00
parent 149cafc5ab
commit a84c9cdda7
2 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
buffer.c
View File

@ -26,6 +26,7 @@
*/ */
#include <err.h> #include <err.h>
#include <stdbool.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -111,18 +112,17 @@ static int flow(struct Lines *hard, int cols, const struct Line *soft) {
struct Style style = StyleDefault; struct Style style = StyleDefault;
for (char *str = line->str; *str;) { for (char *str = line->str; *str;) {
size_t len = styleParse(&style, (const char **)&str); size_t len = styleParse(&style, (const char **)&str);
if (*str == '\t' && !align) { if (!len) continue;
align = width + 1;
*str = ' ';
}
if (isspace(*str) || *str == '-') {
wrap = str;
}
wchar_t wc; bool tab = (*str == '\t' && !align);
if (tab) *str = ' ';
wchar_t wc = L'\0';
int n = mbtowc(&wc, str, len); int n = mbtowc(&wc, str, len);
if (n <= 0) continue; if (n < 0) {
if (wc == ZWS || wc == ZWNJ) { n = 1;
width++;
} else if (wc == ZWS || wc == ZWNJ) {
// XXX: ncurses likes to render these as spaces when they should be // XXX: ncurses likes to render these as spaces when they should be
// zero-width, so just remove them entirely. // zero-width, so just remove them entirely.
memmove(str, &str[n], strlen(&str[n]) + 1); memmove(str, &str[n], strlen(&str[n]) + 1);
@ -134,32 +134,38 @@ static int flow(struct Lines *hard, int cols, const struct Line *soft) {
width += wcwidth(wc); width += wcwidth(wc);
} }
if (width < cols) { if (width <= cols) {
if (tab && width < cols) align = width;
if (iswspace(wc)) wrap = str;
if (*str == '-') wrap = &str[1];
str += n; str += n;
continue; continue;
} }
if (!wrap) wrap = str; if (!wrap) wrap = str;
n = mbtowc(&wc, wrap, strlen(wrap));
if (n < 0) {
n = 1;
} else if (!iswspace(wc)) {
n = 0;
}
flowed++; flowed++;
line = linesNext(hard); line = linesNext(hard);
line->heat = soft->heat; line->heat = soft->heat;
line->time = soft->time; line->time = soft->time;
size_t cap = StyleCap + align + strlen(&wrap[1]) + 1; size_t cap = StyleCap + align + strlen(&wrap[n]) + 1;
line->str = malloc(cap); line->str = malloc(cap);
if (!line->str) err(EX_OSERR, "malloc"); if (!line->str) err(EX_OSERR, "malloc");
struct Cat cat = { line->str, cap, 0 }; struct Cat cat = { line->str, cap, 0 };
styleCat(&cat, style); styleCat(&cat, style);
str = &line->str[cat.len]; str = &line->str[cat.len];
catf(&cat, "%*s%n%s", align, "", &width, &wrap[1]); catf(&cat, "%*s%n%s", align, "", &width, &wrap[n]);
str += width; str += width;
if (isspace(*wrap)) { *wrap = '\0';
wrap[0] = '\0';
} else {
wrap[1] = '\0';
}
wrap = NULL; wrap = NULL;
} }

4
ui.c
View File

@ -457,7 +457,9 @@ static void windowUpdate(void) {
if (line->heat < Cold && window->ignore) continue; if (line->heat < Cold && window->ignore) continue;
wmove(main, y, 0); wmove(main, y, 0);
styleAdd(main, line->str); styleAdd(main, line->str);
wclrtoeol(main); int ny, nx;
getyx(main, ny, nx);
if (ny == y) wclrtoeol(main);
if (!y--) break; if (!y--) break;
} }