ncurses 6.1 - patch 20191012

[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 57f142b7cad9912428dbbc800fea4ac7d7f18887..12dc19c2a7eebbe0666531e47222052da384e614 100644 (file)
--- a/ncurses/widechar/lib_ins_wch.c
+++ b/ncurses/widechar/lib_ins_wch.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 2002-2016,2017 Free Software Foundation, Inc.              *
+ * Copyright (c) 2002-2017,2019 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            *


@@ -39,7 +39,7 @@
 
 #include <curses.priv.h>
 
 
 #include <curses.priv.h>
 

-MODULE_ID("$Id: lib_ins_wch.c,v 1.22 2017/04/08 22:52:26 tom Exp $")
+MODULE_ID("$Id: lib_ins_wch.c,v 1.23 2019/05/04 20:46:24 tom Exp $")

 
 /*
  * Insert the given character, updating the current location to simplify
 
 /*
  * Insert the given character, updating the current location to simplify


@@ -48,7 +48,7 @@ MODULE_ID("$Id: lib_ins_wch.c,v 1.22 2017/04/08 22:52:26 tom Exp $")
 NCURSES_EXPORT(int)
 _nc_insert_wch(WINDOW *win, const cchar_t *wch)
 {
 NCURSES_EXPORT(int)
 _nc_insert_wch(WINDOW *win, const cchar_t *wch)
 {

-    int cells = wcwidth(CharOf(CHDEREF(wch)));
+    int cells = _nc_wacs_width(CharOf(CHDEREF(wch)));

     int code = OK;
 
     if (cells < 0) {
     int code = OK;
 
     if (cells < 0) {


@@ -120,7 +120,7 @@ wins_nwstr(WINDOW *win, const wchar_t *wstr, int n)
            NCURSES_SIZE_T ox = win->_curx;
 
            for (cp = wstr; ((cp - wstr) < n) && *cp; cp++) {
            NCURSES_SIZE_T ox = win->_curx;
 
            for (cp = wstr; ((cp - wstr) < n) && *cp; cp++) {

-               int len = wcwidth(*cp);
+               int len = _nc_wacs_width(*cp);

 
                if ((len >= 0 && len != 1) || !is7bits(*cp)) {
                    cchar_t tmp_cchar;
 
                if ((len >= 0 && len != 1) || !is7bits(*cp)) {
                    cchar_t tmp_cchar;