ncurses 6.2 - patch 20210418

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

diff --git a/ncurses/base/lib_addch.c b/ncurses/base/lib_addch.c
index a7d498b490a0e3d624775406f77373a96b954797..378c2881faac5d6d4d689f441d3986dfd5f7b341 100644 (file)
--- a/ncurses/base/lib_addch.c
+++ b/ncurses/base/lib_addch.c
@@ -1,5 +1,6 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2013,2014 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            *
  *                                                                          *
  * 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>
 
 #include <curses.priv.h>
 #include <ctype.h>
 

-MODULE_ID("$Id: lib_addch.c,v 1.128 2014/02/23 01:21:08 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);
 
 
 static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT);
 


@@ -51,7 +52,7 @@ static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT);
  */
 
 /* Return bit mask for clearing color pair number if given ch has color */
  */
 
 /* Return bit mask for clearing color pair number if given ch has color */

-#define COLOR_MASK(ch) (~(attr_t)((ch) & A_COLOR ? A_COLOR : 0))
+#define COLOR_MASK(ch) (~(attr_t)(((ch) & A_COLOR) ? A_COLOR : 0))

 
 static NCURSES_INLINE NCURSES_CH_T
 render_char(WINDOW *win, NCURSES_CH_T ch)
 
 static NCURSES_INLINE NCURSES_CH_T
 render_char(WINDOW *win, NCURSES_CH_T ch)


@@ -117,14 +118,18 @@ _nc_render(WINDOW *win, NCURSES_CH_T ch)
 #endif
 
 static bool
 #endif
 
 static bool

-newline_forces_scroll(WINDOW *win, NCURSES_SIZE_T * ypos)
+newline_forces_scroll(WINDOW *win, NCURSES_SIZE_T *ypos)

 {
     bool result = FALSE;
 
 {
     bool result = FALSE;
 

-    if (*ypos >= win->_regtop && *ypos == win->_regbottom) {
-       *ypos = win->_regbottom;
-       result = TRUE;
-    } else {
+    if (*ypos >= win->_regtop && *ypos <= win->_regbottom) {
+       if (*ypos == win->_regbottom) {
+           *ypos = win->_regbottom;
+           result = TRUE;
+       } else if (*ypos < win->_maxy) {
+           *ypos = (NCURSES_SIZE_T) (*ypos + 1);
+       }
+    } else if (*ypos < win->_maxy) {

        *ypos = (NCURSES_SIZE_T) (*ypos + 1);
     }
     return result;
        *ypos = (NCURSES_SIZE_T) (*ypos + 1);
     }
     return result;


@@ -203,6 +208,20 @@ _nc_build_wch(WINDOW *win, ARG_CH_T ch)
     WINDOW_EXT(win, addch_x) = x;
     WINDOW_EXT(win, addch_y) = y;
 
     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;
     init_mb(state);
     buffer[WINDOW_EXT(win, addch_used)] = (char) CharOf(CHDEREF(ch));
     WINDOW_EXT(win, addch_used) += 1;


@@ -270,11 +289,11 @@ waddch_literal(WINDOW *win, NCURSES_CH_T ch)
 
                /* handle EILSEQ (i.e., when len >= -1) */
                if (len == -1 && is8bits(CharOf(ch))) {
 
                /* handle EILSEQ (i.e., when len >= -1) */
                if (len == -1 && is8bits(CharOf(ch))) {

-                   int rc = OK;

                    const char *s = NCURSES_SP_NAME(unctrl)
                      (NCURSES_SP_ARGx (chtype) CharOf(ch));
 
                    if (s[1] != '\0') {
                    const char *s = NCURSES_SP_NAME(unctrl)
                      (NCURSES_SP_ARGx (chtype) CharOf(ch));
 
                    if (s[1] != '\0') {

+                       int rc = OK;

                        while (*s != '\0') {
                            rc = waddch(win, UChar(*s) | attr);
                            if (rc != OK)
                        while (*s != '\0') {
                            rc = waddch(win, UChar(*s) | attr);
                            if (rc != OK)


@@ -299,7 +318,7 @@ waddch_literal(WINDOW *win, NCURSES_CH_T ch)
      * adjustments.
      */
     if_WIDEC({
      * adjustments.
      */
     if_WIDEC({

-       int len = wcwidth(CharOf(ch));
+       int len = _nc_wacs_width(CharOf(ch));

        int i;
        int j;
        wchar_t *chars;
        int i;
        int j;
        wchar_t *chars;


@@ -339,6 +358,7 @@ waddch_literal(WINDOW *win, NCURSES_CH_T ch)
                    return ERR;
                x = win->_curx;
                y = win->_cury;
                    return ERR;
                x = win->_curx;
                y = win->_cury;

+               CHECK_POSITION(win, x, y);

                line = win->_line + y;
            }
            /*
                line = win->_line + y;
            }
            /*


@@ -427,7 +447,7 @@ waddch_nosync(WINDOW *win, const NCURSES_CH_T ch)
               s[1] == 0
        )
        || (
               s[1] == 0
        )
        || (

-              (isprint((int)t) && !iscntrl((int)t))
+              (isprint((int) t) && !iscntrl((int) t))

 #if USE_WIDEC_SUPPORT
               || ((sp == 0 || !sp->_legacy_coding) &&
                   (WINDOW_EXT(win, addch_used)
 #if USE_WIDEC_SUPPORT
               || ((sp == 0 || !sp->_legacy_coding) &&
                   (WINDOW_EXT(win, addch_used)


@@ -443,6 +463,7 @@ waddch_nosync(WINDOW *win, const NCURSES_CH_T ch)
      */
     x = win->_curx;
     y = win->_cury;
      */
     x = win->_curx;
     y = win->_cury;

+    CHECK_POSITION(win, x, y);

 
     switch (t) {
     case '\t':
 
     switch (t) {
     case '\t':


@@ -501,7 +522,7 @@ waddch_nosync(WINDOW *win, const NCURSES_CH_T ch)
     default:
        while (*s) {
            NCURSES_CH_T sch;
     default:
        while (*s) {
            NCURSES_CH_T sch;

-           SetChar(sch, *s++, AttrOf(ch));
+           SetChar(sch, UChar(*s++), AttrOf(ch));

            if_EXT_COLORS(SetPair(sch, GetPair(ch)));
            if (waddch_literal(win, sch) == ERR)
                return ERR;
            if_EXT_COLORS(SetPair(sch, GetPair(ch)));
            if (waddch_literal(win, sch) == ERR)
                return ERR;