ncurses 6.2 - patch 20210522

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

diff --git a/ncurses/widechar/lib_get_wstr.c b/ncurses/widechar/lib_get_wstr.c
index 906e02a6528ecff1c4e8068c650f6ee25c2b8873..f09f87f3833f65da75c67ee979943ce12ce67bd2 100644 (file)
--- a/ncurses/widechar/lib_get_wstr.c
+++ b/ncurses/widechar/lib_get_wstr.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 2002,2003 Free Software Foundation, Inc.                   *
+ * Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ * Copyright 2002-2009,2011 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            *
@@ -27,7 +28,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- *  Author: Thomas E. Dickey 2002                                           *
+ *  Author: Thomas E. Dickey                                                *
  ****************************************************************************/
 
 /*
@@ -38,25 +39,39 @@
 */
 
 #include <curses.priv.h>
-#include <term.h>
 
-MODULE_ID("$Id: lib_get_wstr.c,v 1.6 2003/05/17 21:33:03 tom Exp $")
+MODULE_ID("$Id: lib_get_wstr.c,v 1.18 2021/05/22 23:49:33 tom Exp $")
+
+static int
+wadd_wint(WINDOW *win, wint_t *src)
+{
+    cchar_t tmp;
+    wchar_t wch[2];
+
+    wch[0] = (wchar_t) (*src);
+    wch[1] = 0;
+    setcchar(&tmp, wch, A_NORMAL, (short) 0, NULL);
+    return wadd_wch(win, &tmp);
+}
 
 /*
  * This wipes out the last character, no matter whether it was a tab, control
  * or other character, and handles reverse wraparound.
  */
-static wchar_t *
-WipeOut(WINDOW *win, int y, int x, wchar_t * first, wchar_t * last, bool echoed)
+static wint_t *
+WipeOut(WINDOW *win, int y, int x, wint_t *first, wint_t *last, int echoed)
 {
     if (last > first) {
        *--last = '\0';
        if (echoed) {
            int y1 = win->_cury;
            int x1 = win->_curx;
+           int n;
 
            wmove(win, y, x);
-           waddwstr(win, first);
+           for (n = 0; first[n] != 0; ++n) {
+               wadd_wint(win, first + n);
+           }
            getyx(win, y, x);
            while (win->_cury < y1
                   || (win->_cury == y1 && win->_curx < x1))
@@ -69,39 +84,37 @@ WipeOut(WINDOW *win, int y, int x, wchar_t * first, wchar_t * last, bool echoed)
 }
 
 NCURSES_EXPORT(int)
-wgetn_wstr(WINDOW *win, wint_t * str, int maxlen)
+wgetn_wstr(WINDOW *win, wint_t *str, int maxlen)
 {
+    SCREEN *sp = _nc_screen_of(win);
     TTY buf;
     bool oldnl, oldecho, oldraw, oldcbreak;
-    wint_t erasec;
-    wint_t killc;
-    wchar_t *oldstr;
-    wchar_t *tmpstr;
+    wchar_t erasec = 0;
+    wchar_t killc = 0;
+    wint_t *oldstr = str;
+    wint_t *tmpstr = str;
     wint_t ch;
     int y, x, code;
 
-    T((T_CALLED("wgetn_wstr(%p,%p, %d)"), win, str, maxlen));
+    T((T_CALLED("wgetn_wstr(%p,%p, %d)"), (void *) win, (void *) str, maxlen));
 
     if (!win)
        returnCode(ERR);
 
-    _nc_get_tty_mode(&buf);
+    maxlen = _nc_getstr_limit(maxlen);
 
-    oldnl = SP->_nl;
-    oldecho = SP->_echo;
-    oldraw = SP->_raw;
-    oldcbreak = SP->_cbreak;
-    nl();
-    noecho();
-    noraw();
-    cbreak();
+    _nc_get_tty_mode(&buf);
 
-    erasec = erasechar();
-    killc = killchar();
+    oldnl = sp->_nl;
+    oldecho = sp->_echo;
+    oldraw = sp->_raw;
+    oldcbreak = sp->_cbreak;
+    NCURSES_SP_NAME(nl) (NCURSES_SP_ARG);
+    NCURSES_SP_NAME(noecho) (NCURSES_SP_ARG);
+    NCURSES_SP_NAME(raw) (NCURSES_SP_ARG);
 
-    assert(sizeof(wchar_t) == sizeof(wint_t));
-    oldstr = (wchar_t *) str;
-    tmpstr = (wchar_t *) str;
+    NCURSES_SP_NAME(erasewchar) (NCURSES_SP_ARGx &erasec);
+    NCURSES_SP_NAME(killwchar) (NCURSES_SP_ARGx &killc);
 
     getyx(win, y, x);
 
@@ -118,12 +131,12 @@ wgetn_wstr(WINDOW *win, wint_t * str, int maxlen)
            code = KEY_CODE_YES;
            ch = KEY_ENTER;
        }
-       if (ch < KEY_MIN) {
-           if (ch == erasec) {
+       if (ch != 0 && ch < KEY_MIN) {
+           if (ch == (wint_t) erasec) {
                ch = KEY_BACKSPACE;
                code = KEY_CODE_YES;
            }
-           if (ch == killc) {
+           if (ch == (wint_t) killc) {
                ch = KEY_EOL;
                code = KEY_CODE_YES;
            }
@@ -153,17 +166,15 @@ wgetn_wstr(WINDOW *win, wint_t * str, int maxlen)
            } else {
                beep();
            }
-       } else if (maxlen >= 0 && tmpstr - oldstr >= maxlen) {
+       } else if (tmpstr - oldstr >= maxlen) {
            beep();
        } else {
            *tmpstr++ = ch;
            *tmpstr = 0;
            if (oldecho == TRUE) {
                int oldy = win->_cury;
-               cchar_t tmp;
 
-               setcchar(&tmp, tmpstr - 1, A_NORMAL, 0, NULL);
-               if (wadd_wch(win, &tmp) == ERR) {
+               if (wadd_wint(win, tmpstr - 1) == ERR) {
                    /*
                     * We can't really use the lower-right corner for input,
                     * since it'll mess up bookkeeping for erases.
@@ -200,23 +211,23 @@ wgetn_wstr(WINDOW *win, wint_t * str, int maxlen)
     /* Restore with a single I/O call, to fix minor asymmetry between
      * raw/noraw, etc.
      */
-    SP->_nl = oldnl;
-    SP->_echo = oldecho;
-    SP->_raw = oldraw;
-    SP->_cbreak = oldcbreak;
+    sp->_nl = oldnl;
+    sp->_echo = oldecho;
+    sp->_raw = oldraw;
+    sp->_cbreak = oldcbreak;
 
     (void) _nc_set_tty_mode(&buf);
 
     *tmpstr = 0;
     if (code == ERR) {
        if (tmpstr == oldstr) {
-           *tmpstr++ = (wchar_t) WEOF;
+           *tmpstr++ = WEOF;
            *tmpstr = 0;
        }
        returnCode(ERR);
     }
 
-    T(("wgetn_wstr returns %s", _nc_viswbuf(oldstr)));
+    T(("wgetn_wstr returns %s", _nc_viswibuf(oldstr)));
 
     returnCode(OK);
 }