ncurses 5.7 - patch 20100306

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

diff --git a/ncurses/base/lib_instr.c b/ncurses/base/lib_instr.c
index 157d2ec9b4f7266c127c274cc5840eda13730e5d..e6d1a739c94f47023e8966678f654fe2d7689214 100644 (file)
--- a/ncurses/base/lib_instr.c
+++ b/ncurses/base/lib_instr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2001,2002 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2007,2009 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,6 +29,7 @@
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
+ *     and: Thomas E. Dickey                        1996-on                 *
  ****************************************************************************/
 
 /*
@@ -40,14 +41,14 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_instr.c,v 1.12 2002/10/05 23:23:05 tom Exp $")
+MODULE_ID("$Id: lib_instr.c,v 1.17 2009/10/24 22:55:45 tom Exp $")
 
 NCURSES_EXPORT(int)
 winnstr(WINDOW *win, char *str, int n)
 {
     int i = 0, row, col;
 
-    T((T_CALLED("winnstr(%p,%p,%d)"), win, str, n));
+    T((T_CALLED("winnstr(%p,%p,%d)"), (void *) win, str, n));
 
     if (!str)
        returnCode(0);
@@ -59,11 +60,49 @@ winnstr(WINDOW *win, char *str, int n)
            n = win->_maxx - win->_curx + 1;
 
        for (; i < n;) {
-           str[i++] = CharOf(win->_line[row].text[col]);
+#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)) {
+                           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;
+               break;
            }
        }
     }