From 6aa42b852bc569f7baedc85b74037588777ccbb4 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Fri, 14 Sep 2018 18:48:03 -0400 Subject: Remove word handling from formatParse --- ui.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'ui.c') diff --git a/ui.c b/ui.c index e1e006d..b1e56c7 100644 --- a/ui.c +++ b/ui.c @@ -194,11 +194,14 @@ static void addFormat(WINDOW *win, const struct Format *format) { } static int addWrap(WINDOW *win, const wchar_t *str) { + int lines = 0; + struct Format format = { .str = str }; formatReset(&format); - - int lines = 0; while (formatParse(&format, NULL)) { + size_t word = 1 + wcscspn(&format.str[1], L" "); + if (word < format.len) format.len = word; + int _, x, xMax; getyx(win, _, x); getmaxyx(win, _, xMax); @@ -210,6 +213,7 @@ static int addWrap(WINDOW *win, const wchar_t *str) { waddch(win, '\n'); lines++; } + addFormat(win, &format); } return lines; -- cgit 1.4.1