ncurses 5.9 - patch 20110917
[ncurses.git] / ncurses / base / lib_addstr.c
index d6f9345542e34427b3a4c061c418b0e0b8fc9934..a1a55cb8bfd8b9bfa88ec7e11202beedfeb802b0 100644 (file)
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2001,2002 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2010,2011 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            *
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
+ *                                                                          *
+ *  Rewritten 2001-2004 to support wide-characters by                       *
+ *     Sven Verdoolaege                                                    *
+ *     Thomas Dickey                                                       *
  ****************************************************************************/
 
 /*
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_addstr.c,v 1.34 2002/10/06 00:25:25 tom Exp $")
-
-#if USE_WIDEC_SUPPORT
-#define CONV_DATA   mbstate_t state; wchar_t cached; int clen = 0
-#define CONV_INIT   memset (&state, '\0', sizeof (state)); cached = (wchar_t)WEOF
-#define NEXT_CHAR(s,ch, n)                                             \
-    {                                                                  \
-       int len, i = 0;                                                 \
-       memset(&ch, 0, sizeof(cchar_t));                                \
-       if (cached != (wchar_t) WEOF) {                                 \
-           ch.chars[i++] = cached;                                     \
-           cached = (wchar_t) WEOF;                                    \
-           n -= clen;                                                  \
-           s += clen;                                                  \
-       }                                                               \
-       for (; i < CCHARW_MAX && n > 0; ++i) {                          \
-           if ((len = mbrtowc(&ch.chars[i], s, n, &state)) < 0) {      \
-               code = ERR;                                             \
-               break;                                                  \
-           }                                                           \
-           if (i == 0 || wcwidth(ch.chars[i]) == 0) {                  \
-               n -= len;                                               \
-               s += len;                                               \
-           } else {                                                    \
-               cached = ch.chars[i];                                   \
-               clen = len;                                             \
-               ch.chars[i] = L'\0';                                    \
-               break;                                                  \
-           }                                                           \
-       }                                                               \
-       if (code == ERR)                                                \
-           break;                                                      \
-    }
-#else
-#define CONV_DATA
-#define CONV_INIT
-#define NEXT_CHAR(s,ch, n)                                             \
-    ch = *s++;                                                         \
-    --n
-#endif
+MODULE_ID("$Id: lib_addstr.c,v 1.52 2011/05/28 23:02:09 tom Exp $")
 
 NCURSES_EXPORT(int)
 waddnstr(WINDOW *win, const char *astr, int n)
 {
-    unsigned const char *str = (unsigned const char *) astr;
+    const char *str = astr;
     int code = ERR;
-    CONV_DATA;
 
-    T((T_CALLED("waddnstr(%p,%s,%d)"), win, _nc_visbufn(astr, n), n));
+    T((T_CALLED("waddnstr(%p,%s,%d)"), (void *) win, _nc_visbufn(astr, n), n));
 
     if (win && (str != 0)) {
-       TR(TRACE_VIRTPUT | TRACE_ATTRS, ("... current %s", _traceattr(win->_attrs)));
+       TR(TRACE_VIRTPUT | TRACE_ATTRS,
+          ("... current %s", _traceattr(WINDOW_ATTRS(win))));
        code = OK;
        if (n < 0)
            n = (int) strlen(astr);
 
        TR(TRACE_VIRTPUT, ("str is not null, length = %d", n));
-       CONV_INIT;
-       while ((n > 0) && (*str != '\0')) {
+       while ((n-- > 0) && (*str != '\0')) {
            NCURSES_CH_T ch;
-           TR(TRACE_VIRTPUT, ("*str = %#x", *str));
-           NEXT_CHAR(str, ch, n);
+           TR(TRACE_VIRTPUT, ("*str = %#o", UChar(*str)));
+           SetChar(ch, UChar(*str++), A_NORMAL);
            if (_nc_waddch_nosync(win, ch) == ERR) {
                code = ERR;
                break;
@@ -114,18 +78,20 @@ waddnstr(WINDOW *win, const char *astr, int n)
 }
 
 NCURSES_EXPORT(int)
-waddchnstr(WINDOW *win, const chtype * astr, int n)
+waddchnstr(WINDOW *win, const chtype *astr, int n)
 {
-    NCURSES_SIZE_T y = win->_cury;
-    NCURSES_SIZE_T x = win->_curx;
+    NCURSES_SIZE_T y, x;
     int code = OK;
+    int i;
     struct ldat *line;
 
-    T((T_CALLED("waddchnstr(%p,%p,%d)"), win, astr, n));
+    T((T_CALLED("waddchnstr(%p,%p,%d)"), (void *) win, (const void *) astr, n));
 
     if (!win)
        returnCode(ERR);
 
+    y = win->_cury;
+    x = win->_curx;
     if (n < 0) {
        const chtype *str;
        n = 0;
@@ -138,16 +104,10 @@ waddchnstr(WINDOW *win, const chtype * astr, int n)
        returnCode(code);
 
     line = &(win->_line[y]);
-#if USE_WIDEC_SUPPORT
-    {
-       int i;
-       for (i = 0; i < n; ++i)
-           SetChar(line->text[i + x], ChCharOf(astr[i]), ChAttrOf(astr[i]));
+    for (i = 0; i < n && ChCharOf(astr[i]) != '\0'; ++i) {
+       SetChar2(line->text[i + x], astr[i]);
     }
-#else
-    memcpy(line->text + x, astr, n * sizeof(*astr));
-#endif
-    CHANGED_RANGE(line, x, x + n - 1);
+    CHANGED_RANGE(line, x, (NCURSES_SIZE_T) (x + n - 1));
 
     _nc_synchook(win);
     returnCode(code);
@@ -155,30 +115,38 @@ waddchnstr(WINDOW *win, const chtype * astr, int n)
 
 #if USE_WIDEC_SUPPORT
 
-int
-_nc_wchstrlen(const cchar_t * s)
+NCURSES_EXPORT(int)
+_nc_wchstrlen(const cchar_t *s)
 {
     int result = 0;
-    while (CharOf(s[result]) != L'\0') {
-       result++;
+    if (s != 0) {
+       while (CharOf(s[result]) != L'\0') {
+           result++;
+       }
     }
     return result;
 }
 
 NCURSES_EXPORT(int)
-wadd_wchnstr(WINDOW *win, const cchar_t * const astr, int n)
+wadd_wchnstr(WINDOW *win, const cchar_t *astr, int n)
 {
-    NCURSES_SIZE_T y = win->_cury;
-    NCURSES_SIZE_T x = win->_curx;
+    static const NCURSES_CH_T blank = NewChar(BLANK_TEXT);
+    NCURSES_SIZE_T y;
+    NCURSES_SIZE_T x;
     int code = OK;
     struct ldat *line;
-    int i, start, end;
+    int i, j, start, len, end;
 
-    T((T_CALLED("wadd_wchnstr(%p,%s,%d)"), win, _nc_viscbuf(astr, n), n));
+    T((T_CALLED("wadd_wchnstr(%p,%s,%d)"),
+       (void *) win,
+       _nc_viscbuf(astr, n),
+       n));
 
     if (!win)
        returnCode(ERR);
 
+    y = win->_cury;
+    x = win->_curx;
     if (n < 0) {
        n = _nc_wchstrlen(astr);
     }
@@ -190,22 +158,58 @@ wadd_wchnstr(WINDOW *win, const cchar_t * const astr, int n)
     line = &(win->_line[y]);
     start = x;
     end = x + n - 1;
-    if (isnac(line->text[x])) {
-       line->text[x - 1] = win->_nc_bkgd;
-       --start;
+
+    /*
+     * Reset orphaned cells of multi-column characters that extend up to the
+     * new string's location to blanks.
+     */
+    if (x > 0 && isWidecExt(line->text[x])) {
+       for (i = 0; i <= x; ++i) {
+           if (!isWidecExt(line->text[x - i])) {
+               /* must be isWidecBase() */
+               start -= i;
+               while (i > 0) {
+                   line->text[x - i--] = _nc_render(win, blank);
+               }
+               break;
+           }
+       }
     }
