ncurses 5.5

[ncurses.git] / ncurses / widechar / lib_add_wch.c

diff --git a/ncurses/widechar/lib_add_wch.c b/ncurses/widechar/lib_add_wch.c
index 8d4346efbce86a9fdf6789f3cbad5588c03f1502..29dc5eb13785cbe4cb59a48e46f9696a323c8c7f 100644 (file)
--- a/ncurses/widechar/lib_add_wch.c
+++ b/ncurses/widechar/lib_add_wch.c
@@ -35,7 +35,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_add_wch.c,v 1.2 2004/02/07 17:53:33 tom Exp $")
+MODULE_ID("$Id: lib_add_wch.c,v 1.4 2004/09/19 00:33:51 tom Exp $")
 
 NCURSES_EXPORT(int)
 wadd_wch(WINDOW *win, const cchar_t * wch)
@@ -54,12 +54,12 @@ wadd_wch(WINDOW *win, const cchar_t * wch)
                break;
            if ((PUTC_n = wcrtomb(PUTC_buf, PUTC_ch, &PUT_st)) <= 0) {
                code = ERR;
-               if (PUTC_ch < 256)
-                   code = waddch(win, UChar(PUTC_ch));
+               if (is8bits(PUTC_ch))
+                   code = waddch(win, UChar(PUTC_ch) | wch->attr);
                break;
            }
            for (n = 0; n < PUTC_n; n++) {
-               if ((code = waddch(win, UChar(PUTC_buf[n]))) == ERR) {
+               if ((code = waddch(win, UChar(PUTC_buf[n]) | wch->attr)) == ERR) {
                    break;
                }
            }
@@ -89,12 +89,12 @@ wecho_wchar(WINDOW *win, const cchar_t * wch)
                break;
            if ((PUTC_n = wcrtomb(PUTC_buf, PUTC_ch, &PUT_st)) <= 0) {
                code = ERR;
-               if (PUTC_ch < 256)
-                   code = waddch(win, UChar(PUTC_ch));
+               if (is8bits(PUTC_ch))
+                   code = waddch(win, UChar(PUTC_ch) | wch->attr);
                break;
            }
            for (n = 0; n < PUTC_n; n++) {
-               if ((code = waddch(win, UChar(PUTC_buf[n]))) == ERR) {
+               if ((code = waddch(win, UChar(PUTC_buf[n]) | wch->attr)) == ERR) {
                    break;
                }
            }