about summary refs log tree commit diff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--ui.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/ui.c b/ui.c
index b1e56c7..0e22fd8 100644
--- a/ui.c
+++ b/ui.c
@@ -193,6 +193,14 @@ static void addFormat(WINDOW *win, const struct Format *format) {
 	waddnwstr(win, format->str, format->len);
 }
 
+static int printWidth(const wchar_t *str, size_t len) {
+	int width = 0;
+	for (size_t i = 0; i < len; ++i) {
+		if (iswprint(str[i])) width += wcwidth(str[i]);
+	}
+	return width;
+}
+
 static int addWrap(WINDOW *win, const wchar_t *str) {
 	int lines = 0;
 
@@ -205,7 +213,7 @@ static int addWrap(WINDOW *win, const wchar_t *str) {
 		int _, x, xMax;
 		getyx(win, _, x);
 		getmaxyx(win, _, xMax);
-		if (xMax - x - 1 < wcswidth(format.str, format.len)) {
+		if (xMax - x - 1 < printWidth(format.str, word)) {
 			if (format.str[0] == L' ') {
 				format.str++;
 				format.len--;
00'>2015-08-14about: move layout into page functionsJohn Keeping 2015-08-14ui-shared: add cgit_print_layout_{start,end}()John Keeping 2015-08-14html: remove html_status()John Keeping 2015-08-14snapshot: don't reimplement cgit_print_error_page()John Keeping 2015-08-14snapshot: use cgit_print_error_page() for HTTP status codesJohn Keeping 2015-08-14patch: use cgit_print_error_page() for HTTP status codesJohn Keeping 2015-08-14blob: use cgit_print_error_page() to add HTTP headersJohn Keeping 2015-08-14snapshot: use cgit_print_error_page() instead of html_status()John Keeping 2015-08-14plain: use cgit_print_error_page() instead of html_status()John Keeping 2015-08-14clone: use cgit_print_error_page() instead of html_status()John Keeping 2015-08-14cgit: use cgit_print_error_page() where appropriateJohn Keeping 2015-08-14ui-shared: add cgit_print_error_page() functionJohn Keeping 2015-08-14ui-patch: make sure to send http headersChristian Hesse 2015-08-13Makefile: make "git/config.mak.uname" inclusion optionalJohn Keeping 2015-08-13ui-shared: show full date in tooltip if longer ago than max_relativeJohn Keeping 2015-08-13ui-shared: use common function in print_rel_date()John Keeping 2015-08-13ui-shared: extract date formatting to a functionJohn Keeping 2015-08-13filter: don't use dlsym unnecessarilyJohn Keeping 2015-08-13ui-tree: use "sane" isgraph()John Keeping 2015-08-13cgit.h: move stdbool.h from ui-shared.hJohn Keeping 2015-08-13cache.c: fix header orderJohn Keeping 2015-08-13configfile.c: don't include system headers directlyJohn Keeping 2015-08-13Remove redundant includesJohn Keeping 2015-08-13Makefile: include Git's config.mak.unameJohn Keeping 2015-08-13tests: allow shell to be overriddenJohn Keeping 2015-08-13redirect: cleanlinessJason A. Donenfeld 2015-08-13redirect: be more careful for different cgi setupsJason A. Donenfeld 2015-08-12ui-log: fix double countingJohn Keeping 2015-08-12log: allow users to follow a fileJohn Keeping 2015-08-12shared: make cgit_diff_tree_cb publicJohn Keeping 2015-08-12t0110: Chain together using &&Jason A. Donenfeld 2015-08-12about: always ensure page has a trailing slashJason A. Donenfeld 2015-08-12filters: apply HTML escapingLazaros Koromilas 2015-08-12git: update to v2.5.0Christian Hesse 2015-08-12Fix processing of repo.hide and repo.ignoreDaniel Reichelt