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 12aadd7a6911d4739e55430e3414de566a31688a..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.115 2009/01/17 20:37:32 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);
 
@@ -260,7 +260,13 @@ waddch_literal(WINDOW *win, NCURSES_CH_T ch)
     /*
      * Build up multibyte characters until we have a wide-character.
      */
+#if NCURSES_SP_FUNCS
+#define DeriveSP() SCREEN *sp = _nc_screen_of(win);
+#else
+#define DeriveSP()             /*nothing */
+#endif
     if_WIDEC({
+       DeriveSP();
        if (WINDOW_EXT(win, addch_used) != 0 || !Charable(ch)) {
            int len = _nc_build_wch(win, CHREF(ch));
 
@@ -268,9 +274,10 @@ 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 = unctrl((chtype) CharOf(ch));
+                   const char *s = NCURSES_SP_NAME(unctrl)
+                     (NCURSES_SP_ARGx (chtype) CharOf(ch));
 
                    if (s[1] != '\0') {
                        while (*s != '\0') {
@@ -405,8 +412,11 @@ waddch_nosync(WINDOW *win, const NCURSES_CH_T ch)
 {
     NCURSES_SIZE_T x, y;
     chtype t = CharOf(ch);
-    const char *s = unctrl(t);
-
+#if USE_WIDEC_SUPPORT || NCURSES_SP_FUNCS || USE_REENTRANT
+    SCREEN *sp = _nc_screen_of(win);
+#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
@@ -415,14 +425,14 @@ waddch_nosync(WINDOW *win, const NCURSES_CH_T ch)
     if ((AttrOf(ch) & A_ALTCHARSET)
        || (
 #if USE_WIDEC_SUPPORT
-              (SP != 0 && SP->_legacy_coding) &&
+              (sp != 0 && sp->_legacy_coding) &&
 #endif
               s[1] == 0
        )
        || (
               isprint(t)
 #if USE_WIDEC_SUPPORT
-              || ((SP == 0 || !SP->_legacy_coding) &&
+              || ((sp == 0 || !sp->_legacy_coding) &&
                   (WINDOW_EXT(win, addch_used)
                    || !_nc_is_charable(CharOf(ch))))
 #endif
@@ -438,8 +448,12 @@ waddch_nosync(WINDOW *win, const NCURSES_CH_T ch)
 
     switch (t) {
     case '\t':
-       x += (TABSIZE - (x % TABSIZE));
-
+#if USE_REENTRANT
+       tabsize = *ptrTabsize(sp);
+#else
+       tabsize = TABSIZE;
+#endif
+       x += (tabsize - (x % tabsize));
        /*
         * Space-fill the tab on the bottom line so that we'll get the
         * "correct" cursor position.
@@ -525,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)) {
@@ -544,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)) {