ncurses 5.9 - patch 20150328

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

diff --git a/ncurses/base/lib_addch.c b/ncurses/base/lib_addch.c
index dd6f800e6b6f9fff70c79e228f9fd6b998e4d39f..4b16a476c90aad7cb9b40cc844b6085a3ead1481 100644 (file)
--- a/ncurses/base/lib_addch.c
+++ b/ncurses/base/lib_addch.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2013,2014 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.125 2011/10/22 16:51:31 tom Exp $")
+MODULE_ID("$Id: lib_addch.c,v 1.129 2014/08/16 20:41:04 tom Exp $")

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


@@ -412,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)
        || (


@@ -425,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


@@ -498,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;