ncurses 6.2 - patch 20210213

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

diff --git a/ncurses/base/lib_addch.c b/ncurses/base/lib_addch.c
index 7c70fa63c062c29b913f532ac7d6994cc44451cf..0da27e0b424bb2d6c73bb43202f09836a3eeb606 100644 (file)
--- a/ncurses/base/lib_addch.c
+++ b/ncurses/base/lib_addch.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998-2017,2019 Free Software Foundation, Inc.              *
+ * Copyright 2019-2020,2021 Thomas E. Dickey                                *
+ * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -36,7 +37,7 @@
 #include <curses.priv.h>
 #include <ctype.h>
 
-MODULE_ID("$Id: lib_addch.c,v 1.132 2019/05/04 20:46:24 tom Exp $")
+MODULE_ID("$Id: lib_addch.c,v 1.136 2021/02/13 22:33:05 tom Exp $")
 
 static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT);
 
@@ -125,7 +126,7 @@ newline_forces_scroll(WINDOW *win, NCURSES_SIZE_T *ypos)
        if (*ypos == win->_regbottom) {
            *ypos = win->_regbottom;
            result = TRUE;
-       } else {
+       } else if (*ypos < win->_maxy) {
            *ypos = (NCURSES_SIZE_T) (*ypos + 1);
        }
     } else if (*ypos < win->_maxy) {
@@ -207,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;
@@ -335,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 + 1) {
+           } else if (x + len > win->_maxx) {
                int count = win->_maxx + 1 - x;
                TR(TRACE_VIRTPUT, ("fill %d remaining cells", count));
                fill_cells(win, count);
@@ -343,6 +358,7 @@ waddch_literal(WINDOW *win, NCURSES_CH_T ch)
                    return ERR;
                x = win->_curx;
                y = win->_cury;
+               CHECK_POSITION(win, x, y);
                line = win->_line + y;
            }
            /*
@@ -447,6 +463,7 @@ waddch_nosync(WINDOW *win, const NCURSES_CH_T ch)
      */
     x = win->_curx;
     y = win->_cury;
+    CHECK_POSITION(win, x, y);
 
     switch (t) {
     case '\t':