ncurses 5.7 - patch 20100403

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

diff --git a/ncurses/base/lib_addch.c b/ncurses/base/lib_addch.c
index 714e3e7e562956f8a11bcb1518a623e7d982c948..3e62d17c8db98da6aa326aaa25ab100e34b2daa0 100644 (file)
--- a/ncurses/base/lib_addch.c
+++ b/ncurses/base/lib_addch.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2009,2010 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.118 2009/04/18 23:53:04 tom Exp $")
+MODULE_ID("$Id: lib_addch.c,v 1.123 2010/03/31 23:38:02 tom Exp $")

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


@@ -77,12 +77,6 @@ render_char(WINDOW *win, NCURSES_CH_T ch)
            if ((pair = GET_WINDOW_PAIR(win)) == 0)
                pair = GetPair(win->_nc_bkgd);
        }
            if ((pair = GET_WINDOW_PAIR(win)) == 0)
                pair = GetPair(win->_nc_bkgd);
        }

-#if 0
-       if (pair > 255) {
-           NCURSES_CH_T fixme = ch;
-           SetPair(fixme, pair);
-       }
-#endif

        AddAttr(ch, (a & COLOR_MASK(AttrOf(ch))));
        SetPair(ch, pair);
     }
        AddAttr(ch, (a & COLOR_MASK(AttrOf(ch))));
        SetPair(ch, pair);
     }


@@ -260,10 +254,13 @@ waddch_literal(WINDOW *win, NCURSES_CH_T ch)
     /*
      * Build up multibyte characters until we have a wide-character.
      */
     /*
      * Build up multibyte characters until we have a wide-character.
      */

-    if_WIDEC({

 #if NCURSES_SP_FUNCS
 #if NCURSES_SP_FUNCS

-       SCREEN *sp = _nc_screen_of(win);
+#define DeriveSP() SCREEN *sp = _nc_screen_of(win);
+#else
+#define DeriveSP()             /*nothing */

 #endif
 #endif

+    if_WIDEC({
+       DeriveSP();

        if (WINDOW_EXT(win, addch_used) != 0 || !Charable(ch)) {
            int len = _nc_build_wch(win, CHREF(ch));
 
        if (WINDOW_EXT(win, addch_used) != 0 || !Charable(ch)) {
            int len = _nc_build_wch(win, CHREF(ch));
 


@@ -271,7 +268,7 @@ waddch_literal(WINDOW *win, NCURSES_CH_T ch)
                attr_t attr = AttrOf(ch);
 
                /* handle EILSEQ (i.e., when len >= -1) */
                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));
                    int rc = OK;
                    const char *s = NCURSES_SP_NAME(unctrl)
                      (NCURSES_SP_ARGx (chtype) CharOf(ch));


@@ -446,7 +443,7 @@ waddch_nosync(WINDOW *win, const NCURSES_CH_T ch)
     switch (t) {
     case '\t':
 #if USE_REENTRANT
     switch (t) {
     case '\t':
 #if USE_REENTRANT

-       tabsize = sp->_TABSIZE;
+       tabsize = *ptrTabsize(sp);

 #else
        tabsize = TABSIZE;
 #endif
 #else
        tabsize = TABSIZE;
 #endif


@@ -536,7 +533,7 @@ waddch(WINDOW *win, const chtype ch)
     NCURSES_CH_T wch;
     SetChar2(wch, 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)) {
                                      _tracechtype(ch)));
 
     if (win && (waddch_nosync(win, wch) != ERR)) {


@@ -555,7 +552,8 @@ wechochar(WINDOW *win, const chtype ch)
     NCURSES_CH_T wch;
     SetChar2(wch, 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)) {
                                      _tracechtype(ch)));
 
     if (win && (waddch_nosync(win, wch) != ERR)) {