From ebe7300d4d5ea549c342500379498fab4b77ea87 Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Sat, 22 Jun 2024 23:49:00 +0000 Subject: [PATCH] ncurses 6.5 - patch 20240622 + improve test/gdc.c (patch by Branden Robinson). + improve formatting/style of manpages (patches by Branden Robinson). + adjust naming of mingw *-config scripts to match the pkg-config names + widen pattern in pc/*-config scripts to disallow more linker options + add --cflags-only-I and --cflags-only-other options to misc/ncurses-config.in + revert change to CF_BUILD_CC macro (report by Vassili Courzakis, cf: 20240518). --- NEWS | 12 +- VERSION | 2 +- aclocal.m4 | 8 +- announce.html.in | 10 +- configure | 4 +- dist.mk | 4 +- doc/html/man/curs_add_wchstr.3x.html | 18 +- doc/html/man/curs_addch.3x.html | 99 ++--- doc/html/man/curs_addstr.3x.html | 17 +- doc/html/man/curs_beep.3x.html | 10 +- doc/html/man/curs_get_wstr.3x.html | 24 +- doc/html/man/curs_getstr.3x.html | 271 +++++++------ doc/html/man/curs_kernel.3x.html | 67 ++-- doc/html/man/curs_pad.3x.html | 10 +- doc/html/man/curs_slk.3x.html | 8 +- doc/html/man/curs_termcap.3x.html | 8 +- doc/html/man/curs_util.3x.html | 8 +- doc/html/man/curs_variables.3x.html | 8 +- doc/html/man/ncurses.3x.html | 206 +++++----- doc/html/man/tabs.1.html | 12 +- doc/html/man/terminfo.5.html | 2 +- doc/html/man/tput.1.html | 14 +- man/curs_add_wchstr.3x | 25 +- man/curs_addch.3x | 14 +- man/curs_addstr.3x | 19 +- man/curs_beep.3x | 8 +- man/curs_get_wstr.3x | 20 +- man/curs_getstr.3x | 564 ++++++++++++++++++--------- man/curs_kernel.3x | 10 +- man/curs_pad.3x | 56 ++- man/curs_slk.3x | 8 +- man/curs_termcap.3x | 14 +- man/curs_util.3x | 8 +- man/curs_variables.3x | 6 +- man/man_db.renames.in | 4 +- man/manhtml.aliases | 5 +- man/manhtml.externs | 3 +- man/ncurses.3x | 49 ++- man/tabs.1 | 8 +- man/terminfo.tail | 4 +- man/tput.1 | 13 +- misc/gen-pkgconfig.in | 6 +- misc/ncurses-config.in | 107 +++-- package/debian-mingw/changelog | 4 +- package/debian-mingw/rules | 1 + package/debian-mingw64/changelog | 4 +- package/debian-mingw64/rules | 1 + package/debian/changelog | 4 +- package/mingw-ncurses.nsi | 4 +- package/mingw-ncurses.spec | 2 +- package/ncurses.spec | 2 +- package/ncursest.spec | 2 +- test/gdc.6 | 78 ++-- test/gdc.c | 37 +- 54 files changed, 1167 insertions(+), 745 deletions(-) diff --git a/NEWS b/NEWS index bec446a8..29088a35 100644 --- a/NEWS +++ b/NEWS @@ -26,7 +26,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: NEWS,v 1.4139 2024/06/15 20:49:04 tom Exp $ +-- $Id: NEWS,v 1.4143 2024/06/22 22:59:44 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -46,6 +46,16 @@ See the AUTHORS file for the corresponding full names. Changes through 1.9.9e did not credit all contributions; it is not possible to add this information. +20240622 + + improve test/gdc.c (patch by Branden Robinson). + + improve formatting/style of manpages (patches by Branden Robinson). + + adjust naming of mingw *-config scripts to match the pkg-config names + + widen pattern in pc/*-config scripts to disallow more linker options + + add --cflags-only-I and --cflags-only-other options to + misc/ncurses-config.in + + revert change to CF_BUILD_CC macro (report by Vassili Courzakis, + cf: 20240518). + 20240615 + improve formatting/style of manpages (patches by Branden Robinson). + review/update modules files. diff --git a/VERSION b/VERSION index 416c43d0..e80d9211 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:10 6.5 20240615 +5:0:10 6.5 20240622 diff --git a/aclocal.m4 b/aclocal.m4 index 003bb308..8c39fe41 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -29,7 +29,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1995-on dnl -dnl $Id: aclocal.m4,v 1.1071 2024/05/18 19:49:14 tom Exp $ +dnl $Id: aclocal.m4,v 1.1073 2024/06/22 19:57:54 tom Exp $ dnl Macros used in NCURSES auto-configuration script. dnl dnl These macros are maintained separately from NCURSES. The copyright on @@ -741,7 +741,7 @@ if test "$cf_cv_type_of_bool" = unknown ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_BUILD_CC version: 12 updated: 2024/03/17 09:17:26 +dnl CF_BUILD_CC version: 13 updated: 2024/06/22 13:42:22 dnl ----------- dnl If we're cross-compiling, allow the user to override the tools and their dnl options. The configure script is oriented toward identifying the host @@ -841,9 +841,9 @@ else : ${BUILD_CC:='${CC}'} : ${BUILD_CPP:='${CPP}'} : ${BUILD_CFLAGS:='${CFLAGS}'} - : ${BUILD_CPPFLAGS:='ifelse([$1],,'${CPPFLAGS}',[$1])'} + : ${BUILD_CPPFLAGS:='${CPPFLAGS}'} : ${BUILD_LDFLAGS:='${LDFLAGS}'} - : ${BUILD_LIBS:='ifelse([$2],,'${LIBS}',[$2])'} + : ${BUILD_LIBS:='${LIBS}'} : ${BUILD_EXEEXT:='$x'} : ${BUILD_OBJEXT:='o'} fi diff --git a/announce.html.in b/announce.html.in index 9889ef1b..737dff41 100644 --- a/announce.html.in +++ b/announce.html.in @@ -1,5 +1,5 @@ -curs_add_wchstr 3x 2024-05-11 ncurses 6.5 Library calls +curs_add_wchstr 3x 2024-06-22 ncurses 6.5 Library calls -

curs_add_wchstr 3x 2024-05-11 ncurses 6.5 Library calls

+

curs_add_wchstr 3x 2024-06-22 ncurses 6.5 Library calls

 curs_add_wchstr(3x)              Library calls             curs_add_wchstr(3x)
 
@@ -113,6 +113,15 @@
        X/Open Curses, Issue 4 describes these functions.
 
 
+

HISTORY

+       These functions were initially specified by  X/Open  Curses,  Issue  4.
+       The   System V   Interface  Definition,  Version  4  (1995),  specified
+       functions named waddwchstr and waddwchnstr (and  the  usual  variants).
+       These  were  later additions to SVr4.x, not appearing in the first SVr4
+       (1989).  They differed from X/Open's wadd_wchstr  and  wadd_wchnstr  in
+       that they each took an argument of type wchar_t instead of cchar_t.
+
+

SEE ALSO

        curs_addchstr(3x) describes comparable functions of the ncurses library
        in its non-wide-character configuration.
@@ -121,7 +130,7 @@
 
 
 
-ncurses 6.5                       2024-05-11               curs_add_wchstr(3x)
+ncurses 6.5                       2024-06-22               curs_add_wchstr(3x)
diff --git a/doc/html/man/curs_addch.3x.html b/doc/html/man/curs_addch.3x.html index ac18dbcb..e0499b47 100644 --- a/doc/html/man/curs_addch.3x.html +++ b/doc/html/man/curs_addch.3x.html @@ -28,19 +28,19 @@ * sale, use or other dealings in this Software without prior written * * authorization. * **************************************************************************** - * @Id: curs_addch.3x,v 1.92 2024/06/08 20:51:41 tom Exp @ + * @Id: curs_addch.3x,v 1.94 2024/06/22 21:34:49 tom Exp @ --> -curs_addch 3x 2024-06-08 ncurses 6.5 Library calls +curs_addch 3x 2024-06-22 ncurses 6.5 Library calls -

curs_addch 3x 2024-06-08 ncurses 6.5 Library calls

+

curs_addch 3x 2024-06-22 ncurses 6.5 Library calls

 curs_addch(3x)                   Library calls                  curs_addch(3x)
 
@@ -206,90 +206,93 @@

PORTABILITY

-       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
+       Applications employing ncurses extensions should condition their use on
+       the visibility of the NCURSES_VERSION preprocessor macro.
+
+       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
        error conditions for them.
 
-       SVr4 curses describes a successful return value  only  as  "an  integer
+       SVr4  curses  describes  a  successful return value only as "an integer
        value other than ERR".
 
-       The  defaults specified for forms-drawing characters apply in the POSIX
+       The defaults specified for forms-drawing characters apply in the  POSIX
        locale.

ACS Symbols

-       X/Open Curses states that the  ACS_  definitions  are  char  constants.
+       X/Open  Curses  states  that  the  ACS_ definitions are char constants.
        Some implementations are problematic.
 
-       o   Solaris  curses, for example, defines the ACS symbols as constants;
+       o   Solaris curses, for example, defines the ACS symbols as  constants;
            others define them as elements of an array.
 
-           This implementation uses an array, acs_map,  as  did  SVr4  curses.
+           This  implementation  uses  an  array, acs_map, as did SVr4 curses.
            NetBSD also uses an array, actually named _acs_char, with a #define
            for compatibility.
 
-       o   HP-UX curses equates some of the  ACS_  symbols  to  the  analogous
-           WACS_  symbols  as  if  the  ACS_ symbols were wide characters (see
-           curs_add_wch(3x)).  The  misdefined  symbols  are  the  arrows  and
+       o   HP-UX  curses  equates  some  of  the ACS_ symbols to the analogous
+           WACS_ symbols as if the ACS_  symbols  were  wide  characters  (see
+           curs_add_wch(3x)).   The  misdefined  symbols  are  the  arrows and
            others that are not used for line drawing.
 
-       o   X/Open  Curses  (Issues  2 through 7) has a typographical error for
-           the ACS_LANTERN symbol, equating  its  "VT100+  Character"  to  "I"
-           (capital  I),  while  the  header  files  for SVr4 curses and other
+       o   X/Open Curses (Issues 2 through 7) has a  typographical  error  for
+           the  ACS_LANTERN  symbol,  equating  its  "VT100+ Character" to "I"
+           (capital I), while the header  files  for  SVr4  curses  and  other
            implementations use "i" (small i).
 
-           None of the terminal descriptions on Unix platforms  use  uppercase
-           I,  except  for  Solaris  (in  its  terminfo  entry  for screen(1),
-           apparently based on the X/Open documentation around 1995).  On  the
-           other  hand,  its gs6300 (AT&T PC6300 with EMOTS Terminal Emulator)
+           None  of  the terminal descriptions on Unix platforms use uppercase
+           I, except  for  Solaris  (in  its  terminfo  entry  for  screen(1),
+           apparently  based on the X/Open documentation around 1995).  On the
+           other hand, its gs6300 (AT&T PC6300 with EMOTS  Terminal  Emulator)
            description uses lowercase i.
 
-       Some ACS  symbols  (ACS_S3,  ACS_S7,  ACS_LEQUAL,  ACS_GEQUAL,  ACS_PI,
-       ACS_NEQUAL,  and  ACS_STERLING)  were  not  documented  in any publicly
-       released System V.  However, many publicly available  terminfo  entries
-       include  acsc  capabilities in which their key characters (pryz{|}) are
-       embedded, and a second-hand list of their  character  descriptions  has
-       come  to light.  The ncurses developers invented ACS-prefixed names for
+       Some  ACS  symbols  (ACS_S3,  ACS_S7,  ACS_LEQUAL,  ACS_GEQUAL, ACS_PI,
+       ACS_NEQUAL, and ACS_STERLING)  were  not  documented  in  any  publicly
+       released  System V.   However, many publicly available terminfo entries
+       include acsc capabilities in which their key characters  (pryz{|})  are
+       embedded,  and  a  second-hand list of their character descriptions has
+       come to light.  The ncurses developers invented ACS-prefixed names  for
        them.
 
        The displayed values of ACS_ constants depend on
 
        o   the  ncurses  ABI--for  example,  wide-character  versus  non-wide-
-           character  configurations  (the  former  is  capable  of displaying
+           character configurations  (the  former  is  capable  of  displaying
            Unicode while the latter is not), and
 
        o   whether the locale uses UTF-8 encoding.
 
-       In certain cases, the  terminal  is  unable  to  display  forms-drawing
-       characters   except   by   using  UTF-8;  see  the  discussion  of  the
+       In  certain  cases,  the  terminal  is  unable to display forms-drawing
+       characters  except  by  using  UTF-8;  see  the   discussion   of   the
        NCURSES_NO_UTF8_ACS environment variable in ncurses(3x).

Character Set

-       X/Open Curses assumes that the parameter passed to  waddch  contains  a
-       single  character.   That  character may have been more than eight bits
-       wide in an SVr3 or SVr4 implementation, but X/Open  Curses  leaves  the
-       width  of  a non-wide character code unspecified.  The standard further
-       does not specify the internal structure of a chtype, though the use  of
-       bit  operations  to  combine  the  character code with attributes and a
+       X/Open  Curses  assumes  that the parameter passed to waddch contains a
+       single character.  That character may have been more  than  eight  bits
+       wide  in  an  SVr3 or SVr4 implementation, but X/Open Curses leaves the
+       width of a non-wide character code unspecified.  The  standard  further
+       does  not specify the internal structure of a chtype, though the use of
+       bit operations to combine the character  code  with  attributes  and  a
        color pair identifier into a chtype for passage to waddch is common.  A
        portable application uses only the macros discussed in curs_attr(3x) to
        manipulate a chtype.
 
        In ncurses, chtype holds an eight-bit character, but the library allows
-       a  multibyte  character sequence to be passed via a succession of calls
-       to waddch.  Other implementations  do  not;  a  waddch  call  transmits
-       exactly  one  character,  which  may  be rendered in one or more screen
-       locations depending  on  whether  it  is  printable  (see  unctrl(3x)).
-       Depending  on  the  locale,  ncurses  inspects  the byte passed in each
-       waddch call and checks whether the latest call  continues  a  multibyte
-       character.    When  a  character  is  complete,  ncurses  displays  the
-       character  and  advances  the  cursor.   If  the  calling   application
+       a multibyte character sequence to be passed via a succession  of  calls
+       to  waddch.   Other  implementations  do  not;  a waddch call transmits
+       exactly one character, which may be rendered  in  one  or  more  screen
+       locations  depending  on  whether  it  is  printable  (see unctrl(3x)).
+       Depending on the locale, ncurses  inspects  the  byte  passed  in  each
+       waddch  call  and  checks whether the latest call continues a multibyte
+       character.   When  a  character  is  complete,  ncurses  displays   the
+       character   and  advances  the  cursor.   If  the  calling  application
        interrupts the succession of bytes in a multibyte character sequence by
-       changing the current  location--for  example,  with  wmove(3x)--ncurses
+       changing  the  current  location--for  example, with wmove(3x)--ncurses
        discards the incomplete character.
 
        For  portability  to  other  implementations,  do  not  rely  upon  the
-       foregoing behavior.  Check whether a character can be represented as  a
+       foregoing  behavior.  Check whether a character can be represented as a
        single byte in the current locale.
 
        o   If it can, call either waddch or wadd_wch(3x).
@@ -298,22 +301,22 @@

HISTORY

-       The original curses in 4BSD (1980) introduced waddch.
+       4BSD (1980) curses introduced waddch.
 
        SVr3 (1987) added wechochar.

SEE ALSO

-       curs_add_wch(3x)  describes comparable functions of the ncurses library
+       curs_add_wch(3x) describes comparable functions of the ncurses  library
        in its wide-character configuration (ncursesw).
 
        curses(3x),    curs_addchstr(3x),    curs_addstr(3x),    curs_attr(3x),
-       curs_clear(3x),   curs_inch(3x),   curs_outopts(3x),  curs_refresh(3x),
+       curs_clear(3x),  curs_inch(3x),   curs_outopts(3x),   curs_refresh(3x),
        curs_variables(3x), putchar(3)
 
 
 
-ncurses 6.5                       2024-06-08                    curs_addch(3x)
+ncurses 6.5                       2024-06-22                    curs_addch(3x)
    diff --git a/doc/html/man/curs_addstr.3x.html b/doc/html/man/curs_addstr.3x.html index 4ac4e972..f626abb5 100644 --- a/doc/html/man/curs_addstr.3x.html +++ b/doc/html/man/curs_addstr.3x.html @@ -27,19 +27,19 @@ * sale, use or other dealings in this Software without prior written * * authorization. * **************************************************************************** - * @Id: curs_addstr.3x,v 1.49 2024/06/01 22:29:08 tom Exp @ + * @Id: curs_addstr.3x,v 1.51 2024/06/22 21:26:53 tom Exp @ --> -curs_addstr 3x 2024-06-01 ncurses 6.5 Library calls +curs_addstr 3x 2024-06-22 ncurses 6.5 Library calls -

    curs_addstr 3x 2024-06-01 ncurses 6.5 Library calls

    +

    curs_addstr 3x 2024-06-22 ncurses 6.5 Library calls

     curs_addstr(3x)                  Library calls                 curs_addstr(3x)
 
@@ -101,6 +101,14 @@
        error conditions for them.
 
 
+

    HISTORY

    +       4BSD (1980) curses introduced waddstr  along  with  its  variants,  the
+       latter defined as macros.
+
+       SVr3.1 (1987) added waddnstr (and its variants) redefining waddstr as a
+       macro wrapping it.
+
+

    SEE ALSO

            curs_addwstr(3x) describes comparable functions of the ncurses  library
        in its wide-character configuration (ncursesw).
@@ -109,7 +117,7 @@
 
 
 
-ncurses 6.5                       2024-06-01                   curs_addstr(3x)
+ncurses 6.5                       2024-06-22                   curs_addstr(3x)
    diff --git a/doc/html/man/curs_beep.3x.html b/doc/html/man/curs_beep.3x.html index bb53a28e..8dc4771f 100644 --- a/doc/html/man/curs_beep.3x.html +++ b/doc/html/man/curs_beep.3x.html @@ -27,19 +27,19 @@ * sale, use or other dealings in this Software without prior written * * authorization. * **************************************************************************** - * @Id: curs_beep.3x,v 1.31 2024/05/18 20:06:33 tom Exp @ + * @Id: curs_beep.3x,v 1.33 2024/06/22 21:27:35 tom Exp @ --> -curs_beep 3x 2024-05-18 ncurses 6.5 Library calls +curs_beep 3x 2024-06-22 ncurses 6.5 Library calls -

    curs_beep 3x 2024-05-18 ncurses 6.5 Library calls

    +

    curs_beep 3x 2024-06-22 ncurses 6.5 Library calls

     curs_beep(3x)                    Library calls                   curs_beep(3x)
 
@@ -90,7 +90,7 @@

    HISTORY

    -       beep and flash appeared in SVr2 (1984).
+       beep and flash appeared in SVr2 (1984).

    SEE ALSO

    @@ -98,7 +98,7 @@
 
 
 
-ncurses 6.5                       2024-05-18                     curs_beep(3x)
+ncurses 6.5                       2024-06-22                     curs_beep(3x)
      diff --git a/doc/html/man/curs_get_wstr.3x.html b/doc/html/man/curs_get_wstr.3x.html index 6d387bd0..b4ec79d4 100644 --- a/doc/html/man/curs_get_wstr.3x.html +++ b/doc/html/man/curs_get_wstr.3x.html @@ -27,19 +27,19 @@ * sale, use or other dealings in this Software without prior written * * authorization. * **************************************************************************** - * @Id: curs_get_wstr.3x,v 1.52 2024/06/08 21:01:53 tom Exp @ + * @Id: curs_get_wstr.3x,v 1.54 2024/06/22 21:34:19 tom Exp @ --> -curs_get_wstr 3x 2024-06-08 ncurses 6.5 Library calls +curs_get_wstr 3x 2024-06-22 ncurses 6.5 Library calls -

      curs_get_wstr 3x 2024-06-08 ncurses 6.5 Library calls

      +

      curs_get_wstr 3x 2024-06-22 ncurses 6.5 Library calls

       curs_get_wstr(3x)                Library calls               curs_get_wstr(3x)
 
@@ -55,15 +55,15 @@

      SYNOPSIS

              #include <curses.h>
 
-       int get_wstr(wint_t *wstr);
-       int getn_wstr(wint_t *wstr, int n);
-       int wget_wstr(WINDOW *win, wint_t *wstr);
-       int wgetn_wstr(WINDOW *win, wint_t *wstr, int n);
+       int get_wstr(wint_t * wstr);
+       int wget_wstr(WINDOW * win, wint_t * wstr);
+       int mvget_wstr(int y, int x, wint_t * wstr);
+       int mvwget_wstr(WINDOW * win, int y, int x, wint_t * wstr);
 
-       int mvget_wstr(int y, int x, wint_t *wstr);
-       int mvgetn_wstr(int y, int x, wint_t *wstr, int n);
-       int mvwget_wstr(WINDOW *win, int y, int x, wint_t *wstr);
-       int mvwgetn_wstr(WINDOW *win, int y, int x, wint_t *wstr, int n);
+       int getn_wstr(wint_t * wstr, int n);
+       int wgetn_wstr(WINDOW * win, wint_t * wstr, int n);
+       int mvgetn_wstr(int y, int x, wint_t * wstr, int n);
+       int mvwgetn_wstr(WINDOW * win, int y, int x, wint_t * wstr, int n);

      DESCRIPTION

      @@ -189,7 +189,7 @@
 
 
 
-ncurses 6.5                       2024-06-08                 curs_get_wstr(3x)
+ncurses 6.5                       2024-06-22                 curs_get_wstr(3x)
        diff --git a/doc/html/man/curs_getstr.3x.html b/doc/html/man/curs_getstr.3x.html index dc22cb80..226514a4 100644 --- a/doc/html/man/curs_getstr.3x.html +++ b/doc/html/man/curs_getstr.3x.html @@ -27,19 +27,19 @@ * sale, use or other dealings in this Software without prior written * * authorization. * **************************************************************************** - * @Id: curs_getstr.3x,v 1.65 2024/06/08 21:04:32 tom Exp @ + * @Id: curs_getstr.3x,v 1.67 2024/06/22 22:20:56 tom Exp @ --> -curs_getstr 3x 2024-06-08 ncurses 6.5 Library calls +curs_getstr 3x 2024-06-22 ncurses 6.5 Library calls -

        curs_getstr 3x 2024-06-08 ncurses 6.5 Library calls

        +

        curs_getstr 3x 2024-06-22 ncurses 6.5 Library calls

         curs_getstr(3x)                  Library calls                 curs_getstr(3x)
 
@@ -54,192 +54,211 @@

        SYNOPSIS

                #include <curses.h>
 
-       int getstr(char *str);
-       int getnstr(char *str, int n);
-       int wgetstr(WINDOW *win, char *str);
-       int wgetnstr(WINDOW *win, char *str, int n);
+       int getstr(char * str);
+       int wgetstr(WINDOW * win, char * str);
+       int mvgetstr(int y, int x, char * str);
+       int mvwgetstr(WINDOW * win, int y, int x, char * str);
 
-       int mvgetstr(int y, int x, char *str);
-       int mvwgetstr(WINDOW *win, int y, int x, char *str);
-       int mvgetnstr(int y, int x, char *str, int n);
-       int mvwgetnstr(WINDOW *win, int y, int x, char *str, int n);
+       int getnstr(char * str, int n);
+       int wgetnstr(WINDOW * win, char * str, int n);
+       int mvgetnstr(int y, int x, char * str, int n);
+       int mvwgetnstr(WINDOW * win, int y, int x, char * str, int n);

        DESCRIPTION

        -       The function wgetnstr is equivalent to a series of calls to wgetch(3x),
-       until a newline or carriage return terminates the series:
+       wgetstr populates a  user-supplied  string  buffer  str  by  repeatedly
+       calling  wgetch(3x) with the win argument until a line feed or carriage
+       return character is input.  The function
 
-       o   The terminating character is not included in the returned string.
+       o   does not copy the terminating character to str;
 
-       o   In all instances, the end of the string is terminated by a NUL.
+       o   always terminates str with a null character;
 
-       o   The  function  stores  the result in the area pointed to by the str
-           parameter.
+       o   interprets  the   screen's   erase   and   kill   characters   (see
+           erasechar(3x) and killchar(3x));
 
-       o   The function reads at most n characters, thus preventing a possible
-           overflow of the input buffer.
+       o   recognizes  function  keys  only  if  the screen's keypad option is
+           enabled (see keypad(3x));
 
-           Any  attempt  to  enter more characters (other than the terminating
-           newline or carriage return) causes a beep.
+       o   treats the function keys KEY_LEFT and KEY_BACKSPACE the same as the
+           erase character; and
 
-           Function keys also cause a beep and are ignored.
+       o   discards  function key inputs other than those treated as the erase
+           character, calling beep(3x).
 
-       The user's erase and kill characters are interpreted:
+       The erase character replaces the character at the  end  of  the  buffer
+       with  a  null character, while the kill character does the same for the
+       entire buffer.
 
-       o   The erase character (e.g., ^H) erases the character at the  end  of
-           the buffer, moving the cursor to the left.
+       If the screen's echo option is enabled (see echo(3x)), wgetstr  updates
+       win with wechochar(3x).  Further,
 
-           If keypad mode is on for the window, KEY_LEFT and KEY_BACKSPACE are
-           both considered equivalent to the user's erase character.
+       o   the  erase  character and its function key synonyms move the cursor
+           to the left, and
 
-       o   The kill character (e.g., ^U) erases the entire buffer, leaving the
-           cursor at the beginning of the buffer.
+       o   the kill character returns the cursor to where it was located  when
+           wgetstr was called.
 
-       Characters  input  are  echoed  only  if echo is currently on.  In that
-       case, backspace  is  echoed  as  deletion  of  the  previous  character
-       (typically a left motion).
+       wgetnstr  is  similar,  but  reads  at  most  n  characters, aiding the
+       application to avoid overrunning the buffer to which  str  points.   An
+       attempt  to  input  more  than n characters (other than the terminating
+       line feed or carriage return) is ignored with a beep.
 
-       The   getnstr,   mvgetnstr,  mvwgetnstr,  and  wgetnstr  functions  are
-       identical to the getstr, mvgetstr, mvwgetstr,  and  wgetstr  functions,
-       respectively,  except  that the *n* versions read at most n characters,
-       letting the application prevent overflow of the input buffer.
+       ncurses(3x) describes the variants of these functions.

        RETURN VALUE

        -       All  of  these  functions  return  the  integer  OK   upon   successful
-       completion.  (SVr4 specifies only "an integer value other than ERR") If
-       unsuccessful, they return ERR.
+       These functions return OK on success and ERR on failure.
 
-       X/Open defines no error conditions.
+       In ncurses, they return ERR if
 
-       In this implementation, these functions return ERR
+       o   win is NULL, or
 
-       o   if the window pointer is null,
+       o   if an internal wgetch call fails.
 
-       o   if its timeout expires without having any data, or
+       Further, in ncurses, these functions return KEY_RESIZE  if  a  SIGWINCH
+       event interrupts the function.
 
-       o   if the associated call to wgetch failed.
-
-       This implementation provides an  extension  as  well.   If  a  SIGWINCH
-       interrupts  the  function,  it will return KEY_RESIZE rather than OK or
-       ERR.
-
-       Functions prefixed with "mv" first perform cursor movement and fail  if
+       Functions  prefixed with "mv" first perform cursor movement and fail if
        the position (y, x) is outside the window boundaries.

        NOTES

        -       Any of these functions other than wgetnstr may be macros.
+       All of these functions except wgetnstr may be implemented as macros.
+
+       Use of getstr, mvgetstr, mvwgetstr,  or  wgetstr  to  read  input  that
+       overruns  the  buffer  pointed to by str causes undefined results.  Use
+       their n-infixed counterpart functions instead.
+
+       While wgetnstr is conceptually a series of calls  to  wgetch,  it  also
+       temporarily  changes  properties  of the curses screen to permit simple
+       editing of the input buffer.  It saves  the  screen's  state  and  then
+       calls  nl(3x)  and,  if  the  screen  was  in  normal  ("cooked") mode,
+       cbreak(3x).  Before returning, it  restores  the  saved  screen  state.
+       Other   implementations  differ  in  detail,  affecting  which  control
+       characters they can accept in the  buffer;  see  section  "PORTABILITY"
+       below.
 
-       Using  getstr,  mvgetstr,  mvwgetstr,  or  wgetstr  to read a line that
-       overflows the array pointed to by str causes  undefined  results.   The
-       use  of  getnstr,  mvgetnstr, mvwgetnstr, or wgetnstr, respectively, is
-       recommended.
+
+

        EXTENSIONS

        +       The return value KEY_RESIZE is an ncurses extension.

        PORTABILITY

        -       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
-       error conditions for them.
+       Applications employing ncurses extensions should condition their use on
+       the visibility of the NCURSES_VERSION preprocessor macro.
 
-       SVr3  and  early  SVr4  curses  implementations did not reject function
-       keys; the SVr4.0 documentation claimed that  "special  keys"  (such  as
-       function  keys,  "home"  key,  "clear"  key,  etc.)  are "interpreted",
-       without giving details.  It  lied.   In  fact,  the  "character"  value
-       appended to the string by those implementations was predictable but not
-       useful (being, in fact, the low-order eight  bits  of  the  key's  KEY_
-       value).
+       X/Open Curses Issue 4 describes these functions.  It specifies no error
+       conditions  for them, but indicates that wgetnstr and its variants read
+       "the entire multi-byte sequence associated with a character" and "fail"
+       if n and str together do not describe a buffer "large enough to contain
+       any complete characters".   In  ncurses,  however,  wgetch  reads  only
+       single-byte characters, so this scenario does not arise.
 
-       The  functions  getnstr, mvgetnstr, and mvwgetnstr were present but not
-       documented in SVr4.
+       SVr4  curses  describes  a  successful return value only as "an integer
+       value other than ERR".
 
-       X/Open Curses, Issue 5 (2007) stated that these functions "read at most
-       n  bytes"  but did not state whether the terminating NUL counted toward
-       that limit.  X/Open Curses, Issue 7 (2009) changed  that  to  say  they
-       "read at most n-1 bytes" to allow for the terminating NUL.  As of 2018,
-       some implementations count it, some do not:
+       SVr3 and early SVr4 curses  implementations  did  not  reject  function
+       keys; the SVr4 documentation asserted that, like the screen's erase and
+       kill characters, they were
 
-       o   ncurses 6.1 and PDCurses do not count the NUL in the  given  limit,
-           while
+              interpreted, as well as any special keys (such as function keys,
+              "home" key, "clear" key, etc.)
+
+       without  further  detail.   It  lied.   In  fact, the "character" value
+       appended to the string by those implementations was predictable but not
+       useful  --  being,  in fact, the low-order eight bits of the key code's
+       KEY_ constant value.  (The same language, unchanged except for styling,
+       survived into X/Open Curses Issue 4, but disappeared from Issue 7.)
 
-       o   Solaris SVr4 and NetBSD curses count the NUL as part of the limit.
+       X/Open  Curses Issue 5 (2007) stated that these functions "read at most
+       n bytes" but did not  state  whether  the  terminating  null  character
+       counted  toward  that limit.  X/Open Curses Issue 7 (2009) changed that
+       to say they "read at most n-1 bytes" to allow for the terminating  null
+       character.  As of 2018, some implementations count it, some do not.
 
-       o   Solaris   xcurses   provides  both:  its  wide-character  wget_nstr
-           reserves  a  NUL,  but  its  wgetnstr  does  not  count   the   NUL
-           consistently.
+       o   ncurses 6.1 and PDCurses do not count the null character toward the
+           limit, while Solaris and NetBSD curses do.
 
-       In SVr4 curses, a negative value of n tells wgetnstr to assume that the
-       caller's buffer is large enough to hold the result, i.e., to  act  like
-       wgetstr.   X/Open  Curses does not mention this (or anything related to
-       negative or zero values of n), however  most  implementations  use  the
-       feature, with different limits:
+       o   Solaris  xcurses  offers   both   behaviors:   its   wide-character
+           wgetn_wstr  reserves  room  for a wide null character, but its non-
+           wide wgetnstr does not consistently count a null  character  toward
+           the limit.
 
-       o   Solaris  SVr4  curses  and  PDCurses limit the result to 255 bytes.
-           Other Unix systems than Solaris are likely to use the same limit.
+       In SVr4 curses, a negative n tells wgetnstr to assume that the caller's
+       buffer is large enough to hold the result; that is, the  function  then
+       acts  like  wgetstr.   X/Open Curses does not mention this behavior (or
+       anything  related  to  nonpositive  n  values),  however  most   curses
+       libraries  implement  it.  Most implementations nevertheless enforce an
+       upper limit on the count of bytes they write to the destination  buffer
+       str.
 
-       o   Solaris xcurses limits the result to LINE_MAX bytes.
+       o   BSD   curses   lacked  wgetnstr,  and  its  wgetstr  wrote  to  str
+           unboundedly, as did that in SVr2.
 
-       o   NetBSD 7 assumes no particular limit for the result  from  wgetstr.
-           However,  it  limits  the wgetnstr parameter n to ensure that it is
-           greater than zero.
+       o   PDCurses, and SVr3.1, SVr4, and Solaris curses limit both functions
+           to  writing  256  bytes.  Other System V-based platforms likely use
+           the same limit.
 
-           A comment in NetBSD's source code states that this is specified  in
-           SUSv2.
+       o   Solaris xcurses limits the write to LINE_MAX bytes.
 
-       o   ncurses  (before  6.2)  assumes  no particular limit for the result
-           from wgetstr, and treats the n  parameter  of  wgetnstr  like  SVr4
-           curses.
+       o   NetBSD 7 curses imposes no particular limit on the  length  of  the
+           write,  but does validate n to ensure that it is greater than zero.
+           A comment in NetBSD's source  code  asserts  that  SUSv2  specifies
+           this.
 
-       o   ncurses  6.2  uses  LINE_MAX,  or a larger (system-dependent) value
-           which the sysconf function may provide.   If  neither  LINE_MAX  or
-           sysconf  is available, ncurses uses the POSIX value for LINE_MAX (a
-           2048 byte limit).  In either case,  it  reserves  a  byte  for  the
-           terminating NUL.
+       o   ncurses  prior  to 6.2 (2020) imposes no limit on the length of the
+           write, and treats wgetnstr's n parameter as SVr4 curses does.
 
-       Although  getnstr  is equivalent to a series of calls to getch, it also
-       makes changes to the curses modes to allow simple editing of the  input
-       buffer:
+       o   ncurses 6.2 uses LINE_MAX  or  a  larger  (system-dependent)  value
+           provided  by  sysconf(3).   If  neither  LINE_MAX  nor  sysconf  is
+           available, ncurses  uses  the  POSIX  minimum  value  for  LINE_MAX
+           (2048).   In  either  case,  it reserves a byte for the terminating
+           null character.
 
-       o   getnstr  saves  the  current  value of the nl, echo, raw and cbreak
-           modes, and sets nl, noecho, noraw, and cbreak.
+       Implementations vary in their handling of input control characters.
 
-           getnstr handles the echoing of characters, rather than  relying  on
-           the caller to set an appropriate mode.
+       o   While they may enable the screen's echo option, some do not take it
+           out  of  raw  mode,  and  may  take  cbreak  mode into account when
+           deciding whether to handle echoing within wgetnstr or to rely on it
+           as a side effect of calling wgetch.
 
-       o   It  also  obtains  the erase and kill characters from erasechar and
-           killchar, respectively.
+       o   Originally,  ncurses, like its progenitor pcurses, had its wgetnstr
+           call noraw and cbreak before accepting input.  That may  have  been
+           done  to  make  function keys work; it is not necessary with modern
+           ncurses.
 
-       o   On return, getnstr restores the modes to their previous values.
+           Since 1995, ncurses has provided handlers for SIGINTR  and  SIGQUIT
+           events,  which  are typically generated at the keyboard with ^C and
+           ^\ respectively.  In cbreak mode, those handlers catch a signal and
+           stop   the  program,  whereas  other  implementations  write  those
+           characters into the buffer.
 
-       Other implementations differ in their treatment of special characters:
+       o   Starting with ncurses 6.3 (2021), wgetnstr preserves  raw  mode  if
+           the  screen  was  already  in that state, allowing one to enter the
+           characters the terminal interprets as  interrupt  and  quit  events
+           into the buffer, for better compatibility with SVr4 curses.
 
-       o   While they may set the echo  mode,  other  implementations  do  not
-           modify  the  raw  mode,  They  may  take the cbreak mode set by the
-           caller into account when deciding whether to handle echoing  within
-           getnstr or as a side-effect of the getch calls.
 
-       o   The original ncurses (as pcurses in 1986) set noraw and cbreak when
-           accepting input for getnstr.  That  may  have  been  done  to  make
-           function- and cursor-keys work; it is not necessary with ncurses.
+

        HISTORY

        +       4BSD (1980) curses introduced wgetstr along with its variants.
 
-           Since  1995, ncurses has provided signal handlers for INTR and QUIT
-           (e.g., ^C or ^\).  With the noraw and cbreak  settings,  those  may
-           catch  a  signal  and stop the program, where other implementations
-           allow one to enter those characters in the buffer.
+       SVr3.1 (1987) added wgetnstr, but none of its variants.
 
-       o   Starting in 2021 (ncurses 6.3), getnstr sets raw, rather than noraw
-           and   cbreak  for  better  compatibility  with  SVr4-curses,  e.g.,
-           allowing one to enter a ^C into the buffer.
+       X/Open  Curses  Issue  4  (1995)  specified  getnstr,  mvwgetnstr,  and
+       mvgetnstr.

        SEE ALSO

                curs_get_wstr(3x) describes comparable functions of the ncurses library
        in its wide-character configuration (ncursesw).
 
-       curses(3x), curs_getch(3x), curs_termattrs(3x), curs_variables(3x)
+       curses(3x),     curs_addch(3x),     curs_getch(3x),    curs_inopts(3x),
+       curs_termattrs(3x),
 
 
 
-ncurses 6.5                       2024-06-08                   curs_getstr(3x)
+ncurses 6.5                       2024-06-22                   curs_getstr(3x)
        diff --git a/doc/html/man/curs_kernel.3x.html b/doc/html/man/curs_kernel.3x.html index b93fcbf4..6d821c12 100644 --- a/doc/html/man/curs_kernel.3x.html +++ b/doc/html/man/curs_kernel.3x.html @@ -27,19 +27,19 @@ * sale, use or other dealings in this Software without prior written * * authorization. * **************************************************************************** - * @Id: curs_kernel.3x,v 1.65 2024/06/08 21:00:58 tom Exp @ + * @Id: curs_kernel.3x,v 1.67 2024/06/22 21:24:26 tom Exp @ --> -curs_kernel 3x 2024-06-08 ncurses 6.5 Library calls +curs_kernel 3x 2024-06-22 ncurses 6.5 Library calls -

        curs_kernel 3x 2024-06-08 ncurses 6.5 Library calls

        +

        curs_kernel 3x 2024-06-22 ncurses 6.5 Library calls

         curs_kernel(3x)                  Library calls                 curs_kernel(3x)
 
@@ -141,45 +141,46 @@
        program  to  write  to  the  terminal  screen.  For example, first call
        refresh(3x) to ensure that the screen and the library's model of it  is
        up  to  date;  then call reset_shell_mode; write to the screen with the
-       external application; call reset_prog_mode; and finally call  mvcur  to
-       set  the  cursor's  location  to  where  curses thinks it is, since the
-       library has no knowledge of how the external application moved it.
+       external application; call reset_prog_mode; and finally call mvcur(...,
+       ...,  -1, -1) to move the terminal cursor to where curses thinks it is,
+       since the library has no knowledge  of  how  the  external  application
+       moved it.

        napms

        -       napms sleeps  for  ms  milliseconds.   If  ms  exceeds  30,000  (thirty
+       napms  sleeps  for  ms  milliseconds.   If  ms  exceeds  30,000 (thirty
        seconds), it is capped at that value.

        ripoffline

        -       ripoffline  provides access to the same facility that slk_init(3x) uses
-       to reduce the size of the screen.  ripoffline  must  be  called  before
+       ripoffline provides access to the same facility that slk_init(3x)  uses
+       to  reduce  the  size  of the screen.  ripoffline must be called before
        initscr or newterm is called, to prepare these initial actions:
 
        o   If line is positive, a line is removed from the top of stdscr.
 
        o   if line is negative, a line is removed from the bottom.
 
-       When  the  resulting initialization is done inside initscr, the routine
+       When the resulting initialization is done inside initscr,  the  routine
        init (supplied by the user) is called with two arguments:
 
        o   a window pointer to the one-line window that has been allocated and
 
        o   an integer with the number of columns in the window.
 
-       Inside this initialization routine, the  integer  variables  LINES  and
-       COLS  (defined  in  <curses.h>)  are  not guaranteed to be accurate and
-       wrefresh or doupdate must not be  called.   It  is  allowable  to  call
+       Inside  this  initialization  routine,  the integer variables LINES and
+       COLS (defined in <curses.h>) are not  guaranteed  to  be  accurate  and
+       wrefresh  or  doupdate  must  not  be  called.  It is allowable to call
        wnoutrefresh during the initialization routine.
 
-       ripoffline  can  be  called  up to five times before calling initscr or
+       ripoffline can be called up to five times  before  calling  initscr  or
        newterm.

        RETURN VALUE

                Except for curs_set, these routines always return OK.
 
-       curs_set returns the previous cursor state, or  ERR  if  the  requested
+       curs_set  returns  the  previous  cursor state, or ERR if the requested
        visibility is not supported.
 
        X/Open defines no error conditions.  In this implementation
@@ -189,7 +190,7 @@
             to obtain the terminal settings fails.
 
        ripoffline
-            returns ERR if the maximum number of ripped-off lines exceeds  the
+            returns  ERR if the maximum number of ripped-off lines exceeds the
             maximum (5).
 
 
@@ -197,21 +198,21 @@
        Note that getsyx is a macro, so & is not necessary before the variables
        y and x.
 
-       Older SVr4 man pages  warn  that  the  return  value  of  curs_set  "is
+       Older  SVr4  man  pages  warn  that  the  return  value of curs_set "is
        currently incorrect".  This implementation gets it right, but it may be
        unwise to count on the correctness of the return value anywhere else.
 
        Both ncurses and SVr4 will call curs_set in endwin if curs_set has been
-       called  to make the cursor other than normal, i.e., either invisible or
-       very visible.  There is no way for ncurses  to  determine  the  initial
+       called to make the cursor other than normal, i.e., either invisible  or
+       very  visible.   There  is  no way for ncurses to determine the initial
        cursor state to restore that.

        EXTENSIONS

        -       In  ncurses, mvcur accepts -1 for either or both old coordinates.  This
-       value tells ncurses that the old location is unknown, and that it  must
-       use  only absolute motion, as with the cursor_address (cup) capability,
-       rather than the least  costly  combination  of  absolute  and  relative
+       In ncurses, mvcur accepts -1 for either or both old coordinates.   This
+       value  tells ncurses that the old location is unknown, and that it must
+       use only absolute motion, as with the cursor_address (cup)  capability,
+       rather  than  the  least  costly  combination  of absolute and relative
        motion.
 
 
@@ -219,24 +220,24 @@
        Applications employing ncurses extensions should condition their use on
        the visibility of the NCURSES_VERSION preprocessor macro.
 
-       The virtual screen functions setsyx and getsyx  are  not  described  in
+       The  virtual  screen  functions  setsyx and getsyx are not described in
        X/Open Curses, Issue 4.  All other functions are as described in X/Open
        Curses.
 
-       The SVr4 documentation describes setsyx and  getsyx  as  having  return
-       type  int.   This  is misleading, as they are macros with no documented
+       The  SVr4  documentation  describes  setsyx and getsyx as having return
+       type int.  This is misleading, as they are macros  with  no  documented
        semantics for the return value.
 
        X/Open Curses notes:
 
-              "After use of mvcur(), the model Curses maintains of  the  state
-              of  the  terminal  might  not  match  the  actual  state  of the
-              terminal.  An application should touch and  refresh  the  window
+              "After  use  of mvcur(), the model Curses maintains of the state
+              of the  terminal  might  not  match  the  actual  state  of  the
+              terminal.   An  application  should touch and refresh the window
               before resuming conventional use of Curses."
 
-       Both  ncurses  and  SVr4  curses  implement mvcur using the SCREEN data
-       allocated in either initscr(3x) or newterm(3x).  X/Open  Curses  states
-       that  the old location must be given for mvcur to accommodate terminals
+       Both ncurses and SVr4 curses implement  mvcur  using  the  SCREEN  data
+       allocated  in  either initscr(3x) or newterm(3x).  X/Open Curses states
+       that the old location must be given for mvcur to accommodate  terminals
        that lack absolute cursor positioning.
 
        If interrupted, ncurses restarts napms.  That, and the limitation to 30
@@ -249,7 +250,7 @@
 
 
 
-ncurses 6.5                       2024-06-08                   curs_kernel(3x)
+ncurses 6.5                       2024-06-22                   curs_kernel(3x)
          diff --git a/doc/html/man/curs_pad.3x.html b/doc/html/man/curs_pad.3x.html index 4ff08481..c1bf123c 100644 --- a/doc/html/man/curs_pad.3x.html +++ b/doc/html/man/curs_pad.3x.html @@ -27,19 +27,19 @@ * sale, use or other dealings in this Software without prior written * * authorization. * **************************************************************************** - * @Id: curs_pad.3x,v 1.63 2024/05/25 20:10:58 tom Exp @ + * @Id: curs_pad.3x,v 1.65 2024/06/22 22:20:03 tom Exp @ --> -curs_pad 3x 2024-05-25 ncurses 6.5 Library calls +curs_pad 3x 2024-06-22 ncurses 6.5 Library calls -

          curs_pad 3x 2024-05-25 ncurses 6.5 Library calls

          +

          curs_pad 3x 2024-06-22 ncurses 6.5 Library calls

           curs_pad(3x)                     Library calls                    curs_pad(3x)
 
@@ -133,7 +133,7 @@
        specifies only "an integer  value  other  than  ERR")  upon  successful
        completion.
 
-       Functions  that  return pointers return NULL on error, and set errno to
+       Functions  that  return pointers return NULL on error, and set errno to
        ENOMEM.
 
        X/Open  Curses  does  not  specify  any  error  conditions.   In   this
@@ -229,7 +229,7 @@
 
 
 
-ncurses 6.5                       2024-05-25                      curs_pad(3x)
+ncurses 6.5                       2024-06-22                      curs_pad(3x)
            diff --git a/doc/html/man/curs_slk.3x.html b/doc/html/man/curs_slk.3x.html index de9699fc..5802ec28 100644 --- a/doc/html/man/curs_slk.3x.html +++ b/doc/html/man/curs_slk.3x.html @@ -27,19 +27,19 @@ * sale, use or other dealings in this Software without prior written * * authorization. * **************************************************************************** - * @Id: curs_slk.3x,v 1.73 2024/05/25 20:10:58 tom Exp @ + * @Id: curs_slk.3x,v 1.75 2024/06/22 21:25:23 tom Exp @ --> -curs_slk 3x 2024-05-25 ncurses 6.5 Library calls +curs_slk 3x 2024-06-22 ncurses 6.5 Library calls -

            curs_slk 3x 2024-05-25 ncurses 6.5 Library calls

            +

            curs_slk 3x 2024-06-22 ncurses 6.5 Library calls

             curs_slk(3x)                     Library calls                    curs_slk(3x)
 
@@ -312,7 +312,7 @@
 
 
 
-ncurses 6.5                       2024-05-25                      curs_slk(3x)
+ncurses 6.5                       2024-06-22                      curs_slk(3x)
              diff --git a/doc/html/man/curs_termcap.3x.html b/doc/html/man/curs_termcap.3x.html index c2763afe..e2bb7de0 100644 --- a/doc/html/man/curs_termcap.3x.html +++ b/doc/html/man/curs_termcap.3x.html @@ -27,19 +27,19 @@ * sale, use or other dealings in this Software without prior written * * authorization. * **************************************************************************** - * @Id: curs_termcap.3x,v 1.85 2024/04/20 19:13:12 tom Exp @ + * @Id: curs_termcap.3x,v 1.87 2024/06/22 21:28:07 tom Exp @ --> -curs_termcap 3x 2024-04-20 ncurses 6.5 Library calls +curs_termcap 3x 2024-06-22 ncurses 6.5 Library calls -

              curs_termcap 3x 2024-04-20 ncurses 6.5 Library calls

              +

              curs_termcap 3x 2024-06-22 ncurses 6.5 Library calls

               curs_termcap(3x)                 Library calls                curs_termcap(3x)
 
@@ -369,7 +369,7 @@
 
 
 
-ncurses 6.5                       2024-04-20                  curs_termcap(3x)
+ncurses 6.5                       2024-06-22                  curs_termcap(3x)
                diff --git a/doc/html/man/curs_util.3x.html b/doc/html/man/curs_util.3x.html index 6da4a8e9..0784e42d 100644 --- a/doc/html/man/curs_util.3x.html +++ b/doc/html/man/curs_util.3x.html @@ -28,19 +28,19 @@ * sale, use or other dealings in this Software without prior written * * authorization. * **************************************************************************** - * @Id: curs_util.3x,v 1.110 2024/06/15 20:20:12 tom Exp @ + * @Id: curs_util.3x,v 1.112 2024/06/22 21:25:23 tom Exp @ --> -curs_util 3x 2024-06-15 ncurses 6.5 Library calls +curs_util 3x 2024-06-22 ncurses 6.5 Library calls -

                curs_util 3x 2024-06-15 ncurses 6.5 Library calls

                +

                curs_util 3x 2024-06-22 ncurses 6.5 Library calls

                 curs_util(3x)                    Library calls                   curs_util(3x)
 
@@ -406,7 +406,7 @@
 
 
 
-ncurses 6.5                       2024-06-15                     curs_util(3x)
+ncurses 6.5                       2024-06-22                     curs_util(3x)
                  diff --git a/doc/html/man/curs_variables.3x.html b/doc/html/man/curs_variables.3x.html index 92ae9851..a72a37e3 100644 --- a/doc/html/man/curs_variables.3x.html +++ b/doc/html/man/curs_variables.3x.html @@ -27,19 +27,19 @@ * sale, use or other dealings in this Software without prior written * * authorization. * **************************************************************************** - * @Id: curs_variables.3x,v 1.47 2024/04/13 22:37:35 tom Exp @ + * @Id: curs_variables.3x,v 1.49 2024/06/22 21:25:23 tom Exp @ --> -curs_variables 3x 2024-04-13 ncurses 6.5 Library calls +curs_variables 3x 2024-06-22 ncurses 6.5 Library calls -

                  curs_variables 3x 2024-04-13 ncurses 6.5 Library calls

                  +

                  curs_variables 3x 2024-06-22 ncurses 6.5 Library calls

                   curs_variables(3x)               Library calls              curs_variables(3x)
 
@@ -266,7 +266,7 @@
 
 
 
-ncurses 6.5                       2024-04-13                curs_variables(3x)
+ncurses 6.5                       2024-06-22                curs_variables(3x)
                    diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html index af5f6612..18331ce1 100644 --- a/doc/html/man/ncurses.3x.html +++ b/doc/html/man/ncurses.3x.html @@ -28,19 +28,19 @@ * sale, use or other dealings in this Software without prior written * * authorization. * **************************************************************************** - * @Id: ncurses.3x,v 1.223 2024/06/08 20:45:43 tom Exp @ + * @Id: ncurses.3x,v 1.225 2024/06/22 22:14:58 tom Exp @ --> -ncurses 3x 2024-06-08 ncurses 6.5 Library calls +ncurses 3x 2024-06-22 ncurses 6.5 Library calls -

                    ncurses 3x 2024-06-08 ncurses 6.5 Library calls

                    +

                    ncurses 3x 2024-06-22 ncurses 6.5 Library calls

                     ncurses(3x)                      Library calls                     ncurses(3x)
 
@@ -61,7 +61,7 @@
        terminals  with  output  optimized to minimize screen updates.  ncurses
        replaces the curses libraries from System V Release 4 Unix ("SVr4") and
        4.4BSD  Unix,  the  development  of  which  ceased  in the 1990s.  This
-       document describes ncurses version 6.5 (patch 20240615).
+       document describes ncurses version 6.5 (patch 20240622).
 
        ncurses permits control of the terminal screen's contents;  abstraction
        and  subdivision thereof with windows and pads; acquisition of keyboard
@@ -84,8 +84,8 @@
            underlying integral type or  the  availability  of  a  preprocessor
            macro  exclusive  of  a  function  definition  (which  prevents its
            address  from  being   taken).    This   section   also   describes
-           implementation  details  that will be significant to the programmer
-           but which are not standardized.
+           implementation  details of significance to the programmer but which
+           are not standardized.
 
        o   "EXTENSIONS" presents ncurses innovations beyond the X/Open  Curses
            standard  and/or  the  SVr4 curses implementation.  They are termed
@@ -107,26 +107,25 @@
        may  be available; if so, link with it using -lncurses_g.  (Your system
        integrator may have installed these libraries such that you can use the
        options  -lcurses and -lcurses_g, respectively.)  The ncurses_g library
-       generates trace logs (in a file called trace in the current  directory)
-       that  describe ncurses actions.  See section "ALTERNATE CONFIGURATIONS"
-       below.
+       logs events describing ncurses actions to a file called  trace  in  the
+       current directory.  See section "ALTERNATE CONFIGURATIONS" below.

                    Application Structure

                    -       A  curses  application  uses  information  from  the   system   locale;
+       A   curses   application  uses  information  from  the  system  locale;
        setlocale(3) prepares it for curses library calls.
 
            setlocale(LC_ALL, "");
 
-       If  the  locale  is  not  thus  initialized,  the  library assumes that
-       characters are printable as in ISO 8859-1, to work with certain  legacy
-       programs.   You  should initialize the locale; do not expect consistent
+       If the locale  is  not  thus  initialized,  the  library  assumes  that
+       characters  are printable as in ISO 8859-1, to work with certain legacy
+       programs.  You should initialize the locale; do not  expect  consistent
        behavior from the library when the locale has not been set up.
 
-       initscr(3x) or newterm(3x) must be called to initialize  curses  before
+       initscr(3x)  or  newterm(3x) must be called to initialize curses before
        use of any functions that deal with windows and screens.
 
-       To  get  character-at-a-time  input  without echoing--most interactive,
+       To get character-at-a-time  input  without  echoing--most  interactive,
        screen-oriented programs want this--use the following sequence.
 
            initscr(); cbreak(); noecho();
@@ -136,17 +135,22 @@
            noqiflush();
            keypad(stdscr, TRUE);
 
-       A curses program then often enters an event loop of  some  sort.   Call
+       A  curses  program  then often enters an event loop of some sort.  Call
        endwin(3x) before exiting.

                    Overview

                    -       A  curses  library abstracts the terminal screen by representing all or
-       part of it as a WINDOW data structure.  A window is a rectangular  grid
-       of  character  cells,  addressed by line and column coordinates (y, x),
-       with the upper left corner as (0, 0).  A window called stdscr, the same
-       size  as  the terminal screen, is always available.  Create others with
-       newwin(3x).
+       A curses library abstracts the terminal with a SCREEN  data  structure,
+       and  represents  all  or  part  of  its display with WINDOW structures.
+       Distinct properties apply to each; for example, the line discipline  of
+       a  typical  Unix terminal driver is in one of three modes: raw, cbreak,
+       or normal ("cooked").  In curses, the line discipline is a property  of
+       the screen, applying identically to all windows associated with it.
+
+       A  window  is  a rectangular grid of character cells, addressed by line
+       and column coordinates (y, x), with the upper left corner as (0, 0).  A
+       window  called  stdscr, the same size as the terminal screen, is always
+       available.  Create others with newwin(3x).
 
        A curses library does not manage overlapping windows (but  see  below).
        You  can either use stdscr to manage one screen-filling window, or tile
@@ -380,13 +384,13 @@
                     def_shell_mode           curs_kernel(3x)
                     define_key               define_key(3x)*
                     del_curterm              curs_terminfo(3x)
-
                     delay_output             curs_util(3x)
                     delch                    curs_delch(3x)
                     deleteln                 curs_deleteln(3x)
                     delscreen                curs_initscr(3x)
                     delwin                   curs_window(3x)
                     derwin                   curs_window(3x)
+
                     doupdate                 curs_refresh(3x)
                     dupwin                   curs_window(3x)
                     echo                     curs_inopts(3x)
@@ -446,7 +450,6 @@
                     in_wch                   curs_in_wch(3x)
                     in_wchnstr               curs_in_wchstr(3x)
                     in_wchstr                curs_in_wchstr(3x)
-
                     inch                     curs_inch(3x)
                     inchnstr                 curs_inchstr(3x)
                     inchstr                  curs_inchstr(3x)
@@ -455,6 +458,7 @@
                     init_extended_pair       curs_color(3x)*
                     init_pair                curs_color(3x)
                     initscr                  curs_initscr(3x)
+
                     innstr                   curs_instr(3x)
                     innwstr                  curs_inwstr(3x)
                     ins_nwstr                curs_ins_wstr(3x)
@@ -512,7 +516,6 @@
                     mvaddchstr               curs_addchstr(3x)
                     mvaddnstr                curs_addstr(3x)
                     mvaddnwstr               curs_addwstr(3x)
-
                     mvaddstr                 curs_addstr(3x)
                     mvaddwstr                curs_addwstr(3x)
                     mvchgat                  curs_attr(3x)
@@ -523,6 +526,7 @@
                     mvget_wstr               curs_get_wstr(3x)
                     mvgetch                  curs_getch(3x)
                     mvgetn_wstr              curs_get_wstr(3x)
+
                     mvgetnstr                curs_getstr(3x)
                     mvgetstr                 curs_getstr(3x)
                     mvhline                  curs_border(3x)
@@ -578,7 +582,6 @@
                     mvwinnwstr               curs_inwstr(3x)
                     mvwins_nwstr             curs_ins_wstr(3x)
                     mvwins_wch               curs_ins_wch(3x)
-
                     mvwins_wstr              curs_ins_wstr(3x)
                     mvwinsch                 curs_insch(3x)
                     mvwinsnstr               curs_insstr(3x)
@@ -591,6 +594,7 @@
                     mvwvline_set             curs_border_set(3x)
                     napms                    curs_kernel(3x)
                     newpad                   curs_pad(3x)
+
                     newterm                  curs_initscr(3x)
                     newwin                   curs_window(3x)
                     nl                       curs_inopts(3x)
@@ -644,7 +648,6 @@
                     slk_attr                 curs_slk(3x)*
                     slk_attr_off             curs_slk(3x)
                     slk_attr_on              curs_slk(3x)
-
                     slk_attr_set             curs_slk(3x)
                     slk_attroff              curs_slk(3x)
                     slk_attron               curs_slk(3x)
@@ -659,6 +662,7 @@
                     slk_set                  curs_slk(3x)
                     slk_touch                curs_slk(3x)
                     slk_wset                 curs_slk(3x)
+
                     standend                 curs_attr(3x)
                     standout                 curs_attr(3x)
                     start_color              curs_color(3x)
@@ -710,7 +714,6 @@
                     vwprintw                 curs_printw(3x)
                     vwscanw                  curs_scanw(3x)
                     wadd_wch                 curs_add_wch(3x)
-
                     wadd_wchnstr             curs_add_wchstr(3x)
                     wadd_wchstr              curs_add_wchstr(3x)
                     waddch                   curs_addch(3x)
@@ -727,6 +730,7 @@
                     wattroff                 curs_attr(3x)
                     wattron                  curs_attr(3x)
                     wattrset                 curs_attr(3x)
+
                     wbkgd                    curs_bkgd(3x)
                     wbkgdset                 curs_bkgd(3x)
                     wbkgrnd                  curs_bkgrnd(3x)
@@ -776,7 +780,6 @@
                     winstr                   curs_instr(3x)
                     winwstr                  curs_inwstr(3x)
                     wmouse_trafo             curs_mouse(3x)*
-
                     wmove                    curs_move(3x)
                     wnoutrefresh             curs_refresh(3x)
                     wprintw                  curs_printw(3x)
@@ -1316,168 +1319,169 @@
        to draw colored text on a background whose color is set  independently,
        providing better control over color contrasts.  See default_colors(3x).
 
-       An  ncurses  application  can  eschew  knowledge  of  WINDOW  structure
-       internals, instead using accessor functions such as is_scrollok(3x).
+       An  ncurses  application  can  eschew  knowledge  of  SCREEN and WINDOW
+       structure  internals,  instead  using  accessor   functions   such   as
+       is_cbreak(3x) and is_scrollok(3x).
 
-       ncurses enables an application  to  direct  its  output  to  a  printer
+       ncurses  enables  an  application  to  direct  its  output to a printer
        attached to the terminal device; see curs_print(3x).
 
-       ncurses  offers slk_attr(3x) as a counterpart of attr_get(3x) for soft-
-       label key lines, and extended_slk_color(3x) as a form of  slk_color(3x)
-       that  can  gather  color  information  from  them  when many colors are
+       ncurses offers slk_attr(3x) as a counterpart of attr_get(3x) for  soft-
+       label  key lines, and extended_slk_color(3x) as a form of slk_color(3x)
+       that can gather color  information  from  them  when  many  colors  are
        supported.
 
-       ncurses   permits   modification   of   unctrl(3x)'s   behavior;    see
+       ncurses    permits   modification   of   unctrl(3x)'s   behavior;   see
        use_legacy_coding(3x).
 
-       Rudimentary  support  for multi-threaded applications may be available;
+       Rudimentary support for multi-threaded applications may  be  available;
        see curs_threads(3x).
 
-       Functions that ease the management of multiple screens can be  exposed;
+       Functions  that ease the management of multiple screens can be exposed;
        see curs_sp_funcs(3x).
 
-       To  aid  applications  to  debug their memory usage, ncurses optionally
-       offers functions  to  more  aggressively  free  memory  it  dynamically
+       To aid applications to debug their  memory  usage,  ncurses  optionally
+       offers  functions  to  more  aggressively  free  memory  it dynamically
        allocates itself; see curs_memleaks(3x).
 
-       The  library  facilitates auditing and troubleshooting of its behavior;
+       The library facilitates auditing and troubleshooting of  its  behavior;
        see curs_trace(3x).
 
-       Compiling ncurses with the option -DUSE_GETCAP causes it to  fall  back
-       to  reading /etc/termcap if the terminal setup code cannot find a term-
+       Compiling  ncurses  with the option -DUSE_GETCAP causes it to fall back
+       to reading /etc/termcap if the terminal setup code cannot find a  term-
        info  entry  corresponding  to  TERM.   Use  of  this  feature  is  not
-       recommended,  as  it essentially includes an entire termcap compiler in
-       the ncurses startup code, at a cost in  memory  usage  and  application
+       recommended, as it essentially includes an entire termcap  compiler  in
+       the  ncurses  startup  code,  at a cost in memory usage and application
        launch latency.
 
-       PDCurses   and  NetBSD  curses  incorporate  some  ncurses  extensions.
+       PDCurses  and  NetBSD  curses  incorporate  some  ncurses   extensions.
        Individual man pages indicate where this is the case.

                    PORTABILITY

                            X/Open Curses defines two levels of conformance, "base" and "enhanced".
        The latter includes several additional features, such as wide-character
-       and color support.  ncurses intends base-level conformance with  X/Open
-       Curses,  and  supports  all  features  of its enhanced level except the
-       untic utility.
+       and  color support.  ncurses intends base-level conformance with X/Open
+       Curses, and supports all features of  its  enhanced  level  except  the
+       untic utility.
 
-       Differences between X/Open Curses and ncurses  are  documented  in  the
+       Differences  between  X/Open  Curses  and ncurses are documented in the
        "PORTABILITY" sections of applicable man pages.

                    Error Checking

                    -       In  many cases, X/Open Curses is vague about error conditions, omitting
+       In many cases, X/Open Curses is vague about error conditions,  omitting
        some of the SVr4 documentation.
 
-       Unlike other implementations, ncurses checks pointer  parameters,  such
-       as  those to WINDOW structures, to ensure that they are not null.  This
-       is done primarily to guard  against  programmer  error.   The  standard
+       Unlike  other  implementations, ncurses checks pointer parameters, such
+       as those to WINDOW structures, to ensure that they are not null.   This
+       is  done  primarily  to  guard  against programmer error.  The standard
        interface does not provide a way for the library to tell an application
-       which of several possible errors occurred.  An application that  relies
-       on  ncurses  to  check  its function parameters for validity limits its
+       which  of several possible errors occurred.  An application that relies
+       on ncurses to check its function parameters  for  validity  limits  its
        portability and robustness.

                    Padding Differences

                    -       In historical curses implementations, delays embedded in  the  terminfo
-       capabilities  carriage_return  (cr),  scroll_forward (ind), cursor_left
+       In  historical  curses implementations, delays embedded in the terminfo
+       capabilities carriage_return (cr),  scroll_forward  (ind),  cursor_left
        (cub1), form_feed (ff), and tab (ht) activated corresponding delay bits
-       in  the  Unix terminal driver.  ncurses performs all padding by sending
-       NUL bytes to the device.  This method is slightly more  expensive,  but
-       narrows   the   interface   to   the   Unix  kernel  significantly  and
+       in the Unix terminal driver.  ncurses performs all padding  by  sending
+       NUL  bytes  to the device.  This method is slightly more expensive, but
+       narrows  the  interface  to   the   Unix   kernel   significantly   and
        correspondingly increases the package's portability.

                    Header Files

                    -       The header file curses.h itself includes the header files  stdio.h  and
+       The  header  file curses.h itself includes the header files stdio.h and
        unctrl.h.
 
        X/Open Curses has more to say,
 
-           The  inclusion  of  curses.h  may make visible all symbols from the
+           The inclusion of curses.h may make visible  all  symbols  from  the
            headers stdio.h, term.h, termios.h, and wchar.h.
 
        but does not finish the story.  A more complete account follows.
 
        o   The first curses, in 4BSD, provided a curses.h file.
 
-           BSD curses code included curses.h and  unctrl.h  from  an  internal
+           BSD  curses  code  included  curses.h and unctrl.h from an internal
            header file curses.ext, where "ext" abbreviated "externs".
 
-           The  implementations of printw and scanw used undocumented internal
-           functions of the standard I/O library (_doprnt  and  _doscan),  but
+           The implementations of printw and scanw used undocumented  internal
+           functions  of  the  standard I/O library (_doprnt and _doscan), but
            nothing in curses.h itself relied upon stdio.h.
 
-       o   SVr2  curses  added  newterm, which relies upon stdio.h because its
+       o   SVr2 curses added newterm, which relies upon  stdio.h  because  its
            function prototype employs the FILE type.
 
            SVr4 curses added putwin and getwin, which also use stdio.h.
 
            X/Open Curses specifies all three of these functions.
 
-           SVr4 curses and X/Open Curses  do  not  require  the  developer  to
-           include  stdio.h  before  curses.h.  Both document use of curses as
+           SVr4  curses  and  X/Open  Curses  do  not require the developer to
+           include stdio.h before curses.h.  Both document use  of  curses  as
            requiring only curses.h.
 
            As a result, standard curses.h always includes stdio.h.
 
-       o   X/Open Curses and SVr4 curses  are  inconsistent  with  respect  to
+       o   X/Open  Curses  and  SVr4  curses  are inconsistent with respect to
            unctrl.h.
 
-           As  noted in curs_util(3x), ncurses includes unctrl.h from curses.h
+           As noted in curs_util(3x), ncurses includes unctrl.h from  curses.h
            (as SVr4 does).
 
-       o   X/Open Curses's comments about term.h and termios.h  may  refer  to
+       o   X/Open  Curses's  comments  about term.h and termios.h may refer to
            HP-UX and AIX.
 
-           HP-UX  curses includes term.h from curses.h to declare setupterm in
+           HP-UX curses includes term.h from curses.h to declare setupterm  in
            curses.h, but ncurses and Solaris curses do not.
 
-           AIX curses includes  term.h  and  termios.h.   Again,  ncurses  and
+           AIX  curses  includes  term.h  and  termios.h.   Again, ncurses and
            Solaris curses do not.
 
-       o   X/Open  Curses  says that curses.h may include term.h, but does not
+       o   X/Open Curses says that curses.h may include term.h, but  does  not
            require it to do so.
 
-           Some programs use functions declared in both curses.h  and  term.h,
-           and  must  include  both header files in the same module.  Very old
-           versions of  AIX  curses  required  inclusion  of  curses.h  before
+           Some  programs  use functions declared in both curses.h and term.h,
+           and must include both header files in the same  module.   Very  old
+           versions  of  AIX  curses  required  inclusion  of  curses.h before
            term.h.
 
-           The  header  files supplied by ncurses include the standard library
-           headers required for its  declarations,  so  ncurses's  own  header
-           files  can  be  included  in  any  order.  But for portability, you
+           The header files supplied by ncurses include the  standard  library
+           headers  required  for  its  declarations,  so ncurses's own header
+           files can be included in  any  order.   But  for  portability,  you
            should include curses.h before term.h.
 
-       o   X/Open Curses says "may make visible" because  including  a  header
-           file  does  not  necessarily  make visible all of the symbols in it
+       o   X/Open  Curses  says  "may make visible" because including a header
+           file does not necessarily make visible all of  the  symbols  in  it
            (consider #ifdef and similar).
 
-           For instance, ncurses's curses.h may include wchar.h if the  proper
-           symbol  is defined, and if ncurses is configured for wide-character
-           support.  If wchar.h is included, its symbols may be  made  visible
+           For  instance, ncurses's curses.h may include wchar.h if the proper
+           symbol is defined, and if ncurses is configured for  wide-character
+           support.   If  wchar.h is included, its symbols may be made visible
            depending on the value of the _XOPEN_SOURCE feature test macro.
 
        o   X/Open Curses mandates an application's inclusion of one standard C
-           library header in a  special  case:  stdarg.h  before  curses.h  to
-           prototype  the  functions  vw_printw  and  vw_scanw (as well as the
-           obsolete vwprintw and vwscanw).  Each of  these  takes  a  variadic
+           library  header  in  a  special  case:  stdarg.h before curses.h to
+           prototype the functions vw_printw and  vw_scanw  (as  well  as  the
+           obsolete  vwprintw  and  vwscanw).   Each of these takes a variadic
            argument list, a va_list parameter, like that of printf(3).
 
-           SVr3  curses  introduced  the  two  obsolete  functions, and X/Open
-           Curses the others.   In  between,  SVr4  curses  provided  for  the
-           possibility  that  an application might include either varargs.h or
-           stdarg.h.  These represented  contrasting  approaches  to  handling
-           variadic  argument  lists.   The older interface, varargs.h, used a
-           pointer to char for variadic functions' va_list parameter.   Later,
-           the  list  acquired its own standard data type, va_list, defined in
-           stdarg.h, empowering the compiler to check the types of a  function
-           call's  actual  parameters  against the formal ones declared in its
+           SVr3 curses introduced  the  two  obsolete  functions,  and  X/Open
+           Curses  the  others.   In  between,  SVr4  curses  provided for the
+           possibility that an application might include either  varargs.h  or
+           stdarg.h.   These  represented  contrasting  approaches to handling
+           variadic argument lists.  The older interface,  varargs.h,  used  a
+           pointer  to char for variadic functions' va_list parameter.  Later,
+           the list acquired its own standard data type, va_list,  defined  in
+           stdarg.h,  empowering the compiler to check the types of a function
+           call's actual parameters against the formal ones  declared  in  its
            prototype.
 
-           No  conforming  implementations  of  X/Open   Curses   require   an
+           No   conforming   implementations   of  X/Open  Curses  require  an
            application to include stdarg.h before curses.h because they either
-           have allowed for a special type, or,  like  ncurses,  they  include
+           have  allowed  for  a  special type, or, like ncurses, they include
            stdarg.h themselves to provide a portable interface.
 
 
@@ -1491,7 +1495,7 @@
 
 
 
-ncurses 6.5                       2024-06-08                       ncurses(3x)
+ncurses 6.5                       2024-06-22                       ncurses(3x)
                      diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html index 5a548fab..c2ef365d 100644 --- a/doc/html/man/tabs.1.html +++ b/doc/html/man/tabs.1.html @@ -27,19 +27,19 @@ * sale, use or other dealings in this Software without prior written * * authorization. * **************************************************************************** - * @Id: tabs.1,v 1.59 2024/04/20 19:08:15 tom Exp @ + * @Id: tabs.1,v 1.61 2024/06/22 22:15:32 tom Exp @ --> -tabs 1 2024-04-20 ncurses 6.5 User commands +tabs 1 2024-06-22 ncurses 6.5 User commands -

                      tabs 1 2024-04-20 ncurses 6.5 User commands

                      +

                      tabs 1 2024-06-22 ncurses 6.5 User commands

                       tabs(1)                          User commands                         tabs(1)
 
@@ -245,8 +245,8 @@
        the  committee  considered  redesigning  the  tabs  and tput utilities,
        without settling on an improved solution.  It claims that
 
-           "no known historical version of tabs  supports  the  capability  of
-           setting arbitrary tab stops."
+           no known historical version of  tabs  supports  the  capability  of
+           setting arbitrary tab stops.
 
        The   feature  described  in  subsection  "Explicit  Lists"  above  was
        implemented in PWB/Unix, and permitted  the  setting  of  abitrary  tab
@@ -258,7 +258,7 @@
 
 
 
-ncurses 6.5                       2024-04-20                           tabs(1)
+ncurses 6.5                       2024-06-22                           tabs(1)
                        diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html index 107bc38f..f9496ff8 100644 --- a/doc/html/man/terminfo.5.html +++ b/doc/html/man/terminfo.5.html @@ -71,7 +71,7 @@ have, by specifying how to perform screen operations, and by specifying padding requirements and initialization sequences. - This document describes ncurses version 6.5 (patch 20240615). + This document describes ncurses version 6.5 (patch 20240622).

                        terminfo Entry Syntax

                        diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index 0d9d1788..623be9c7 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tput.1,v 1.116 2024/06/08 20:50:34 tom Exp @
+  * @Id: tput.1,v 1.118 2024/06/22 21:28:35 tom Exp @
 -->
 
 
 
 
 
-tput 1 2024-06-08 ncurses 6.5 User commands
+tput 1 2024-06-22 ncurses 6.5 User commands
 
 
 
 
-
                        tput 1 2024-06-08 ncurses 6.5 User commands
                        
+
                        tput 1 2024-06-22 ncurses 6.5 User commands
                        
 
                         tput(1)                          User commands                         tput(1)
 
@@ -477,8 +477,10 @@
        As of ncurses 6.1,  the  "reset"  features  of  the  two  programs  are
        (mostly) the same.  Two minor differences remain.
 
-       o   The  tset  program  waits  one  second  when resetting, in case the
-           terminal happens to be a hardware device.
+       o   When  issuing  a  reset, the tset program checks whether the device
+           appears to be a pseudoterminal (as might  be  used  by  a  terminal
+           emulator program), and, if it does not, waits one second in case it
+           is communicating with a hardware terminal.
 
        o   The two programs  write  the  terminal  initialization  strings  to
            different  streams;  that  is, standard error for tset and standard
@@ -557,7 +559,7 @@
 
 
 
-ncurses 6.5                       2024-06-08                           tput(1)
+ncurses 6.5                       2024-06-22                           tput(1)
 
                        
 
                        
 
                          
diff --git a/man/curs_add_wchstr.3x b/man/curs_add_wchstr.3x
index 4a0d06e9..bf28a61e 100644
--- a/man/curs_add_wchstr.3x
+++ b/man/curs_add_wchstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_add_wchstr.3x,v 1.40 2024/05/11 20:39:53 tom Exp $
-.TH curs_add_wchstr 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_add_wchstr.3x,v 1.42 2024/06/22 21:26:27 tom Exp $
+.TH curs_add_wchstr 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -139,6 +139,27 @@ may be implemented as macros.
 .SH PORTABILITY
 X/Open Curses,
 Issue 4 describes these functions.
+.SH HISTORY
+These functions were initially specified by X/Open Curses,
+Issue 4.
+The System\ V Interface Definition,
+Version 4 (1995),
+specified functions named
+.I \%waddwchstr
+and
+.I \%waddwchnstr
+(and the usual variants).
+These were later additions to
+.RI SVr4. x ,
+not appearing in the first SVr4 (1989).
+They differed from X/Open's
+.I \%wadd_wchstr
+and
+.I \%wadd_wchnstr
+in that they each took an argument of type
+.I \%wchar_t
+instead of
+.IR \%cchar_t "."
 .SH SEE ALSO
 \fB\%curs_addchstr\fP(3X) describes comparable functions of the
 .I \%ncurses
diff --git a/man/curs_addch.3x b/man/curs_addch.3x
index 4e1bf944..cdea7bb6 100644
--- a/man/curs_addch.3x
+++ b/man/curs_addch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addch.3x,v 1.92 2024/06/08 20:51:41 tom Exp $
-.TH curs_addch 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_addch.3x,v 1.94 2024/06/22 21:34:49 tom Exp $
+.TH curs_addch 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -284,6 +284,12 @@ variable,
 but X/Open Curses does not specify it;
 see \fB\%curs_variables\fP(3X).
 .SH PORTABILITY
+Applications employing
+.I \%ncurses
+extensions should condition their use on the visibility of the
+.B \%NCURSES_VERSION
+preprocessor macro.
+.PP
 X/Open Curses,
 Issue 4 describes these functions.
 It specifies no error conditions for them.
@@ -471,9 +477,9 @@ If it cannot,
 use only
 \fB\%wadd_wch\fP(3X).
 .SH HISTORY
-The original
+4BSD (1980)
 .I curses
-in 4BSD (1980) introduced
+introduced
 .IR \%waddch "."
 .PP
 SVr3 (1987)
diff --git a/man/curs_addstr.3x b/man/curs_addstr.3x
index cee228de..848b9978 100644
--- a/man/curs_addstr.3x
+++ b/man/curs_addstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addstr.3x,v 1.49 2024/06/01 22:29:08 tom Exp $
-.TH curs_addstr 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_addstr.3x,v 1.51 2024/06/22 21:26:53 tom Exp $
+.TH curs_addstr 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -130,6 +130,21 @@ All of these functions except \fBwaddnstr\fP may be macros.
 X/Open Curses,
 Issue 4 describes these functions.
 It specifies no error conditions for them.
+.SH HISTORY
+4BSD (1980)
+.I curses
+introduced
+.I \%waddstr
+along with its variants,
+the latter defined as macros.
+.PP
+SVr3.1 (1987)
+added
+.I \%waddnstr
+(and its variants)
+redefining
+.I \%waddstr
+as a macro wrapping it.
 .SH SEE ALSO
 \fB\%curs_addwstr\fP(3X) describes comparable functions of the
 .I \%ncurses
diff --git a/man/curs_beep.3x b/man/curs_beep.3x
index 6a01deca..c0e9de21 100644
--- a/man/curs_beep.3x
+++ b/man/curs_beep.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_beep.3x,v 1.31 2024/05/18 20:06:33 tom Exp $
-.TH curs_beep 3X 2024-05-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_beep.3x,v 1.33 2024/06/22 21:27:35 tom Exp $
+.TH curs_beep 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fB\%beep\fP,
 \fB\%flash\fP \-
@@ -101,9 +101,9 @@ they always return
 .BR OK ","
 and X/Open Curses specifies them as doing so.
 .SH HISTORY
-.B beep
+.I beep
 and
-.B flash
+.I flash
 appeared in SVr2 (1984).
 .SH SEE ALSO
 \fB\%curses\fP(3X),
diff --git a/man/curs_get_wstr.3x b/man/curs_get_wstr.3x
index 733054c7..3893bb95 100644
--- a/man/curs_get_wstr.3x
+++ b/man/curs_get_wstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_get_wstr.3x,v 1.52 2024/06/08 21:01:53 tom Exp $
-.TH curs_get_wstr 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_get_wstr.3x,v 1.54 2024/06/22 21:34:19 tom Exp $
+.TH curs_get_wstr 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -58,15 +58,15 @@ get a wide-character string from a \fIcurses\fR terminal keyboard
 .nf
 \fB#include 
 .PP
-\fBint get_wstr(wint_t *\fIwstr\fP);
-\fBint getn_wstr(wint_t *\fIwstr\fP, int \fIn\fP);
-\fBint wget_wstr(WINDOW *\fIwin\fP, wint_t *\fIwstr\fP);
-\fBint wgetn_wstr(WINDOW *\fIwin\fP, wint_t *\fIwstr\fP, int \fIn\fP);
+\fBint get_wstr(wint_t * \fIwstr\fP);
+\fBint wget_wstr(WINDOW * \fIwin\fP, wint_t * \fIwstr\fP);
+\fBint mvget_wstr(int \fIy\fP, int \fIx\fP, wint_t * \fIwstr\fP);
+\fBint mvwget_wstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, wint_t * \fIwstr\fP);
 .PP
-\fBint mvget_wstr(int \fIy\fP, int \fIx\fP, wint_t *\fIwstr\fP);
-\fBint mvgetn_wstr(int \fIy\fP, int \fIx\fP, wint_t *\fIwstr\fP, int \fIn\fP);
-\fBint mvwget_wstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, wint_t *\fIwstr\fP);
-\fBint mvwgetn_wstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, wint_t *\fIwstr\fP, int \fIn\fP);
+\fBint getn_wstr(wint_t * \fIwstr\fP, int \fIn\fP);
+\fBint wgetn_wstr(WINDOW * \fIwin\fP, wint_t * \fIwstr\fP, int \fIn\fP);
+\fBint mvgetn_wstr(int \fIy\fP, int \fIx\fP, wint_t * \fIwstr\fP, int \fIn\fP);
+\fBint mvwgetn_wstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, wint_t * \fIwstr\fP, int \fIn\fP);
 .fi
 .SH DESCRIPTION
 The function
diff --git a/man/curs_getstr.3x b/man/curs_getstr.3x
index eec58a54..8ad2471f 100644
--- a/man/curs_getstr.3x
+++ b/man/curs_getstr.3x
@@ -27,17 +27,19 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getstr.3x,v 1.65 2024/06/08 21:04:32 tom Exp $
-.TH curs_getstr 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_getstr.3x,v 1.67 2024/06/22 22:20:56 tom Exp $
+.TH curs_getstr 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
+.ds ^  \(ha
 .\}
 .el \{\
 .ie t .ds `` ``
 .el   .ds `` ""
 .ie t .ds '' ''
 .el   .ds '' ""
+.ds       ^  ^
 .\}
 .
 .de bP
@@ -58,97 +60,119 @@ accept character strings from \fIcurses\fR terminal keyboard
 .nf
 \fB#include 
 .PP
-\fBint getstr(char *\fIstr\fP);
-\fBint getnstr(char *\fIstr\fP, int \fIn\fP);
-\fBint wgetstr(WINDOW *\fIwin\fP, char *\fIstr\fP);
-\fBint wgetnstr(WINDOW *\fIwin\fP, char *\fIstr\fP, int \fIn\fP);
+\fBint getstr(char * \fIstr\fP);
+\fBint wgetstr(WINDOW * \fIwin\fP, char * \fIstr\fP);
+\fBint mvgetstr(int \fIy\fP, int \fIx\fP, char * \fIstr\fP);
+\fBint mvwgetstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, char * \fIstr\fP);
 .PP
-\fBint mvgetstr(int \fIy\fP, int \fIx\fP, char *\fIstr\fP);
-\fBint mvwgetstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, char *\fIstr\fP);
-\fBint mvgetnstr(int \fIy\fP, int \fIx\fP, char *\fIstr\fP, int \fIn\fP);
-\fBint mvwgetnstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, char *\fIstr\fP, int \fIn\fP);
+\fBint getnstr(char * \fIstr\fP, int \fIn\fP);
+\fBint wgetnstr(WINDOW * \fIwin\fP, char * \fIstr\fP, int \fIn\fP);
+\fBint mvgetnstr(int \fIy\fP, int \fIx\fP, char * \fIstr\fP, int \fIn\fP);
+\fBint mvwgetnstr(WINDOW * \fIwin\fP, int \fIy\fP, int \fIx\fP, char * \fIstr\fP, int \fIn\fP);
 .fi
 .SH DESCRIPTION
+.B \%wgetstr
+populates a user-supplied string buffer
+.I str
+by repeatedly calling \fBwgetch\fP(3X)
+with the
+.I win
+argument
+until a line feed or carriage return character is input.
+.\" Of the two, because wgetnstr() calls nl(), only a line feed (\n)
+.\" will ever be returned by wgetch().
 The function
-\fBwgetnstr\fP
-is equivalent to a series of calls to
-\fBwgetch\fP(3X),
-until a newline or carriage return terminates the series:
 .bP
-The terminating character is not included in the returned string.
+does not copy the terminating character to
+.IR str ";"
 .bP
-In all instances, the end of the string is terminated
-by a NUL.
+always terminates
+.I str
+with a null character;
 .bP
-The function stores the result in the area pointed to
-by the \fIstr\fP parameter.
+interprets the screen's erase and kill characters
+(see \fB\%erasechar\fP(3X) and \fB\%killchar\fP(3X));
 .bP
-The function reads at most \fIn\fP characters,
-thus preventing a possible overflow of the input buffer.
-.IP
-Any attempt to enter more characters
-(other than the terminating newline or carriage return)
-causes a beep.
-.IP
-Function keys also cause a beep and are ignored.
+recognizes function keys only if the screen's keypad option is enabled
+(see \fB\%keypad\fP(3X));
+.bP
+treats the function keys
+.B \%KEY_LEFT
+and
+.B \%KEY_BACKSPACE
+the same as the erase character;
+and
+.bP
+discards function key inputs other than those treated as the erase
+character,
+calling \fBbeep\fP(3X).
+.PP
+The erase character replaces the character at the end of the buffer with
+a null character,
+while the kill character does the same for the entire buffer.
 .PP
-The user's \fIerase\fP and \fIkill\fP characters are interpreted:
+If the screen's echo option is enabled
+(see \fBecho\fP(3X)),
+.B \%wgetstr
+updates
+.I win
+with \fB\%wechochar\fP(3X).
+Further,
 .bP
-The \fIerase\fP character (e.g., \fB^H\fP) erases the character
-at the end of the buffer, moving the cursor to the left.
-.IP
-If \fIkeypad\fP mode is on for the window,
-\fBKEY_LEFT\fP and \fBKEY_BACKSPACE\fP
-are both considered equivalent to the user's \fIerase\fP character.
+the erase character
+and its function key synonyms
+move the cursor to the left,
+and
 .bP
-The \fIkill\fP character (e.g., \fB^U\fP) erases the entire buffer,
-leaving the cursor at the beginning of the buffer.
+the kill character returns the cursor to where it was located when
+.B \%wgetstr
+was called.
 .PP
-Characters input are echoed only if \fBecho\fP is currently on.
-In that case,
-backspace is echoed as deletion of the previous character
-(typically a left motion).
+.B \%wgetnstr
+is similar,
+but reads at most
+.I n
+characters,
+aiding the application to avoid overrunning the buffer to which
+.I str
+points.
+An attempt to input more than
+.I n
+characters
+(other than the terminating line feed or carriage return)
+is ignored with a beep.
 .PP
-The
-\fBgetnstr\fP,
-\fBmvgetnstr\fP,
-\fBmvwgetnstr\fP, and
-\fBwgetnstr\fP
-functions are identical
-to the
-\fBgetstr\fP,
-\fBmvgetstr\fP,
-\fBmvwgetstr\fP, and
-\fBwgetstr\fP
-functions, respectively,
-except that the
-\fB*n*\fP
-versions read at most
-\fIn\fP
-characters, letting the application prevent overflow of the
-input buffer.
+\fB\%ncurses\fP(3X) describes the variants of these functions.
 .SH RETURN VALUE
-All of these functions return the integer \fBOK\fP upon successful completion.
-(SVr4 specifies only \*(``an integer value other than \fBERR\fP\*('')
-If unsuccessful, they return \fBERR\fP.
-.PP
-X/Open defines no error conditions.
+These functions return
+.B OK
+on success and
+.B ERR
+on failure.
 .PP
-In this implementation,
-these functions return
+In
+.IR \%ncurses ","
+they return
 .B ERR
+if
 .bP
-if the window pointer is null,
+.I win
+is
+.BR NULL ","
+or
 .bP
-if its timeout expires without having any data, or
-.bP
-if the associated call to
-\fBwgetch\fP
-failed.
+if an internal
+.B \%wgetch
+call fails.
 .PP
-This implementation provides an extension as well.
-If a \fBSIGWINCH\fP interrupts the function, it will return \fBKEY_RESIZE\fP
-rather than \fBOK\fP or \fBERR\fP.
+Further,
+in
+.IR \%ncurses ","
+these functions return
+.B \%KEY_RESIZE
+if a
+.B \%SIGWINCH
+event interrupts the function.
 .PP
 Functions prefixed with \*(``mv\*('' first perform cursor movement and
 fail if the position
@@ -156,138 +180,307 @@ fail if the position
 .IR x )
 is outside the window boundaries.
 .SH NOTES
-Any of these functions other than
-\fBwgetnstr\fP
-may be macros.
+All of these functions except
+.B \%wgetnstr
+may be implemented as macros.
+.PP
+Use of
+.BR \%getstr ","
+.BR \%mvgetstr ","
+.BR \%mvwgetstr ","
+or
+.B \%wgetstr
+to read input that
+overruns the buffer pointed to by
+.I str
+causes undefined results.
+Use their
+.BR n -infixed
+counterpart functions instead.
 .PP
-Using
-\fBgetstr\fP,
-\fBmvgetstr\fP,
-\fBmvwgetstr\fP, or
-\fBwgetstr\fP
-to read a line that
-overflows the array pointed to by
-\fBstr\fP
-causes undefined
-results.
-The use of
-\fBgetnstr\fP,
-\fBmvgetnstr\fP,
-\fBmvwgetnstr\fP, or
-\fBwgetnstr\fP,
-respectively, is recommended.
+While
+.B \%wgetnstr
+is conceptually a series of calls to
+.BR \%wgetch ","
+it also temporarily changes properties of the
+.I curses
+screen to permit simple editing of the input buffer.
+It saves the screen's state and then calls \fBnl\fP(3X) and,
+if the screen was in normal (\*(``cooked\*('') mode,
+\fB\%cbreak\fP(3X).
+Before returning,
+it restores the saved screen state.
+Other implementations differ in detail,
+affecting which control characters they can accept in the buffer;
+see section \*(``PORTABILITY\*('' below.
+.SH EXTENSIONS
+The return value
+.B \%KEY_RESIZE
+is an
+.I \%ncurses
+extension.
 .SH PORTABILITY
-X/Open Curses,
-Issue 4 describes these functions.
-It specifies no error conditions for them.
+Applications employing
+.I \%ncurses
+extensions should condition their use on the visibility of the
+.B \%NCURSES_VERSION
+preprocessor macro.
 .PP
-SVr3 and early SVr4 curses implementations did not reject function keys;
-the SVr4.0 documentation claimed that \*(``special keys\*(''
+X/Open Curses Issue 4 describes these functions.
+It specifies no error conditions for them,
+but indicates that
+.I \%wgetnstr
+and its variants read
+\*(``the entire multi-byte sequence associated with a character\*(''
+and \*(``fail\*('' if
+.I n
+and
+.I str
+together do not describe a buffer
+\*(``large enough to contain any complete characters\*(''.
+In
+.IR \%ncurses ","
+however,
+.I \%wgetch
+reads only single-byte characters,
+so this scenario does not arise.
+.\" You can pass ncurses wgetnstr n=0 and it will beep at you with each
+.\" key stroke.
+.PP
+SVr4
+.I curses
+describes a successful return value only as
+\*(``an integer value other than
+.BR ERR \*(''.
+.PP
+SVr3 and early SVr4
+.I curses
+implementations did not reject function keys;
+the SVr4 documentation asserted that,
+like the screen's erase and kill characters,
+they were
+.PP
+.RS
+interpreted,
+as well as any special keys
 (such as function keys,
 \*(``home\*('' key,
 \*(``clear\*('' key,
-\fIetc\fP.) are \*(``interpreted\*('',
-without giving details.
-It lied.
-In fact, the \*(``character\*('' value appended to the
-string by those implementations was predictable but not useful
-(being, in fact, the low-order eight bits of the key's KEY_ value).
+.IR etc. )
+.\" SVID 4, Volume 3, p. 495
+.RE
 .PP
-The functions \fBgetnstr\fP, \fBmvgetnstr\fP, and \fBmvwgetnstr\fP were
-present but not documented in SVr4.
+without further detail.
+It lied.
+In fact,
+the \*(``character\*('' value
+appended to the string
+by those implementations
+was predictable but not useful \(em
+being,
+in fact,
+the low-order eight bits of the key code's
+.B KEY_
+constant value.
+(The same language,
+unchanged except for styling,
+survived into X/Open Curses Issue 4, \" p. 94 (PDF 114)
+but disappeared from Issue 7.) \" p. 105 (PDF 119)
 .PP
-X/Open Curses, Issue 5 (2007) stated that these functions
-\*(``read at most \fIn\fP bytes\*(''
-but did not state whether the terminating NUL counted toward that limit.
-X/Open Curses, Issue 7 (2009) changed that to say they
-\*(``read at most \fIn\fP\-1 bytes\*(''
-to allow for the terminating NUL.
-As of 2018, some implementations count it, some do not:
-.bP
-\fI\%ncurses\fP 6.1 and PDCurses do not count the NUL in the given limit, while
+X/Open Curses Issue 5 (2007) stated that these functions
+\*(``read at most
+.I n
+bytes\*(''
+but did not state whether the terminating null character
+counted toward that limit.
+X/Open Curses Issue 7 (2009) changed that to say they
+\*(``read at most
+.IR n \-1
+bytes\*(''
+to allow for the terminating null character.
+As of 2018,
+some implementations count it,
+some do not.
 .bP
-Solaris SVr4 and NetBSD curses count the NUL as part of the limit.
+.I \%ncurses
+6.1 and
+.I PDCurses
+do not count the null character toward the limit,
+while Solaris and NetBSD
+.I curses
+do.
 .bP
-Solaris xcurses provides both:
-its wide-character \fBwget_nstr\fP reserves a NUL,
-but its \fBwgetnstr\fP does not count the NUL consistently.
+Solaris
+.I xcurses
+offers both behaviors:
+its wide-character
+.I \%wgetn_wstr
+reserves room for a wide null character,
+but its non-wide
+.I \%wgetnstr
+does not consistently count a null character toward the limit.
 .PP
-In SVr4 curses,
-a negative value of \fIn\fP tells \fBwgetnstr\fP to assume that the
-caller's buffer is large enough to hold the result,
-i.e., to act like \fBwgetstr\fP.
-X/Open Curses does not mention this
-(or anything related to negative or zero values of \fIn\fP),
-however most implementations
-use the feature, with different limits:
+In SVr4
+.IR curses ","
+a negative
+.I n
+tells
+.I \%wgetnstr
+to assume that the caller's buffer
+is large enough to hold the result;
+that is,
+the function then acts like
+.IR \%wgetstr "."
+X/Open Curses does not mention this behavior
+(or anything related to nonpositive
+.I n
+values),
+however most
+.I curses
+libraries implement it.
+Most implementations nevertheless enforce an upper limit
+on the count of bytes they write to the destination buffer
+.IR str "."
 .bP
-Solaris SVr4 curses and PDCurses limit the result to 255 bytes.
-Other Unix systems than Solaris are likely to use the same limit.
+BSD
+.I curses
+lacked
+.IR \%wgetnstr ","
+and its
+.I \%wgetstr
+wrote to
+.I str
+unboundedly,
+.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=4BSD/usr/src/lib/\
+.\"   libcurses/getstr.c
+.\" https://minnie.tuhs.org/cgi-bin/utree.pl?file=4.4BSD/usr/src/lib/\
+.\"   libcurses/getstr.c
+as did that in SVr2.
+.\" https://github.com/ryanwoodsmall/oldsysv/blob/master/sysvr2-vax/\
+.\"   src/lib/libcurses/screen/getstr.c
 .bP
-Solaris xcurses limits the result to \fBLINE_MAX\fP bytes.
-.bP
-NetBSD 7 assumes no particular limit for the result from \fBwgetstr\fP.
-However, it limits the \fBwgetnstr\fP parameter \fIn\fP to ensure
-that it is greater than zero.
-.IP
-A comment in NetBSD's source code states that this is specified in SUSv2.
+.IR PDCurses ","
+and
+SVr3.1,
+SVr4,
+and
+Solaris
+.I curses
+limit both functions to writing 256 bytes.
+Other System\ V-based platforms likely use the same limit.
+.\" https://github.com/ryanwoodsmall/oldsysv/blob/master/\
+.\"   sysvr3/31/usr/src/lib/libcurses/screen/wgetstr.c#L10
+.\"   sysvr4/svr4/lib/xlibcurses/screen/wgetstr.c#L12
 .bP
-\fI\%ncurses\fP (before 6.2) assumes no particular limit for the result
-from \fBwgetstr\fP, and treats the \fIn\fP parameter of \fBwgetnstr\fP
-like SVr4 curses.
+Solaris
+.I xcurses
+limits the write to
+.B LINE_MAX
+bytes.
 .bP
-\fI\%ncurses\fP 6.2 uses \fBLINE_MAX\fP,
-or a larger (system-dependent) value
-which the \fBsysconf\fP function may provide.
-If neither \fBLINE_MAX\fP or \fBsysconf\fP is available,
-\fI\%ncurses\fP uses the POSIX value for \fBLINE_MAX\fP (a 2048 byte limit).
-In either case, it reserves a byte for the terminating NUL.
-.PP
-Although \fBgetnstr\fP is equivalent to a series of calls to \fBgetch\fP,
-it also makes changes to the curses modes to allow simple editing of
-the input buffer:
-.bP
-\fBgetnstr\fP saves the current value of the \fBnl\fP, \fBecho\fP,
-\fBraw\fP and \fBcbreak\fP modes, and sets
-\fBnl\fP,
-\fBnoecho\fP,
-\fBnoraw\fP, and
-\fBcbreak\fP.
-.IP
-\fBgetnstr\fP handles the echoing of characters,
-rather than relying on the caller to set an appropriate mode.
+NetBSD 7
+.I curses
+imposes no particular limit on the length of the write,
+but does validate
+.I n
+to ensure that it is greater than zero.
+A comment in NetBSD's source code asserts that SUSv2 specifies this.
 .bP
-It also obtains the \fIerase\fP and \fIkill\fP characters
-from \fBerasechar\fP and \fBkillchar\fP, respectively.
+.I \%ncurses
+prior to 6.2 (2020)
+imposes no limit on the length of the write,
+and treats
+.IR wgetnstr 's
+.I n
+parameter as SVr4
+.I curses
+does.
 .bP
-On return, \fBgetnstr\fP restores the modes to their previous values.
+.I \%ncurses
+6.2 uses
+.B LINE_MAX
+or a larger (system-dependent) value
+provided by \fI\%sysconf\fP(3).
+If neither
+.B LINE_MAX
+nor
+.I \%sysconf
+is available,
+.I \%ncurses
+uses the POSIX minimum value for
+.B LINE_MAX
+(2048). \" _POSIX2_LINE_MAX
+In either case,
+it reserves a byte for the terminating null character.
 .PP
-Other implementations differ in their treatment of special characters:
+Implementations vary in their handling of input control characters.
 .bP
-While they may set the \fIecho\fP mode,
-other implementations do not modify the \fIraw\fP mode,
-They may take the \fIcbreak\fP
-mode set by the caller into account when deciding whether to handle
-echoing within \fBgetnstr\fP or as a side-effect of the \fBgetch\fP calls.
+While they may enable the screen's echo option,
+some do not take it out of raw mode,
+and may take cbreak mode into account
+when deciding whether to handle echoing within
+.I \%wgetnstr
+or to rely on it as a side effect of calling
+.IR \%wgetch "."
 .bP
-The original \fI\%ncurses\fP
-(as \fIpcurses\fP in 1986)
-set \fBnoraw\fP and \fBcbreak\fP when accepting input for \fBgetnstr\fP.
-That may have been done to make function- and cursor-keys work;
-it is not necessary with \fI\%ncurses\fP.
+Originally,
+.IR \%ncurses ","
+like its progenitor
+.IR \%pcurses ","
+had its
+.I \%wgetnstr
+call
+.I \%noraw
+and
+.I \%cbreak
+before accepting input.
+That may have been done to make function keys work;
+it is not necessary with modern
+.IR \%ncurses "."
 .IP
 Since 1995,
-\fI\%ncurses\fP has provided signal handlers for INTR and QUIT
-(e.g., \fB^C\fP or \fB^\e\fP).
-With the \fBnoraw\fP and \fBcbreak\fP settings,
-those may catch a signal and stop the program,
-where other implementations allow one to enter those characters in the buffer.
+.I \%ncurses
+has provided handlers for
+.B SIGINTR
+and
+.B SIGQUIT
+events,
+which are typically generated at the keyboard with
+.B \*^C
+and
+.B \*^\e
+respectively.
+In cbreak mode,
+those handlers catch a signal and stop the program,
+whereas other implementations write those characters into the buffer.
 .bP
-Starting in 2021
-(\fI\%ncurses\fP 6.3),
-\fBgetnstr\fP sets \fBraw\fP,
-rather than \fBnoraw\fP and \fBcbreak\fP for better compatibility with
-SVr4-curses, e.g., allowing one to enter a \fB^C\fP into the buffer.
+Starting with
+.I \%ncurses
+6.3 (2021),
+.I \%wgetnstr
+preserves raw mode if the screen was already in that state,
+allowing one to enter the characters the terminal interprets
+as interrupt and quit events
+into the buffer,
+for better compatibility with SVr4
+.IR curses "."
+.SH HISTORY
+4BSD (1980)
+.I curses
+introduced
+.I \%wgetstr
+along with its variants.
+.PP
+SVr3.1 (1987)
+added
+.IR \%wgetnstr ","
+but none of its variants.
+.PP
+X/Open Curses Issue 4 (1995) specified
+.IR \%getnstr ","
+.IR \%mvwgetnstr ","
+and
+.IR \%mvgetnstr "."
 .SH SEE ALSO
 \fB\%curs_get_wstr\fP(3X) describes comparable functions of the
 .I \%ncurses
@@ -295,6 +488,7 @@ library in its wide-character configuration
 .RI \%( ncursesw ).
 .PP
 \fB\%curses\fP(3X),
+\fB\%curs_addch\fP(3X),
 \fB\%curs_getch\fP(3X),
-\fB\%curs_termattrs\fP(3X),
-\fB\%curs_variables\fP(3X)
+\fB\%curs_inopts\fP(3X), \" echo(), keypad()
+\fB\%curs_termattrs\fP(3X), \" erasechar(), killchar()
diff --git a/man/curs_kernel.3x b/man/curs_kernel.3x
index e474b640..457db4da 100644
--- a/man/curs_kernel.3x
+++ b/man/curs_kernel.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_kernel.3x,v 1.65 2024/06/08 21:00:58 tom Exp $
-.TH curs_kernel 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_kernel.3x,v 1.67 2024/06/22 21:24:26 tom Exp $
+.TH curs_kernel 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -198,8 +198,10 @@ write to the screen with the external application;
 call
 .BR \%reset_prog_mode ";"
 and finally call
-.B \%mvcur
-to set the cursor's location to where
+.BR \%mvcur( ".\|.\|." ,
+.RB .\|.\|. ,
+.B \-1, \-1)
+to move the terminal cursor to where
 .I \%curses
 thinks it is,
 since the library has no knowledge of how the external application
diff --git a/man/curs_pad.3x b/man/curs_pad.3x
index f42968bd..d2fadb90 100644
--- a/man/curs_pad.3x
+++ b/man/curs_pad.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_pad.3x,v 1.63 2024/05/25 20:10:58 tom Exp $
-.TH curs_pad 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_pad.3x,v 1.65 2024/06/22 22:20:03 tom Exp $
+.TH curs_pad 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -87,7 +87,8 @@ or
 .B \%pnoutrefresh
 instead.
 .SS newpad
-\fB\%newpad\fP creates and returns a pointer to a new pad data structure
+.B \%newpad
+creates and returns a pointer to a new pad data structure
 with the given number of lines,
 .IR nlines ,
 and columns,
@@ -114,7 +115,7 @@ it is often necessary to call \fB\%touchwin\fP(3X) or
 before calling
 .BR \%prefresh .
 .SS "prefresh, pnoutrefresh"
-.B \%prefresh\fP
+.B \%prefresh
 and
 .B \%pnoutrefresh
 are analogous to \fB\%wrefresh\fP(3X) and \fB\%wnoutrefresh\fP(3X)
@@ -156,7 +157,7 @@ The location of the character
 written to the pad is used to populate the arguments to
 .BR \%prefresh .
 .SS pecho_wchar
-.B \%pecho_wchar\fP
+.B \%pecho_wchar
 is functionally equivalent to calling \fB\%wadd_wch\fP(3X) followed by
 .BR \%prefresh .
 It suggests to the
@@ -168,20 +169,28 @@ The location of the character
 written to the pad is used to populate the arguments to
 .BR \%prefresh .
 .SH RETURN VALUE
-Functions that return an integer return \fBERR\fP upon failure and
-\fBOK\fP
+Functions that return an integer return
+.B ERR
+upon failure and
+.B OK
 (SVr4 specifies only
-\*(``an integer value other than \fBERR\fP\*('')
+\*(``an integer value other than
+.BR ERR \*('')
 upon successful completion.
 .PP
-Functions that return pointers return \fBNULL\fP on error,
-and set \fB\%errno\fP to \fB\%ENOMEM\fP.
+Functions that return pointers return
+.B NULL
+on error,
+and set
+.I \%errno
+to
+.BR \%ENOMEM "."
 .PP
 X/Open Curses does not specify any error conditions.
 In this implementation
 .RS 3
 .TP 5
-\fB\%prefresh\fP and \fB\%pnoutrefresh\fP
+.BR prefresh\  and\  pnoutrefresh
 return
 .B ERR
 if the window pointer is null, or
@@ -189,24 +198,33 @@ if the window is not really a pad or
 if the area to refresh extends off-screen or
 if the minimum coordinates are greater than the maximum.
 .TP 5
-\fBpechochar\fP
+.B pechochar
 returns
 .B ERR
-if the window is not really a pad, and the associated call
-to \fB\%wechochar\fP returns
+if the window is not really a pad,
+and the associated call to
+.B \%wechochar
+returns
 .BR ERR "."
 .TP 5
-\fBpecho_wchar\fP
+.B pecho_wchar
 returns
 .B ERR
-if the window is not really a pad, and the associated call
-to \fB\%wecho_wchar\fP returns
+if the window is not really a pad,
+and the associated call to
+.B \%wecho_wchar
+returns
 .BR ERR "."
 .RE
 .SH NOTES
-\fB\%pechochar\fP may be a macro.
+.B \%pechochar
+may be a macro.
 .SH PORTABILITY
-BSD \fIcurses\fP has no \fIpad\fP feature.
+BSD
+.I curses
+has no
+.I pad
+feature.
 .PP
 SVr2 \fIcurses\fP (1986) provided the \fB\%newpad\fP and related functions,
 documenting them in a single line each.
diff --git a/man/curs_slk.3x b/man/curs_slk.3x
index 1866064a..e141d7b6 100644
--- a/man/curs_slk.3x
+++ b/man/curs_slk.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_slk.3x,v 1.73 2024/05/25 20:10:58 tom Exp $
-.TH curs_slk 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_slk.3x,v 1.75 2024/06/22 21:25:23 tom Exp $
+.TH curs_slk 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -135,9 +135,9 @@ helping the user to associate each label with its numbered function key.
 \fBLINES\fP and the vertical size of \fB\%stdscr\fP are further reduced.
 .SS Labels
 Populate the labels with normal strings
-(\fB\%slk_set\fP)
+\%(\fBslk_set\fP)
 or wide-character strings
-(\fB\%slk_wset\fP).
+\%(\fBslk_wset\fP).
 Each function takes three parameters.
 .TP 8 \" "labnum" + 2n
 .I labnum
diff --git a/man/curs_termcap.3x b/man/curs_termcap.3x
index 6bd2a66a..f7bb8d6b 100644
--- a/man/curs_termcap.3x
+++ b/man/curs_termcap.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_termcap.3x,v 1.85 2024/04/20 19:13:12 tom Exp $
-.TH curs_termcap 3X 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_termcap.3x,v 1.87 2024/06/22 21:28:07 tom Exp $
+.TH curs_termcap 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -275,7 +275,7 @@ on error.
 Error conditions include:
 .bP
 uninitialized state
-(\fB\%tgetent\fP was not called successfully),
+\%(\fBtgetent\fP was not called successfully),
 .bP
 .I cap
 being a null pointer,
@@ -421,7 +421,7 @@ Nevertheless,
 the BSD sources included two different \fI\%termcap.h\fP header files
 over time.
 .bP
-One was used internally by \fBjove\fP(1) from 4.3BSD onward.
+One was used internally by \fIjove\fP(1) from 4.3BSD onward.
 .\" 2BSD became a branch retaining support for non-virtual memory
 .\" systems (such as the PDP-11) whereas most BSD development focused on
 .\" the VAX and other VM-enabled systems starting with 3BSD.
@@ -466,11 +466,11 @@ support the \fI\%readline\fP(3) library.
 \fI\%ncurses\fP 1.8.1
 (November 1993)
 provided a \fI\%termcap.h\fP file.
-It reflected influence from GNU \fItermcap\fP and \fBemacs\fP(1)
-(rather than \fBjove\fP(1)),
+It reflected influence from GNU \fItermcap\fP and \fI\%emacs\fP(1)
+(rather than \fIjove\fP(1)),
 providing the following interface:
 .bP
-global symbols used by \fIemacs\fP,
+global symbols used by \fI\%emacs\fP,
 .bP
 \fIconst\fP-qualified function prototypes,
 and
diff --git a/man/curs_util.3x b/man/curs_util.3x
index 4b6450ee..74227f0d 100644
--- a/man/curs_util.3x
+++ b/man/curs_util.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_util.3x,v 1.110 2024/06/15 20:20:12 tom Exp $
-.TH curs_util 3X 2024-06-15 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_util.3x,v 1.112 2024/06/22 21:25:23 tom Exp $
+.TH curs_util 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -264,8 +264,8 @@ There are a few caveats:
 .bP
 the data written is a copy of the \fI\%WINDOW\fP structure,
 and its associated character cells.
-The format differs between the wide-character (\fI\%ncursesw\fP) and
-non-wide (\fI\%ncurses\fP) libraries.
+The format differs between the wide-character \%(\fIncursesw\fP) and
+non-wide \%(\fIncurses\fP) libraries.
 You can transfer data between the two,
 however.
 .bP
diff --git a/man/curs_variables.3x b/man/curs_variables.3x
index 467b6944..8b150147 100644
--- a/man/curs_variables.3x
+++ b/man/curs_variables.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_variables.3x,v 1.47 2024/04/13 22:37:35 tom Exp $
-.TH curs_variables 3X 2024-04-13 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_variables.3x,v 1.49 2024/06/22 21:25:23 tom Exp $
+.TH curs_variables 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -285,7 +285,7 @@ the physical screen with \fB\%mvcur\fP(3X).
 \fI\%ncurses\fP uses the value of \fB\%TABSIZE\fP only to update the
 virtual screen.
 It uses the terminal description's \*(``\fBit\fP\*(''
-(\fB\%init_tabs\fP) capability for computing hardware tabs
+\%(\fBinit_tabs\fP) capability for computing hardware tabs
 (that is,
 tab stops on the physical screen).
 .bP
diff --git a/man/man_db.renames.in b/man/man_db.renames.in
index 63768803..ef6b5f08 100644
--- a/man/man_db.renames.in
+++ b/man/man_db.renames.in
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: man_db.renames.in,v 1.76 2024/06/08 20:52:35 Branden.Robinson Exp $
+# $Id: man_db.renames.in,v 1.77 2024/06/22 22:20:56 tom Exp $
 # Manual-page renamings for the man_db program
 #
 # Files:
@@ -178,6 +178,7 @@ attr_get.3x			attr_get.3ncurses
 attr_on.3x			attr_on.3ncurses
 attron.3x			attron.3ncurses
 baudrate.3x			baudrate.3ncurses
+beep.3x				beep.3ncurses
 bkgd.3x				bkgd.3ncurses
 bkgrnd.3x			bkgrnd.3ncurses
 cbreak.3x			cbreak.3ncurses
@@ -217,6 +218,7 @@ initscr.3x			initscr.3ncurses
 is_scrollok.3x			is_scrollok.3ncurses
 keyname.3x			keyname.3ncurses
 keypad.3x			keypad.3ncurses
+killchar.3x			killchar.3ncurses
 leaveok.3x			leaveok.3ncurses
 longname.3x			longname.3ncurses
 meta.3x				meta.3ncurses
diff --git a/man/manhtml.aliases b/man/manhtml.aliases
index 27a9b371..fe68cf5b 100644
--- a/man/manhtml.aliases
+++ b/man/manhtml.aliases
@@ -1,4 +1,4 @@
-# $Id: manhtml.aliases,v 1.39 2024/06/08 23:34:02 tom Exp $
+# $Id: manhtml.aliases,v 1.41 2024/06/22 23:03:10 tom Exp $
 #***************************************************************************
 # Copyright 2019-2023,2024 Thomas E. Dickey                                *
 # Copyright 2013,2017 Free Software Foundation, Inc.                       *
@@ -35,6 +35,7 @@ attr_get(3X)		curs_attr(3X)
 attr_on(3X)		curs_attr(3X)
 attron(3X)		curs_attr(3X)
 baudrate(3X)		curs_termattrs(3X)
+beep(3X)		curs_beep(3X)
 bkgd(3X)		curs_bkgd(3X)
 bkgrnd(3X)		curs_bkgrnd(3X)
 cbreak(3X)		curs_inopts(3X)
@@ -68,7 +69,9 @@ in_wch(3X)		curs_in_wch(3X)
 inch(3X)		curs_inch(3X)
 infocmp(1)		infocmp(1M)
 initscr(3X)		curs_initscr(3X)
+is_cbreak(3X)		curs_inopts(3X)
 is_scrollok(3X)		curs_opaque(3X)
+killchar(3X)		curs_termattrs(3X)
 keyname(3X)		curs_util(3X)
 keypad(3X)		curs_inopts(3X)
 longname(3X)		curs_termattrs(3X)
diff --git a/man/manhtml.externs b/man/manhtml.externs
index 1cf3af64..0db34210 100644
--- a/man/manhtml.externs
+++ b/man/manhtml.externs
@@ -1,4 +1,4 @@
-# $Id: manhtml.externs,v 1.27 2024/06/15 20:24:43 tom Exp $
+# $Id: manhtml.externs,v 1.28 2024/06/22 22:20:56 tom Exp $
 # Items in this list will not be linked by man2html
 #***************************************************************************
 # Copyright 2019-2023,2024 Thomas E. Dickey                                *
@@ -72,6 +72,7 @@ sscanf(3)
 stdio(3)
 stty(1)
 swprintf(3)
+sysconf(3)
 system(3)
 termios(3)
 tmux(1)
diff --git a/man/ncurses.3x b/man/ncurses.3x
index b784cc07..b41af100 100644
--- a/man/ncurses.3x
+++ b/man/ncurses.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: ncurses.3x,v 1.223 2024/06/08 20:45:43 tom Exp $
-.TH ncurses 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: ncurses.3x,v 1.225 2024/06/22 22:14:58 tom Exp $
+.TH ncurses 3X 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -121,8 +121,8 @@ API should be aware,
 such as limitations on the size of an underlying integral type or the
 availability of a preprocessor macro exclusive of a function definition
 (which prevents its address from being taken).
-This section also describes implementation details that will be
-significant to the programmer but which are not standardized.
+This section also describes implementation details
+of significance to the programmer but which are not standardized.
 .bP
 \*(``EXTENSIONS\*('' presents
 .I \%ncurses
@@ -170,13 +170,12 @@ and
 respectively.)
 The
 .I \%ncurses_g
-library generates trace logs
-(in a file called
-.I \%trace
-in the current directory)
-that describe
+library logs events describing
 .I \%ncurses
-actions.
+actions
+to a file called
+.I \%trace
+in the current directory.
 See section \*(``ALTERNATE CONFIGURATIONS\*('' below.
 .SS "Application Structure"
 A
@@ -229,10 +228,27 @@ Call \fB\%endwin\fP(3X) before exiting.
 .SS Overview
 A
 .I curses
-library abstracts the terminal screen by representing all or part of it
-as a
+library abstracts the terminal with a
+.I \%SCREEN
+data structure,
+and represents all or part of its display
+with
 .I \%WINDOW
-data structure.
+structures.
+Distinct properties apply to each;
+for example,
+the
+.I "line discipline"
+of a typical Unix terminal driver
+is in one of three modes:
+raw,
+\%cbreak,
+or normal (\*(``cooked\*('').
+In
+.IR curses ","
+the line discipline is a property of the screen,
+applying identically to all windows associated with it.
+.PP
 A
 .I window
 is a rectangular grid of character cells,
@@ -1933,9 +1949,12 @@ See \fB\%default_colors\fP(3X).
 An
 .I \%ncurses
 application can eschew knowledge of
+.I \%SCREEN
+and
 .I \%WINDOW
 structure internals,
 instead using accessor functions such as
+\fB\%is_cbreak\fP(3X) and
 \fB\%is_scrollok\fP(3X).
 .PP
 .I \%ncurses
@@ -2002,7 +2021,9 @@ such as wide-character and color support.
 .I \%ncurses
 intends base-level conformance with X/Open Curses,
 and supports all features of its enhanced level
-except the \fB\%untic\fP utility.
+except the
+.I \%untic
+utility.
 .PP
 Differences between X/Open Curses and
 .I \%ncurses
diff --git a/man/tabs.1 b/man/tabs.1
index 059bc1ec..11686039 100644
--- a/man/tabs.1
+++ b/man/tabs.1
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tabs.1,v 1.59 2024/04/20 19:08:15 tom Exp $
-.TH @TABS@ 1 2024-04-20 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: tabs.1,v 1.61 2024/06/22 22:15:32 tom Exp $
+.TH @TABS@ 1 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -341,9 +341,9 @@ without settling on an improved solution.
 It claims that
 .PP
 .RS 4
-\*(``no known historical version of
+no known historical version of
 .I tabs
-supports the capability of setting arbitrary tab stops.\*(''
+supports the capability of setting arbitrary tab stops.
 .RE
 .PP
 The feature described in subsection \*(``Explicit Lists\*('' above was
diff --git a/man/terminfo.tail b/man/terminfo.tail
index 74a27415..7f400117 100644
--- a/man/terminfo.tail
+++ b/man/terminfo.tail
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: terminfo.tail,v 1.150 2024/06/08 20:42:50 Branden.Robinson Exp $
+.\" $Id: terminfo.tail,v 1.151 2024/06/22 21:25:23 tom Exp $
 .ps +1
 .SS "User-Defined Capabilities"
 .
@@ -2076,7 +2076,7 @@ Solaris,
 and \fI\%ncurses\fP support all SVr4 capabilities.
 .bP
 IRIX supports the SVr4 set and adds one undocumented extended string
-capability (\fB\%set_pglen\fP).
+capability \%(\fBset_pglen\fP).
 .bP
 SVr1 and Ultrix support a restricted subset of \fI\%terminfo\fP
 capabilities.
diff --git a/man/tput.1 b/man/tput.1
index ad930962..60aeb72d 100644
--- a/man/tput.1
+++ b/man/tput.1
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tput.1,v 1.116 2024/06/08 20:50:34 tom Exp $
-.TH @TPUT@ 1 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: tput.1,v 1.118 2024/06/22 21:28:35 tom Exp $
+.TH @TPUT@ 1 2024-06-22 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -885,8 +885,13 @@ As of
 the \*(``reset\*('' features of the two programs are (mostly) the same.
 Two minor differences remain.
 .bP
-The \fB\%@TSET@\fP program waits one second when resetting,
-in case the terminal happens to be a hardware device.
+When issuing a reset,
+the \fB\%@TSET@\fP program
+checks whether the device appears to be a pseudoterminal
+(as might be used by a terminal emulator program),
+and,
+if it does not,
+waits one second in case it is communicating with a hardware terminal.
 .bP
 The two programs write the terminal initialization strings
 to different streams;
diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in
index 89a5cd4a..3affeefc 100644
--- a/misc/gen-pkgconfig.in
+++ b/misc/gen-pkgconfig.in
@@ -1,7 +1,7 @@
 #!@SHELL@
-# $Id: gen-pkgconfig.in,v 1.56 2022/10/08 16:45:20 tom Exp $
+# $Id: gen-pkgconfig.in,v 1.57 2024/06/22 21:02:53 tom Exp $
 ##############################################################################
-# Copyright 2018-2021,2022 Thomas E. Dickey                                  #
+# Copyright 2018-2022,2024 Thomas E. Dickey                                  #
 # Copyright 2009-2015,2018 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -92,7 +92,7 @@ do
 	-specs*) # ignore linker specs-files which were used to build library
 		continue
 		;;
-	-Wl,-z,*) # ignore flags used to manipulate shared image
+	-Wl,-z*) # ignore flags used to manipulate shared image
 		continue
 		;;
 	-Wl,--dynamic-linker*) # ignore ELF interpreter
diff --git a/misc/ncurses-config.in b/misc/ncurses-config.in
index c9f1cf80..b17f6842 100644
--- a/misc/ncurses-config.in
+++ b/misc/ncurses-config.in
@@ -1,7 +1,7 @@
 #!@SHELL@
-# $Id: ncurses-config.in,v 1.52 2022/07/26 21:36:28 tom Exp $
+# $Id: ncurses-config.in,v 1.53 2024/06/22 20:52:02 tom Exp $
 ##############################################################################
-# Copyright 2018-2021,2022 Thomas E. Dickey                                  #
+# Copyright 2018-2022,2024 Thomas E. Dickey                                  #
 # Copyright 2006-2015,2017 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -107,7 +107,7 @@ do
 	-specs*) # ignore linker specs-files which were used to build library
 		continue
 		;;
-	-Wl,-z,*) # ignore flags used to manipulate shared image
+	-Wl,-z*) # ignore flags used to manipulate shared image
 		continue
 		;;
 	-Wl,--dynamic-linker*) # ignore ELF interpreter
@@ -186,16 +186,57 @@ while [ $# -gt 0 ]; do
 		;;
 	# compile/link
 	--cflags)
-		INCS="@PKG_CFLAGS@"
-		if [ "x@WITH_OVERWRITE@" = xno ]; then
-			INCS="$INCS -I${includesubdir}"
-		fi
-		if [ "${includedir}" != /usr/include ]; then
-			INCS="$INCS -I${includedir}"
-		fi
-		sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
-			$INCS
-ENDECHO
+		OPTS=
+		for opt in @PKG_CFLAGS@
+		do
+			case "x$opt" in
+			x-[DIU]*)
+				OPTS="$OPTS $opt"
+				;;
+			x-Wl,*)
+				OPTS="$OPTS $opt"
+				;;
+			x-[OW]*)
+				;;
+			*)
+				OPTS="$OPTS $opt"
+				;;
+			esac
+		done
+		printf "%s\n" "$OPTS"
+		;;
+	--cflags-only-I)
+		OPTS=
+		for opt in @PKG_CFLAGS@
+		do
+			case "x$opt" in
+			x-[DIU]*)
+				OPTS="$OPTS $opt"
+				;;
+			*)
+				;;
+			esac
+		done
+		printf "%s\n" "$OPTS"
+		;;
+	--cflags-only-other)
+		OPTS=
+		for opt in @PKG_CFLAGS@
+		do
+			case "x$opt" in
+			x-[DIU]*)
+				;;
+			x-Wl,*)
+				OPTS="$OPTS $opt"
+				;;
+			x-[OW]*)
+				;;
+			*)
+				OPTS="$OPTS $opt"
+				;;
+			esac
+		done
+		printf "%s\n" "$OPTS"
 		;;
 	--libs)
 		OPTS=
@@ -294,30 +335,32 @@ ENDECHO
 Usage: `basename "$0"` [options]
 
 Options:
-  --prefix           echos the package-prefix of ${THIS}
-  --exec-prefix      echos the executable-prefix of ${THIS}
+  --prefix            echos the package-prefix of ${THIS}
+  --exec-prefix       echos the executable-prefix of ${THIS}
 
-  --cflags           echos the C compiler flags needed to compile with ${THIS}
-  --libs             echos the libraries needed to link with ${THIS}
+  --cflags            echos the C compiler flags needed to compile for ${THIS}
+  --cflags-only-I     echos only -I C compiler flags needed with ${THIS}
+  --cflags-only-other echos only C compiler flags other than -I for ${THIS}
+  --libs              echos the libraries needed to link with ${THIS}
 
-  --libs-only-L      echos -L linker options (search path) for ${THIS}
-  --libs-only-l      echos -l linker options (libraries) for ${THIS}
-  --libs-only-other  echos linker options other than -L/-l
+  --libs-only-L       echos -L linker options (search path) for ${THIS}
+  --libs-only-l       echos -l linker options (libraries) for ${THIS}
+  --libs-only-other   echos linker options other than -L/-l
 
-  --version          echos the release+patchdate version of ${THIS}
-  --abi-version      echos the ABI version of ${THIS}
-  --mouse-version    echos the mouse-interface version of ${THIS}
+  --version           echos the release+patchdate version of ${THIS}
+  --abi-version       echos the ABI version of ${THIS}
+  --mouse-version     echos the mouse-interface version of ${THIS}
 
-  --bindir           echos the directory containing ${THIS} programs
-  --datadir          echos the directory containing ${THIS} data
-  --includedir       echos the directory containing ${THIS} header files
-  --libdir           echos the directory containing ${THIS} libraries
-  --mandir           echos the directory containing ${THIS} manpages
-  --terminfo         echos the \$TERMINFO terminfo database path
-  --terminfo-dirs    echos the \$TERMINFO_DIRS directory list
-  --termpath         echos the \$TERMPATH termcap list
+  --bindir            echos the directory containing ${THIS} programs
+  --datadir           echos the directory containing ${THIS} data
+  --includedir        echos the directory containing ${THIS} header files
+  --libdir            echos the directory containing ${THIS} libraries
+  --mandir            echos the directory containing ${THIS} manpages
+  --terminfo          echos the \$TERMINFO terminfo database path
+  --terminfo-dirs     echos the \$TERMINFO_DIRS directory list
+  --termpath          echos the \$TERMPATH termcap list
 
-  --help             prints this message
+  --help              prints this message
 ENDHELP
 		;;
 	--error|*)
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index b43c082a..56090ae8 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20240615) unstable; urgency=low
+ncurses6td (6.5+20240622) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Sat, 15 Jun 2024 05:33:15 -0400
+ -- Thomas E. Dickey   Fri, 21 Jun 2024 18:24:47 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw/rules b/package/debian-mingw/rules
index 76fbf06d..aada7641 100755
--- a/package/debian-mingw/rules
+++ b/package/debian-mingw/rules
@@ -83,6 +83,7 @@ configure-stamp:
 		--target=$(TARGET) \
 		--prefix=$(MINGW_TOP) \
 		--with-build-cc=$(BUILD_CC) \
+		--with-config-suffix=td \
 		--with-pc-suffix=$(MY_ABI)td \
 		--with-pkg-config-libdir=/usr/$(TARGET)/lib/pkgconfig \
 		$(CONFIG_OPTIONS)
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index b43c082a..56090ae8 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20240615) unstable; urgency=low
+ncurses6td (6.5+20240622) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Sat, 15 Jun 2024 05:33:15 -0400
+ -- Thomas E. Dickey   Fri, 21 Jun 2024 18:24:47 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/rules b/package/debian-mingw64/rules
index b39fec67..29c80b41 100755
--- a/package/debian-mingw64/rules
+++ b/package/debian-mingw64/rules
@@ -83,6 +83,7 @@ configure-stamp:
 		--target=$(TARGET) \
 		--prefix=$(MINGW_TOP) \
 		--with-build-cc=$(BUILD_CC) \
+		--with-config-suffix=td \
 		--with-pc-suffix=$(MY_ABI)td \
 		--with-pkg-config-libdir=/usr/$(TARGET)/lib/pkgconfig \
 		$(CONFIG_OPTIONS)
diff --git a/package/debian/changelog b/package/debian/changelog
index e7c01705..82f59573 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6td (6.5+20240615) unstable; urgency=low
+ncurses6td (6.5+20240622) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Sat, 15 Jun 2024 05:33:15 -0400
+ -- Thomas E. Dickey   Fri, 21 Jun 2024 18:24:47 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 7a17c6dc..7717e0aa 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.653 2024/06/15 09:33:15 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.654 2024/06/21 22:24:47 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "5"
 !define VERSION_YYYY  "2024"
-!define VERSION_MMDD  "0615"
+!define VERSION_MMDD  "0622"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 645e02e2..ff423fd8 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.5
-Release: 20240615
+Release: 20240622
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 36ea54cc..15880da9 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.5
-Release: 20240615
+Release: 20240622
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 6cfbf90d..7a4dfa95 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.5
-Release: 20240615
+Release: 20240622
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/test/gdc.6 b/test/gdc.6
index 3a002644..700687e6 100644
--- a/test/gdc.6
+++ b/test/gdc.6
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: gdc.6,v 1.9 2024/06/15 15:16:34 tom Exp $
+.\" $Id: gdc.6,v 1.10 2024/06/22 21:31:03 tom Exp $
 .TH GDC 6 2024-06-15 ncurses-examples Games
 .ie \n(.g \{\
 .ds `` \(lq
@@ -41,42 +41,66 @@
 .\}
 .SH NAME
 gdc \-
-grand digital clock (curses)
+grand digital clock using
+.I curses
 .SH SYNOPSIS
-.B gdc \fP[\fIoptions\fP] [\fIn\fP]
+.B gdc
+.RB [ \-dns ]
+.RB [ \-t
+.IB hh : mm : ss\c
+]
+.RI [ count ]
 .SH DESCRIPTION
-.I Gdc
-runs a digital clock made of reverse-video blanks on a terminal screen.
-If the terminal supports color,
-the clock is drawn in red.
-You can make the clock stop, pause, or resume by pressing a \*(``q\*('',
-\*(``s\*('' or space, respectively.
+.I gdc
+uses
+.I curses
+to display a clock on the terminal.
+It constructs the digits from reverse-video blank characters.
+If the terminal type supports color,
+the digits are drawn in red.
+Make the clock stop,
+pause,
+or resume by typing \*(``q\*('',
+\*(``s\*('',
+or space,
+respectively.
+.PP
+Given a numeric operand,
+the clock
+stops after
+.I count
+seconds.
+Normally,
+.I gdc
+runs \*(``forever\*(''
+(at least 2 billion seconds).
 .SH OPTIONS
 .TP
 .B \-d
-use terminal's default colors for the background.
+uses the terminal's default background color.
 .TP
 .B \-n
-redirects input to /dev/null,
-making it ignore the stop/pause commands.
-You can still stop it by pressing the interrupt key.
+reads input from
+.IR \%/dev/null ,
+making
+.I gdc
+ignore the stop and pause commands.
+You can still stop it with a terminal interrupt.
 .TP
 .B \-s
-makes digits scroll as they change.
+scrolls the digits up as they change.
 When running on a fast display,
-the program breaks up the scrolling into subsecond repaints,
+the program breaks up the scrolling into sub-second redraws,
 making the operation appear smooth.
 .TP
-.B \-t \fIhh:mm:ss\fP
-specify starting time (default is \*(``now\*('').
-.PP
-With an optional numeric argument
-.I num
-it stops after
-.I num
-seconds.
-Normally it runs \*(``forever\*('' (counting down from 2 billion seconds).
+.BR \-t \ \c
+.IB hh : mm : ss
+uses the specified time instead of the current time.
 .SH AUTHORS
-Amos Shapir, modified for curses by John Lupien.
-.br
-Improvements for ncurses by Thomas Dickey.
+Amos Shapir,
+John Lupien
+(modifications for
+.IR curses ),
+Thomas Dickey
+(improvements for
+.IR \%ncurses )
diff --git a/test/gdc.c b/test/gdc.c
index 7243c104..975b20fd 100644
--- a/test/gdc.c
+++ b/test/gdc.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2020,2022 Thomas E. Dickey                                *
+ * Copyright 2019-2022,2024 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -34,7 +34,7 @@
  * modified 10-18-89 for curses (jrl)
  * 10-18-89 added signal handling
  *
- * $Id: gdc.c,v 1.57 2022/12/04 00:40:11 tom Exp $
+ * $Id: gdc.c,v 1.58 2024/06/22 22:27:52 tom Exp $
  */
 
 #include 
