ncurses 6.2 - patch 20210220

[ncurses.git] / ncurses / base / lib_addch.c

diff --git a/ncurses/base/lib_addch.c b/ncurses/base/lib_addch.c
index 7c9e407c6aa6495fccde7a5982607089964c65c4..378c2881faac5d6d4d689f441d3986dfd5f7b341 100644 (file)
--- a/ncurses/base/lib_addch.c
+++ b/ncurses/base/lib_addch.c
@@ -37,7 +37,7 @@
 #include <curses.priv.h>
 #include <ctype.h>
 
-MODULE_ID("$Id: lib_addch.c,v 1.135 2021/01/31 00:42:53 tom Exp $")
+MODULE_ID("$Id: lib_addch.c,v 1.137 2021/02/20 22:24:34 tom Exp $")
 
 static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT);
 
@@ -208,6 +208,20 @@ _nc_build_wch(WINDOW *win, ARG_CH_T ch)
     WINDOW_EXT(win, addch_x) = x;
     WINDOW_EXT(win, addch_y) = y;
 
+    /*
+     * If the background character is a wide-character, that may interfere with
+     * processing multibyte characters in this function.
+     */
+    if (!is8bits(CharOf(CHDEREF(ch)))) {
+       if (WINDOW_EXT(win, addch_used) != 0) {
+           /* discard the incomplete multibyte character */
+           WINDOW_EXT(win, addch_used) = 0;
+           TR(TRACE_VIRTPUT,
+              ("Alert discarded incomplete multibyte"));
+       }
+       return 1;
+    }
+
     init_mb(state);
     buffer[WINDOW_EXT(win, addch_used)] = (char) CharOf(CHDEREF(ch));
     WINDOW_EXT(win, addch_used) += 1;
@@ -336,7 +350,7 @@ waddch_literal(WINDOW *win, NCURSES_CH_T ch)
            if (len > win->_maxx + 1) {
                TR(TRACE_VIRTPUT, ("character will not fit"));
                return ERR;
-           } else if (x + len > win->_maxx) {
+           } else if (x + len > win->_maxx + 1) {
                int count = win->_maxx + 1 - x;
                TR(TRACE_VIRTPUT, ("fill %d remaining cells", count));
                fill_cells(win, count);