From 8e728fee157ea96bb6e96a485a11d5a638bd6c98 Mon Sep 17 00:00:00 2001 From: Paul Fertser Date: Mon, 11 Apr 2022 13:43:22 +0300 Subject: [PATCH] Show return symbol for embedded newlines When editing multi-line messages or comments everything past the first newline becomes invisible. This patch fixes it by substituting a Unicode symbol for "return" instead of printing the newline as is. On locales where it's not available single backslash is used instead. --- src/ui/inputwin.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/src/ui/inputwin.c b/src/ui/inputwin.c index 60a0e36f..caab9ff1 100644 --- a/src/ui/inputwin.c +++ b/src/ui/inputwin.c @@ -328,7 +328,30 @@ _inp_write(char* line, int offset) getyx(inp_win, y, x); col += x; - waddstr(inp_win, line); + for (size_t i = 0; line[i] != '\0'; i++) { + char* c = &line[i]; + char retc[MB_CUR_MAX]; + + size_t ch_len = mbrlen(c, MB_CUR_MAX, NULL); + if ((ch_len == (size_t)-2) || (ch_len == (size_t)-1)) { + waddch(inp_win, ' '); + continue; + } + + if (line[i] == '\n') { + c = retc; + ch_len = wctomb(retc, L'\u23ce'); /* return symbol */ + if (ch_len == -1) { /* not representable */ + retc[0] = '\\'; + ch_len = 1; + } + } else { + i += ch_len - 1; + } + + waddnstr(inp_win, c, ch_len); + } + wmove(inp_win, 0, col); _inp_win_handle_scroll();