ncurses 6.0 - patch 20160528

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

diff --git a/ncurses/base/lib_addch.c b/ncurses/base/lib_addch.c
index 515ebaf0b8fc551a269af9ed7b7cda0ff85cb32e..2c0727947f35638f04288bc5226a4ea1b5f93081 100644 (file)
--- a/ncurses/base/lib_addch.c
+++ b/ncurses/base/lib_addch.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2014,2016 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 +36,7 @@
 #include <curses.priv.h>
 #include <ctype.h>
 
 #include <curses.priv.h>
 #include <ctype.h>
 

-MODULE_ID("$Id: lib_addch.c,v 1.124 2010/04/24 22:41:05 tom Exp $")
+MODULE_ID("$Id: lib_addch.c,v 1.130 2016/05/28 23:12:00 tom Exp $")

 
 static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT);
 
 
 static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT);
 


@@ -51,7 +51,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)


@@ -209,7 +209,8 @@ _nc_build_wch(WINDOW *win, ARG_CH_T ch)
     buffer[WINDOW_EXT(win, addch_used)] = '\0';
     if ((len = (int) mbrtowc(&result,
                             buffer,
     buffer[WINDOW_EXT(win, addch_used)] = '\0';
     if ((len = (int) mbrtowc(&result,
                             buffer,

-                            WINDOW_EXT(win, addch_used), &state)) > 0) {
+                            (size_t) WINDOW_EXT(win, addch_used),
+                            &state)) > 0) {

        attr_t attrs = AttrOf(CHDEREF(ch));
        if_EXT_COLORS(int pair = GetPair(CHDEREF(ch)));
        SetChar(CHDEREF(ch), result, attrs);
        attr_t attrs = AttrOf(CHDEREF(ch));
        if_EXT_COLORS(int pair = GetPair(CHDEREF(ch)));
        SetChar(CHDEREF(ch), result, attrs);


@@ -269,11 +270,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)


@@ -411,10 +412,12 @@ waddch_nosync(WINDOW *win, const NCURSES_CH_T ch)
 #endif
     const char *s = NCURSES_SP_NAME(unctrl) (NCURSES_SP_ARGx t);
     int tabsize = 8;
 #endif
     const char *s = NCURSES_SP_NAME(unctrl) (NCURSES_SP_ARGx t);
     int tabsize = 8;

+

     /*
      * If we are using the alternate character set, forget about locale.
      * Otherwise, if unctrl() returns a single-character or the locale
     /*
      * If we are using the alternate character set, forget about locale.
      * Otherwise, if unctrl() returns a single-character or the locale

-     * claims the code is printable, treat it that way.
+     * claims the code is printable (and not also a control character),
+     * treat it that way.

      */
     if ((AttrOf(ch) & A_ALTCHARSET)
        || (
      */
     if ((AttrOf(ch) & A_ALTCHARSET)
        || (


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

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

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

-       ))
+       )) {

        return waddch_literal(win, ch);
        return waddch_literal(win, ch);

+    }

 
     /*
      * Handle carriage control and other codes that are not printable, or are
 
     /*
      * Handle carriage control and other codes that are not printable, or are


@@ -497,7 +501,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;