diff options
| author | June McEnroe <june@causal.agency> | 2020-02-19 20:31:29 -0500 |
|---|---|---|
| committer | June McEnroe <june@causal.agency> | 2020-02-19 20:31:29 -0500 |
| commit | d5c4e7e37129eed00cec7c3b221753cbf37d163f (patch) | |
| tree | 20dc23fa7acdced68239d8d9425df6265af1e05a | |
| parent | Remove bad continues in styleParse loops (diff) | |
| download | catgirl-d5c4e7e37129eed00cec7c3b221753cbf37d163f.tar.gz catgirl-d5c4e7e37129eed00cec7c3b221753cbf37d163f.zip | |
Apply word wrapping to tabs before setting align
This fixes long URLs right after the initial \t being wrapped and line counted incorrectly.
| -rw-r--r-- | ui.c | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/ui.c b/ui.c index 81917a4..d6f79c2 100644 --- a/ui.c +++ b/ui.c @@ -493,7 +493,7 @@ static void windowScrollUnread(struct Window *window) { } static int wordWidth(const char *str) { - size_t len = strcspn(str, " "); + size_t len = strcspn(str, " \t"); int width = 0; while (len) { wchar_t wc; @@ -515,18 +515,10 @@ static int wordWrap(WINDOW *win, const char *str) { int align = 0; struct Style style = Reset; while (*str) { - if (*str == '\t') { - if (align) { - waddch(win, '\t'); - str++; - } else { - waddch(win, ' '); - getyx(win, y, align); - str++; - } - } else if (*str == ' ') { + char ch = *str; + if (ch == ' ' || ch == '\t') { getyx(win, y, x); - const char *word = &str[strspn(str, " ")]; + const char *word = &str[strspn(str, " \t")]; if (width - x - 1 <= wordWidth(word)) { lines += 1 + (align + wordWidth(word)) / width; waddch(win, '\n'); @@ -534,13 +526,16 @@ static int wordWrap(WINDOW *win, const char *str) { wmove(win, y, align); str = word; } else { - waddch(win, ' '); + waddch(win, (align ? ch : ' ')); str++; } } + if (ch == '\t' && !align) { + getyx(win, y, align); + } size_t len = styleParse(&style, &str); - size_t ws = strcspn(str, "\t "); + size_t ws = strcspn(str, " \t"); if (ws < len) len = ws; wattr_set( |