 @@ -1,14 +1,14 @@
-/*	$NetBSD: addbytes.c,v 1.40 2013/10/16 19:59:29 roy Exp $	*/
+/*	$NetBSD: addbytes.c,v 1.41 2013/11/09 11:16:59 blymn Exp $	*/
 /*
  * Copyright (c) 1987, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -24,132 +24,143 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)addbytes.c	8.4 (Berkeley) 5/4/94";
 #else
-__RCSID("$NetBSD: addbytes.c,v 1.40 2013/10/16 19:59:29 roy Exp $");
+__RCSID("$NetBSD: addbytes.c,v 1.41 2013/11/09 11:16:59 blymn Exp $");
 #endif
 #endif				/* not lint */
 #include <stdlib.h>
 #include <string.h>
 #include "curses.h"
 #include "curses_private.h"
 #ifdef DEBUG
 #include <assert.h>
 #endif
 #define	SYNCH_IN	{y = win->cury; x = win->curx;}
 #define	SYNCH_OUT	{win->cury = y; win->curx = x;}
 #define	PSYNCH_IN	{*y = win->cury; *x = win->curx;}
 #define	PSYNCH_OUT	{win->cury = *y; win->curx = *x;}
 #ifndef _CURSES_USE_MACROS
 /*
  * addbytes --
  *      Add the character to the current position in stdscr.
  */
 int
 addbytes(const char *bytes, int count)
+{
-	return __waddbytes(stdscr, bytes, count, 0);
+	return _cursesi_waddbytes(stdscr, bytes, count, 0, 1);
+}
 /*
  * waddbytes --
  *      Add the character to the current position in the given window.
  */
 int
 waddbytes(WINDOW *win, const char *bytes, int count)
+{
-	return __waddbytes(win, bytes, count, 0);
+	return _cursesi_waddbytes(win, bytes, count, 0, 1);
+}
 /*
  * mvaddbytes --
  *      Add the characters to stdscr at the location given.
  */
 int
 mvaddbytes(int y, int x, const char *bytes, int count)
+{
 	return mvwaddbytes(stdscr, y, x, bytes, count);
+}
 /*
  * mvwaddbytes --
  *      Add the characters to the given window at the location given.
  */
 int
 mvwaddbytes(WINDOW *win, int y, int x, const char *bytes, int count)
+{
 	if (wmove(win, y, x) == ERR)
 		return ERR;
-	return __waddbytes(win, bytes, count, 0);
+	return _cursesi_waddbytes(win, bytes, count, 0, 1);
+}
 #endif
 int
 __waddbytes(WINDOW *win, const char *bytes, int count, attr_t attr)
+{
 	return _cursesi_waddbytes(win, bytes, count, attr, 1);
+}
 /*
- * waddbytes --
+ * _cursesi_waddbytes --
  *	Add the character to the current position in the given window.
  * if char_interp is non-zero then character interpretation is done on
  * the byte (i.e. \n to newline, \r to carriage return, \b to backspace
  * and so on).
  */
 int
-__waddbytes(WINDOW *win, const char *bytes, int count, attr_t attr)
+_cursesi_waddbytes(WINDOW *win, const char *bytes, int count, attr_t attr,
 	    int char_interp)
