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 17ba6e2bcd6c1eeacff20225f8ea95d1bc6baee5..cc3e8781dac801687b52fdd41508a181125a3c11 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>
 
 #include <curses.priv.h>
 #include <ctype.h>
 

-MODULE_ID("$Id: lib_addch.c,v 1.111 2008/03/29 18:48:02 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);
 
 
 static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT);
 


@@ -290,12 +290,15 @@ waddch_literal(WINDOW *win, NCURSES_CH_T ch)
        int len = wcwidth(CharOf(ch));
        int i;
        int j;
        int len = wcwidth(CharOf(ch));
        int i;
        int j;

+       wchar_t *chars;

 
        if (len == 0) {         /* non-spacing */
            if ((x > 0 && y >= 0)
 
        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,
                for (i = 0; i < CCHARW_MAX; ++i) {
                    if (chars[i] == 0) {
                        TR(TRACE_VIRTPUT,