ncurses 6.0 - patch 20170325

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

diff --git a/ncurses/base/lib_insnstr.c b/ncurses/base/lib_insnstr.c
index 16d945952b37fa1927dbf695b6d69ddd76d54731..d147871037e98f0228ec635985ebcace7988e714 100644 (file)
--- a/ncurses/base/lib_insnstr.c
+++ b/ncurses/base/lib_insnstr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2004,2009 Free Software Foundation, Inc.                   *
+ * Copyright (c) 2004-2009,2016 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            *
@@ -40,31 +40,55 @@
 #include <curses.priv.h>
 #include <ctype.h>
 
-MODULE_ID("$Id: lib_insnstr.c,v 1.2 2009/05/30 14:53:49 tom Exp $")
+MODULE_ID("$Id: lib_insnstr.c,v 1.5 2016/05/28 21:03:33 tom Exp $")
 
 NCURSES_EXPORT(int)
 winsnstr(WINDOW *win, const char *s, int n)
 {
     int code = ERR;
-    NCURSES_SIZE_T oy;
-    NCURSES_SIZE_T ox;
     const unsigned char *str = (const unsigned char *) s;
-    const unsigned char *cp;
 
-    T((T_CALLED("winsnstr(%p,%s,%d)"), win, _nc_visbufn(s, n), n));
+    T((T_CALLED("winsnstr(%p,%s,%d)"), (void *) win, _nc_visbufn(s, n), n));
 
     if (win != 0 && str != 0) {
        SCREEN *sp = _nc_screen_of(win);
+#if USE_WIDEC_SUPPORT
+       /*
+        * If the output contains "wide" (multibyte) characters, we will not
+        * really know the width of a character until we get the last byte
+        * of the character.  Since the preceding byte(s) may use more columns
+        * on the screen than the final character, it is best to route the
+        * call to the wins_nwstr() function.
+        */
+       if (sp->_screen_unicode) {
+           size_t nn = (n > 0) ? (size_t) n : strlen(s);
+           wchar_t *buffer = typeMalloc(wchar_t, nn + 1);
+           if (buffer != 0) {
+               mbstate_t state;
+               size_t n3;
+               init_mb(state);
+               n3 = mbstowcs(buffer, s, nn);
+               if (n3 != (size_t) (-1)) {
+                   code = wins_nwstr(win, buffer, (int) n3);
+               }
+               free(buffer);
+           }
+       }
+       if (code == ERR)
+#endif
+       {
+           NCURSES_SIZE_T oy = win->_cury;
+           NCURSES_SIZE_T ox = win->_curx;
+           const unsigned char *cp;
 
-       oy = win->_cury;
-       ox = win->_curx;
-       for (cp = str; *cp && (n <= 0 || (cp - str) < n); cp++) {
-           _nc_insert_ch(sp, win, (chtype) UChar(*cp));
+           for (cp = str; *cp && (n <= 0 || (cp - str) < n); cp++) {
+               _nc_insert_ch(sp, win, (chtype) UChar(*cp));
+           }
+           win->_curx = ox;
+           win->_cury = oy;
+           _nc_synchook(win);
+           code = OK;
        }
-       win->_curx = ox;
-       win->_cury = oy;
-       _nc_synchook(win);
-       code = OK;
     }
     returnCode(code);
 }