ncurses 5.6 - patch 20070812

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

diff --git a/ncurses/base/lib_instr.c b/ncurses/base/lib_instr.c
index b3e1d030a4b64eb11f4e4ce63799c71789a4b029..3fb29490ad0638f1025a6271ac22c516122cdef0 100644 (file)
--- a/ncurses/base/lib_instr.c
+++ b/ncurses/base/lib_instr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998-2005,2007 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            *
@@ -29,9 +29,9 @@
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
+ *     and: Thomas E. Dickey                        1996-on                 *
  ****************************************************************************/
 
-
 /*
 **     lib_instr.c
 **
@@ -41,33 +41,72 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_instr.c,v 1.8 1998/02/11 12:13:54 tom Exp $")
+MODULE_ID("$Id: lib_instr.c,v 1.16 2007/07/21 20:18:10 tom Exp $")
 
-int winnstr(WINDOW *win, char *str, int n)
+NCURSES_EXPORT(int)
+winnstr(WINDOW *win, char *str, int n)
 {
-       int     i=0, row, col;
+    int i = 0, row, col;
+
+    T((T_CALLED("winnstr(%p,%p,%d)"), win, str, n));
 
-       T((T_CALLED("winnstr(%p,%p,%d)"), win, str, n));
+    if (!str)
+       returnCode(0);
 
-       if (!str)
-         returnCode(0);
-       
-       if (win) {
-         getyx(win, row, col);
+    if (win) {
+       getyx(win, row, col);
 
-         if (n < 0)
+       if (n < 0)
            n = win->_maxx - win->_curx + 1;
 
-         for (; i < n;) {
-           str[i++] = TextOf(win->_line[row].text[col]);
+       for (; i < n;) {
+#if USE_WIDEC_SUPPORT
+           cchar_t *cell = &(win->_line[row].text[col]);
+           wchar_t *wch;
+           attr_t attrs;
+           short pair;
+           int n2;
+           bool done = FALSE;
+           mbstate_t state;
+           size_t i3, n3;
+           char *tmp;
+
+           if (!isWidecExt(*cell)) {
+               n2 = getcchar(cell, 0, 0, 0, 0);
+               if (n2 > 0
+                   && (wch = typeCalloc(wchar_t, (unsigned) n2 + 1)) != 0) {
+                   if (getcchar(cell, wch, &attrs, &pair, 0) == OK) {
+
+                       init_mb(state);
+                       n3 = wcstombs(0, wch, 0);
+                       if (isEILSEQ(n3) || (n3 == 0)) {
+                           ;
+                       } else if ((int) (n3 + i) > n) {
+                           done = TRUE;
+                       } else if ((tmp = typeCalloc(char, n3 + 10)) == 0) {
+                           done = TRUE;
+                       } else {
+                           init_mb(state);
+                           wcstombs(tmp, wch, n3);
+                           for (i3 = 0; i3 < n3; ++i3)
+                               str[i++] = tmp[i3];
+                           free(tmp);
+                       }
+                   }
+                   free(wch);
+                   if (done)
+                       break;
+               }
+           }
+#else
+           str[i++] = (char) CharOf(win->_line[row].text[col]);
+#endif
            if (++col > win->_maxx) {
-             col = 0;
-             if (++row > win->_maxy)
                break;
            }
-         }
        }
-       str[i] = '\0';  /* SVr4 does not seem to count the null */
-       returnCode(i);
+    }
+    str[i] = '\0';             /* SVr4 does not seem to count the null */
+    T(("winnstr returns %s", _nc_visbuf(str)));
+    returnCode(i);
 }
-