ncurses 5.8 - patch 20110307

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

diff --git a/ncurses/base/lib_addstr.c b/ncurses/base/lib_addstr.c
index 59a3bae81c8cd91319b4dd5c2660521121ba01d8..d73ce00a4519a979853408412e30e76e94d142de 100644 (file)
--- a/ncurses/base/lib_addstr.c
+++ b/ncurses/base/lib_addstr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998,1999,2000 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2009,2010 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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -29,6 +29,10 @@
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
 /****************************************************************************
  *  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                                                       *

  ****************************************************************************/
 
 /*
  ****************************************************************************/
 
 /*


@@ -40,26 +44,29 @@
 
 #include <curses.priv.h>
 
 
 #include <curses.priv.h>
 

-MODULE_ID("$Id: lib_addstr.c,v 1.18 2000/07/29 16:42:41 tom Exp $")
+MODULE_ID("$Id: lib_addstr.c,v 1.51 2010/12/19 01:22:58 tom Exp $")

 
 

-int
-waddnstr(WINDOW *win, const char *const astr, int n)
+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;
 
     int code = ERR;
 

-    T((T_CALLED("waddnstr(%p,%s,%d)"), win, _nc_visbuf(astr), n));
+    T((T_CALLED("waddnstr(%p,%s,%d)"), (void *) win, _nc_visbufn(astr, n), n));

 
     if (win && (str != 0)) {
 
     if (win && (str != 0)) {

-       TR(TRACE_VIRTPUT | TRACE_ATTRS, ("... current %s", _traceattr(win->_attrs)));
-       TR(TRACE_VIRTPUT, ("str is not null"));
+       TR(TRACE_VIRTPUT | TRACE_ATTRS,
+          ("... current %s", _traceattr(WINDOW_ATTRS(win))));

        code = OK;
        if (n < 0)
            n = (int) strlen(astr);
 
        code = OK;
        if (n < 0)
            n = (int) strlen(astr);
 

+       TR(TRACE_VIRTPUT, ("str is not null, length = %d", n));

        while ((n-- > 0) && (*str != '\0')) {
        while ((n-- > 0) && (*str != '\0')) {

-           TR(TRACE_VIRTPUT, ("*str = %#x", *str));
-           if (_nc_waddch_nosync(win, (chtype) * str++) == ERR) {
+           NCURSES_CH_T ch;
+           TR(TRACE_VIRTPUT, ("*str = %#o", UChar(*str)));
+           SetChar(ch, UChar(*str++), A_NORMAL);
+           if (_nc_waddch_nosync(win, ch) == ERR) {

                code = ERR;
                break;
            }
                code = ERR;
                break;
            }


@@ -70,19 +77,21 @@ waddnstr(WINDOW *win, const char *const astr, int n)
     returnCode(code);
 }
 
     returnCode(code);
 }
 

-int
-waddchnstr(WINDOW *win, const chtype * const astr, int n)
+NCURSES_EXPORT(int)
+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 code = OK;

+    int i;

     struct ldat *line;
 
     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);
 
 
     if (!win)
        returnCode(ERR);
 

+    y = win->_cury;
+    x = win->_curx;

     if (n < 0) {
        const chtype *str;
        n = 0;
     if (n < 0) {
        const chtype *str;
        n = 0;


@@ -95,9 +104,145 @@ waddchnstr(WINDOW *win, const chtype * const astr, int n)
        returnCode(code);
 
     line = &(win->_line[y]);
        returnCode(code);
 
     line = &(win->_line[y]);

-    memcpy(line->text + x, astr, n * sizeof(*astr));
-    CHANGED_RANGE(line, x, x + n - 1);
+    for (i = 0; i < n && ChCharOf(astr[i]) != '\0'; ++i) {
+       SetChar2(line->text[i + x], astr[i]);
+    }
+    CHANGED_RANGE(line, x, (NCURSES_SIZE_T) (x + n - 1));

 
     _nc_synchook(win);
     returnCode(code);
 }
 
     _nc_synchook(win);
     returnCode(code);
 }

+
+#if USE_WIDEC_SUPPORT
+
+NCURSES_EXPORT(int)
+_nc_wchstrlen(const cchar_t *s)
+{
+    int result = 0;
+    while (CharOf(s[result]) != L'\0') {
+       result++;
+    }
+    return result;
+}
+
+NCURSES_EXPORT(int)
+wadd_wchnstr(WINDOW *win, const cchar_t *astr, int n)
+{
+    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, j, start, len, end;
+
+    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);
+    }
+    if (n > win->_maxx - x + 1)
+       n = win->_maxx - x + 1;
+    if (n == 0)
+       returnCode(code);
+
+    line = &(win->_line[y]);
+    start = x;
+    end = x + n - 1;
+
+    /*
+     * 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;
+           }
+       }
+    }
+
+    /*
+     * 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;
+       }
+    }
+
+    /*
+     * 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);
+
+    _nc_synchook(win);
+    returnCode(code);
+}
+
+NCURSES_EXPORT(int)
+waddnwstr(WINDOW *win, const wchar_t *str, int n)
+{
+    int code = ERR;
+
+    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(WINDOW_ATTRS(win))));
+       code = OK;
+       if (n < 0)
+           n = (int) wcslen(str);
+
+       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", (unsigned long) *str));
+           SetChar(ch, *str++, A_NORMAL);
+           if (wadd_wch(win, &ch) == ERR) {
+               code = ERR;
+               break;
+           }
+       }
+       _nc_synchook(win);
+    }
+    TR(TRACE_VIRTPUT, ("waddnwstr returns %d", code));
+    returnCode(code);
+}
+
+#endif