ncurses 5.6 - patch 20070812

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

diff --git a/ncurses/base/lib_addch.c b/ncurses/base/lib_addch.c
index df5fddd0bad1ce073a367b1dddf0ed183f037fe8..9d73edfde5dea44ac6b44450560c8718394a2d8e 100644 (file)
--- a/ncurses/base/lib_addch.c
+++ b/ncurses/base/lib_addch.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2005,2006 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,9 @@
 #include <curses.priv.h>
 #include <ctype.h>
 
-MODULE_ID("$Id: lib_addch.c,v 1.95 2005/03/27 16:52:16 tom Exp $")
+MODULE_ID("$Id: lib_addch.c,v 1.104 2006/10/14 20:31:19 tom Exp $")
+
+static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT);
 
 /*
  * Ugly microtweaking alert.  Everything from here to end of module is
@@ -51,11 +53,11 @@ MODULE_ID("$Id: lib_addch.c,v 1.95 2005/03/27 16:52:16 tom Exp $")
 /* Return bit mask for clearing color pair number if given ch has color */
 #define COLOR_MASK(ch) (~(attr_t)((ch) & A_COLOR ? A_COLOR : 0))
 
-static inline NCURSES_CH_T
+static NCURSES_INLINE NCURSES_CH_T
 render_char(WINDOW *win, NCURSES_CH_T ch)
 /* compute a rendition of the given char correct for the current context */
 {
-    attr_t a = win->_attrs;
+    attr_t a = WINDOW_ATTRS(win);
     int pair = GetPair(ch);
 
     if (ISBLANK(ch)
@@ -89,7 +91,7 @@ render_char(WINDOW *win, NCURSES_CH_T ch)
        ("render_char bkg %s (%d), attrs %s (%d) -> ch %s (%d)",
        _tracech_t2(1, CHREF(win->_nc_bkgd)),
        GetPair(win->_nc_bkgd),
-       _traceattr(win->_attrs),
+       _traceattr(WINDOW_ATTRS(win)),
        GET_WINDOW_PAIR(win),
        _tracech_t2(3, CHREF(ch)),
        GetPair(ch)));
@@ -120,6 +122,20 @@ _nc_render(WINDOW *win, NCURSES_CH_T ch)
 #define CHECK_POSITION(win, x, y)      /* nothing */
 #endif
 
+static bool
+newline_forces_scroll(WINDOW *win, NCURSES_SIZE_T * ypos)
+{
+    bool result = FALSE;
+
+    if (*ypos >= win->_regtop && *ypos == win->_regbottom) {
+       *ypos = win->_regbottom;
+       result = TRUE;
+    } else {
+       *ypos += 1;
+    }
+    return result;
+}
+
 /*
  * The _WRAPPED flag is useful only for telling an application that we've just
  * wrapped the cursor.  We don't do anything with this flag except set it when
@@ -133,8 +149,7 @@ static int
 wrap_to_next_line(WINDOW *win)
 {
     win->_flags |= _WRAPPED;
-    if (++win->_cury > win->_regbottom) {
-       win->_cury = win->_regbottom;
+    if (newline_forces_scroll(win, &(win->_cury))) {
        win->_curx = win->_maxx;
        if (!win->_scroll)
            return (ERR);
@@ -153,7 +168,7 @@ static int waddch_literal(WINDOW *, NCURSES_CH_T);
 static void
 fill_cells(WINDOW *win, int count)
 {
-    NCURSES_CH_T blank = NewChar2(BLANK_TEXT, BLANK_ATTR);
+    NCURSES_CH_T blank = blankchar;
     int save_x = win->_curx;
     int save_y = win->_cury;
 
@@ -222,7 +237,7 @@ _nc_build_wch(WINDOW *win, ARG_CH_T ch)
 
 static
 #if !USE_WIDEC_SUPPORT         /* cannot be inline if it is recursive */
-inline
+NCURSES_INLINE
 #endif
 int
 waddch_literal(WINDOW *win, NCURSES_CH_T ch)
@@ -251,7 +266,7 @@ waddch_literal(WINDOW *win, NCURSES_CH_T ch)
 
            if (len > 0) {
                if (is8bits(CharOf(ch))) {
-                   const char *s = unctrl(CharOf(ch));
+                   const char *s = unctrl((chtype) CharOf(ch));
                    if (s[1] != 0) {
                        return waddstr(win, s);
                    }
@@ -315,7 +330,7 @@ waddch_literal(WINDOW *win, NCURSES_CH_T ch)
             * setup though.
             */
            for (i = 0; i < len; ++i) {
-               if (isWidecBase(win->_line[y].text[i])) {
+               if (isWidecBase(win->_line[y].text[x + i])) {
                    break;
                } else if (isWidecExt(win->_line[y].text[x + i])) {
                    for (j = i; x + j <= win->_maxx; ++j) {
@@ -334,7 +349,9 @@ waddch_literal(WINDOW *win, NCURSES_CH_T ch)
            for (i = 0; i < len; ++i) {
                NCURSES_CH_T value = ch;
                SetWidecExt(value, i);
-               TR(TRACE_VIRTPUT, ("multicolumn %d:%d", i + 1, len));
+               TR(TRACE_VIRTPUT, ("multicolumn %d:%d (%d,%d)",
+                                  i + 1, len,
+                                  win->_begy + y, win->_begx + x));
                line->text[x] = value;
                CHANGED_CELL(line, x);
                ++x;
@@ -354,8 +371,8 @@ waddch_literal(WINDOW *win, NCURSES_CH_T ch)
   testwrapping:
     );
 
-    TR(TRACE_VIRTPUT, ("cell (%d, %d..%d) = %s",
-                      win->_cury, win->_curx, x - 1,
+    TR(TRACE_VIRTPUT, ("cell (%ld, %ld..%d) = %s",
+                      (long) win->_cury, (long) win->_curx, x - 1,
                       _tracech_t(CHREF(ch))));
 
     if (x > win->_maxx) {
@@ -365,11 +382,11 @@ waddch_literal(WINDOW *win, NCURSES_CH_T ch)
     return OK;
 }
 
-static inline int
+static NCURSES_INLINE int
 waddch_nosync(WINDOW *win, const NCURSES_CH_T ch)
 /* the workhorse function -- add a character to the given window */
 {
-    int x, y;
+    NCURSES_SIZE_T x, y;
     chtype t = CharOf(ch);
     const char *s = unctrl(t);
 
@@ -412,7 +429,7 @@ waddch_nosync(WINDOW *win, const NCURSES_CH_T ch)
         */
        if ((!win->_scroll && (y == win->_regbottom))
            || (x <= win->_maxx)) {
-           NCURSES_CH_T blank = NewChar2(BLANK_TEXT, BLANK_ATTR);
+           NCURSES_CH_T blank = blankchar;
            AddAttr(blank, AttrOf(ch));
            while (win->_curx < x) {
                if (waddch_literal(win, blank) == ERR)
@@ -422,9 +439,8 @@ waddch_nosync(WINDOW *win, const NCURSES_CH_T ch)
        } else {
            wclrtoeol(win);
            win->_flags |= _WRAPPED;
-           if (++y > win->_regbottom) {
+           if (newline_forces_scroll(win, &y)) {
                x = win->_maxx;
-               y--;
                if (win->_scroll) {
                    scroll(win);
                    x = 0;
@@ -436,8 +452,7 @@ waddch_nosync(WINDOW *win, const NCURSES_CH_T ch)
        break;
     case '\n':
        wclrtoeol(win);
-       if (++y > win->_regbottom) {
-           y--;
+       if (newline_forces_scroll(win, &y)) {
            if (win->_scroll)
                scroll(win);
            else