ncurses 5.7 - patch 20100327

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

diff --git a/ncurses/base/lib_addch.c b/ncurses/base/lib_addch.c
index 61248f5d1912ab332a9be9eb3a05200467c76389..e104e10840c9073ed409bdfcd2970137d6860bef 100644 (file)
--- a/ncurses/base/lib_addch.c
+++ b/ncurses/base/lib_addch.c
@@ -36,7 +36,7 @@
 #include <curses.priv.h>
 #include <ctype.h>
 
-MODULE_ID("$Id: lib_addch.c,v 1.119 2009/05/15 23:47:26 tom Exp $")
+MODULE_ID("$Id: lib_addch.c,v 1.122 2009/10/24 22:49:16 tom Exp $")
 
 static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT);
 
@@ -263,7 +263,7 @@ waddch_literal(WINDOW *win, NCURSES_CH_T ch)
 #if NCURSES_SP_FUNCS
 #define DeriveSP() SCREEN *sp = _nc_screen_of(win);
 #else
-#define DeriveSP() /*nothing*/
+#define DeriveSP()             /*nothing */
 #endif
     if_WIDEC({
        DeriveSP();
@@ -274,7 +274,7 @@ waddch_literal(WINDOW *win, NCURSES_CH_T ch)
                attr_t attr = AttrOf(ch);
 
                /* handle EILSEQ (i.e., when len >= -1) */
-               if (is8bits(CharOf(ch))) {
+               if (len == -1 && is8bits(CharOf(ch))) {
                    int rc = OK;
                    const char *s = NCURSES_SP_NAME(unctrl)
                      (NCURSES_SP_ARGx (chtype) CharOf(ch));
@@ -449,7 +449,7 @@ waddch_nosync(WINDOW *win, const NCURSES_CH_T ch)
     switch (t) {
     case '\t':
 #if USE_REENTRANT
-       tabsize = sp->_TABSIZE;
+       tabsize = *ptrTabsize(sp);
 #else
        tabsize = TABSIZE;
 #endif
@@ -539,7 +539,7 @@ waddch(WINDOW *win, const chtype ch)
     NCURSES_CH_T wch;
     SetChar2(wch, ch);
 
-    TR(TRACE_VIRTPUT | TRACE_CCALLS, (T_CALLED("waddch(%p, %s)"), win,
+    TR(TRACE_VIRTPUT | TRACE_CCALLS, (T_CALLED("waddch(%p, %s)"), (void *) win,
                                      _tracechtype(ch)));
 
     if (win && (waddch_nosync(win, wch) != ERR)) {
@@ -558,7 +558,8 @@ wechochar(WINDOW *win, const chtype ch)
     NCURSES_CH_T wch;
     SetChar2(wch, ch);
 
-    TR(TRACE_VIRTPUT | TRACE_CCALLS, (T_CALLED("wechochar(%p, %s)"), win,
+    TR(TRACE_VIRTPUT | TRACE_CCALLS, (T_CALLED("wechochar(%p, %s)"),
+                                     (void *) win,
                                      _tracechtype(ch)));
 
     if (win && (waddch_nosync(win, wch) != ERR)) {