ncurses 5.6 - patch 20080517

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

diff --git a/ncurses/base/lib_addch.c b/ncurses/base/lib_addch.c
index 9d73edfde5dea44ac6b44450560c8718394a2d8e..cc3e8781dac801687b52fdd41508a181125a3c11 100644 (file)
--- a/ncurses/base/lib_addch.c
+++ b/ncurses/base/lib_addch.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2006,2008 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            *
@@ -36,7 +36,7 @@
 #include <curses.priv.h>
 #include <ctype.h>
 
-MODULE_ID("$Id: lib_addch.c,v 1.104 2006/10/14 20:31:19 tom Exp $")
+MODULE_ID("$Id: lib_addch.c,v 1.112 2008/05/17 19:08:40 Miroslav.Lichvar Exp $")
 
 static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT);
 
@@ -217,19 +217,19 @@ _nc_build_wch(WINDOW *win, ARG_CH_T ch)
                       buffer,
                       WINDOW_EXT(win, addch_used), &state)) > 0) {
        attr_t attrs = AttrOf(CHDEREF(ch));
+       if_EXT_COLORS(int pair = GetPair(CHDEREF(ch)));
        SetChar(CHDEREF(ch), result, attrs);
+       if_EXT_COLORS(SetPair(CHDEREF(ch), pair));
+       WINDOW_EXT(win, addch_used) = 0;
+    } else if (len == -1) {
+       /*
+        * An error occurred.  We could either discard everything,
+        * or assume that the error was in the previous input.
+        * Try the latter.
+        */
+       TR(TRACE_VIRTPUT, ("Alert! mbrtowc returns error"));
+       /* handle this with unctrl() */
        WINDOW_EXT(win, addch_used) = 0;
-    } else {
-       if (len == -1) {
-           /*
-            * An error occurred.  We could either discard everything,
-            * or assume that the error was in the previous input.
-            * Try the latter.
-            */
-           TR(TRACE_VIRTPUT, ("Alert! mbrtowc returns error"));
-           buffer[0] = CharOf(CHDEREF(ch));
-           WINDOW_EXT(win, addch_used) = 1;
-       }
     }
     return len;
 }
@@ -264,13 +264,16 @@ waddch_literal(WINDOW *win, NCURSES_CH_T ch)
        if (WINDOW_EXT(win, addch_used) != 0 || !Charable(ch)) {
            int len = _nc_build_wch(win, CHREF(ch));
 
-           if (len > 0) {
+           if (len >= -1) {
+               /* handle EILSEQ */
                if (is8bits(CharOf(ch))) {
                    const char *s = unctrl((chtype) CharOf(ch));
                    if (s[1] != 0) {
                        return waddstr(win, s);
                    }
                }
+               if (len == -1)
+                   return waddch(win, ' ');
            } else {
                return OK;
            }
@@ -287,12 +290,15 @@ waddch_literal(WINDOW *win, NCURSES_CH_T ch)
        int len = wcwidth(CharOf(ch));
        int i;
        int j;
+       wchar_t *chars;
 
        if (len == 0) {         /* non-spacing */
            if ((x > 0 && y >= 0)
-               || ((y = win->_cury - 1) >= 0 &&
-                   (x = win->_maxx) > 0)) {
-               wchar_t *chars = (win->_line[y].text[x - 1].chars);
+               || (win->_maxx >= 0 && win->_cury >= 1)) {
+               if (x > 0 && y >= 0)
+                   chars = (win->_line[y].text[x - 1].chars);
+               else
+                   chars = (win->_line[y - 1].text[win->_maxx].chars);
                for (i = 0; i < CCHARW_MAX; ++i) {
                    if (chars[i] == 0) {
                        TR(TRACE_VIRTPUT,
@@ -473,6 +479,7 @@ waddch_nosync(WINDOW *win, const NCURSES_CH_T ch)
        while (*s) {
            NCURSES_CH_T sch;
            SetChar(sch, *s++, AttrOf(ch));
+           if_EXT_COLORS(SetPair(sch, GetPair(ch)));
            if (waddch_literal(win, sch) == ERR)
                return ERR;
        }