@@ -60,6 +60,7 @@ static long older[6], next[6], newer[6], mask;
 static int sigtermed = 0;
 static bool redirected = FALSE;
 static bool hascolor = FALSE;
+static bool hascustomtime = FALSE;
 
 static void
 sighndl(int signo)
@@ -154,18 +155,19 @@ usage(int ok)
 {
     static const char *msg[] =
     {
-	"Usage: gdc [options] [count]"
+	"usage: gdc [-dns] -[t HH:MM:SS] [COUNT]"
+	,""
+	,"Display a digital clock, running indefinitely or for COUNT"
+	" seconds."
 	,""
 	,USAGE_COMMON
 	,"Options:"
 #if HAVE_USE_DEFAULT_COLORS
-	," -d       invoke use_default_colors"
+	," -d           uses the terminal's default background color"
 #endif
-	," -n       redirect input to /dev/null"
-	," -s       scroll each number into place, rather than flipping"
-	," -t TIME  specify starting time as hh:mm:ss (default is ``now'')"
-	,""
-	,"If you specify a count, gdc runs for that number of seconds"
+	," -n           reads input from /dev/null"
+	," -s           scrolls each digit into place"
+	," -t HH:MM:SS  starts clock at specified time"
     };
     unsigned j;
     for (j = 0; j < SIZEOF(msg); j++)
@@ -247,6 +249,7 @@ main(int argc, char *argv[])
 	    smooth = TRUE;
 	    break;
 	case 't':
+	    hascustomtime = TRUE;
 	    starts = parse_time(optarg);
 	    break;
 	case OPTS_VERSION:
@@ -399,14 +402,16 @@ main(int argc, char *argv[])
 	    }
 	}
 
-	/* this depends on the detailed format of ctime(3) */
-	_nc_STRNCPY(buf, ctime(&now), (size_t) 30);
-	{
-	    char *d2 = buf + 10;
-	    char *s2 = buf + 19;
-	    while ((*d2++ = *s2++) != '\0') ;
+	if (!hascustomtime) {
+	    /* this depends on the detailed format of ctime(3) */
+	    _nc_STRNCPY(buf, ctime(&now), (size_t) 30);
+	    {
+		char *d2 = buf + 10;
+		char *s2 = buf + 19;
+		while ((*d2++ = *s2++) != '\0') ;
+	    }
+	    MvAddStr(16, 30, buf);
 	}
-	MvAddStr(16, 30, buf);
 
 	move(6, 0);
 	drawbox(FALSE);
-- 
2.45.2