From 88e2197a8f3272abbdc9a322806a7bdc9fff2daa Mon Sep 17 00:00:00 2001 From: "C. McEnroe" Date: Tue, 26 May 2020 15:18:55 -0400 Subject: Don't send zero-width characters to ncurses --- ui.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/ui.c b/ui.c index 5b7ef5e..fd9bfab 100644 --- a/ui.c +++ b/ui.c @@ -563,6 +563,19 @@ static int wordWidth(const char *str) { return width; } +// XXX: ncurses likes to render zero-width characters as spaces... +static int waddnstrnzw(WINDOW *win, const char *str, int len) { + wchar_t wc; + while (len) { + int n = mbtowc(&wc, str, len); + if (n < 1) return waddnstr(win, str, len); + if (wcwidth(wc)) waddnstr(win, str, n); + str += n; + len -= n; + } + return OK; +} + static int wordWrap(WINDOW *win, const char *str) { int y, x, width; getmaxyx(win, y, width); @@ -601,7 +614,7 @@ static int wordWrap(WINDOW *win, const char *str) { colorPair(Colors[style.fg], Colors[style.bg]), NULL ); - waddnstr(win, str, len); + waddnstrnzw(win, str, len); str += len; } return lines; -- cgit 1.4.1 y refs log tree commit diff
path: root/www/photo.causal.agency/2024-07-09/000005110035.txt (unfollow)
Commit message (Collapse)Author
2024-08-16Add first roll through Zenit-122June McEnroe
2024-08-16Add ability to specify camera bodyJune McEnroe
2024-08-14Add photos from August 2June McEnroe
2024-08-13Add photos from July 30 (actually 29 evening)June McEnroe
2024-08-09Add photos from July 29June McEnroe
2024-08-08Add photos from July 27June McEnroe
2024-07-26Add photos from July 14June McEnroe
2024-07-16Add photos from July 9June McEnroe
2024-07-15Add photos from July 6June McEnroe
2024-07-10Add the end of the Harman Phoenix rollJune McEnroe
2024-07-08Add photos from July 3, the hikeJune McEnroe
2024-07-07Add photos from July 1June McEnroe
2024-07-07Add photos from June 25-30June McEnroe
2024-06-30Add photos from June 22 (and the few days after that)June McEnroe
2024-06-30Accommodate lower-case .jpg filesJune McEnroe
2024-06-23Add another BACKXWASH showJune McEnroe
It was good!
2024-06-16Update bioJune McEnroe
2024-06-15Add photo descriptions from June 12June McEnroe
2024-06-10Add first roll of film from June 8June McEnroe
2024-06-10Cope with not having an EXIF infoJune McEnroe
2024-06-10Resize using target pixel counts for consistencyJune McEnroe
This will resize film scans to about the same size as for the digital photos.
2024-06-10Add The Girl Who Was Convinced...June McEnroe
Not much there. The illustrations are very nice though.
2024-06-09Add photos from May 31June McEnroe
2024-06-09Use monospace on photo pagesJune McEnroe
2024-06-09Put lens and (future) film at the tops of photo pagesJune McEnroe
2024-05-22Remove use of sysexits.hJune McEnroe
2024-05-22Add photo descriptions from 05-03 and 05-06June McEnroe
2024-05-21Fix = precedence in whenJune McEnroe