ncurses 6.2 - patch 20210418

[ncurses.git] / ncurses / widechar / lib_ins_wch.c

diff --git a/ncurses/widechar/lib_ins_wch.c b/ncurses/widechar/lib_ins_wch.c
index 4210579175c4f51d16f26472fb47da0e1923a52d..f75361081b62e7a1ad45173aa1685c1d5b141733 100644 (file)
--- a/ncurses/widechar/lib_ins_wch.c
+++ b/ncurses/widechar/lib_ins_wch.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 2002-2011,2016 Free Software Foundation, Inc.              *
+ * Copyright 2019,2020 Thomas E. Dickey                                     *
+ * Copyright 2002-2016,2017 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            *
@@ -39,7 +40,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_ins_wch.c,v 1.20 2016/03/13 00:42:34 tom Exp $")
+MODULE_ID("$Id: lib_ins_wch.c,v 1.25 2020/12/05 20:04:59 tom Exp $")
 
 /*
  * Insert the given character, updating the current location to simplify
@@ -48,8 +49,7 @@ MODULE_ID("$Id: lib_ins_wch.c,v 1.20 2016/03/13 00:42:34 tom Exp $")
 NCURSES_EXPORT(int)
 _nc_insert_wch(WINDOW *win, const cchar_t *wch)
 {
-    int cells = wcwidth(CharOf(CHDEREF(wch)));
-    int cell;
+    int cells = _nc_wacs_width(CharOf(CHDEREF(wch)));
     int code = OK;
 
     if (cells < 0) {
@@ -59,6 +59,7 @@ _nc_insert_wch(WINDOW *win, const cchar_t *wch)
            cells = 1;
 
        if (win->_curx <= win->_maxx) {
+           int cell;
            struct ldat *line = &(win->_line[win->_cury]);
            NCURSES_CH_T *end = &(line->text[win->_curx]);
            NCURSES_CH_T *temp1 = &(line->text[win->_maxx]);
@@ -82,15 +83,13 @@ _nc_insert_wch(WINDOW *win, const cchar_t *wch)
 NCURSES_EXPORT(int)
 wins_wch(WINDOW *win, const cchar_t *wch)
 {
-    NCURSES_SIZE_T oy;
-    NCURSES_SIZE_T ox;
     int code = ERR;
 
     T((T_CALLED("wins_wch(%p, %s)"), (void *) win, _tracecchar_t(wch)));
 
     if (win != 0) {
-       oy = win->_cury;
-       ox = win->_curx;
+       NCURSES_SIZE_T oy = win->_cury;
+       NCURSES_SIZE_T ox = win->_curx;
 
        code = _nc_insert_wch(win, wch);
 
@@ -105,9 +104,6 @@ NCURSES_EXPORT(int)
 wins_nwstr(WINDOW *win, const wchar_t *wstr, int n)
 {
     int code = ERR;
-    NCURSES_SIZE_T oy;
-    NCURSES_SIZE_T ox;
-    const wchar_t *cp;
 
     T((T_CALLED("wins_nwstr(%p,%s,%d)"),
        (void *) win, _nc_viswbufn(wstr, n), n));
@@ -115,15 +111,17 @@ wins_nwstr(WINDOW *win, const wchar_t *wstr, int n)
     if (win != 0
        && wstr != 0) {
        if (n < 1)
-           n = (int) wcslen(wstr);
+           n = INT_MAX;
        code = OK;
+
        if (n > 0) {
+           const wchar_t *cp;
            SCREEN *sp = _nc_screen_of(win);
+           NCURSES_SIZE_T oy = win->_cury;
+           NCURSES_SIZE_T ox = win->_curx;
 
-           oy = win->_cury;
-           ox = win->_curx;
-           for (cp = wstr; *cp && ((cp - wstr) < n); cp++) {
-               int len = wcwidth(*cp);
+           for (cp = wstr; (*cp != L'\0') && ((cp - wstr) < n); cp++) {
+               int len = _nc_wacs_width(*cp);
 
                if ((len >= 0 && len != 1) || !is7bits(*cp)) {
                    cchar_t tmp_cchar;