-    for (i = 0; i < n && x <= win->_maxx; ++i) {
-       line->text[x++] = astr[i];
-       if (wcwidth(CharOf(astr[i])) > 1) {
-           if (x <= win->_maxx)
-               AddAttr(line->text[x++], WA_NAC);
-           else
-               line->text[x - 1] = win->_nc_bkgd;
+
+    /*
+     * Copy the new string to the window.
+     */
+    for (i = 0; i < n && CharOf(astr[i]) != L'\0' && x <= win->_maxx; ++i) {
+       if (isWidecExt(astr[i]))
+           continue;
+
+       len = wcwidth(CharOf(astr[i]));
+
+       if (x + len - 1 <= win->_maxx) {
+           line->text[x] = _nc_render(win, astr[i]);
+           if (len > 1) {
+               for (j = 0; j < len; ++j) {
+                   if (j != 0) {
+                       line->text[x + j] = line->text[x];
+                   }
+                   SetWidecExt(line->text[x + j], j);
+               }
+           }
+           x = (NCURSES_SIZE_T) (x + len);
+           end += len - 1;
+       } else {
+           break;
        }
     }
-    if (x <= win->_maxx && isnac(line->text[x])) {
-       line->text[x] = win->_nc_bkgd;
+
+    /*
+     * Set orphaned cells of multi-column characters which lie after the new
+     * string to blanks.
+     */
+    while (x <= win->_maxx && isWidecExt(line->text[x])) {
+       line->text[x] = _nc_render(win, blank);
        ++end;
+       ++x;
     }
     CHANGED_RANGE(line, start, end);
 
@@ -214,15 +218,15 @@ wadd_wchnstr(WINDOW *win, const cchar_t * const astr, int n)
 }
 
 NCURSES_EXPORT(int)
-waddnwstr(WINDOW *win, const wchar_t * str, int n)
+waddnwstr(WINDOW *win, const wchar_t *str, int n)
 {
     int code = ERR;
-    int i;
 
-    T((T_CALLED("waddnwstr(%p,%s,%d)"), win, _nc_viswbufn(str,n), n));
+    T((T_CALLED("waddnwstr(%p,%s,%d)"), (void *) win, _nc_viswbufn(str, n), n));
 
     if (win && (str != 0)) {
-       TR(TRACE_VIRTPUT | TRACE_ATTRS, ("... current %s", _traceattr(win->_attrs)));
+       TR(TRACE_VIRTPUT | TRACE_ATTRS,
+          ("... current %s", _traceattr(WINDOW_ATTRS(win))));
        code = OK;
        if (n < 0)
            n = (int) wcslen(str);
@@ -230,16 +234,9 @@ waddnwstr(WINDOW *win, const wchar_t * str, int n)
        TR(TRACE_VIRTPUT, ("str is not null, length = %d", n));
        while ((n-- > 0) && (*str != L('\0'))) {
            NCURSES_CH_T ch;
-           TR(TRACE_VIRTPUT, ("*str[0] = %#lx", *str));
+           TR(TRACE_VIRTPUT, ("*str[0] = %#lx", (unsigned long) *str));
            SetChar(ch, *str++, A_NORMAL);
-           i = 1;
-           while (i < CCHARW_MAX && n > 0 && (*str != L('\0'))
-                  && wcwidth(*str) == 0) {
-               TR(TRACE_VIRTPUT, ("*str[%d] = %#lx", i, *str));
-               ch.chars[i++] = *str++;
-               --n;
-           }
-           if (_nc_waddch_nosync(win, ch) == ERR) {
+           if (wadd_wch(win, &ch) == ERR) {
                code = ERR;
                break;
            }