+{
-	int		 x, y, err;
+	int		 ox, x, y, err;
 	__LINE		*lp;
 #ifdef HAVE_WCHAR
 	int		n;
 	cchar_t		cc;
 	wchar_t		wc;
 	mbstate_t	st;
 #else
 	int		c;
 #endif
 #ifdef DEBUG
 	int             i;
 	for (i = 0; i < win->maxy; i++) {
 		assert(win->alines[i]->sentinel == SENTINEL_VALUE);
+	}
 	__CTRACE(__CTRACE_INPUT, "ADDBYTES: add %d bytes\n", count);
 #endif
 	err = OK;
 	SYNCH_IN;
 	lp = win->alines[y];
 	ox = win->curx;
 #ifdef HAVE_WCHAR
 	(void)memset(&st, 0, sizeof(st));
 #endif
 	while (count > 0) {
 #ifndef HAVE_WCHAR
 		c = *bytes++;
 #ifdef DEBUG
 		__CTRACE(__CTRACE_INPUT, "ADDBYTES('%c', %x) at (%d, %d)\n",
 		    c, attr, y, x);
 #endif
-		err = _cursesi_addbyte(win, &lp, &y, &x, c, attr);
+		err = _cursesi_addbyte(win, &lp, &y, &x, c, attr, char_interp);
 		count--;
 #else
 		/*
 		 * For wide-character support only, try and convert the
 		 * given string into a wide character - we do this because
 		 * this is how ncurses behaves (not that I think this is
 		 * actually the correct thing to do but if we don't do it
 		 * a lot of things that rely on this behaviour will break
 		 * and we will be blamed).  If the conversion succeeds
 		 * then we eat the n characters used to make the wide char
 		 * from the string.
 		 */
 		n = (int)mbrtowc(&wc, bytes, (size_t)count, &st);
 @@ -159,225 +170,233 @@ __waddbytes(WINDOW *win, const char *byt
 			n = 1;
 			(void)memset(&st, 0, sizeof(st));
 		} else if (wc == 0) {
 			break;
+		}
 #ifdef DEBUG
 	__CTRACE(__CTRACE_INPUT,
 		 "ADDBYTES WIDE(0x%x [%s], %x) at (%d, %d), ate %d bytes\n",
 		 (unsigned) wc, unctrl((unsigned) wc), attr, y, x, n);
 #endif
 		cc.vals[0] = wc;
 		cc.elements = 1;
 		cc.attributes = attr;
-		err = _cursesi_addwchar(win, &lp, &y, &x, &cc);
+		err = _cursesi_addwchar(win, &lp, &y, &x, &cc, char_interp);
 		bytes += n;
 		count -= n;
 #endif
+	}
 	SYNCH_OUT;
 #ifdef DEBUG
 	for (i = 0; i < win->maxy; i++) {
 		assert(win->alines[i]->sentinel == SENTINEL_VALUE);
+	}
 #endif
 	return (err);
+}
 /*
  * _cursesi_addbyte -
  *	Internal function to add a byte and update the row and column
  * positions as appropriate.  This function is only used in the narrow
- * character version of curses.
+ * character version of curses.  If update_cursor is non-zero then character
  * interpretation.
  */
 int
 _cursesi_addbyte(WINDOW *win, __LINE **lp, int *y, int *x, int c,
-		 attr_t attr)
+		 attr_t attr, int char_interp)
+{
-	static char	 blanks[] = "        ";
+	static char	 blank[] = " ";
 	int		 newx;
 	attr_t		 attributes;
 	int		 tabsize;
 	int		 newx, i;
 	attr_t		 attributes;
-	switch (c) {
+	if (char_interp) {
-	case '\t':
+		switch (c) {
-		tabsize = win->screen->TABSIZE;
+		case '\t':
-		PSYNCH_OUT;
+			tabsize = win->screen->TABSIZE;
-		if (waddbytes(win, blanks, tabsize - (*x % tabsize)) == ERR)
+			PSYNCH_OUT;
-			return (ERR);
+			for (i = 0; i < (tabsize - (*x % tabsize)); i++) {
-		PSYNCH_IN;
+				if (waddbytes(win, blank, 1) == ERR)
-		break;
+					return (ERR);
+			}
 			PSYNCH_IN;
 			return (OK);
 		case '\n':
 			PSYNCH_OUT;
 			wclrtoeol(win);
 			PSYNCH_IN;
 			(*lp)->flags |= __ISPASTEOL;
 			break;
 		case '\r':
 			*x = 0;
 			win->curx = *x;
 			return (OK);
 		case '\b':
 			if (--(*x) < 0)
 				*x = 0;
 			win->curx = *x;
 			return (OK);
+		}
+	}
 	default:
 #ifdef DEBUG
-		__CTRACE(__CTRACE_INPUT, "ADDBYTES(%p, %d, %d)\n",
+	__CTRACE(__CTRACE_INPUT, "ADDBYTES(%p, %d, %d)\n", win, *y, *x);
 			 win, *y, *x);
 #endif
-		if ((*lp)->flags & __ISPASTEOL) {
+	if (char_interp && ((*lp)->flags & __ISPASTEOL)) {
-		  new_line:
+		*x = 0;
-			*x = 0;
+		(*lp)->flags &= ~__ISPASTEOL;
-			(*lp)->flags &= ~__ISPASTEOL;
+		if (*y == win->scr_b) {
 			if (*y == win->scr_b) {
 #ifdef DEBUG
-				__CTRACE(__CTRACE_INPUT,
+			__CTRACE(__CTRACE_INPUT,
-					 "ADDBYTES - on bottom "
+				 "ADDBYTES - on bottom "
-					 "of scrolling region\n");
+				 "of scrolling region\n");
 #endif
-				if (!(win->flags & __SCROLLOK))
+			if (!(win->flags & __SCROLLOK))
-					return ERR;
+				return ERR;
-				PSYNCH_OUT;
+			PSYNCH_OUT;
-				scroll(win);
+			scroll(win);
-				PSYNCH_IN;
+			PSYNCH_IN;
-			} else {
+		} else {
-				(*y)++;
+			(*y)++;
 			*lp = win->alines[*y];
 			if (c == '\n')
 				break;
+		}
 		*lp = win->alines[*y];
 		if (c == '\n')
 			return (OK);
+	}
 		attributes = (win->wattr | attr) &
 			(__ATTRIBUTES & ~__COLOR);
 		if (attr & __COLOR)
 			attributes |= attr & __COLOR;
 		else if (win->wattr & __COLOR)
 			attributes |= win->wattr & __COLOR;
 #ifdef DEBUG
-		__CTRACE(__CTRACE_INPUT,
+	__CTRACE(__CTRACE_INPUT,
-			 "ADDBYTES: 1: y = %d, x = %d, firstch = %d, "
+		 "ADDBYTES: 1: y = %d, x = %d, firstch = %d, lastch = %d\n",
-			 "lastch = %d\n",
+		 *y, *x, *win->alines[*y]->firstchp,
-			 *y, *x, *win->alines[*y]->firstchp,
+		 *win->alines[*y]->lastchp);
 			 *win->alines[*y]->lastchp);
 #endif
 		/*
 		 * Always update the change pointers.  Otherwise,
 		 * we could end up not displaying 'blank' characters
 		 * when overlapping windows are displayed.
 		 */
 		newx = *x + win->ch_off;
 		(*lp)->flags |= __ISDIRTY;
 		/*
 		 * firstchp/lastchp are shared between
 		 * parent window and sub-window.
 		 */
 		if (newx < *(*lp)->firstchp)
 			*(*lp)->firstchp = newx;
 		if (newx > *(*lp)->lastchp)
 			*(*lp)->lastchp = newx;
 #ifdef DEBUG
 		__CTRACE(__CTRACE_INPUT,
 			 "ADDBYTES: change gives f/l: %d/%d [%d/%d]\n",
 			 *(*lp)->firstchp, *(*lp)->lastchp,
 			 *(*lp)->firstchp - win->ch_off,
 			 *(*lp)->lastchp - win->ch_off);
 #endif
 		if (win->bch != ' ' && c == ' ')
 			(*lp)->line[*x].ch = win->bch;
 		else
 			(*lp)->line[*x].ch = c;
 		if (attributes & __COLOR)
 			(*lp)->line[*x].attr =
 				attributes | (win->battr & ~__COLOR);
 		else
 			(*lp)->line[*x].attr = attributes | win->battr;
-		if (*x == win->maxx - 1)
+	attributes = (win->wattr | attr) & (__ATTRIBUTES & ~__COLOR);
-			(*lp)->flags |= __ISPASTEOL;
+	if (attr & __COLOR)
-		else
+		attributes |= attr & __COLOR;
-			(*x)++;
+	else if (win->wattr & __COLOR)
-#ifdef DEBUG
+		attributes |= win->wattr & __COLOR;
 		__CTRACE(__CTRACE_INPUT,
 			 "ADDBYTES: 2: y = %d, x = %d, firstch = %d, "
 			 "lastch = %d\n",
 			 *y, *x, *win->alines[*y]->firstchp,
 			 *win->alines[*y]->lastchp);
 #endif
 		break;
 	case '\n':
 		PSYNCH_OUT;
 		wclrtoeol(win);
 		PSYNCH_IN;
 		goto new_line;
 	case '\r':
 		*x = 0;
 		break;
 	case '\b':
 		if (--(*x) < 0)
 			*x = 0;
 		break;
 	/*
 	 * Always update the change pointers.  Otherwise,
 	 * we could end up not displaying 'blank' characters
 	 * when overlapping windows are displayed.
 	 */
 	newx = *x + win->ch_off;
 	(*lp)->flags |= __ISDIRTY;
 	/*
 	 * firstchp/lastchp are shared between
 	 * parent window and sub-window.
 	 */
 	if (newx < *(*lp)->firstchp)
 		*(*lp)->firstchp = newx;
 	if (newx > *(*lp)->lastchp)
 		*(*lp)->lastchp = newx;
 #ifdef DEBUG
 	__CTRACE(__CTRACE_INPUT, "ADDBYTES: change gives f/l: %d/%d [%d/%d]\n",
 		 *(*lp)->firstchp, *(*lp)->lastchp,
 		 *(*lp)->firstchp - win->ch_off,
 		 *(*lp)->lastchp - win->ch_off);
 #endif
 	if (win->bch != ' ' && c == ' ')
 		(*lp)->line[*x].ch = win->bch;
 	else
 		(*lp)->line[*x].ch = c;
 	if (attributes & __COLOR)
 		(*lp)->line[*x].attr =
 			attributes | (win->battr & ~__COLOR);
 	else
 		(*lp)->line[*x].attr = attributes | win->battr;
 	if (*x == win->maxx - 1)
 		(*lp)->flags |= __ISPASTEOL;
 	else
 		(*x)++;
 #ifdef DEBUG
 	__CTRACE(__CTRACE_INPUT,
 		 "ADDBYTES: 2: y = %d, x = %d, firstch = %d, lastch = %d\n",
 		 *y, *x, *win->alines[*y]->firstchp,
 		 *win->alines[*y]->lastchp);
 #endif
 	return (OK);
+}
 /*
  * _cursesi_addwchar -
  *	Internal function to add a wide character and update the row
  * and column positions.
  */
 int
 _cursesi_addwchar(WINDOW *win, __LINE **lnp, int *y, int *x,
-		  const cchar_t *wch)
+		  const cchar_t *wch, int char_interp)
+{
 #ifndef HAVE_WCHAR
 	return (ERR);
 #else
 	int sx = 0, ex = 0, cw = 0, i = 0, newx = 0, tabsize;
 	__LDATA *lp = &win->alines[*y]->line[*x], *tp = NULL;
 	nschar_t *np = NULL;
 	cchar_t cc;
 	attr_t attributes;
-	/* special characters handling */
+	if (char_interp) {
-	switch (wch->vals[0]) {
+		/* special characters handling */
-	case L'\b':
+		switch (wch->vals[0]) {
-		if (--*x < 0)
+		case L'\b':
 			if (--*x < 0)
 				*x = 0;
 			win->curx = *x;
 			return OK;
 		case L'\r':
 			*x = 0;
-		win->curx = *x;
+			win->curx = *x;
-		return OK;
+			return OK;
-	case L'\r':
+		case L'\n':
-		*x = 0;
+			wclrtoeol(win);
 		return OK;
 	case L'\n':
 		wclrtoeol(win);
 		PSYNCH_IN;
 		*x = 0;
 		(*lnp)->flags &= ~__ISPASTEOL;
 		if (*y == win->scr_b) {
 			if (!(win->flags & __SCROLLOK))
 				return ERR;
 			PSYNCH_OUT;
 			scroll(win);
 			PSYNCH_IN;
-		} else {
+			*x = 0;
-			(*y)++;
+			(*lnp)->flags &= ~__ISPASTEOL;
 			if (*y == win->scr_b) {
-		PSYNCH_OUT;
+				if (!(win->flags & __SCROLLOK))
-		return OK;
+					return ERR;
-	case L'\t':
+				PSYNCH_OUT;
-		cc.vals[0] = L' ';
+				scroll(win);
-		cc.elements = 1;
+				PSYNCH_IN;
-		cc.attributes = win->wattr;
+			} else {
-		tabsize = win->screen->TABSIZE;
+				(*y)++;
 		for (i = 0; i < tabsize - (*x % tabsize); i++) {
-			if (wadd_wch(win, &cc) == ERR)
+			PSYNCH_OUT;
-				return ERR;
+			return OK;
 		case L'\t':
 			cc.vals[0] = L' ';
 			cc.elements = 1;
 			cc.attributes = win->wattr;
 			tabsize = win->screen->TABSIZE;
 			for (i = 0; i < tabsize - (*x % tabsize); i++) {
 				if (wadd_wch(win, &cc) == ERR)
 					return ERR;
+			}
 			return OK;
+		}
 		return OK;
+	}
 	/* check for non-spacing character */
 	if (!wcwidth(wch->vals[0])) {
 #ifdef DEBUG
 		__CTRACE(__CTRACE_INPUT,
 			 "_cursesi_addwchar: char '%c' is non-spacing\n",
 			 wch->vals[0]);
 #endif /* DEBUG */
 		cw = WCOL(*lp);
 		if (cw < 0) {
 			lp += cw;
 			*x += cw;
 @@ -389,27 +408,27 @@ _cursesi_addwchar(WINDOW *win, __LINE **
 			np->next = lp->nsp;
 			lp->nsp = np;
+		}
 		(*lnp)->flags |= __ISDIRTY;
 		newx = *x + win->ch_off;
 		if (newx < *(*lnp)->firstchp)
 			*(*lnp)->firstchp = newx;
 		if (newx > *(*lnp)->lastchp)
 			*(*lnp)->lastchp = newx;
 		__touchline(win, *y, *x, *x);
 		return OK;
+	}
 	/* check for new line first */
-	if ((*lnp)->flags & __ISPASTEOL) {
+	if (char_interp && ((*lnp)->flags & __ISPASTEOL)) {
 		*x = 0;
 		(*lnp)->flags &= ~__ISPASTEOL;
 		if (*y == win->scr_b) {
 			if (!(win->flags & __SCROLLOK))
 				return ERR;
 			PSYNCH_OUT;
 			scroll(win);
 			PSYNCH_IN;
 		} else {
 			(*y)++;
+		}
 		(*lnp) = win->alines[*y];
 		lp = &win->alines[*y]->line[*x];
 @@ -434,26 +453,27 @@ _cursesi_addwchar(WINDOW *win, __LINE **
 			SET_WCOL(*tp, 1);
+		}
 		sx = *x + cw;
 		(*lnp)->flags |= __ISDIRTY;
 		newx = sx + win->ch_off;
 		if (newx < *(*lnp)->firstchp)
 			*(*lnp)->firstchp = newx;
+	}
 	/* check for enough space before the end of line */
 	cw = wcwidth(wch->vals[0]);
 	if (cw < 0)
 		cw = 1;
 	if (cw > win->maxx - *x) {
 #ifdef DEBUG
 		__CTRACE(__CTRACE_INPUT,
 			 "_cursesi_addwchar: clear EOL (%d,%d)\n",
 			 *y, *x);
 #endif /* DEBUG */
 		(*lnp)->flags |= __ISDIRTY;
 		newx = *x + win->ch_off;
 		if (newx < *(*lnp)->firstchp)
 			*(*lnp)->firstchp = newx;
 		for (tp = lp; *x < win->maxx; tp++, (*x)++) {
 			tp->ch = (wchar_t) btowc((int) win->bch);
 			if (_cursesi_copy_nsp(win->bnsp, tp) == ERR)
 @@ -536,46 +556,47 @@ _cursesi_addwchar(WINDOW *win, __LINE **
 	__CTRACE(__CTRACE_INPUT, "_cursesi_addwchar: add rest columns (%d:%d)\n",
 		sx + 1, sx + cw - 1);
 #endif /* DEBUG */
 	for (tp = lp + 1, *x = sx + 1; *x - sx <= cw - 1; tp++, (*x)++) {
 		if (tp->nsp) {
 			__cursesi_free_nsp(tp->nsp);
 			tp->nsp = NULL;
+		}
 		tp->ch = wch->vals[0];
 		tp->attr = lp->attr & WA_ATTRIBUTES;
 		/* Mark as "continuation" cell */
 		tp->attr |= __WCWIDTH;
+	}
 	if (*x == win->maxx) {
 		(*lnp)->flags |= __ISPASTEOL;
 		newx = win->maxx - 1 + win->ch_off;
 		if (newx > *(*lnp)->lastchp)
 			*(*lnp)->lastchp = newx;
 		__touchline(win, *y, sx, (int) win->maxx - 1);
 		win->curx = sx;
 	} else {
 		win->curx = *x;
 		/* clear the remining of the current characer */
 		if (*x && *x < win->maxx) {
 			ex = sx + cw;
 			tp = &win->alines[*y]->line[ex];
 			while (ex < win->maxx && WCOL(*tp) < 0) {
 #ifdef DEBUG
 				__CTRACE(__CTRACE_INPUT,
-					 "_cursesi_addwchar: clear "
+				 	"_cursesi_addwchar: clear "
-					 "remaining of current char (%d,%d)nn",
+				 	"remaining of current char (%d,%d)nn",
-					 *y, ex);
+				 	*y, ex);
 #endif /* DEBUG */
 				tp->ch = (wchar_t) btowc((int) win->bch);
 				if (_cursesi_copy_nsp(win->bnsp, tp) == ERR)
 					return ERR;
 				tp->attr = win->battr;
 				SET_WCOL(*tp, 1);
 				tp++, ex++;
+			}
 			newx = ex - 1 + win->ch_off;
 			if (newx > *(*lnp)->lastchp)
 				*(*lnp)->lastchp = newx;
 			__touchline(win, *y, sx, ex - 1);
+		}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: addchnstr.c,v 1.5 2012/09/28 06:00:39 blymn Exp $	*/
+/*	$NetBSD: addchnstr.c,v 1.6 2013/11/09 11:16:59 blymn Exp $	*/
 /*
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Douwe Kiela (virtus@wanadoo.nl).
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -21,27 +21,27 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: addchnstr.c,v 1.5 2012/09/28 06:00:39 blymn Exp $");
+__RCSID("$NetBSD: addchnstr.c,v 1.6 2013/11/09 11:16:59 blymn Exp $");
 #endif				/* not lint */
 #include <stdlib.h>
 #include "curses.h"
 #include "curses_private.h"
 #ifndef _CURSES_USE_MACROS
 /*
  * addchstr --
  *      Add a string to stdscr starting at (_cury, _curx).
  */
 @@ -125,58 +125,61 @@ mvwaddchnstr(WINDOW *win, int y, int x,
  *	starting at (_cury, _curx) until the end of line is reached or
  *      n characters have been added.  If n is negative, add as much
  *	of the string that will fit on the current line.  SUSv2 says
  *      that the addchnstr family does not wrap and strings are truncated
  *      to the RHS of the window.
  */
 int
 waddchnstr(WINDOW *win, const chtype *chstr, int n)
+{
 	size_t  len;
 	const chtype *chp;
 	attr_t	attr;
 	char	*ocp, *cp, *start;
-	int i, ret;
+	int i, ret, ox, oy;
 #ifdef DEBUG
 	__CTRACE(__CTRACE_INPUT, "waddchnstr: win = %p, chstr = %p, n = %d\n",
 	    win, chstr, n);
 #endif
 	if (n >= 0)
 		for (chp = chstr, len = 0; n-- && *chp++; ++len);
 	else
 		for (chp = chstr, len = 0; *chp++; ++len);
 	/* check if string is too long for current location */
 	if (len > (win->maxx - win->curx))
 		len = win->maxx - win->curx;
 	if ((ocp = malloc(len + 1)) == NULL)
 		return ERR;
 	chp = chstr;
 	cp = ocp;
 	start = ocp;
 	i = 0;
 	attr = (*chp) & __ATTRIBUTES;
 	ox = win->curx;
 	oy = win->cury;
 	while (len) {
 		*cp = (*chp) & __CHARTEXT;
 		cp++;
 		chp++;
 		i++;
 		len--;
 		if (((*chp) & __ATTRIBUTES) != attr) {
 			*cp = '\0';
-			if (__waddbytes(win, start, i, attr) == ERR) {
+			if (_cursesi_waddbytes(win, start, i, attr, 0) == ERR) {
 				free(ocp);
 				return ERR;
+			}
 			attr = (*chp) & __ATTRIBUTES;
 			start = cp;
 			i = 0;
+		}
+	}
 	*cp = '\0';
-	ret = __waddbytes(win, start, i, attr);
+	ret = _cursesi_waddbytes(win, start, i, attr, 0);
 	free(ocp);
 	wmove(win, oy, ox);
 	return ret;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: curses_private.h,v 1.48 2013/10/16 19:59:29 roy Exp $	*/
+/*	$NetBSD: curses_private.h,v 1.49 2013/11/09 11:16:59 blymn Exp $	*/
 /*-
  * Copyright (c) 1998-2000 Brett Lymn
  *                         (blymn@baea.com.au, brett_lymn@yahoo.com.au)
  * All rights reserved.
+ *
  * This code has been donated to The NetBSD Foundation by the Author.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -89,26 +89,27 @@ struct __ldata {
 } while(/*CONSTCOND*/0)
 #endif /* HAVE_WCHAR */
 #define __LDATASIZE	(sizeof(__LDATA))
 struct __line {
 #ifdef DEBUG
 #define SENTINEL_VALUE 0xaac0ffee
 	unsigned int sentinel;          /* try to catch line overflows */
 #endif
 #define	__ISDIRTY	0x01		/* Line is dirty. */
 #define __ISPASTEOL	0x02		/* Cursor is past end of line */
 #define __ISFORCED	0x04		/* Force update, no optimisation */
 	unsigned int flags;
 	unsigned int hash;		/* Hash value for the line. */
 	int *firstchp, *lastchp;	/* First and last chngd columns ptrs */
 	int firstch, lastch;		/* First and last changed columns. */
 	__LDATA *line;			/* Pointer to the line text. */
 };
 struct __window {		/* Window structure. */
 	struct __window	*nextp, *orig;	/* Subwindows list and parent. */
 	int begy, begx;			/* Window home. */
 	int cury, curx;			/* Current x, y coordinates. */
 	int maxy, maxx;			/* Maximum values for curx, cury. */
 	int reqy, reqx;			/* Size requested when created */
 @@ -280,28 +281,30 @@ extern SCREEN   *_cursesi_screen;
 #define __CTRACE_ATTR		0x00000400
 #define __CTRACE_ERASE		0x00000800
 #define __CTRACE_FILEIO		0x00001000
 #define __CTRACE_ALL		0x7fffffff
 void	 __CTRACE_init(void);
 void	 __CTRACE(int, const char *, ...) __attribute__((__format__(__printf__, 2, 3)));
 #endif
 /* Private functions. */
 int     __cputchar_args(int, void *);
 void     _cursesi_free_keymap(keymap_t *);
 int      _cursesi_gettmode(SCREEN *);
 void     _cursesi_reset_acs(SCREEN *);
-int	_cursesi_addbyte(WINDOW *, __LINE **, int *, int *, int , attr_t);
+int	_cursesi_addbyte(WINDOW *, __LINE **, int *, int *, int , attr_t, int);
-int	_cursesi_addwchar(WINDOW *, __LINE **, int *, int *, const cchar_t *);
+int	_cursesi_addwchar(WINDOW *, __LINE **, int *, int *, const cchar_t *,
 			  int);
 int	_cursesi_waddbytes(WINDOW *, const char *, int, attr_t, int);
 #ifdef HAVE_WCHAR
 void     _cursesi_reset_wacs(SCREEN *);
 #endif /* HAVE_WCHAR */
 void     _cursesi_resetterm(SCREEN *);
 int      _cursesi_setterm(char *, SCREEN *);
 int	 __delay(void);
 u_int	 __hash_more(const void *, size_t, u_int);
 #define	__hash(s, len)	__hash_more((s), (len), 0u)
 void	 __id_subwins(WINDOW *);
 void	 __init_getch(SCREEN *);
 void	 __init_acs(SCREEN *);
 #ifdef HAVE_WCHAR
 void	 __init_get_wch(SCREEN *);