From: Thomas E. Dickey Date: Sun, 9 Jun 2024 01:06:48 +0000 (+0000) Subject: ncurses 6.5 - patch 20240608 X-Git-Url: http://ncurses.scripts.mit.edu/?a=commitdiff_plain;h=979d4bf823d05c9c1cb349e6585a0359095aeb3a;p=ncurses.git ncurses 6.5 - patch 20240608 + change winwstr to return wide character count instead of OK (patch by Branden Robinson). + improve formatting/style of manpages (patches by Branden Robinson). + rename testing dpkg's for ncurses6 to resolve a naming conflict with Debian's ncurses packages. --- diff --git a/Ada95/include/ncurses_cfg.hin b/Ada95/include/ncurses_cfg.hin index f8bcb662..c19ac8a5 100644 --- a/Ada95/include/ncurses_cfg.hin +++ b/Ada95/include/ncurses_cfg.hin @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2024 Thomas E. Dickey * * Copyright 2005-2017,2018 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -31,7 +31,7 @@ * Author: Thomas E. Dickey 1997 * ****************************************************************************/ /* - * $Id: ncurses_cfg.hin,v 1.11 2020/02/02 23:34:34 tom Exp $ + * $Id: ncurses_cfg.hin,v 1.13 2024/06/08 14:04:14 tom Exp $ * * This is a template-file used to generate the "ncurses_cfg.h" file. * @@ -41,7 +41,7 @@ * * See: * https://invisible-island.net/autoconf/ - * ftp://ftp.invisible-island.net/autoconf/ + * https://invisible-island.net/archives/autoconf/ */ #ifndef NC_CONFIG_H #define NC_CONFIG_H diff --git a/Ada95/package/AdaCurses-doc.spec b/Ada95/package/AdaCurses-doc.spec index c5b68dd4..cfc8527c 100644 --- a/Ada95/package/AdaCurses-doc.spec +++ b/Ada95/package/AdaCurses-doc.spec @@ -3,13 +3,13 @@ Summary: AdaCurses - Ada95 binding documentation for ncurses %define AppVersion MAJOR.MINOR %define AppRelease YYYYMMDD %define AppPackage %{AppProgram}-doc -# $Id: AdaCurses-doc.spec,v 1.7 2019/11/23 21:15:53 tom Exp $ +# $Id: AdaCurses-doc.spec,v 1.8 2024/06/08 13:54:31 tom Exp $ Name: %{AppPackage} Version: %{AppVersion} Release: %{AppRelease} License: MIT Group: Applications/Development -URL: ftp://ftp.invisible-island.net/%{AppProgram} +URL: https://invisible-island.net/%{AppProgram} Source0: %{AppProgram}-%{AppRelease}.tgz Packager: Thomas Dickey diff --git a/Ada95/package/AdaCurses.spec b/Ada95/package/AdaCurses.spec index be18e68d..aa557ab1 100644 --- a/Ada95/package/AdaCurses.spec +++ b/Ada95/package/AdaCurses.spec @@ -2,13 +2,13 @@ Summary: Ada95 binding for ncurses %define AppProgram AdaCurses %define AppVersion MAJOR.MINOR %define AppRelease YYYYMMDD -# $Id: AdaCurses.spec,v 1.33 2024/06/01 22:51:57 tom Exp $ +# $Id: AdaCurses.spec,v 1.34 2024/06/08 13:53:14 tom Exp $ Name: %{AppProgram} Version: %{AppVersion} Release: %{AppRelease} License: MIT Group: Applications/Development -URL: ftp://ftp.invisible-island.net/%{AppProgram} +URL: https://invisible-island.net/%{AppProgram} Source0: %{AppProgram}-%{AppRelease}.tgz Packager: Thomas Dickey diff --git a/Ada95/package/debian/rules b/Ada95/package/debian/rules index 162668f2..8f8e841c 100755 --- a/Ada95/package/debian/rules +++ b/Ada95/package/debian/rules @@ -41,7 +41,7 @@ configure-stamp: --disable-rpath-link \ --with-shared \ --with-ada-sharedlib \ - --with-screen=ncurses6 \ + --with-screen=ncursesw6td \ --without-pkg-config touch configure-stamp diff --git a/Ada95/package/debian/watch b/Ada95/package/debian/watch index 1b870ba1..5a8f1d2a 100644 --- a/Ada95/package/debian/watch +++ b/Ada95/package/debian/watch @@ -1,4 +1,4 @@ version=3 -opts=passive ftp://ftp.invisible-island.net/AdaCurses/AdaCurses-([\d.]+)\.tgz \ +opts=passive https://invisible-island.net/archives/AdaCurses/AdaCurses-([\d.]+)\.tgz \ debian uupdate diff --git a/INSTALL b/INSTALL index a8198fb5..f7a252c3 100644 --- a/INSTALL +++ b/INSTALL @@ -26,7 +26,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: INSTALL,v 1.255 2024/05/04 15:54:00 tom Exp $ +-- $Id: INSTALL,v 1.256 2024/06/08 21:06:02 Branden.Robinson Exp $ --------------------------------------------------------------------- How to install Ncurses/Terminfo on your system --------------------------------------------------------------------- @@ -550,8 +550,8 @@ CONFIGURE OPTIONS: problem. --enable-bsdpad - Recognize BSD-style prefix padding. Some ancient BSD programs (such as - nethack) call tputs("50") to implement delays. + Recognize BSD-style prefix padding. Some programs written using + the BSD curses API use tputs("50") to implement delays. --enable-check-size Compile-in feature to detect screensize for terminals which do not diff --git a/MANIFEST b/MANIFEST index a9395d2f..9e506b48 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1012,7 +1012,7 @@ ./package/debian-mingw/compat ./package/debian-mingw/control ./package/debian-mingw/copyright -./package/debian-mingw/mingw32-ncurses6.lintian-overrides +./package/debian-mingw/mingw32-ncurses6td.lintian-overrides ./package/debian-mingw/rules ./package/debian-mingw/source/format ./package/debian-mingw/watch @@ -1020,7 +1020,7 @@ ./package/debian-mingw64/compat ./package/debian-mingw64/control ./package/debian-mingw64/copyright -./package/debian-mingw64/mingw64-ncurses6.lintian-overrides +./package/debian-mingw64/mingw64-ncurses6td.lintian-overrides ./package/debian-mingw64/rules ./package/debian-mingw64/source/format ./package/debian-mingw64/watch @@ -1028,10 +1028,10 @@ ./package/debian/compat ./package/debian/control ./package/debian/copyright -./package/debian/ncurses6.lintian-overrides -./package/debian/ncurses6.triggers -./package/debian/ncursest6.lintian-overrides -./package/debian/ncursest6.triggers +./package/debian/ncurses6td.lintian-overrides +./package/debian/ncurses6td.triggers +./package/debian/ncursest6td.lintian-overrides +./package/debian/ncursest6td.triggers ./package/debian/rules ./package/debian/source/format ./package/debian/watch diff --git a/NEWS b/NEWS index 76eaf90e..d829b88a 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.4131 2024/06/01 22:49:52 tom Exp $ +-- $Id: NEWS,v 1.4134 2024/06/08 21:21:25 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -46,6 +46,13 @@ 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. +20240608 + + change winwstr to return wide character count instead of OK (patch + by Branden Robinson). + + improve formatting/style of manpages (patches by Branden Robinson). + + rename testing dpkg's for ncurses6 to resolve a naming conflict with + Debian's ncurses packages. + 20240601 + improve formatting/style of manpages (patches by Branden Robinson). + change Ada95/configure to use --with-screen option rather than diff --git a/VERSION b/VERSION index 0ee88e4d..bb0b549a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:10 6.5 20240601 +5:0:10 6.5 20240608 diff --git a/dist.mk b/dist.mk index 4c5f84b3..054a859c 100644 --- a/dist.mk +++ b/dist.mk @@ -26,7 +26,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: dist.mk,v 1.1616 2024/06/01 11:06:41 tom Exp $ +# $Id: dist.mk,v 1.1617 2024/06/08 09:49:40 tom Exp $ # Makefile for creating ncurses distributions. # # This only needs to be used directly as a makefile by developers, but @@ -38,7 +38,7 @@ SHELL = /bin/sh # These define the major/minor/patch versions of ncurses. NCURSES_MAJOR = 6 NCURSES_MINOR = 5 -NCURSES_PATCH = 20240601 +NCURSES_PATCH = 20240608 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/doc/html/man/curs_addch.3x.html b/doc/html/man/curs_addch.3x.html index 593355b5..ac18dbcb 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.90 2024/06/01 22:29:08 tom Exp @ + * @Id: curs_addch.3x,v 1.92 2024/06/08 20:51:41 tom Exp @ --> -curs_addch 3x 2024-06-01 ncurses 6.5 Library calls +curs_addch 3x 2024-06-08 ncurses 6.5 Library calls -

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

+

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

 curs_addch(3x)                   Library calls                  curs_addch(3x)
 
@@ -217,80 +217,79 @@

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).
@@ -305,16 +304,16 @@

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-01                    curs_addch(3x)
+ncurses 6.5                       2024-06-08                    curs_addch(3x)
    diff --git a/doc/html/man/curs_get_wch.3x.html b/doc/html/man/curs_get_wch.3x.html index a8149fb9..8db43778 100644 --- a/doc/html/man/curs_get_wch.3x.html +++ b/doc/html/man/curs_get_wch.3x.html @@ -27,19 +27,19 @@ * sale, use or other dealings in this Software without prior written * * authorization. * **************************************************************************** - * @Id: curs_get_wch.3x,v 1.41 2024/05/11 20:39:53 tom Exp @ + * @Id: curs_get_wch.3x,v 1.43 2024/06/08 20:25:25 tom Exp @ --> -curs_get_wch 3x 2024-05-11 ncurses 6.5 Library calls +curs_get_wch 3x 2024-06-08 ncurses 6.5 Library calls -

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

    +

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

     curs_get_wch(3x)                 Library calls                curs_get_wch(3x)
 
@@ -81,31 +81,35 @@
        If  no input is pending, then if the no-delay flag is set in the window
        (see nodelay(3x)), the function returns ERR;  otherwise,  curses  waits
        until  the  terminal  has  input.   If cbreak(3x) has been called, this
-       happens after one character is read.  If nocbreak(3x) has been  called,
-       it  occurs  when  the  next newline is read.  If halfdelay(3x) has been
-       called, curses waits until input is available or  the  specified  delay
-       elapses.
+       happens after one character is read.  If nocbreak(3x) or noraw(3x)  has
+       been  called,  it  occurs  when the next newline is read.  (Because the
+       terminal's normal or "cooked" mode is line-buffered, multiple  wget_wch
+       calls   may   then   be  necessary  to  empty  the  input  queue.)   If
+       halfdelay(3x) has been called, curses waits until input is available or
+       the specified delay elapses.
 
        If echo(3x) has been called, and the window is not a pad, curses writes
-       wch to the window (at the cursor position) per the following rules.
+       the wide character from the input queue to the window  (at  the  cursor
+       position) per the following rules.
 
-       o   If wch matches the terminal's erase  character,  the  cursor  moves
-           leftward  one  position  and  the  new  position  is  erased  as if
-           wmove(3x) and then  wdelch(3x)  were  called.   When  the  window's
-           keypad  mode is enabled (see below), KEY_LEFT and KEY_BACKSPACE are
-           handled the same way.
+       o   If  the  wide character matches the terminal's erase character (see
+           erasewchar(3x)), the cursor moves leftward one position and the new
+           position is erased as if wmove(3x) and then wdelch(3x) were called.
+           When the window's keypad mode is enabled (see below), KEY_LEFT  and
+           KEY_BACKSPACE are handled the same way.
 
-       o   curses writes any other wch to the window, as with wecho_wchar(3x).
+       o   curses  writes  any  other  wide  character  to the window, as with
+           wecho_wchar(3x).
 
        o   If the window win has been moved or modified since the last call to
            wrefresh(3x), curses calls wrefresh on it.
 
-       If  wch  is a carriage return and nl(3x) has been called, wgetch stores
-       the the character code for line feed in wch instead.
+       If  the wide character is a carriage return and nl(3x) has been called,
+       wgetch stores the the wide character code for line feed in wch instead.

    Ungetting Characters

    -       unget_wch places wch into the input queue to be returned  by  the  next
+       unget_wch places wc into the input queue to be retrieved  by  the  next
        call  to  wget_wch.  A single input queue serves all windows associated
        with the terminal.
 
@@ -168,7 +172,7 @@
 
 
 
-ncurses 6.5                       2024-05-11                  curs_get_wch(3x)
+ncurses 6.5                       2024-06-08                  curs_get_wch(3x)
      diff --git a/doc/html/man/curs_get_wstr.3x.html b/doc/html/man/curs_get_wstr.3x.html index ded3cb3d..6d387bd0 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.50 2024/05/25 20:10:58 tom Exp @ + * @Id: curs_get_wstr.3x,v 1.52 2024/06/08 21:01:53 tom Exp @ --> -curs_get_wstr 3x 2024-05-25 ncurses 6.5 Library calls +curs_get_wstr 3x 2024-06-08 ncurses 6.5 Library calls -

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

      +

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

       curs_get_wstr(3x)                Library calls               curs_get_wstr(3x)
 
@@ -142,8 +142,8 @@

      PORTABILITY

      -       These functions are described in The Single Unix Specification, Version
-       2.  No error conditions are defined.
+       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
+       error conditions for them.
 
        This  implementation  returns  ERR if the window pointer is null, or if
        the lower-level wget_wch call returns an ERR.  In the latter  case,  an
@@ -189,7 +189,7 @@
 
 
 
-ncurses 6.5                       2024-05-25                 curs_get_wstr(3x)
+ncurses 6.5                       2024-06-08                 curs_get_wstr(3x)
        diff --git a/doc/html/man/curs_getch.3x.html b/doc/html/man/curs_getch.3x.html index 3bc1777c..3b11ae8c 100644 --- a/doc/html/man/curs_getch.3x.html +++ b/doc/html/man/curs_getch.3x.html @@ -28,19 +28,19 @@ * sale, use or other dealings in this Software without prior written * * authorization. * **************************************************************************** - * @Id: curs_getch.3x,v 1.95 2024/06/01 22:29:08 tom Exp @ + * @Id: curs_getch.3x,v 1.97 2024/06/08 20:26:46 tom Exp @ --> -curs_getch 3x 2024-06-01 ncurses 6.5 Library calls +curs_getch 3x 2024-06-08 ncurses 6.5 Library calls -

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

        +

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

         curs_getch(3x)                   Library calls                  curs_getch(3x)
 
@@ -84,20 +84,22 @@
        If no input is pending, then if the no-delay flag is set in the  window
        (see  nodelay(3x)),  the  function returns ERR; otherwise, curses waits
        until the terminal has input.  If  cbreak(3x)  has  been  called,  this
-       happens  after one character is read.  If nocbreak(3x) has been called,
-       it occurs when the next newline is read.   If  halfdelay(3x)  has  been
-       called,  curses  waits  until input is available or the specified delay
-       elapses.
+       happens  after one character is read.  If nocbreak(3x) or noraw(3x) has
+       been called, it occurs when the next newline  is  read.   (Because  the
+       terminal's  normal  or  "cooked" mode is line-buffered, multiple wgetch
+       calls  may  then  be  necessary  to  empty  the   input   queue.)    If
+       halfdelay(3x) has been called, curses waits until input is available or
+       the specified delay elapses.
 
        If echo(3x) has been called, and the window is not a pad, curses writes
        the returned character c to the window (at the cursor position) per the
        following rules.
 
-       o   If c matches the  terminal's  erase  character,  the  cursor  moves
-           leftward  one  position  and  the  new  position  is  erased  as if
-           wmove(3x) and then  wdelch(3x)  were  called.   When  the  window's
-           keypad  mode is enabled (see below), KEY_LEFT and KEY_BACKSPACE are
-           handled the same way.
+       o   If c matches the terminal's erase  character  (see  erasechar(3x)),
+           the  cursor  moves  leftward  one  position and the new position is
+           erased as if wmove(3x) and then wdelch(3x) were called.   When  the
+           window's   keypad   mode  is  enabled  (see  below),  KEY_LEFT  and
+           KEY_BACKSPACE are handled the same way.
 
        o   curses writes any other c to the window, as with wechochar(3x).
 
@@ -178,9 +180,9 @@
               KEY_UP          Arrow keys
               KEY_LEFT
               KEY_RIGHT
+
               KEY_HOME        Home key (upward+left arrow)
               KEY_BACKSPACE   Backspace
-
               KEY_F0          Function keys; space for 64 keys is reserved
               KEY_F(n)        Function key n where 0 <= n <= 63
               KEY_DL          Delete line
@@ -244,9 +246,9 @@
               KEY_SCOMMAND    Shifted command key
               KEY_SCOPY       Shifted copy key
               KEY_SCREATE     Shifted create key
+
               KEY_SDC         Shifted delete character key
               KEY_SDL         Shifted delete line key
-
               KEY_SEND        Shifted end key
               KEY_SEOL        Shifted clear line key
               KEY_SEXIT       Shifted exit key
@@ -282,8 +284,8 @@
        key.
 
        o   wgetch  returns  KEY_RESIZE,  even  if  the window's keypad mode is
-           disabled, when ncurses handles a SIGWINCH signal;  see  initscr(3x)
-           and resizeterm(3x).
+           disabled, if ncurses has handled a SIGWINCH signal since wgetch was
+           called; see initscr(3x) and resizeterm(3x).
 
        o   wgetch  returns KEY_MOUSE to indicate that a mouse event is pending
            collection; see curs_mouse(3x).  Receipt of this  code  requires  a
@@ -388,45 +390,44 @@
        wgetch reads only single-byte characters.
 
        The  echo  behavior  of  these  functions on input of KEY_ or backspace
-       characters  was  not  specified  in  the  SVr4   documentation.    This
-       description is adapted from X/Open Curses.
-
-       The   behavior  of  wgetch  in  the  presence  of  signal  handlers  is
-       unspecified in the SVr4 documentation and X/Open Curses.  In historical
-       curses  implementations,  it  varied depending on whether the operating
-       system's dispatch of a signal to a handler interrupted a  read(2)  call
-       in  progress,  and  also  (in  some  implementations)  whether an input
-       timeout  or  non-blocking  mode  had  been  set.   A  portable   curses
-       application  prepares  for  two  cases:  (a)  signal  receipt  does not
+       characters is not documented in SVr4 curses.
+
+       The behavior of wgetch in  the  presence  of  signal  handlers  is  not
+       documented  in  SVr4  curses  and  is unspecified by X/Open Curses.  In
+       historical curses implementations, it varied depending on  whether  the
+       operating  system's  dispatch  of  a  signal to a handler interrupted a
+       read(2) call in progress, and also (in some implementations) whether an
+       input  timeout  or  non-blocking  mode had been set.  A portable curses
+       application prepares  for  two  cases:  (a)  signal  receipt  does  not
        interrupt wgetch; or (b) signal receipt interrupts wgetch and causes it
        to return ERR with errno set to EINTR.
 
        KEY_MOUSE is mentioned in X/Open Curses, along with a few related term-
-       info capabilities, but no higher-level functions use the feature.   The
+       info  capabilities, but no higher-level functions use the feature.  The
        implementation in ncurses is an extension.
 
-       KEY_RESIZE  and  has_key  are extensions first implemented for ncurses.
+       KEY_RESIZE and has_key are extensions first  implemented  for  ncurses.
        By  2022,  PDCurses  and  NetBSD  curses  had  added  them  along  with
        KEY_MOUSE.

        SEE ALSO

        -       ECMA-6  "7-bit  coded  Character  Set" <https://ecma-international.org/
+       ECMA-6 "7-bit  coded  Character  Set"  <https://ecma-international.org/
        publications-and-standards/standards/ecma-6/>
 
-       ECMA-48  "Control  Functions  for  Coded  Character   Sets"   <https://
+       ECMA-48   "Control   Functions  for  Coded  Character  Sets"  <https://
        ecma-international.org/publications-and-standards/standards/ecma-48/>
 
-       curs_get_wch(3x)  describes comparable functions of the ncurses library
+       curs_get_wch(3x) describes comparable functions of the ncurses  library
        in its wide-character configuration (ncursesw).
 
-       curses(3x),    curs_addch(3x),     curs_inopts(3x),     curs_mouse(3x),
-       curs_move(3x),  curs_outopts(3x), curs_refresh(3x), curs_variables(3x),
+       curses(3x),     curs_addch(3x),     curs_inopts(3x),    curs_mouse(3x),
+       curs_move(3x), curs_outopts(3x), curs_refresh(3x),  curs_variables(3x),
        resizeterm(3x), ascii(7)
 
 
 
-ncurses 6.5                       2024-06-01                    curs_getch(3x)
+ncurses 6.5                       2024-06-08                    curs_getch(3x)
          diff --git a/doc/html/man/curs_getstr.3x.html b/doc/html/man/curs_getstr.3x.html index 0753dc21..dc22cb80 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.63 2024/06/01 22:29:08 tom Exp @ + * @Id: curs_getstr.3x,v 1.65 2024/06/08 21:04:32 tom Exp @ --> -curs_getstr 3x 2024-06-01 ncurses 6.5 Library calls +curs_getstr 3x 2024-06-08 ncurses 6.5 Library calls -

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

          +

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

           curs_getstr(3x)                  Library calls                 curs_getstr(3x)
 
@@ -138,99 +138,96 @@

          PORTABILITY

          -       These functions are described in The Single Unix Specification, Version
-       2.  No error conditions are defined.
+       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
+       error conditions for them.
 
-       This  implementation  returns  ERR if the window pointer is null, or if
-       the lower-level wgetch(3x) call returns an ERR.
-
-       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
+       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_
+       useful (being, in fact, the low-order eight  bits  of  the  key's  KEY_
        value).
 
-       The functions getnstr, mvgetnstr, and mvwgetnstr were present  but  not
+       The  functions  getnstr, mvgetnstr, and mvwgetnstr were present but not
        documented in SVr4.
 
        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
+       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:
 
-       o   ncurses  6.1  and PDCurses do not count the NUL in the given limit,
+       o   ncurses 6.1 and PDCurses do not count the NUL in the  given  limit,
            while
 
        o   Solaris SVr4 and NetBSD curses count the NUL as part of the limit.
 
-       o   Solaris  xcurses  provides  both:  its   wide-character   wget_nstr
-           reserves   a   NUL,  but  its  wgetnstr  does  not  count  the  NUL
+       o   Solaris   xcurses   provides  both:  its  wide-character  wget_nstr
+           reserves  a  NUL,  but  its  wgetnstr  does  not  count   the   NUL
            consistently.
 
        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
+       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 SVr4 curses and PDCurses limit the  result  to  255  bytes.
+       o   Solaris  SVr4  curses  and  PDCurses limit the result to 255 bytes.
            Other Unix systems than Solaris are likely to use the same limit.
 
        o   Solaris xcurses limits the result to LINE_MAX bytes.
 
-       o   NetBSD  7  assumes no particular limit for the result from wgetstr.
-           However, it limits the wgetnstr parameter n to ensure  that  it  is
+       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.
 
-           A  comment in NetBSD's source code states that this is specified in
+           A comment in NetBSD's source code states that this is specified  in
            SUSv2.
 
-       o   ncurses (before 6.2) assumes no particular  limit  for  the  result
-           from  wgetstr,  and  treats  the  n parameter of wgetnstr like SVr4
+       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   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
+       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.
 
-       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
+       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   getnstr saves the current value of the nl,  echo,  raw  and  cbreak
+       o   getnstr  saves  the  current  value of the nl, echo, raw and cbreak
            modes, and sets nl, noecho, noraw, and cbreak.
 
-           getnstr  handles  the echoing of characters, rather than relying on
+           getnstr handles the echoing of characters, rather than  relying  on
            the caller to set an appropriate mode.
 
-       o   It also obtains the erase and kill characters  from  erasechar  and
+       o   It  also  obtains  the erase and kill characters from erasechar and
            killchar, respectively.
 
        o   On return, getnstr restores the modes to their previous values.
 
        Other implementations differ in their treatment of special characters:
 
-       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
+       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
+           accepting input for getnstr.  That  may  have  been  done  to  make
            function- and cursor-keys work; it is not necessary with ncurses.
 
-           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
+           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.
 
        o   Starting in 2021 (ncurses 6.3), getnstr sets raw, rather than noraw
-           and  cbreak  for  better  compatibility  with  SVr4-curses,   e.g.,
+           and   cbreak  for  better  compatibility  with  SVr4-curses,  e.g.,
            allowing one to enter a ^C into the buffer.
 
 
@@ -242,7 +239,7 @@
 
 
 
-ncurses 6.5                       2024-06-01                   curs_getstr(3x)
+ncurses 6.5                       2024-06-08                   curs_getstr(3x)
            diff --git a/doc/html/man/curs_getyx.3x.html b/doc/html/man/curs_getyx.3x.html index fa30badb..f12c587b 100644 --- a/doc/html/man/curs_getyx.3x.html +++ b/doc/html/man/curs_getyx.3x.html @@ -27,19 +27,19 @@ * sale, use or other dealings in this Software without prior written * * authorization. * **************************************************************************** - * @Id: curs_getyx.3x,v 1.45 2024/05/11 20:39:53 tom Exp @ + * @Id: curs_getyx.3x,v 1.47 2024/06/08 20:42:50 tom Exp @ --> -curs_getyx 3x 2024-05-11 ncurses 6.5 Library calls +curs_getyx 3x 2024-06-08 ncurses 6.5 Library calls -

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

            +

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

             curs_getyx(3x)                   Library calls                  curs_getyx(3x)
 
@@ -64,10 +64,10 @@

            DESCRIPTION

                    These macros obtain the cursor position and  bounds  information  of  a
        curses window win.  getyx stores win's cursor position in the variables
-       y and x.  getmaxyx stores win's maximum valid row and column numbers in
-       y and x, respectively.  getbegyx similarly stores the position of win's
-       origin relative to that of the screen (for  stdscr,  these  coordinates
-       are always 0).
+       y and x.  getmaxyx stores win's maximum valid line and  column  numbers
+       in  y  and  x, respectively.  getbegyx similarly stores the position of
+       win's origin  relative  to  that  of  the  screen  (for  stdscr,  these
+       coordinates are always 0).
 
        If  win  is a subwindow (see subwin(3x)), the getparyx macro places the
        coordinates of its origin relative to its parent window into y  and  x,
@@ -109,7 +109,7 @@
 
 
 
-ncurses 6.5                       2024-05-11                    curs_getyx(3x)
+ncurses 6.5                       2024-06-08                    curs_getyx(3x)
              diff --git a/doc/html/man/curs_inch.3x.html b/doc/html/man/curs_inch.3x.html index 3dfd504e..0e8a2c22 100644 --- a/doc/html/man/curs_inch.3x.html +++ b/doc/html/man/curs_inch.3x.html @@ -28,19 +28,19 @@ * sale, use or other dealings in this Software without prior written * * authorization. * **************************************************************************** - * @Id: curs_inch.3x,v 1.58 2024/06/01 22:29:08 tom Exp @ + * @Id: curs_inch.3x,v 1.60 2024/06/08 20:45:43 tom Exp @ --> -curs_inch 3x 2024-06-01 ncurses 6.5 Library calls +curs_inch 3x 2024-06-08 ncurses 6.5 Library calls -

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

              +

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

               curs_inch(3x)                    Library calls                   curs_inch(3x)
 
@@ -109,23 +109,16 @@
        ISO C99.  SVr3.2 (1988) added a 6-bit color pair  identifier  alongside
        the attributes.
 
-       X/Open Curses does not specify the sizes of the character code or color
-       pair identifier, nor the quantity of attribute bits, in  chtype;  these
-       are   implementation-dependent.    ncurses  uses  eight  bits  for  the
-       character code.  An application requiring a wider character  type,  for
-       instance   to   represent   Unicode,   should  use  the  wide-character
-       counterparts of these functions.
-

              SEE ALSO

              -       curs_in_wch(3x) describes comparable functions of the  ncurses  library
+       curs_in_wch(3x)  describes  comparable functions of the ncurses library
        in its wide-character configuration (ncursesw).
 
        curses(3x), curs_instr(3x)
 
 
 
-ncurses 6.5                       2024-06-01                     curs_inch(3x)
+ncurses 6.5                       2024-06-08                     curs_inch(3x)
                diff --git a/doc/html/man/curs_initscr.3x.html b/doc/html/man/curs_initscr.3x.html index 717593ac..9b77d4c3 100644 --- a/doc/html/man/curs_initscr.3x.html +++ b/doc/html/man/curs_initscr.3x.html @@ -27,19 +27,19 @@ * sale, use or other dealings in this Software without prior written * * authorization. * **************************************************************************** - * @Id: curs_initscr.3x,v 1.73 2024/06/01 22:38:43 tom Exp @ + * @Id: curs_initscr.3x,v 1.75 2024/06/08 20:34:23 tom Exp @ --> -curs_initscr 3x 2024-06-01 ncurses 6.5 Library calls +curs_initscr 3x 2024-06-08 ncurses 6.5 Library calls -

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

                +

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

                 curs_initscr(3x)                 Library calls                curs_initscr(3x)
 
@@ -286,7 +286,7 @@
        SIGWINCH
             This handles the window-size changes which  were  ignored  in  the
             standardization   efforts.    The  handler  sets  a  (signal-safe)
-            variable that is later tested by wgetch(3x) and wget_wch(3x):
+            variable that is later tested by wgetch(3x) and wget_wch(3x).
 
             o   wgetch returns the key code KEY_RESIZE.
 
@@ -303,7 +303,7 @@
 
 
 
-ncurses 6.5                       2024-06-01                  curs_initscr(3x)
+ncurses 6.5                       2024-06-08                  curs_initscr(3x)
                  diff --git a/doc/html/man/curs_inopts.3x.html b/doc/html/man/curs_inopts.3x.html index d447ccd2..30829c59 100644 --- a/doc/html/man/curs_inopts.3x.html +++ b/doc/html/man/curs_inopts.3x.html @@ -28,19 +28,19 @@ * sale, use or other dealings in this Software without prior written * * authorization. * **************************************************************************** - * @Id: curs_inopts.3x,v 1.70 2024/06/01 22:28:41 tom Exp @ + * @Id: curs_inopts.3x,v 1.73 2024/06/08 23:24:17 tom Exp @ --> -curs_inopts 3x 2024-06-01 ncurses 6.5 Library calls +curs_inopts 3x 2024-06-08 ncurses 6.5 Library calls -

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

                  +

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

                   curs_inopts(3x)                  Library calls                 curs_inopts(3x)
 
@@ -127,8 +127,8 @@
        echo and noecho determine whether characters  typed  by  the  user  are
        written to the curses window by the input character reading function as
        they are typed.  curses  always  disables  the  terminal  driver's  own
-       echoing.   By  default, a curses window has its echo flag set.  Authors
-       of most interactive programs prefer  to  do  their  own  echoing  in  a
+       echoing.  By default, a curses screen's echo option is set.  Authors of
+       most  interactive  programs  prefer  to  do  their  own  echoing  in  a
        controlled  area  of  the  screen,  or not to echo at all, so they call
        noecho.   The  man  page  for  the  input  character  reading  function
        discusses how echo and noecho interact with cbreak and nocbreak.
@@ -176,9 +176,11 @@

                  nl, nonl

                          Initially,  whether  the  terminal  reports a carriage return using the
-       character code for a line feed depends  on  the  configuration  of  the
-       terminal driver; see termios(3).  nl configures the terminal to perform
-       this translation.  nonl disables it.
+       character code for a line feed in cbreak or raw modes  depends  on  the
+       configuration  of  the  terminal driver; see termios(3).  nl configures
+       the terminal to perform this translation.  nonl disables it.  In normal
+       (or  "cooked")  mode,  the  terminal  driver always translates carriage
+       returns to line feeds.

                  nodelay

                  @@ -289,9 +291,9 @@
 
        In each case, the function returns
 
-       1    if the flag is set,
+       1    if the option is set,
 
-       0    if the flag is reset, or
+       0    if the option is reset, or
 
        -1   if the library is not initialized.
 
@@ -376,11 +378,11 @@

                  SEE ALSO

                          curses(3x),    curs_getch(3x),     curs_initscr(3x),     curs_util(3x),
-       define_key(3x), term_variables(3x), termios(3)
+       define_key(3x), termios(3), term_variables(3x).
 
 
 
-ncurses 6.5                       2024-06-01                   curs_inopts(3x)
+ncurses 6.5                       2024-06-08                   curs_inopts(3x)
                    diff --git a/doc/html/man/curs_ins_wstr.3x.html b/doc/html/man/curs_ins_wstr.3x.html index d947cc46..4c9506f1 100644 --- a/doc/html/man/curs_ins_wstr.3x.html +++ b/doc/html/man/curs_ins_wstr.3x.html @@ -27,19 +27,19 @@ * sale, use or other dealings in this Software without prior written * * authorization. * **************************************************************************** - * @Id: curs_ins_wstr.3x,v 1.40 2024/05/25 20:10:58 tom Exp @ + * @Id: curs_ins_wstr.3x,v 1.42 2024/06/08 21:04:04 tom Exp @ --> -curs_ins_wstr 3x 2024-05-25 ncurses 6.5 Library calls +curs_ins_wstr 3x 2024-06-08 ncurses 6.5 Library calls -

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

                    +

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

                     curs_ins_wstr(3x)                Library calls               curs_ins_wstr(3x)
 
@@ -84,47 +84,48 @@

                    RETURN VALUE

                    -       All functions return the integer ERR upon failure and OK on success.
+       These functions return OK on success and ERR on failure.
 
-       X/Open  Curses  does  not   specify   any   error   conditions.    This
-       implementation returns ERR
+       X/Open Curses does not specify any error conditions.  In ncurses,  they
+       return ERR if
 
-       o   if the win parameter is null or
+       o   win is NULL,
 
-       o   if the wstr parameter is null or
+       o   wstr is NULL, or
 
-       o   if the wins_wch function returns ERR.
+       o   an internal wins_wch(3x) call returns ERR.
 
        Functions  prefixed with "mv" first perform cursor movement and fail if
        the position (y, x) is outside the window boundaries.

                    NOTES

                    -       All but wins_nwstr may be macros.
+       All of these functions except wins_nwstr may be implemented as macros.
 
        If the first character in the string is a non-spacing character,  these
-       functions will fail.  X/Open Curses does not define what will happen if
-       a non-spacing character follows a control character.
+       functions return ERR.  X/Open Curses does not specify what happens if a
+       non-spacing character follows a control character.

                    PORTABILITY

                    -       These functions are described in X/Open Curses,  Issue  4,  which  adds
-       const qualifiers to the arguments.
+       X/Open Curses, Issue 4 describes  these  functions.   It  specifies  no
+       error conditions for them.
 
-       X/Open  states  that the entire string is inserted if n is less than 1.
+       Issue  4 states that the entire string is inserted if n is less than 1.
        This is probably an  error,  because  it  is  inconsistent  with  other
-       functions, and differs from the X/Open implementation on Solaris.
+       functions,  and  differs  from  the  SVr4  curses  and  Solaris xcurses
+       implementations.  Nevertheless, Issue 7 retains it.

                    SEE ALSO

                    -       curs_insstr(3x)  describes  comparable functions of the ncurses library
+       curs_insstr(3x) describes comparable functions of the  ncurses  library
        in its non-wide-character configuration.
 
        curses(3x), curs_ins_wch(3x), curs_in_wch(3x)
 
 
 
-ncurses 6.5                       2024-05-25                 curs_ins_wstr(3x)
+ncurses 6.5                       2024-06-08                 curs_ins_wstr(3x)
                      diff --git a/doc/html/man/curs_insstr.3x.html b/doc/html/man/curs_insstr.3x.html index e1e4b549..55bcbe1b 100644 --- a/doc/html/man/curs_insstr.3x.html +++ b/doc/html/man/curs_insstr.3x.html @@ -27,19 +27,19 @@ * sale, use or other dealings in this Software without prior written * * authorization. * **************************************************************************** - * @Id: curs_insstr.3x,v 1.53 2024/05/25 20:10:58 tom Exp @ + * @Id: curs_insstr.3x,v 1.55 2024/06/08 21:03:03 tom Exp @ --> -curs_insstr 3x 2024-05-25 ncurses 6.5 Library calls +curs_insstr 3x 2024-06-08 ncurses 6.5 Library calls -

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

                      +

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

                       curs_insstr(3x)                  Library calls                 curs_insstr(3x)
 
@@ -102,26 +102,29 @@

                      PORTABILITY

                      -       These  functions  are  described  in X/Open Curses, Issue 4, which adds
-       const qualifiers to the arguments.
+       X/Open  Curses,  Issue  4  describes  these functions.  It specifies no
+       error conditions for them.
 
-       The Single Unix  Specification,  Version  2  states  that  insnstr  and
-       winsnstr  perform  wrapping.  This is probably an error, since it makes
-       this group of  functions  inconsistent.   Also,  no  implementation  of
-       curses documents this inconsistency.
+       Issue 4 distinguished insnstr and winsnstr  by  stating  they  "do  not
+       perform  wrapping".   This  was  probably an error, since it makes this
+       group of functions inconsistent.  No implementation of curses documents
+       this inconsistency, and Issue 7 removed it.
 
-       X/Open  states  that the entire string is inserted if n is less than 1.
+       Issue  4 states that the entire string is inserted if n is less than 1.
        This is probably an  error,  because  it  is  inconsistent  with  other
-       functions,  and  differs  from  the  SVr4 and X/Open implementations on
-       Solaris.
+       functions,  and  differs  from  the  SVr4  curses  and  Solaris xcurses
+       implementations.  Nevertheless, Issue 7 retains it.

                      SEE ALSO

                      +       curs_ins_wstr(3x) describes comparable functions of the ncurses library
+       in its wide-character configuration (ncursesw).
+
        curses(3x), curs_inch(3x), curs_ins_wstr(3x), curs_util(3x)
 
 
 
-ncurses 6.5                       2024-05-25                   curs_insstr(3x)
+ncurses 6.5                       2024-06-08                   curs_insstr(3x)
                        diff --git a/doc/html/man/curs_instr.3x.html b/doc/html/man/curs_instr.3x.html index 5488404b..9ff33254 100644 --- a/doc/html/man/curs_instr.3x.html +++ b/doc/html/man/curs_instr.3x.html @@ -27,19 +27,19 @@ * sale, use or other dealings in this Software without prior written * * authorization. * **************************************************************************** - * @Id: curs_instr.3x,v 1.55 2024/06/01 22:29:08 tom Exp @ + * @Id: curs_instr.3x,v 1.57 2024/06/08 20:47:39 tom Exp @ --> -curs_instr 3x 2024-06-01 ncurses 6.5 Library calls +curs_instr 3x 2024-06-08 ncurses 6.5 Library calls -

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

                        +

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

                         curs_instr(3x)                   Library calls                  curs_instr(3x)
 
@@ -54,69 +54,91 @@

                        SYNOPSIS

                                #include <curses.h>
 
-       int instr(char *str);
-       int innstr(char *str, int n);
-       int winstr(WINDOW *win, char *str);
-       int winnstr(WINDOW *win, char *str, int n);
+       int instr(char * str);
+       int winstr(WINDOW * win, char * str);
+       int mvinstr(int y, int x, char * str);
+       int mvwinstr(WINDOW * win, int y, int x, char * str);
 
-       int mvinstr(int y, int x, char *str);
-       int mvinnstr(int y, int x, char *str, int n);
-       int mvwinstr(WINDOW *win, int y, int x, char *str);
-       int mvwinnstr(WINDOW *win, int y, int x, char *str, int n);
+       int innstr(char * str, int n);
+       int winnstr(WINDOW * win, char * str, int n);
+       int mvinnstr(int y, int x, char * str, int n);
+       int mvwinnstr(WINDOW * win, int y, int x, char * str, int n);

                        DESCRIPTION

                        -       These routines return a string of characters in str,  starting  at  the
-       current  cursor  position in the named window.  Attributes are stripped
-       from the characters.
-
-       The four functions with  n  as  the  last  argument  return  a  leading
-       substring  at  most  n characters long (exclusive of the trailing NUL).
-       Transfer stops at the end of the current line,  or  when  n  characters
-       have been stored at the location referenced by str.
+       winstr extracts a string from a curses  window  win,  starting  at  the
+       cursor  and  stopping  at  the  end  of the line, and stores it in str,
+       terminating it with a null character and omitting  any  attributes  and
+       color  pair  identifier  that  curses  associates  with each character.
+       winnstr does the same, but copies at most n characters from win.  An  n
+       of  -1  implies  no limit; winnstr then works like winstr.  ncurses(3x)
+       describes the variants of these functions.

                        RETURN VALUE

                        -       All  of  the  functions  return  ERR  upon  failure,  or  the number of
-       characters actually read into the string.
+       These functions return the count of characters copied from win to  str,
+       or ERR upon failure.
 
-       X/Open Curses defines no error conditions.  This implementation returns
-       ERR
+       In ncurses, they return ERR if
 
-       o   if the win parameter is null or
+       o   win is NULL or
 
-       o   if the chstr parameter is null.
+       o   str is NULL.
 
        Functions  prefixed with "mv" first perform cursor movement and fail if
        the position (y, x) is outside the window boundaries.

                        NOTES

                        -       All routines except winnstr may be macros.
+       All of these functions except winnstr may be implemented as macros.
 
        Reading a line that overflows the array pointed to by str  with  instr,
-       mvinstr,  mvwinstr  or winstr causes undefined results.  Therefore, the
-       use of innstr, mvinnstr, mvwinnstr, or winnstr is recommended.
+       winstr,  mvinstr, or mvwinstr causes undefined results.  Use of innstr,
+       winnstr, mvinnstr, and mvwinnstr is recommended instead.
+
+
+

                        EXTENSIONS

                        +       innstr, winnstr, mvinnstr, and mvwinnstr's treatment of -1 as  a  valid
+       value of n is an ncurses extension.

                        PORTABILITY

                        -       SVr4 does not document whether a length limit includes or excludes  the
-       trailing NUL.
+       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.
+
+       X/Open  Curses  Issues  4 and 7 both state that instr, winstr, mvinstr,
+       and mvwinstr return OK rather than a character count.  This  is  likely
+       an erratum.
+
+       o   SVr3.1  and  SVr4  implemented  winstr as a wrapper around winnstr,
+           returning the latter's return value.  X/Open Curses's specification
+           thus  may  have  been  an editorial solecism copied from System V's
+           documentation (see below) by X/Open,  rather  than  an  intentional
+           change.
+
+       o   ncurses retains compatibility with System V curses behavior.
+
+       SVr4  documents no return values apart from OK and ERR for any of these
+       functions.  SVr4 does not document whether n counts the null terminator
+       that these functions write to str.
+
 
-       The ncurses library extends the X/Open Curses description by allowing a
-       negative value for n.  In this case, the functions  return  the  string
-       ending at the right margin.
+

                        HISTORY

                        +       SVr3.1 (1987) introduced these functions.

                        SEE ALSO

                        -       curs_ins_wstr(3x) describes comparable functions of the ncurses library
+       curs_inwstr(3x)  describes  comparable functions of the ncurses library
        in its wide-character configuration (ncursesw).
 
        curses(3x), curs_inch(3x), curs_inchstr(3x)
 
 
 
-ncurses 6.5                       2024-06-01                    curs_instr(3x)
+ncurses 6.5                       2024-06-08                    curs_instr(3x)
                        diff --git a/doc/html/man/curs_inwstr.3x.html b/doc/html/man/curs_inwstr.3x.html index e91d0ea9..d5777a28 100644 --- a/doc/html/man/curs_inwstr.3x.html +++ b/doc/html/man/curs_inwstr.3x.html @@ -27,19 +27,19 @@ * sale, use or other dealings in this Software without prior written * * authorization. * **************************************************************************** - * @Id: curs_inwstr.3x,v 1.43 2024/05/25 20:10:58 tom Exp @ + * @Id: curs_inwstr.3x,v 1.45 2024/06/08 21:19:18 tom Exp @ --> -curs_inwstr 3x 2024-05-25 ncurses 6.5 Library calls +curs_inwstr 3x 2024-06-08 ncurses 6.5 Library calls -

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

                        +

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

                         curs_inwstr(3x)                  Library calls                 curs_inwstr(3x)
 
@@ -54,72 +54,88 @@

                        SYNOPSIS

                                #include <curses.h>
 
-       int inwstr(wchar_t *wstr);
-       int innwstr(wchar_t *wstr, int n);
-       int winwstr(WINDOW *win, wchar_t *wstr);
-       int winnwstr(WINDOW *win, wchar_t *wstr, int n);
+       int inwstr(wchar_t * wstr);
+       int winwstr(WINDOW * win, wchar_t * wstr);
+       int mvinwstr(int y, int x, wchar_t * wstr);
+       int mvwinwstr(WINDOW * win, int y, int x, wchar_t * wstr);
 
-       int mvinwstr(int y, int x, wchar_t *wstr);
-       int mvinnwstr(int y, int x, wchar_t *wstr, int n);
-       int mvwinwstr(WINDOW *win, int y, int x, wchar_t *wstr);
-       int mvwinnwstr(WINDOW *win, int y, int x, wchar_t *wstr, int n);
+       int innwstr(wchar_t * wstr, int n);
+       int winnwstr(WINDOW * win, wchar_t * wstr, int n);
+       int mvinnwstr(int y, int x, wchar_t * wstr, int n);
+       int mvwinnwstr(WINDOW * win, int y, int x, wchar_t * wstr, int n);

                        DESCRIPTION

                        -       These routines return a string of  wchar_t  wide  characters  in  wstr,
-       starting at the current cursor position in the named window.
-
-       The  four  functions  with  n  as  the  last  argument return a leading
-       substring at most n characters long (exclusive of  the  trailing  NUL).
-       Transfer  stops  at  the  end of the current line, or when n characters
-       have been stored at the location referenced by wstr.
-
-       If the size  n  is  not  large  enough  to  store  a  complete  complex
-       character, an error is generated.
+       winwstr extracts a wide-character string  from  a  curses  window  win,
+       starting  at the cursor and stopping at the end of the line, and stores
+       it in wstr, terminating it with a wide null character and omitting  any
+       attributes  and  color pair identifier that curses associates with each
+       character.  winnwstr does the same, but copies  at  most  n  characters
+       from  win.   An  n  of  -1  implies  no limit; winnwstr then works like
+       winwstr.  ncurses(3x) describes the variants of these functions.

                        RETURN VALUE

                        -       All  routines return ERR upon failure.  Upon successful completion, the
-       *inwstr routines return OK, and the *innwstr routines return the number
-       of characters read into the string.
+       On successful operation, these  functions  return  the  count  of  wide
+       characters  copied  from  win  to  wstr.  They return ERR upon failure.
+       innwstr, winnwstr,  mvinnwstr,  and  mvwinnwstr  return  ERR  if  n  is
+       insufficiently  large  to  store  a  complete  wide  character  string.
+       (Recall that a curses  complex  character  can  contain  multiple  wide
+       characters, some of which may be non-spacing.)
 
-       X/Open defines no error conditions.  This implementation returns ERR
+       In ncurses, these functions return ERR if
 
-       o   if the win parameter is null or
+       o   win is NULL or
 
-       o   if the wstr parameter is null, or
-
-       o   if no characters could be read.
+       o   wstr is NULL.
 
        Functions  prefixed with "mv" first perform cursor movement and fail if
        the position (y, x) is outside the window boundaries.

                        NOTES

                        -       All routines except winnwstr may be macros.
+       All of these functions except winnwstr may be implemented as macros.
+
+       Reading a line that overflows the array pointed to by str with  inwstr,
+       winwstr,  mvinwstr,  or  mvwinwstr  causes  undefined  results.  Use of
+       innwstr, winnwstr, mvinnwstr, and mvwinnwstr is recommended instead.
 
-       Each cell in the window holds a complex character (a spacing  character
-       and  zero  or more non-spacing characters) together with attributes and
-       color.  These  functions  store  only  the  wide  characters,  ignoring
-       attributes  and  color.  Use in_wchstr to return the complex characters
-       from a window.
 
-       Reading a line that overflows the array pointed to by wstr with inwstr,
-       mvinwstr,  mvwinwstr  or  winwstr causes undefined results.  Therefore,
-       the use of innwstr, mvinnwstr, mvwinnwstr, or winnwstr is recommended.
+

                        EXTENSIONS

                        +       innwstr, winnwstr, mvinnwstr, and mvwinnwstr's treatment  of  -1  as  a
+       valid value of n is an ncurses extension.

                        PORTABILITY

                        -       These functions are described in X/Open Curses, Issue 4.
+       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.
+
+       Notwithstanding  the foregoing, X/Open Curses Issues 4 and 7 both state
+       that innwstr, winnwstr, mvinnwstr, and mvwinnwstr "fail  ...  [i]f  the
+       array  is  not  large  enough  to  contain  any  complete  characters".
+       Strictly interpreted, this means  that  a  caller  of  these  functions
+       cannot use their return values to detect truncation of a wide-character
+       string copied from more  than  one  character  cell  in  win.   ncurses
+       reports any truncation with ERR.
+
+       X/Open  Curses  specifies  inwstr,  winwstr, mvinwstr, and mvwinwstr as
+       returning OK rather than a (wide) character count,  unlike  their  non-
+       wide  counterparts  instr,  winstr,  mvinstr,  and  mvwinstr.   ncurses
+       regards this inconsistency as an error in the standard.

                        SEE ALSO

                        -       curses(3x),    curs_inch(3x),     curs_inchstr(3x),     curs_instr(3x),
-       curs_in_wchstr(3x)
+       curs_instr(3x) describes comparable functions of the ncurses library in
+       its non-wide-character configuration.
+
+       curses(3x), curs_in_wch(3x), curs_in_wchstr(3x)
 
 
 
-ncurses 6.5                       2024-05-25                   curs_inwstr(3x)
+ncurses 6.5                       2024-06-08                   curs_inwstr(3x)
                        diff --git a/doc/html/man/curs_kernel.3x.html b/doc/html/man/curs_kernel.3x.html index 7d52c2d2..b93fcbf4 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.63 2024/05/25 21:13:56 tom Exp @ + * @Id: curs_kernel.3x,v 1.65 2024/06/08 21:00:58 tom Exp @ --> -curs_kernel 3x 2024-05-25 ncurses 6.5 Library calls +curs_kernel 3x 2024-06-08 ncurses 6.5 Library calls -

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

                        +

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

                         curs_kernel(3x)                  Library calls                 curs_kernel(3x)
 
@@ -101,84 +101,85 @@

                        getsyx

                        -       The getsyx routine returns  the  current  coordinates  of  the  virtual
-       screen  cursor in y and x.  If leaveok is currently TRUE, then -1,-1 is
-       returned.  If lines have been removed from the top of the screen, using
-       ripoffline,  y  and x include these lines; therefore, y and x should be
-       used only as arguments for setsyx.
+       getsyx stores the coordinates of virtual screen (newscr)  cursor  in  y
+       and x.  If newscr's leaveok(3x) output option is TRUE, getsyx stores -1
+       in both y and x.  If lines have been removed from the top of the screen
+       using  ripoffline, y includes these lines; therefore, y and x populated
+       by getsyx should be used only as arguments for setsyx.
 
-       Few applications will use this feature, most use getyx instead.
+       Few applications use this feature; most call getyx(3x) instead.

                        setsyx

                        -       The setsyx routine sets the virtual screen cursor to y, x.  If y and  x
-       are  both  -1, then leaveok is set.  The two routines getsyx and setsyx
-       are designed to be used by a library routine, which manipulates  curses
-       windows  but  does  not  want  to  change  the  current position of the
-       program's cursor.   The  library  routine  would  call  getsyx  at  the
-       beginning, do its manipulation of its own windows, do a wnoutrefresh on
-       its windows, call setsyx, and then call doupdate.
+       setsyx sets the virtual screen (newscr)  cursor  location  to  (y,  x).
+       setsyx(-1, -1) is equivalent to leaveok(newscr, TRUE).
 
-       Few applications will use this feature, most use wmove instead.
+       getsyx  and  setsyx  are  designed  to  be  used  by  a  function  that
+       manipulates curses windows but  seeks  to  avoid  changing  the  cursor
+       position.  Such a function would first call getsyx, modify its windows'
+       content,  call  wnoutrefresh(3x)  on  them,  call  setsyx,  then   call
+       doupdate(3x).
+
+       Few applications use this feature; most call wmove(3x) instead.

                        curs_set

                        -       The curs_set routine sets the cursor state  to  invisible,  normal,  or
-       very  visible  for visibility equal to 0, 1, or 2 respectively.  If the
-       terminal supports the visibility requested, the previous  cursor  state
+       The  curs_set  routine  sets  the cursor state to invisible, normal, or
+       very visible for visibility equal to 0, 1, or 2 respectively.   If  the
+       terminal  supports  the visibility requested, the previous cursor state
        is returned; otherwise, ERR is returned.

                        mvcur

                        -       mvcur  provides  low-level cursor motion.  It takes effect immediately,
-       rather than at the next refresh.  Unlike  the  other  low-level  output
-       functions,  which  either  write  to  the standard output stream or are
-       passed a  function  pointer  to  perform  output,  mvcur  uses  a  file
+       mvcur provides low-level cursor motion.  It takes  effect  immediately,
+       rather  than  at  the  next refresh.  Unlike the other low-level output
+       functions, which either write to the  standard  output  stream  or  are
+       passed  a  function  pointer  to  perform  output,  mvcur  uses  a file
        descriptor derived from the output stream parameter of newterm(3x).
 
-       One  application  of  mvcur  accompanies  the  temporary use of another
-       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
+       One application of mvcur  accompanies  the  temporary  use  of  another
+       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.

                        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
@@ -188,7 +189,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).
 
 
@@ -196,25 +197,28 @@
        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.

                        PORTABILITY

                        +       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
        X/Open Curses, Issue 4.  All other functions are as described in X/Open
        Curses.
@@ -245,7 +249,7 @@
 
 
 
-ncurses 6.5                       2024-05-25                   curs_kernel(3x)
+ncurses 6.5                       2024-06-08                   curs_kernel(3x)
                          diff --git a/doc/html/man/curs_scr_dump.3x.html b/doc/html/man/curs_scr_dump.3x.html index 052af277..56aafbb4 100644 --- a/doc/html/man/curs_scr_dump.3x.html +++ b/doc/html/man/curs_scr_dump.3x.html @@ -27,19 +27,19 @@ * sale, use or other dealings in this Software without prior written * * authorization. * **************************************************************************** - * @Id: curs_scr_dump.3x,v 1.45 2024/06/01 22:29:45 tom Exp @ + * @Id: curs_scr_dump.3x,v 1.47 2024/06/08 20:33:56 tom Exp @ --> -curs_scr_dump 3x 2024-06-01 ncurses 6.5 Library calls +curs_scr_dump 3x 2024-06-08 ncurses 6.5 Library calls -

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

                          +

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

                           curs_scr_dump(3x)                Library calls               curs_scr_dump(3x)
 
@@ -86,20 +86,20 @@
        screen on this information rather than clearing it  and  starting  from
        scratch.
 
-       curses  regards  the terminal being in an invalid state for computation
-       of updates based on the contents of filename if
+       curses  regards  the terminal as in an invalid state for computation of
+       updates based on the contents of filename if
 
-       o   the terminal type supports the terminfo  capabilities  exit_ca_mode
-           (rmcup) or non_rev_rmcup (nrrmc), or
+       o   curses knows that the  terminal  has  been  written  to  since  the
+           preceding scr_dump call, or
 
-       o   curses  knows  that  the  terminal  has  been  written to since the
-           preceding scr_dump call.
+       o   the  terminal  type supports the terminfo capabilities exit_ca_mode
+           (rmcup) or non_rev_rmcup (nrrmc).
 
        Either of the foregoing conditions means that curses cannot assume that
        the  terminal's  contents  match their representation in filename.  The
        former is due to  terminal  features  (such  as  xterm(1)'s  "alternate
        screen")  that  couple  cursor-positioning  mode  with a local cache of
-       screen contents.  curses cannot know  whether  terminal  is  displaying
+       screen contents.  curses cannot know whether the terminal is displaying
        from that local cache at the time the application calls scr_init, so it
        makes a pessimistic assumption that a  full  redraw  is  required;  see
        subsection "Cursor Motions" of terminfo(5).
@@ -151,7 +151,7 @@
 
 
 
-ncurses 6.5                       2024-06-01                 curs_scr_dump(3x)
+ncurses 6.5                       2024-06-08                 curs_scr_dump(3x)
                            diff --git a/doc/html/man/curs_terminfo.3x.html b/doc/html/man/curs_terminfo.3x.html index 260228a3..4ba139ae 100644 --- a/doc/html/man/curs_terminfo.3x.html +++ b/doc/html/man/curs_terminfo.3x.html @@ -28,19 +28,19 @@ * sale, use or other dealings in this Software without prior written * * authorization. * **************************************************************************** - * @Id: curs_terminfo.3x,v 1.140 2024/06/01 22:29:08 tom Exp @ + * @Id: curs_terminfo.3x,v 1.142 2024/06/08 23:05:52 tom Exp @ --> -curs_terminfo 3x 2024-06-01 ncurses 6.5 Library calls +curs_terminfo 3x 2024-06-08 ncurses 6.5 Library calls -

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

                            +

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

                             curs_terminfo(3x)                Library calls               curs_terminfo(3x)
 
@@ -660,7 +660,7 @@
 
 
 
-ncurses 6.5                       2024-06-01                 curs_terminfo(3x)
+ncurses 6.5                       2024-06-08                 curs_terminfo(3x)
                              diff --git a/doc/html/man/curs_util.3x.html b/doc/html/man/curs_util.3x.html index abf0a024..fe64f8d6 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.106 2024/06/01 22:28:18 tom Exp @ + * @Id: curs_util.3x,v 1.108 2024/06/08 22:38:18 tom Exp @ --> -curs_util 3x 2024-06-01 ncurses 6.5 Library calls +curs_util 3x 2024-06-08 ncurses 6.5 Library calls -

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

                              +

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

                               curs_util(3x)                    Library calls                   curs_util(3x)
 
@@ -80,7 +80,7 @@

                              DESCRIPTION

                              unctrl

                              -       The  unctrl  routine  returns  a  character string which is a printable
+       The   unctrl   routine  returns  a  character  string  as  a  printable
        representation of the character ch:
 
        o   Printable characters are displayed  as  themselves,  e.g.,  a  one-
@@ -186,7 +186,7 @@
            from the terminal database.
 
        o   ncurses re-fetches the value of the environment variables  so  that
-           it is still the environment variables which set the screen size.
+           it is still the environment variables that set the screen size.
 
        The use_env and use_tioctl routines combine as follows.
 
@@ -221,7 +221,7 @@
 
        o   the window's character cells contain the color pair value, but  not
            the  actual  color  numbers.   If cells in the retrieved window use
-           color pairs which have not been created in  the  application  using
+           color pairs that have not been created  in  the  application  using
            init_pair, they will not be colored when the window is refreshed.
 
 
@@ -260,7 +260,7 @@
                returns ERR if the terminal was not initialized.
 
           putwin
-               returns ERR if the associated fwrite calls return ERR.
+               returns ERR if the associated write(2) calls return ERR.

                              PORTABILITY

                              @@ -286,12 +286,12 @@

                              keyname

                                      The keyname function  may  return  the  names  of  user-defined  string
-       capabilities  which are defined in the terminfo entry via the -x option
+       capabilities  that  are defined in the terminfo entry via the -x option
        of tic.  This implementation  automatically  assigns  at  run-time  key
-       codes  to  user-defined  strings  which  begin with "k".  The key codes
-       start at KEY_MAX, but are not guaranteed  to  be  the  same  value  for
-       different  runs because user-defined codes are merged from all terminal
-       descriptions  which  have  been  loaded.   The   use_extended_names(3x)
+       codes to user-defined strings that begin with "k".  The key codes start
+       at KEY_MAX, but are not guaranteed to be the same value  for  different
+       runs   because   user-defined   codes  are  merged  from  all  terminal
+       descriptions  that  have  been  loaded.    The   use_extended_names(3x)
        function  controls  whether  this  data  is  loaded  when  the terminal
        description is read by the library.
 
@@ -321,13 +321,13 @@
            older ncurses versions.  This implementation (as well as the X/Open
            variant of Solaris curses, dated 1995) uses textual dumps.
 
-           The implementations which  use  binary  dumps  use  block-I/O  (the
-           fwrite  and  fread  functions).   Those  that use textual dumps use
-           buffered-I/O.  A few applications may happen to write extra data in
-           the  file  using these functions.  Doing that can run into problems
-           mixing block- and buffered-I/O.  This  implementation  reduces  the
-           problem  on writes by flushing the output.  However, reading from a
-           file written using mixed schemes may not be successful.
+           The implementations that use binary dumps use  block-I/O  (write(2)
+           and read(2) functions).  Those that use textual dumps use buffered-
+           I/O.  A few applications may happen to write extra data in the file
+           using  these  functions.   Doing  that can run into problems mixing
+           block- and buffered-I/O.  This implementation reduces  the  problem
+           on  writes  by  flushing  the output.  However, reading from a file
+           written using mixed schemes may not be successful.

                              unctrl, wunctrl

                              @@ -390,7 +390,7 @@
 
 
 
-ncurses 6.5                       2024-06-01                     curs_util(3x)
+ncurses 6.5                       2024-06-08                     curs_util(3x)
                                diff --git a/doc/html/man/define_key.3x.html b/doc/html/man/define_key.3x.html index 8ca26d23..9ebd9c88 100644 --- a/doc/html/man/define_key.3x.html +++ b/doc/html/man/define_key.3x.html @@ -28,19 +28,19 @@ * authorization. * **************************************************************************** * Author: Thomas E. Dickey 1997 - * @Id: define_key.3x,v 1.46 2024/05/25 20:15:04 tom Exp @ + * @Id: define_key.3x,v 1.48 2024/06/08 23:25:11 tom Exp @ --> -define_key 3x 2024-05-25 ncurses 6.5 Library calls +define_key 3x 2024-06-08 ncurses 6.5 Library calls -

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

                                +

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

                                 define_key(3x)                   Library calls                  define_key(3x)
 
@@ -96,12 +96,11 @@

                                SEE ALSO

                                -       ncurses(3x),   keyok(3x),   key_defined(3x),  keybound(3x),  keyok(3x),
-       terminfo(5)
+       curses(3x), keybound(3x), keyok(3x), key_defined(3x), terminfo(5)
 
 
 
-ncurses 6.5                       2024-05-25                    define_key(3x)
+ncurses 6.5                       2024-06-08                    define_key(3x)
                                  diff --git a/doc/html/man/key_defined.3x.html b/doc/html/man/key_defined.3x.html index 8ef095ad..5b0c30fe 100644 --- a/doc/html/man/key_defined.3x.html +++ b/doc/html/man/key_defined.3x.html @@ -28,19 +28,19 @@ * authorization. * **************************************************************************** * Author: Thomas E. Dickey 2003 - * @Id: key_defined.3x,v 1.36 2024/05/18 20:04:53 tom Exp @ + * @Id: key_defined.3x,v 1.38 2024/06/08 23:25:34 tom Exp @ --> -key_defined 3x 2024-05-18 ncurses 6.5 Library calls +key_defined 3x 2024-06-08 ncurses 6.5 Library calls -

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

                                  +

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

                                   key_defined(3x)                  Library calls                 key_defined(3x)
 
@@ -83,11 +83,11 @@

                                  SEE ALSO

                                  -       ncurses(3x), define_key(3x), keyok(3x), keybound(3x), keyok(3x)
+       curses(3x), define_key(3x), keybound(3x), keyok(3x)
 
 
 
-ncurses 6.5                       2024-05-18                   key_defined(3x)
+ncurses 6.5                       2024-06-08                   key_defined(3x)
                                    diff --git a/doc/html/man/keybound.3x.html b/doc/html/man/keybound.3x.html index c61af21a..cc3ae3a1 100644 --- a/doc/html/man/keybound.3x.html +++ b/doc/html/man/keybound.3x.html @@ -28,19 +28,19 @@ * authorization. * **************************************************************************** * Author: Thomas E. Dickey 1999 - * @Id: keybound.3x,v 1.38 2024/05/18 20:05:36 tom Exp @ + * @Id: keybound.3x,v 1.40 2024/06/08 23:25:57 tom Exp @ --> -keybound 3x 2024-05-18 ncurses 6.5 Library calls +keybound 3x 2024-06-08 ncurses 6.5 Library calls -

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

                                    +

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

                                     keybound(3x)                     Library calls                    keybound(3x)
 
@@ -90,11 +90,11 @@

                                    SEE ALSO

                                    -       ncurses(3x), define_key(3x), key_defined(3x), keyok(3x), terminfo(5)
+       curses(3x), define_key(3x), keyok(3x), key_defined(3x), terminfo(5)
 
 
 
-ncurses 6.5                       2024-05-18                      keybound(3x)
+ncurses 6.5                       2024-06-08                      keybound(3x)
                                      diff --git a/doc/html/man/keyok.3x.html b/doc/html/man/keyok.3x.html index e6d3a35e..49527407 100644 --- a/doc/html/man/keyok.3x.html +++ b/doc/html/man/keyok.3x.html @@ -28,19 +28,19 @@ * authorization. * **************************************************************************** * Author: Thomas E. Dickey 1997 - * @Id: keyok.3x,v 1.42 2024/05/18 20:06:09 tom Exp @ + * @Id: keyok.3x,v 1.44 2024/06/08 23:26:27 tom Exp @ --> -keyok 3x 2024-05-18 ncurses 6.5 Library calls +keyok 3x 2024-06-08 ncurses 6.5 Library calls -

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

                                      +

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

                                       keyok(3x)                        Library calls                       keyok(3x)
 
@@ -93,11 +93,11 @@

                                      SEE ALSO

                                      -       ncurses(3x), define_key(3x), key_defined(3x), keybound(3x), keyok(3x),
+       curses(3x), define_key(3x), keybound(3x), keyok(3x), key_defined(3x).
 
 
 
-ncurses 6.5                       2024-05-18                         keyok(3x)
+ncurses 6.5                       2024-06-08                         keyok(3x)
                                        diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html index 6c1d89ce..8b29047e 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.221 2024/06/01 22:29:08 tom Exp @ + * @Id: ncurses.3x,v 1.223 2024/06/08 20:45:43 tom Exp @ --> -ncurses 3x 2024-06-01 ncurses 6.5 Library calls +ncurses 3x 2024-06-08 ncurses 6.5 Library calls -

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

                                        +

                                        ncurses 3x 2024-06-08 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 20240601).
+       document describes ncurses version 6.5 (patch 20240608).
 
        ncurses permits control of the terminal screen's contents;  abstraction
        and  subdivision thereof with windows and pads; acquisition of keyboard
@@ -143,7 +143,7 @@

                                        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 row and column coordinates (y, x),
+       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).
@@ -155,8 +155,8 @@
        effects.
 
        Functions permit manipulation of a window and  the  cursor  identifying
-       the  cell  within  it  at  which  the next output operation will occur.
-       Among those, the most basic are move(3x) and addch(3x): these place the
+       the  cell  within  it  at  which  the next operation will occur.  Among
+       those, the most basic are  move(3x)  and  addch(3x):  these  place  the
        cursor within and write a character to stdscr, respectively.
 
        Frequent changes to the terminal screen can cause unpleasant flicker or
@@ -260,7 +260,13 @@
                  type.   In either case, they are accessed via an integral bit
                  mask.
 
-                 Each cell of a WINDOW is stored as a chtype.
+                 Each cell of a WINDOW is stored as a chtype.   X/Open  Curses
+                 does  not  specify  the  sizes of the character code or color
+                 pair identifier, nor  the  quantity  of  attribute  bits,  in
+                 chtype;  these  are  implementation-dependent.   ncurses uses
+                 eight bits for the character code.  An application  requiring
+                 a  wider  character  type, for instance to represent Unicode,
+                 should use the wide-character API.
 
        ncursesw  is the library in its  "wide"  configuration,  which  handles
                  character encodings requiring a larger data type than char (a
@@ -284,7 +290,7 @@
 
                  cchar_t  corresponds to the non-wide configuration's  chtype.
                           It  is  a  structure  type  because it requires more
-                          storage than fits into a standard  scalar  type.   A
+                          storage than  a  standard  scalar  type  offers.   A
                           character  code  may not be representable as a char,
                           and moreover more than one character  may  occupy  a
                           cell  (as  with  accent marks and other diacritics).
@@ -374,6 +380,7 @@
                     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)
@@ -382,7 +389,6 @@
                     derwin                   curs_window(3x)
                     doupdate                 curs_refresh(3x)
                     dupwin                   curs_window(3x)
-
                     echo                     curs_inopts(3x)
                     echo_wchar               curs_add_wch(3x)
                     echochar                 curs_addch(3x)
@@ -440,6 +446,7 @@
                     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)
@@ -449,7 +456,6 @@
                     init_pair                curs_color(3x)
                     initscr                  curs_initscr(3x)
                     innstr                   curs_instr(3x)
-
                     innwstr                  curs_inwstr(3x)
                     ins_nwstr                curs_ins_wstr(3x)
                     ins_wch                  curs_ins_wch(3x)
@@ -506,6 +512,7 @@
                     mvaddchstr               curs_addchstr(3x)
                     mvaddnstr                curs_addstr(3x)
                     mvaddnwstr               curs_addwstr(3x)
+
                     mvaddstr                 curs_addstr(3x)
                     mvaddwstr                curs_addwstr(3x)
                     mvchgat                  curs_attr(3x)
@@ -516,7 +523,6 @@
                     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)
@@ -572,6 +578,7 @@
                     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)
@@ -583,7 +590,6 @@
                     mvwvline                 curs_border(3x)
                     mvwvline_set             curs_border_set(3x)
                     napms                    curs_kernel(3x)
-
                     newpad                   curs_pad(3x)
                     newterm                  curs_initscr(3x)
                     newwin                   curs_window(3x)
@@ -638,6 +644,7 @@
                     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)
@@ -650,7 +657,6 @@
                     slk_refresh              curs_slk(3x)
                     slk_restore              curs_slk(3x)
                     slk_set                  curs_slk(3x)
-
                     slk_touch                curs_slk(3x)
                     slk_wset                 curs_slk(3x)
                     standend                 curs_attr(3x)
@@ -704,6 +710,7 @@
                     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)
@@ -717,7 +724,6 @@
                     wattr_off                curs_attr(3x)
                     wattr_on                 curs_attr(3x)
                     wattr_set                curs_attr(3x)
-
                     wattroff                 curs_attr(3x)
                     wattron                  curs_attr(3x)
                     wattrset                 curs_attr(3x)
@@ -770,6 +776,7 @@
                     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)
@@ -784,7 +791,6 @@
                     wsyncdown                curs_window(3x)
                     wsyncup                  curs_window(3x)
                     wtimeout                 curs_inopts(3x)
-
                     wtouchln                 curs_touch(3x)
                     wunctrl                  curs_util(3x)
                     wvline                   curs_border(3x)
@@ -1485,7 +1491,7 @@
 
 
 
-ncurses 6.5                       2024-06-01                       ncurses(3x)
+ncurses 6.5                       2024-06-08                       ncurses(3x)
                                          diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html index f90e8fc8..b9e784d5 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 20240601). + This document describes ncurses version 6.5 (patch 20240608).

                                          terminfo Entry Syntax

                                          @@ -1186,9 +1186,9 @@
        printing terminal, with no soft copy unit, give it both hc and os.  (os
        applies  to  storage scope terminals, such as TEKTRONIX 4010 series, as
        well as hard copy and APL terminals.)  If there is a code to  move  the
-       cursor to the left edge of the current row, give this as cr.  (Normally
-       this will be carriage return,  control/M.)   If  there  is  a  code  to
-       produce an audible signal (bell, beep, etc) give this as bel.
+       cursor  to  the  left  edge  of  the  current  line,  give  this as cr.
+       (Normally this will be carriage return, control/M.)  If there is a code
+       to produce an audible signal (bell, beep, etc) give this as bel.
 
        If there is a code to move the cursor one position to the left (such as
        backspace) that capability should be given as cub1.   Similarly,  codes
@@ -1217,7 +1217,7 @@
        the  screen when text is output, but this does not necessarily apply to
        a cuf1 from the last column.  The only local motion  which  is  defined
        from  the  left  edge is if bw is given, then a cub1 from the left edge
-       will move to the right edge of the previous row.  If bw is  not  given,
+       will move to the right edge of the previous line.  If bw is not  given,
        the  effect  is undefined.  This is useful for drawing a box around the
        edge of the screen, for example.  If the terminal has switch selectable
        automatic  margins,  the terminfo file usually assumes that this is on;
@@ -1244,8 +1244,8 @@
        Cursor  addressing  and  other  strings  requiring  parameters  in  the
        terminal are described  by  a  parameterized  string  capability,  with
        printf-like  escapes  such  as  %x  in it.  For example, to address the
-       cursor, the cup capability is given, using two parameters: the row  and
-       column  to  address  to.   (Rows and columns are numbered from zero and
+       cursor, the cup capability is given, using two parameters: the line and
+       column  to  address  to.  (Lines and columns are numbered from zero and
        refer to the physical screen visible to the user,  not  to  any  unseen
        memory.)   If  the terminal has memory relative cursor addressing, that
        can be indicated by mrcup.
@@ -1365,14 +1365,14 @@
        order.  That is, to get x-5 one  would  use  "%gx%{5}%-".   %P  and  %g
        variables are persistent across escape-string evaluations.
 
-       Consider  the HP2645, which, to get to row 3 and column 12, needs to be
-       sent \E&a12c03Y padded for 6 milliseconds.  The order of the  rows  and
-       columns  is  inverted  here,  and the row and column are printed as two
+       Consider the HP2645, which, to get to line 3 and column 12, needs to be
+       sent \E&a12c03Y padded for 6 milliseconds.  The order of the lines  and
+       columns  is  inverted here, and the lines and column are printed as two
        digits.  The corresponding terminal description is expressed thus:
               cup=\E&a%p2%dc%p1%dY$<6>,
 
-       The Microterm ACT-IV needs the current row and column sent preceded  by
-       a ^T, with the row and column simply encoded in binary,
+       The Microterm ACT-IV needs the current line and column sent preceded by
+       a ^T, with the line and column simply encoded in binary,
               cup=^T%p1%c%p2%c
 
        Terminals  which  use  "%c"  need  to  be  able to backspace the cursor
@@ -1382,7 +1382,7 @@
        with  terminfo  set tty modes so that tabs are never expanded, so \t is
        safe to send.  This turns out to be essential for the Ann Arbor 4080.)
 
-       A final example is the LSI ADM-3a, which uses row and column offset  by
+       A final example is the LSI ADM-3a, which uses line and column offset by
        a blank character, thus
               cup=\E=%p1%' '%+%c%p2%' '%+%c
 
@@ -1404,8 +1404,8 @@
        corner of the screen, not of memory.  (Thus, the  \EH  sequence  on  HP
        terminals cannot be used for home.)
 
-       If the terminal has row or column absolute cursor addressing, these can
-       be given as single  parameter  capabilities  hpa  (horizontal  position
+       If  the  terminal  has line or column absolute cursor addressing, these
+       can be given as single parameter capabilities hpa (horizontal  position
        absolute)  and  vpa  (vertical position absolute).  Sometimes these are
        shorter than the more general  two  parameter  sequence  (as  with  the
        hp2645)   and  can  be  used  in  preference  to  cup.   If  there  are
@@ -1443,7 +1443,7 @@
                line position, and
 
            o   parameterized  capabilities  for setting the top, bottom, left,
-               right margins given the number of rows or columns.
+               right margins given the number of lines or columns.
 
        In practice, the categorization into "terminal" and  "printer"  is  not
        suitable:
@@ -1948,7 +1948,7 @@
 
        If there are commands to set and clear tab stops, they can be given  as
        tbc (clear all tab stops) and hts (set a tab stop in the current column
-       of every row).  If a more complex sequence is needed to  set  the  tabs
+       of every line).  If a more complex sequence is needed to set  the  tabs
        than can be described by this, the sequence can be placed in is2 or if.
 
        The  tput  reset  command uses the same capability strings as the reset
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index c7bf1e10..0d9d1788 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.114 2024/05/11 20:39:53 tom Exp @
+  * @Id: tput.1,v 1.116 2024/06/08 20:50:34 tom Exp @
 -->
 
 
 
 
 
-tput 1 2024-05-11 ncurses 6.5 User commands
+tput 1 2024-06-08 ncurses 6.5 User commands
 
 
 
 
-
                                          tput 1 2024-05-11 ncurses 6.5 User commands
                                          
+
                                          tput 1 2024-06-08 ncurses 6.5 User commands
                                          
 
                                           tput(1)                          User commands                         tput(1)
 
@@ -53,19 +53,19 @@
 
 
 
                                          SYNOPSIS
                                          -       tput [-T terminal-type] {cap-code [parameter ...]} ...
+       tput [-v] [-T terminal-type] {cap-code [parameter ...]} ...
 
-       tput [-T terminal-type] [-x] clear
+       tput [-v] [-T terminal-type] [-x] clear
 
-       tput [-T terminal-type] init
+       tput [-v] [-T terminal-type] init
 
-       tput [-T terminal-type] reset
+       tput [-v] [-T terminal-type] reset
 
-       tput [-T terminal-type] longname
+       tput [-v] [-T terminal-type] longname
 
-       tput -S
+       tput [-v] -S
 
-       tput -V
+       tput [-v] -V
 
 
 
                                          DESCRIPTION
                                          @@ -259,6 +259,8 @@
                 environment variable.  If specified, the environment variables
                 LINES and COLUMNS are also ignored.
 
+       -v       causes tput to operate verbosely, reporting warnings.
+
        -V       reports the version of ncurses associated with tput, and exits
                 with a successful status.
 
@@ -498,8 +500,8 @@
               Set cursor to normal visibility.
 
        tput home
-              Move the cursor to row 0, column 0: the upper left corner of the
-              screen, usually known as the "home" cursor position.
+              Move the cursor to line 0, column 0: the upper  left  corner  of
+              the screen, usually known as the "home" cursor position.
 
        tput clear
               Clear  the  screen: write the clear_screen capability's value to
@@ -523,7 +525,7 @@
               device.
 
        tput cup 23 4
-              Move the cursor to row 23, column 4.
+              Move the cursor to line 23, column 4.
 
        tput cup
               Report  the  value  of the cursor_address (cup) capability (used
@@ -555,7 +557,7 @@
 
 
 
-ncurses 6.5                       2024-05-11                           tput(1)
+ncurses 6.5                       2024-06-08                           tput(1)
 
                                          
 
                                          
 
                                            
diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index b2b865cc..cbec400c 100644
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -27,19 +27,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tset.1,v 1.86 2024/05/11 20:39:53 tom Exp @
+  * @Id: tset.1,v 1.88 2024/06/08 20:51:12 tom Exp @
 -->
 
 
 
 
 
-tset 1 2024-05-11 ncurses 6.5 User commands
+tset 1 2024-06-08 ncurses 6.5 User commands
 
 
 
 
-
                                            tset 1 2024-05-11 ncurses 6.5 User commands
                                            
+
                                            tset 1 2024-06-08 ncurses 6.5 User commands
                                            
 
                                             tset(1)                          User commands                         tset(1)
 
@@ -115,8 +115,10 @@
            kill characters (among many other things) are set
 
        o   unless   the   "-I"   option  is  enabled,  the  terminal  and  tab
-           initialization strings are sent to the standard error  output,  and
-           tset waits one second (in case a hardware reset was issued).
+           initialization strings are sent to the standard error output,  and,
+           if  the  terminal device does not appear to be a pseudoterminal (as
+           might be used by a  terminal  emulator  program),  tset  waits  one
+           second in case a hardware reset was issued.
 
        o   Finally,  if  the  erase,  interrupt  and line kill characters have
            changed, or are not set to their default values, their  values  are
@@ -393,7 +395,7 @@
 
 
 
-ncurses 6.5                       2024-05-11                           tset(1)
+ncurses 6.5                       2024-06-08                           tset(1)
 
                                            
 
                                            
 
                                              
diff --git a/doc/html/man/user_caps.5.html b/doc/html/man/user_caps.5.html
index 10b6f776..61e2de80 100644
--- a/doc/html/man/user_caps.5.html
+++ b/doc/html/man/user_caps.5.html
@@ -28,19 +28,19 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: user_caps.5,v 1.49 2024/03/16 15:35:01 tom Exp @
+  * @Id: user_caps.5,v 1.51 2024/06/08 21:01:53 tom Exp @
 -->
 
 
 
 
 
-user_caps 5 2024-03-16 ncurses 6.5 File formats
+user_caps 5 2024-06-08 ncurses 6.5 File formats
 
 
 
 
-
                                              user_caps 5 2024-03-16 ncurses 6.5 File formats
                                              
+
                                              user_caps 5 2024-06-08 ncurses 6.5 File formats
                                              
 
                                               user_caps(5)                     File formats                     user_caps(5)
 
@@ -62,8 +62,8 @@
 
                                              Background
                                                      Before  ncurses  5.0,  terminfo  databases  used  a fixed repertoire of
        terminal capabilities designed for the SVr2 terminal database in  1984,
-       and  extended  in  stages  through SVr4 (1989), and standardized in the
-       Single Unix Specification beginning in 1995.
+       and  extended in stages through SVr4 (1989), and standardized in X/Open
+       Curses starting in 1995.
 
        Most of the extensions in this fixed repertoire were additions  to  the
        tables of Boolean, numeric and string capabilities.  Rather than change
@@ -403,7 +403,7 @@
 
 
 
-ncurses 6.5                       2024-03-16                      user_caps(5)
+ncurses 6.5                       2024-06-08                      user_caps(5)
 
                                              
 
                                              
 
                                                
diff --git a/include/ncurses_cfg.hin b/include/ncurses_cfg.hin
index 8d9ed81a..0744fa0c 100644
--- a/include/ncurses_cfg.hin
+++ b/include/ncurses_cfg.hin
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -31,7 +31,7 @@
  *  Author: Thomas E. Dickey      1997-on                                   *
  ****************************************************************************/
 /*
- * $Id: ncurses_cfg.hin,v 1.13 2020/03/08 12:37:59 tom Exp $
+ * $Id: ncurses_cfg.hin,v 1.15 2024/06/08 14:04:14 tom Exp $
  *
  * Both ncurses_cfg.h and ncurses_def.h are internal header-files used when
  * building ncurses.
@@ -44,7 +44,7 @@
  *
  * See:
  *	https://invisible-island.net/autoconf/
- *	ftp://ftp.invisible-island.net/autoconf/
+ *	https://invisible-island.net/archives/autoconf/
  */
 #ifndef NC_CONFIG_H
 #define NC_CONFIG_H
diff --git a/man/curs_addch.3x b/man/curs_addch.3x
index 5fb25b0a..4e1bf944 100644
--- a/man/curs_addch.3x
+++ b/man/curs_addch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_addch.3x,v 1.90 2024/06/01 22:29:08 tom Exp $
-.TH curs_addch 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $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"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -302,7 +302,6 @@ X/Open Curses states that the
 definitions are
 .I char
 constants.
-.PP
 Some implementations are problematic.
 .bP
 Solaris
diff --git a/man/curs_get_wch.3x b/man/curs_get_wch.3x
index c190a7ea..e58d326f 100644
--- a/man/curs_get_wch.3x
+++ b/man/curs_get_wch.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_get_wch.3x,v 1.41 2024/05/11 20:39:53 tom Exp $
-.TH curs_get_wch 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_get_wch.3x,v 1.43 2024/06/08 20:25:25 tom Exp $
+.TH curs_get_wch 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -106,9 +106,14 @@ waits until the terminal has input.
 If \fB\%cbreak\fP(3X)
 has been called,
 this happens after one character is read.
-If \fB\%nocbreak\fP(3X)
+If \fB\%nocbreak\fP(3X) or \fB\%noraw\fP(3X)
 has been called,
 it occurs when the next newline is read.
+(Because the terminal's normal or \*(``cooked\*('' mode
+is line-buffered,
+multiple
+.B \%wget_wch
+calls may then be necessary to empty the input queue.)
 If \fB\%halfdelay\fP(3X)
 has been called,
 .I curses
@@ -117,15 +122,15 @@ waits until input is available or the specified delay elapses.
 If \fB\%echo\fP(3X) has been called,
 and the window is not a pad,
 .I curses
-writes
-.I wch
+writes the wide character
+from the input queue
 to the window
 (at the cursor position)
 per the following rules.
 .bP
-If
-.I wch
-matches the terminal's erase character,
+If the wide character
+matches the terminal's erase character
+(see \fB\%erasewchar\fP(3X)),
 the cursor moves leftward one position
 and the new position is erased
 as if \fB\%wmove\fP(3X) and then \fB\%wdelch\fP(3X) were called.
@@ -138,7 +143,7 @@ are handled the same way.
 .bP
 .I curses
 writes any other
-.I wch
+wide character
 to the window,
 as with \fB\%wecho_wchar\fP(3X).
 .bP
@@ -151,18 +156,17 @@ calls
 .B \%wrefresh
 on it.
 .PP
-If
-.I wch
+If the wide character
 is a carriage return and \fBnl\fP(3X) has been called,
 .B \%wgetch
-stores the the character code for line feed in
+stores the the wide character code for line feed in
 .I wch
 instead.
 .SS "Ungetting Characters"
 .B \%unget_wch
 places
-.I wch
-into the input queue to be returned by the next call to
+.I wc
+into the input queue to be retrieved by the next call to
 .BR \%wget_wch "."
 A single input queue serves all windows associated with the terminal.
 .SH RETURN VALUE
diff --git a/man/curs_get_wstr.3x b/man/curs_get_wstr.3x
index 9722a3e6..733054c7 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.50 2024/05/25 20:10:58 tom Exp $
-.TH curs_get_wstr 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $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"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -178,8 +178,9 @@ respectively, is recommended.
 These functions cannot return \fBKEY_\fP values because there
 is no way to distinguish a \fBKEY_\fP value from a valid \fBwchar_t\fP value.
 .SH PORTABILITY
-These functions are described in The Single Unix Specification, Version 2.
-No error conditions are defined.
+X/Open Curses,
+Issue 4 describes these functions.
+It specifies no error conditions for them.
 .PP
 This implementation returns \fBERR\fP if the window pointer is null,
 or if the lower-level \fBwget_wch\fP call returns an \fBERR\fP.
diff --git a/man/curs_getch.3x b/man/curs_getch.3x
index bc88c0ac..a66e68a2 100644
--- a/man/curs_getch.3x
+++ b/man/curs_getch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getch.3x,v 1.95 2024/06/01 22:29:08 tom Exp $
-.TH curs_getch 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_getch.3x,v 1.97 2024/06/08 20:26:46 tom Exp $
+.TH curs_getch 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -106,9 +106,14 @@ waits until the terminal has input.
 If \fB\%cbreak\fP(3X)
 has been called,
 this happens after one character is read.
-If \fB\%nocbreak\fP(3X)
+If \fB\%nocbreak\fP(3X) or \fB\%noraw\fP(3X)
 has been called,
 it occurs when the next newline is read.
+(Because the terminal's normal or \*(``cooked\*('' mode
+is line-buffered,
+multiple
+.B \%wgetch
+calls may then be necessary to empty the input queue.)
 If \fB\%halfdelay\fP(3X)
 has been called,
 .I curses
@@ -125,7 +130,8 @@ per the following rules.
 .bP
 If
 .I c
-matches the terminal's erase character,
+matches the terminal's erase character
+(see \fB\%erasechar\fP(3X)),
 the cursor moves leftward one position
 and the new position is erased
 as if \fB\%wmove\fP(3X) and then \fB\%wdelch\fP(3X) were called.
@@ -403,11 +409,13 @@ correspond to a physical key.
 returns
 .BR \%KEY_RESIZE ","
 even if the window's keypad mode is disabled,
-when
+if
 .I \%ncurses
-handles a
+has handled a
 .B \%SIGWINCH
-signal;
+signal since
+.B \%wgetch
+was called;
 see \fB\%initscr\fP(3X) and \fB\%resizeterm\fP(3X).
 .bP
 .B \%wgetch
@@ -624,13 +632,14 @@ reads only single-byte characters.
 .PP
 The echo behavior of these functions on input of
 .B KEY_
-or backspace characters was not specified in the SVr4 documentation.
-This description is adapted from X/Open Curses.
+or backspace characters is not documented in SVr4
+.IR curses "."
 .PP
 The behavior of
 .B \%wgetch
-in the presence of signal handlers is unspecified in the SVr4
-documentation and X/Open Curses.
+in the presence of signal handlers is not documented in SVr4
+.I curses
+and is unspecified by X/Open Curses.
 In historical
 .I curses
 implementations,
diff --git a/man/curs_getstr.3x b/man/curs_getstr.3x
index 27b9c951..eec58a54 100644
--- a/man/curs_getstr.3x
+++ b/man/curs_getstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getstr.3x,v 1.63 2024/06/01 22:29:08 tom Exp $
-.TH curs_getstr 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $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"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -177,11 +177,9 @@ The use of
 \fBwgetnstr\fP,
 respectively, is recommended.
 .SH PORTABILITY
-These functions are described in The Single Unix Specification, Version 2.
-No error conditions are defined.
-.PP
-This implementation returns \fBERR\fP if the window pointer is null,
-or if the lower-level \fBwgetch\fP(3X) call returns an \fBERR\fP.
+X/Open Curses,
+Issue 4 describes these functions.
+It specifies no error conditions for them.
 .PP
 SVr3 and early SVr4 curses implementations did not reject function keys;
 the SVr4.0 documentation claimed that \*(``special keys\*(''
diff --git a/man/curs_getyx.3x b/man/curs_getyx.3x
index 92b48af9..4d7ec469 100644
--- a/man/curs_getyx.3x
+++ b/man/curs_getyx.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getyx.3x,v 1.45 2024/05/11 20:39:53 tom Exp $
-.TH curs_getyx 3X 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_getyx.3x,v 1.47 2024/06/08 20:42:50 tom Exp $
+.TH curs_getyx 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -71,7 +71,7 @@ and
 .B \%getmaxyx
 stores
 .IR win "'s"
-maximum valid row and column numbers in
+maximum valid line and column numbers in
 .I y
 and
 .IR x ","
diff --git a/man/curs_inch.3x b/man/curs_inch.3x
index fffcff30..edcc65cd 100644
--- a/man/curs_inch.3x
+++ b/man/curs_inch.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inch.3x,v 1.58 2024/06/01 22:29:08 tom Exp $
-.TH curs_inch 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_inch.3x,v 1.60 2024/06/08 20:45:43 tom Exp $
+.TH curs_inch 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -160,18 +160,6 @@ and fixed-width integral types would not be standard until ISO C99.
 .\" the Alpha arrived in 1993.  --GBR
 SVr3.2 (1988)
 added a 6-bit color pair identifier alongside the attributes.
-.PP
-X/Open Curses does not specify the sizes of the character code or
-color pair identifier,
-nor the quantity of attribute bits,
-in
-.IR chtype ";"
-these are implementation-dependent.
-.I \%ncurses
-uses eight bits for the character code.
-An application requiring a wider character type,
-for instance to represent Unicode,
-should use the wide-character counterparts of these functions.
 .SH SEE ALSO
 \fB\%curs_in_wch\fP(3X) describes comparable functions of the
 .I \%ncurses
diff --git a/man/curs_initscr.3x b/man/curs_initscr.3x
index ecfc1fc6..1e30604a 100644
--- a/man/curs_initscr.3x
+++ b/man/curs_initscr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_initscr.3x,v 1.73 2024/06/01 22:38:43 tom Exp $
-.TH curs_initscr 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_initscr.3x,v 1.75 2024/06/08 20:34:23 tom Exp $
+.TH curs_initscr 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -308,7 +308,7 @@ It also updates the saved terminal modes with
 This handles the window-size changes which were ignored in
 the standardization efforts.
 The handler sets a (signal-safe) variable
-that is later tested by \fB\%wgetch\fP(3X) and \fB\%wget_wch\fP(3X):
+that is later tested by \fB\%wgetch\fP(3X) and \fB\%wget_wch\fP(3X).
 .RS
 .bP
 .B \%wgetch
diff --git a/man/curs_inopts.3x b/man/curs_inopts.3x
index 4f4c2554..ed78d24c 100644
--- a/man/curs_inopts.3x
+++ b/man/curs_inopts.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inopts.3x,v 1.70 2024/06/01 22:28:41 tom Exp $
-.TH curs_inopts 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_inopts.3x,v 1.73 2024/06/08 23:24:17 tom Exp $
+.TH curs_inopts 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -188,7 +188,7 @@ always disables the terminal driver's own echoing.
 By default,
 a
 .I curses
-window has its echo flag set.
+screen's echo option is set.
 Authors of most interactive programs prefer
 to do their own echoing in a controlled area of the screen,
 or not to echo at all,
@@ -320,12 +320,15 @@ to the terminal.
 Initially,
 whether the terminal reports a carriage return
 using the character code for a line feed
+in cbreak or raw modes
 depends on the configuration of the terminal driver;
 see \fI\%termios\fP(3).
 .B nl
 configures the terminal to perform this translation.
 .B nonl
 disables it.
+In normal (or \*(``cooked\*('') mode,
+the terminal driver always translates carriage returns to line feeds.
 .\"
 .SS nodelay
 .B \%nodelay
@@ -559,9 +562,9 @@ follow historical practice in that they attempt to restore normal
 (\*(``cooked\*('') mode from raw and cbreak modes,
 respectively.
 Mixing
-.BR raw / \%noraw
+.BR \%raw / noraw
 calls with
-.BR cbreak / \%nocbreak
+.BR \%cbreak / nocbreak
 calls leads to terminal driver control states that are hard to predict
 or understand;
 doing so is not recommended.
@@ -591,10 +594,10 @@ In each case,
 the function returns
 .TP 5 \" "-1" + 2n tag separation + 1n fudge for typesetters like grops
 .B 1
-if the flag is set,
+if the option is set,
 .TP
 .B 0
-if the flag is reset,
+if the option is reset,
 or
 .TP
 .B \-1
@@ -807,5 +810,5 @@ to eliminate their effect on output.
 \fB\%curs_initscr\fP(3X),
 \fB\%curs_util\fP(3X),
 \fB\%define_key\fP(3X),
-\fB\%term_variables\fP(3X),
-\fB\%termios\fP(3)
+\fB\%termios\fP(3),
+\fB\%term_variables\fP(3X).
diff --git a/man/curs_ins_wstr.3x b/man/curs_ins_wstr.3x
index 76194443..37a58302 100644
--- a/man/curs_ins_wstr.3x
+++ b/man/curs_ins_wstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_ins_wstr.3x,v 1.40 2024/05/25 20:10:58 tom Exp $
-.TH curs_ins_wstr 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_ins_wstr.3x,v 1.42 2024/06/08 21:04:04 tom Exp $
+.TH curs_ins_wstr 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -87,17 +87,29 @@ If \fIn\fP is less than zero, the entire string is inserted
 .PP
 Special characters are handled as in \fBwadd_wch\fP(3X).
 .SH RETURN VALUE
-All functions return the integer \fBERR\fP upon failure and \fBOK\fP on success.
+These functions return
+.B OK
+on success and
+.B ERR
+on failure.
 .PP
 X/Open Curses does not specify any error conditions.
-This implementation returns
+In
+.IR \%ncurses ","
+they return
 .B ERR
+if
 .bP
-if the \fIwin\fP parameter is null or
+.I win
+is
+.BR NULL ","
 .bP
-if the \fIwstr\fP parameter is null or
+.I wstr
+is
+.BR NULL ","
+or
 .bP
-if the \fBwins_wch\fP function returns
+an internal \fB\%wins_wch\fP(3X) call returns
 .BR ERR "."
 .PP
 Functions prefixed with \*(``mv\*('' first perform cursor movement and
@@ -106,20 +118,32 @@ fail if the position
 .IR x )
 is outside the window boundaries.
 .SH NOTES
-All but \fBwins_nwstr\fP may be macros.
+All of these functions except
+.B \%wins_nwstr
+may be implemented as macros.
 .PP
-If the first character in the string is a non-spacing character, these
-functions will fail.
-X/Open Curses does not define what will happen
+If the first character in the string is a non-spacing character,
+these functions return
+.BR ERR "."
+X/Open Curses does not specify what happens
 if a non-spacing character follows a control character.
 .SH PORTABILITY
-These functions are described in X/Open Curses, Issue 4,
-which adds \fI\%const\fP qualifiers to the arguments.
+X/Open Curses,
+Issue 4 describes these functions.
+It specifies no error conditions for them.
 .PP
-X/Open states that the entire string is inserted if \fIn\fP is less than 1.
+Issue 4 states that the entire string is inserted if
+.I n
+is less than 1.
 This is probably an error,
 because it is inconsistent with other functions,
-and differs from the X/Open implementation on Solaris.
+and differs from the SVr4
+.I curses
+and Solaris
+.I xcurses
+implementations.
+Nevertheless,
+Issue 7 retains it.
 .SH SEE ALSO
 \fB\%curs_insstr\fP(3X) describes comparable functions of the
 .I \%ncurses
diff --git a/man/curs_insstr.3x b/man/curs_insstr.3x
index 1a2a0efe..2641f05a 100644
--- a/man/curs_insstr.3x
+++ b/man/curs_insstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_insstr.3x,v 1.53 2024/05/25 20:10:58 tom Exp $
-.TH curs_insstr 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_insstr.3x,v 1.55 2024/06/08 21:03:03 tom Exp $
+.TH curs_insstr 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -107,19 +107,40 @@ is outside the window boundaries.
 .SH NOTES
 All but \fBwinsnstr\fP may be macros.
 .SH PORTABILITY
-These functions are described in X/Open Curses, Issue 4,
-which adds \fI\%const\fP qualifiers to the arguments.
+X/Open Curses,
+Issue 4 describes these functions.
+It specifies no error conditions for them.
 .PP
-The Single Unix Specification, Version 2 states that
-\fBinsnstr\fP and \fBwinsnstr\fP perform wrapping.
-This is probably an error, since it makes this group of functions inconsistent.
-Also, no implementation of curses documents this inconsistency.
+Issue 4 distinguished
+.B \%insnstr
+and
+.B \%winsnstr
+by stating they \*(``do not perform wrapping\*(''.
+This was probably an error,
+since it makes this group of functions inconsistent.
+No implementation of
+.I curses
+documents this inconsistency,
+and Issue 7 removed it.
 .PP
-X/Open states that the entire string is inserted if \fIn\fP is less than 1.
+Issue 4 states that the entire string is inserted if
+.I n
+is less than 1.
 This is probably an error,
 because it is inconsistent with other functions,
-and differs from the SVr4 and X/Open implementations on Solaris.
+and differs from the SVr4
+.I curses
+and Solaris
+.I xcurses
+implementations.
+Nevertheless,
+Issue 7 retains it.
 .SH SEE ALSO
+\fB\%curs_ins_wstr\fP(3X) describes comparable functions of the
+.I \%ncurses
+library in its wide-character configuration
+.RI \%( ncursesw ).
+.PP
 \fB\%curses\fP(3X),
 \fB\%curs_inch\fP(3X),
 \fB\%curs_ins_wstr\fP(3X),
diff --git a/man/curs_instr.3x b/man/curs_instr.3x
index aca21a1b..911d4e89 100644
--- a/man/curs_instr.3x
+++ b/man/curs_instr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_instr.3x,v 1.55 2024/06/01 22:29:08 tom Exp $
-.TH curs_instr 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_instr.3x,v 1.57 2024/06/08 20:47:39 tom Exp $
+.TH curs_instr 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -58,37 +58,69 @@ get a string from a \fIcurses\fR window
 .nf
 \fB#include 
 .PP
-\fBint instr(char *\fIstr\fP);
-\fBint innstr(char *\fIstr\fP, int \fIn\fP);
-\fBint winstr(WINDOW *\fIwin\fP, char *\fIstr\fP);
-\fBint winnstr(WINDOW *\fIwin\fP, char *\fIstr\fP, int \fIn\fP);
+\fBint instr(char *\ \fIstr\fP);
+\fBint winstr(WINDOW *\ \fIwin\fP, char *\ \fIstr\fP);
+\fBint mvinstr(int \fIy\fP, int \fIx\fP, char *\ \fIstr\fP);
+\fBint mvwinstr(WINDOW *\ \fIwin\fP, int \fIy\fP, int \fIx\fP, char *\ \fIstr\fP);
 .PP
-\fBint mvinstr(int \fIy\fP, int \fIx\fP, char *\fIstr\fP);
-\fBint mvinnstr(int \fIy\fP, int \fIx\fP, char *\fIstr\fP, int \fIn\fP);
-\fBint mvwinstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, char *\fIstr\fP);
-\fBint mvwinnstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, char *\fIstr\fP, int \fIn\fP);
+\fBint innstr(char *\ \fIstr\fP, int \fIn\fP);
+\fBint winnstr(WINDOW *\ \fIwin\fP, char *\ \fIstr\fP, int \fIn\fP);
+\fBint mvinnstr(int \fIy\fP, int \fIx\fP, char *\ \fIstr\fP, int \fIn\fP);
+\fBint mvwinnstr(WINDOW *\ \fIwin\fP, int \fIy\fP, int \fIx\fP, char *\ \fIstr\fP, int \fIn\fP);
 .fi
 .SH DESCRIPTION
-These routines return a string of characters in \fIstr\fP,
-starting at the current cursor position in the named window.
-Attributes are stripped from the characters.
-.PP
-The four functions with \fIn\fP as the last argument return
-a leading substring at most \fIn\fP characters long
-(exclusive of the trailing NUL).
-Transfer stops at the end of the current line, or when \fIn\fP characters have
-been stored at the location referenced by \fIstr\fP.
+.B \%winstr
+extracts a string from a
+.I curses
+window
+.IR win ","
+starting at the cursor and stopping at the end of the line,
+and stores it in
+.IR str ","
+terminating it with a null character
+and
+omitting any attributes and color pair identifier
+that
+.I curses
+associates with each character.
+.B \%winnstr
+does the same,
+but copies at most
+.I n
+characters from
+.IR win "."
+An
+.I n
+of
+.B \-1
+implies no limit;
+.B \%winnstr
+then works like
+.BR \%winstr "."
+\fB\%ncurses\fP(3X) describes the variants of these functions.
 .SH RETURN VALUE
-All of the functions return \fBERR\fP upon failure,
-or the number of characters actually read into the string.
+These functions return the count of characters copied from
+.I win
+to
+.IR str ","
+or
+.B ERR
+upon failure.
 .PP
-X/Open Curses defines no error conditions.
-This implementation returns
+In
+.IR \%ncurses ","
+they return
 .B ERR
+if
 .bP
-if the \fIwin\fP parameter is null or
+.I win
+is
+.B NULL
+or
 .bP
-if the \fIchstr\fP parameter is null.
+.I str
+is
+.BR NULL "."
 .PP
 Functions prefixed with \*(``mv\*('' first perform cursor movement and
 fail if the position
@@ -96,32 +128,92 @@ fail if the position
 .IR x )
 is outside the window boundaries.
 .SH NOTES
-All routines except \fBwinnstr\fP may be macros.
+All of these functions except
+.B \%winnstr
+may be implemented as macros.
 .PP
 Reading a line that overflows the array pointed to by
-\fIstr\fP
+.I str
 with
-\fBinstr\fP,
-\fBmvinstr\fP,
-\fBmvwinstr\fP
+.BR \%instr ","
+.BR \%winstr ","
+.BR \%mvinstr ","
 or
-\fBwinstr\fP
+.B \%mvwinstr
 causes undefined results.
-Therefore, the use of
-\fBinnstr\fP,
-\fBmvinnstr\fP,
-\fBmvwinnstr\fP, or
-\fBwinnstr\fP
-is recommended.
+Use of
+.BR \%innstr ","
+.BR \%winnstr ","
+.BR \%mvinnstr ","
+and
+.B \%mvwinnstr
+is recommended instead.
+.SH EXTENSIONS
+.BR \%innstr ","
+.BR \%winnstr ","
+.BR \%mvinnstr ","
+and
+.BR \%mvwinnstr "'s"
+treatment of
+.B \-1
+as a valid value of
+.I n
+is an
+.I \%ncurses
+extension.
 .SH PORTABILITY
-SVr4 does not
-document whether a length limit includes or excludes the trailing NUL.
+Applications employing
+.I \%ncurses
+extensions should condition their use on the visibility of the
+.B \%NCURSES_VERSION
+preprocessor macro.
 .PP
-The \fI\%ncurses\fP library extends the X/Open Curses description by allowing a
-negative value for \fIn\fP.
-In this case, the functions return the string ending at the right margin.
+X/Open Curses,
+Issue 4 describes these functions.
+It specifies no error conditions for them.
+.PP
+X/Open Curses Issues 4 and 7 both state that
+.BR \%instr ","
+.BR \%winstr ","
+.BR \%mvinstr ","
+and
+.B \%mvwinstr
+return
+.B OK
+rather than a character count.
+This is likely an erratum.
+.bP
+SVr3.1 and SVr4 implemented
+.B \%winstr
+as a wrapper around
+.BR \%winnstr ","
+returning the latter's return value.
+X/Open Curses's specification thus may have been an editorial solecism
+copied from System\ V's documentation
+(see below)
+by X/Open,
+rather than an intentional change.
+.bP
+.I \%ncurses
+retains compatibility with System\ V
+.I curses
+behavior.
+.PP
+SVr4 documents no return values apart from
+.B OK
+and
+.B ERR
+for any of these functions.
+SVr4 does not
+document whether
+.I n
+counts the null terminator that these functions write to
+.IR str "."
+.SH HISTORY
+SVr3.1 (1987)
+introduced these functions.
 .SH SEE ALSO
-\fB\%curs_ins_wstr\fP(3X) describes comparable functions of the
+\fB\%curs_inwstr\fP(3X) describes comparable functions of the
 .I \%ncurses
 library in its wide-character configuration
 .RI \%( ncursesw ).
diff --git a/man/curs_inwstr.3x b/man/curs_inwstr.3x
index 9bafe85d..a557cbe3 100644
--- a/man/curs_inwstr.3x
+++ b/man/curs_inwstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inwstr.3x,v 1.43 2024/05/25 20:10:58 tom Exp $
-.TH curs_inwstr 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_inwstr.3x,v 1.45 2024/06/08 21:19:18 tom Exp $
+.TH curs_inwstr 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -57,48 +57,84 @@ get a wide-character string from a \fIcurses\fR window
 .nf
 \fB#include 
 .PP
-\fBint inwstr(wchar_t *\fIwstr\fP);
-\fBint innwstr(wchar_t *\fIwstr\fP, int \fIn\fP);
-\fBint winwstr(WINDOW *\fIwin\fP, wchar_t *\fIwstr\fP);
-\fBint winnwstr(WINDOW *\fIwin\fP, wchar_t *\fIwstr\fP, int \fIn\fP);
+\fBint inwstr(wchar_t *\ \fIwstr\fP);
+\fBint winwstr(WINDOW *\ \fIwin\fP, wchar_t *\ \fIwstr\fP);
+\fBint mvinwstr(int \fIy\fP, int \fIx\fP, wchar_t *\ \fIwstr\fP);
+\fBint mvwinwstr(WINDOW *\ \fIwin\fP, int \fIy\fP, int \fIx\fP, wchar_t *\ \fIwstr\fP);
 .PP
-\fBint mvinwstr(int \fIy\fP, int \fIx\fP, wchar_t *\fIwstr\fP);
-\fBint mvinnwstr(int \fIy\fP, int \fIx\fP, wchar_t *\fIwstr\fP, int \fIn\fP);
-\fBint mvwinwstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, wchar_t *\fIwstr\fP);
-\fBint mvwinnwstr(WINDOW *\fIwin\fP, int \fIy\fP, int \fIx\fP, wchar_t *\fIwstr\fP, int \fIn\fP);
+\fBint innwstr(wchar_t *\ \fIwstr\fP, int \fIn\fP);
+\fBint winnwstr(WINDOW *\ \fIwin\fP, wchar_t *\ \fIwstr\fP, int \fIn\fP);
+\fBint mvinnwstr(int \fIy\fP, int \fIx\fP, wchar_t *\ \fIwstr\fP, int \fIn\fP);
+\fBint mvwinnwstr(WINDOW *\ \fIwin\fP, int \fIy\fP, int \fIx\fP, wchar_t *\ \fIwstr\fP, int \fIn\fP);
 .fi
 .SH DESCRIPTION
-These routines return a string of \fBwchar_t\fP wide characters in \fIwstr\fP,
-starting at the current cursor position in the named window.
-.PP
-The four functions with \fIn\fP as the last argument return
-a leading substring at most \fIn\fP characters long
-(exclusive of the trailing NUL).
-Transfer stops at the end of the current line, or when \fIn\fP characters have
-been stored at the location referenced by \fIwstr\fP.
-.PP
-If the size \fIn\fP is not large enough to store a complete complex character,
-an error is generated.
+.B \%winwstr
+extracts a wide-character string from a
+.I curses
+window
+.IR win ","
+starting at the cursor and stopping at the end of the line,
+and stores it in
+.IR wstr ","
+terminating it with a wide null character
+and
+omitting any attributes and color pair identifier
+that
+.I curses
+associates with each character.
+.B \%winnwstr
+does the same,
+but copies at most
+.I n
+characters from
+.IR win "."
+An
+.I n
+of
+.B \-1
+implies no limit;
+.B \%winnwstr
+then works like
+.BR \%winwstr "."
+\fB\%ncurses\fP(3X) describes the variants of these functions.
 .SH RETURN VALUE
-All routines return
-\fBERR\fP
+On successful operation,
+these functions return the count of wide characters copied from
+.I win
+to
+.IR wstr "."
+They return
+.B ERR
 upon failure.
-Upon
-successful completion, the *\fBinwstr\fP
-routines return
-\fBOK\fP, and the *\fBinnwstr\fP
-routines return the
-number of characters read into the string.
+.BR \%innwstr ","
+.BR \%winnwstr ","
+.BR \%mvinnwstr ","
+and
+.B \%mvwinnwstr
+return
+.B ERR
+if
+.I n
+is insufficiently large to store a complete wide character string.
+(Recall that a
+.I curses
+complex character can contain multiple wide characters,
+some of which may be non-spacing.)
 .PP
-X/Open defines no error conditions.
-This implementation returns
+In
+.IR \%ncurses ","
+these functions return
 .B ERR
+if
 .bP
-if the \fIwin\fP parameter is null or
-.bP
-if the \fIwstr\fP parameter is null, or
+.I win
+is
+.B NULL
+or
 .bP
-if no characters could be read.
+.I wstr
+is
+.BR NULL "."
 .PP
 Functions prefixed with \*(``mv\*('' first perform cursor movement and
 fail if the position
@@ -106,37 +142,90 @@ fail if the position
 .IR x )
 is outside the window boundaries.
 .SH NOTES
-All routines except
-\fBwinnwstr\fP
-may be macros.
-.PP
-Each cell in the window holds a complex character
-(a spacing character and zero or more non-spacing characters)
-together with attributes and color.
-These functions store only the wide characters,
-ignoring attributes and color.
-Use \fBin_wchstr\fP to return the complex characters from a window.
+All of these functions except
+.B \%winnwstr
+may be implemented as macros.
 .PP
 Reading a line that overflows the array pointed to by
-\fIwstr\fP
+.I str
 with
-\fBinwstr\fP,
-\fBmvinwstr\fP,
-\fBmvwinwstr\fP
+.BR \%inwstr ","
+.BR \%winwstr ","
+.BR \%mvinwstr ","
 or
-\fBwinwstr\fP
+.B \%mvwinwstr
 causes undefined results.
-Therefore, the use of
-\fBinnwstr\fP,
-\fBmvinnwstr\fP,
-\fBmvwinnwstr\fP, or
-\fBwinnwstr\fP
-is recommended.
+Use of
+.BR \%innwstr ","
+.BR \%winnwstr ","
+.BR \%mvinnwstr ","
+and
+.B \%mvwinnwstr
+is recommended instead.
+.SH EXTENSIONS
+.BR \%innwstr ","
+.BR \%winnwstr ","
+.BR \%mvinnwstr ","
+and
+.BR \%mvwinnwstr "'s"
+treatment of
+.B \-1
+as a valid value of
+.I n
+is an
+.I \%ncurses
+extension.
 .SH PORTABILITY
-These functions are described in X/Open Curses, Issue 4.
+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.
+.PP
+Notwithstanding the foregoing,
+X/Open Curses Issues 4 and 7 both state that
+.BR \%innwstr ","
+.BR \%winnwstr ","
+.BR \%mvinnwstr ","
+and
+.B \%mvwinnwstr
+\*(``fail .\|.\|. [i]f the array is not large enough to contain any
+complete characters\*(''.
+Strictly interpreted,
+this means that a caller of these functions cannot use their return
+values to detect truncation of a wide-character string copied from more
+than one character cell in
+.IR win "."
+.I \%ncurses
+reports any truncation with
+.BR ERR "."
+.PP
+X/Open Curses specifies
+.BR \%inwstr ","
+.BR \%winwstr ","
+.BR \%mvinwstr ","
+and
+.B \%mvwinwstr
+as returning
+.B OK
+rather than a (wide) character count,
+unlike their non-wide counterparts
+.BR \%instr ","
+.BR \%winstr ","
+.BR \%mvinstr ","
+and
+.BR \%mvwinstr "."
+.I \%ncurses
+regards this inconsistency as an error in the standard.
 .SH SEE ALSO
+\fB\%curs_instr\fP(3X) describes comparable functions of the
+.I \%ncurses
+library in its non-wide-character configuration.
+.PP
 \fB\%curses\fP(3X),
-\fB\%curs_inch\fP(3X),
-\fB\%curs_inchstr\fP(3X),
-\fB\%curs_instr\fP(3X),
+\fB\%curs_in_wch\fP(3X),
 \fB\%curs_in_wchstr\fP(3X)
diff --git a/man/curs_kernel.3x b/man/curs_kernel.3x
index 8c4119de..e474b640 100644
--- a/man/curs_kernel.3x
+++ b/man/curs_kernel.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_kernel.3x,v 1.63 2024/05/25 21:13:56 tom Exp $
-.TH curs_kernel 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $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"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -106,33 +106,66 @@ state of the terminal modes.
 a buffer and \fBresetty\fP restores the state to what it was at the
 last call to \fBsavetty\fP.
 .SS getsyx
-The \fBgetsyx\fP routine returns the current coordinates
-of the \fIvirtual screen\fP cursor in \fIy\fP and \fIx\fP.
-If \fBleaveok\fP is currently \fBTRUE\fP, then
-\fB\-1\fP,\fB\-1\fP is returned.
-If lines have been removed from the top of the
-screen, using \fBripoffline\fP, \fIy\fP and \fIx\fP include these lines;
-therefore, \fIy\fP and \fIx\fP should be used only as arguments for
-\fBsetsyx\fP.
+.B \%getsyx
+stores the coordinates of virtual screen
+.RB \%( newscr )
+cursor in
+.I y
+and
+.IR x "."
+If
+.BR \%newscr 's
+\fB\%leaveok\fP(3X) output option is
+.BR TRUE ","
+.B \%getsyx
+stores
+.B \-1
+in both
+.I y
+and
+.IR x "."
+If lines have been removed from the top of the screen using
+.BR \%ripoffline ","
+.I y
+includes these lines;
+therefore,
+.I y
+and
+.I x
+populated by
+.B \%getsyx
+should be used only as arguments for
+.BR \%setsyx "."
 .PP
-Few applications will use this feature,
-most use \fBgetyx\fP instead.
+Few applications use this feature;
+most call \fB\%getyx\fP(3X) instead.
 .SS setsyx
-The \fBsetsyx\fP routine sets
-the \fIvirtual screen\fP cursor to \fIy\fP, \fIx\fP.
-If \fIy\fP and \fIx\fP are both \fB\-1\fP, then
-\fBleaveok\fP is set.
-The two routines \fBgetsyx\fP and \fBsetsyx\fP
-are designed to be used by a library routine, which manipulates
-\fBcurses\fP windows but does not want to change the current position
-of the program's cursor.
-The library routine would call \fBgetsyx\fP
-at the beginning, do its manipulation of its own windows, do a
-\fBwnoutrefresh\fP on its windows, call \fBsetsyx\fP, and then call
-\fBdoupdate\fP.
+.B \%setsyx
+sets the virtual screen
+.RB \%( newscr )
+cursor location to
+.RI ( y ,
+.IR x ")."
+.B "\%setsyx(\-1, \-1)"
+is equivalent to
+.BR "\%leaveok(newscr, TRUE)" "."
 .PP
-Few applications will use this feature,
-most use \fBwmove\fP instead.
+.B \%getsyx
+and
+.B \%setsyx
+are designed to be used by a function that manipulates
+.I curses
+windows but seeks to avoid changing the cursor position.
+Such a function would first call
+.BR \%getsyx ","
+modify its windows' content,
+call \fB\%wnoutrefresh\fP(3X) on them,
+call
+.BR \%setsyx ","
+then call \fB\%doupdate\fP(3X).
+.PP
+Few applications use this feature;
+most call \fB\%wmove\fP(3X) instead.
 .SS curs_set
 The \fBcurs_set\fP routine sets the cursor state to invisible,
 normal, or very visible for \fBvisibility\fP equal to \fB0\fP,
@@ -263,6 +296,12 @@ capability,
 rather than the least costly combination of absolute and relative
 motion.
 .SH PORTABILITY
+Applications employing
+.I \%ncurses
+extensions should condition their use on the visibility of the
+.B \%NCURSES_VERSION
+preprocessor macro.
+.PP
 The \fIvirtual screen\fP functions \fBsetsyx\fP and \fBgetsyx\fP
 are not described in X/Open Curses, Issue 4.
 All other functions are as described in X/Open Curses.
diff --git a/man/curs_scr_dump.3x b/man/curs_scr_dump.3x
index 4b78ff99..ba9881e5 100644
--- a/man/curs_scr_dump.3x
+++ b/man/curs_scr_dump.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_scr_dump.3x,v 1.45 2024/06/01 22:29:45 tom Exp $
-.TH curs_scr_dump 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_scr_dump.3x,v 1.47 2024/06/08 20:33:56 tom Exp $
+.TH curs_scr_dump 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -99,11 +99,17 @@ bases its next update of the screen on this information rather than
 clearing it and starting from scratch.
 .PP
 .I curses
-regards the terminal being in an invalid state for computation of
-updates based on the contents of
+regards the terminal as in an invalid state for computation of updates
+based on the contents of
 .I filename
 if
 .bP
+.I curses
+knows that the terminal has been written to since the preceding
+.B \%scr_dump
+call,
+or
+.bP
 the terminal type supports the
 .I \%term\%info
 capabilities
@@ -111,13 +117,7 @@ capabilities
 .RB \%( rmcup )
 or
 .B \%non_rev_rmcup
-.RB \%( nrrmc ),
-or
-.bP
-.I curses
-knows that the terminal has been written to since the preceding
-.B \%scr_dump
-call.
+.RB \%( nrrmc ).
 .PP
 Either of the foregoing conditions means that
 .I curses
@@ -129,8 +129,8 @@ The former is due to terminal features
 that couple cursor-positioning mode with a local cache of screen
 contents.
 .I curses
-cannot know whether terminal is displaying from that local cache at the
-time the application calls
+cannot know whether the terminal is displaying from that local cache
+at the time the application calls
 .BR \%scr_init ","
 so it makes a pessimistic assumption that a full redraw is required;
 see subsection \*(``Cursor Motions\*('' of \fB\%terminfo\fP(5).
diff --git a/man/curs_terminfo.3x b/man/curs_terminfo.3x
index 046a3a96..2c373f6f 100644
--- a/man/curs_terminfo.3x
+++ b/man/curs_terminfo.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_terminfo.3x,v 1.140 2024/06/01 22:29:08 tom Exp $
-.TH curs_terminfo 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_terminfo.3x,v 1.142 2024/06/08 23:05:52 tom Exp $
+.TH curs_terminfo 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -1007,6 +1007,7 @@ by adding functions to retrieve capability values
 interface),
 and reusing \fB\%tgoto\fP and \fB\%tputs\fP.
 .PP
+.ne 4v
 .TS
 lB lB
 lB lx.
diff --git a/man/curs_util.3x b/man/curs_util.3x
index a4f5de23..c589f0e2 100644
--- a/man/curs_util.3x
+++ b/man/curs_util.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_util.3x,v 1.106 2024/06/01 22:28:18 tom Exp $
-.TH curs_util 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: curs_util.3x,v 1.108 2024/06/08 22:38:18 tom Exp $
+.TH curs_util 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -85,30 +85,35 @@ miscellaneous \fIcurses\fR utility routines
 .fi
 .SH DESCRIPTION
 .SS unctrl
-The \fBunctrl\fP routine returns a character string which is a printable
+The \fBunctrl\fP routine returns a character string as a printable
 representation of the character \fIch\fP:
 .bP
 Printable characters are displayed as themselves,
-e.g., a one-character string containing the key.
+e.g.,
+a one-character string containing the key.
 .bP
 Control characters are displayed in the \fB^\fIX\fR notation.
 .bP
 Printing characters are displayed as is.
 .bP
-DEL (character 127) is displayed as \fB^?\fP.
+DEL
+(character 127)
+is displayed as \fB^?\fP.
 .bP
 Values above 128 are either meta characters
 (if the screen has not been initialized,
 or if \fBmeta\fP(3X) has been called with a \fBTRUE\fP parameter),
 shown in the \fBM\-\fIX\fR notation,
 or are displayed as themselves.
-In the latter case, the values may not be printable;
+In the latter case,
+the values may not be printable;
 this follows the X/Open specification.
 .PP
 The corresponding \fBwunctrl\fP returns a printable representation of
 a complex character \fIwch\fP.
 .PP
-In both \fBunctrl\fP and \fBwunctrl\fP the attributes and color associated
+In both \fBunctrl\fP and \fBwunctrl\fP the attributes
+and color associated
 with the character parameter are ignored.
 .SS "keyname, key_name"
 The \fBkeyname\fP routine returns a character string
@@ -121,22 +126,28 @@ They are displayed using \fBunctrl\fP.
 Values above 256 may be the codes for function keys.
 The function key name is displayed.
 .bP
-Otherwise (if there is no corresponding name and the key is not a character)
-the function returns null, to denote an error.
+Otherwise
+(if there is no corresponding name and the key is not a character)
+the function returns null,
+to denote an error.
 X/Open also lists an \*(``UNKNOWN KEY\*('' return value,
 which some implementations return rather than null.
 .LP
 The corresponding \fBkey_name\fP returns
 a multibyte character string corresponding
 to the wide-character value \fIwc\fP.
-The two functions (\fBkeyname\fP and \fBkey_name\fP)
+The two functions
+(\fBkeyname\fP and \fBkey_name\fP)
 do not return the same set of strings:
 .bP
-\fBkeyname\fP returns null where \fBkey_name\fP would display a meta character.
+\fBkeyname\fP returns null where \fBkey_name\fP
+would display a meta character.
 .bP
 \fBkey_name\fP does not return the name of a function key.
 .SS "filter, nofilter"
-The \fBfilter\fP routine, if used, must be called before \fBinitscr\fP or
+The \fBfilter\fP routine,
+if used,
+must be called before \fBinitscr\fP or
 \fBnewterm\fP are called.
 Calling \fBfilter\fP causes these changes in initialization:
 .bP
@@ -156,14 +167,15 @@ the capability \fBed\fP is disabled if \fBbce\fP is set;
 .bP
 and the \fBhome\fP string is set to the value of \fBcr\fP.
 .PP
-The \fBnofilter\fP routine cancels the effect of a preceding \fBfilter\fP
-call.
+The \fBnofilter\fP routine cancels the effect
+of a preceding \fBfilter\fP call.
 That allows the caller to initialize a screen on a different device,
 using a different value of \fB$TERM\fP.
 The limitation arises because the \fBfilter\fP routine modifies the
 in-memory copy of the terminal information.
 .SS use_env
-The \fBuse_env\fP routine, if used,
+The \fBuse_env\fP routine,
+if used,
 should be called before \fBinitscr\fP or
 \fBnewterm\fP are called
 (because those compute the screen size).
@@ -181,7 +193,8 @@ Then it asks for the screen size via operating system calls.
 If successful,
 it overrides the values from the terminal database.
 .bP
-Finally (unless \fBuse_env\fP was called with \fBFALSE\fP parameter),
+Finally
+(unless \fBuse_env\fP was called with \fBFALSE\fP parameter),
 \fI\%ncurses\fP examines the \fILINES\fP or \fI\%COLUMNS\fP environment
 variables,
 using a value in those to override the results
@@ -192,7 +205,8 @@ from the operating system or terminal database.
 unless overridden by the \fILINES\fP or \fI\%COLUMNS\fP environment
 variables,
 .SS use_tioctl
-The \fBuse_tioctl\fP routine, if used,
+The \fBuse_tioctl\fP routine,
+if used,
 should be called before \fBinitscr\fP or \fBnewterm\fP are called
 (because those compute the screen size).
 After \fBuse_tioctl\fP is called with \fBTRUE\fP as an argument,
@@ -202,12 +216,13 @@ of screen size as follows:
 checks if the \fILINES\fP and \fI\%COLUMNS\fP environment variables
 are set to a number greater than zero.
 .bP
-for each, \fI\%ncurses\fP updates the corresponding environment variable
+for each,
+\fI\%ncurses\fP updates the corresponding environment variable
 with the value that it has obtained via operating system call
 or from the terminal database.
 .bP
 \fI\%ncurses\fP re-fetches the value of the environment variables so
-that it is still the environment variables which set the screen size.
+that it is still the environment variables that set the screen size.
 .PP
 The \fB\%use_env\fP and \fB\%use_tioctl\fP routines combine as follows.
 .IP
@@ -233,7 +248,9 @@ T}
 .TE
 .SS "putwin, getwin"
 The \fBputwin\fP routine writes all data associated
-with window (or pad) \fIwin\fP into
+with window
+(or pad)
+\fIwin\fP into
 the file to which \fIfilep\fP points.
 This information can be later retrieved
 using the \fBgetwin\fP function.
@@ -249,14 +266,16 @@ 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.
-You can transfer data between the two, however.
+You can transfer data between the two,
+however.
 .bP
-the retrieved window is always created as a top-level window (or pad),
+the retrieved window is always created as a top-level window
+(or pad),
 rather than a subwindow.
 .bP
 the window's character cells contain the color pair \fIvalue\fP,
 but not the actual color \fInumbers\fP.
-If cells in the retrieved window use color pairs which have not been
+If cells in the retrieved window use color pairs that have not been
 created in the application using \fBinit_pair\fP,
 they will not be colored when the window is refreshed.
 .SS delay_output
@@ -268,7 +287,8 @@ because \fI\%ncurses\fP transmits null characters
 instead of sleeping and requesting resumption from the operating system.
 Padding is used unless:
 .bP
-the terminal description has \fBnpc\fP (\fBno_pad_char\fP) capability, or
+the terminal description has \fBnpc\fP (\fBno_pad_char\fP) capability,
+or
 .bP
 the environment variable \fB\%NCURSES_NO_PADDING\fP is set.
 .PP
@@ -278,12 +298,15 @@ If the value of \fIms\fP exceeds 30,000
 (thirty seconds),
 it is capped at that value.
 .SS flushinp
-The \fBflushinp\fP routine throws away any typeahead that has been typed by the
-user and has not yet been read by the program.
+The \fBflushinp\fP routine throws away any typeahead
+that has been typed by the user
+and has not yet been read by the program.
 .SH RETURN VALUE
-Except for \fBflushinp\fP, routines that return an integer return \fBERR\fP
-upon failure and \fBOK\fP (SVr4 specifies only "an integer value other than
-\fBERR\fP") upon successful completion.
+Except for \fBflushinp\fP,
+routines that return an integer
+return \fBERR\fP upon failure and \fBOK\fP
+(SVr4 specifies only "an integer value other than \fBERR\fP")
+upon successful completion.
 .PP
 Routines that return pointers return \fBNULL\fP on error.
 .PP
@@ -299,15 +322,15 @@ if the terminal was not initialized.
 \fBputwin\fP
 returns
 .B ERR
-if the associated \fBfwrite\fP calls return
+if the associated \fIwrite\fP(2) calls return
 .BR ERR "."
 .RE
 .SH PORTABILITY
 .SS filter
-The SVr4 documentation describes the action of \fBfilter\fP only in the vaguest
-terms.
-The description here is adapted from X/Open Curses (which
-erroneously fails to describe the disabling of \fBcuu\fP).
+The SVr4 documentation describes the action of \fBfilter\fP
+only in the vaguest terms.
+The description here is adapted from X/Open Curses
+(which erroneously fails to describe the disabling of \fBcuu\fP).
 .SS "delay_output padding"
 The limitation to 30 seconds
 and the use of \fBnapms\fP
@@ -321,19 +344,22 @@ but does not take timing into account when using the padding character.
 Neither limits the delay.
 .SS keyname
 The \fBkeyname\fP function may return the names of user-defined
-string capabilities which are defined in the terminfo entry via the \fB\-x\fP
+string capabilities that are defined in the terminfo entry
+via the \fB\-x\fP
 option of \fB@TIC@\fP.
 This implementation automatically assigns at run-time key codes to
-user-defined strings which begin with \*(``k\*(''.
-The key codes start at KEY_MAX, but are not guaranteed to be
-the same value for different runs because user-defined codes are
-merged from all terminal descriptions which have been loaded.
+user-defined strings that begin with \*(``k\*(''.
+The key codes start at KEY_MAX,
+but are not guaranteed to be the same value for different runs
+because user-defined codes are merged
+from all terminal descriptions that have been loaded.
 The \fBuse_extended_names\fP(3X) function controls whether this data is
 loaded when the terminal description is read by the library.
 .SS "nofilter, use_tioctl"
 The \fBnofilter\fP and \fBuse_tioctl\fP routines are specific to
 \fI\%ncurses\fP.
-They were not supported on Version 7, BSD or System V implementations.
+They were not supported on Version 7,
+BSD or System V implementations.
 It is recommended that any code depending on \fI\%ncurses\fP extensions
 be conditioned using \fBNCURSES_VERSION\fP.
 .SS "putwin/getwin file-format"
@@ -345,68 +371,96 @@ use an implementation-specific format.
 Although the format is an obvious target for standardization,
 it has been overlooked.
 .IP
-Interestingly enough, according to the copyright dates in Solaris source,
-the functions (along with \fBscr_init\fP, etc.) originated with
-the University of California, Berkeley (in 1982)
-and were later (in 1988) incorporated into SVr4.
-Oddly, there are no such functions in the 4.3BSD curses sources.
+Interestingly enough,
+according to the copyright dates in Solaris source,
+the functions
+(along with \fBscr_init\fP,
+etc.\&)
+originated with the University of California,
+Berkeley
+(in 1982)
+and were later
+(in 1988)
+incorporated into SVr4.
+Oddly,
+there are no such functions in the 4.3BSD curses sources.
 .bP
 Most implementations simply dump the binary \fI\%WINDOW\fP structure
 to the file.
-These include SVr4 curses, NetBSD and PDCurses,
+These include SVr4 curses,
+NetBSD and PDCurses,
 as well as older \fI\%ncurses\fP versions.
 This implementation
-(as well as the X/Open variant of Solaris curses, dated 1995)
+(as well as the X/Open variant of Solaris curses,
+dated 1995)
 uses textual dumps.
 .IP
-The implementations which use binary dumps use block-I/O
-(the \fBfwrite\fP and \fBfread\fP functions).
+The implementations that use binary dumps use block-I/O
+(\fIwrite\fP(2) and \fIread\fP(2) functions).
 Those that use textual dumps use buffered-I/O.
 A few applications may happen to write extra data in the file using
 these functions.
 Doing that can run into problems mixing block- and buffered-I/O.
-This implementation reduces the problem on writes by flushing the output.
-However, reading from a file written using mixed schemes may not be successful.
+This implementation reduces the problem on writes by flushing the
+output.
+However,
+reading from a file written using mixed schemes may not be successful.
 .SS "unctrl, wunctrl"
-X/Open Curses, Issue 4 describes these functions.
-It states that \fBunctrl\fP and \fBwunctrl\fP will return a null pointer if
-unsuccessful, but does not define any error conditions.
+X/Open Curses,
+Issue 4 describes these functions.
+It states that \fBunctrl\fP and \fBwunctrl\fP will return a null pointer
+if unsuccessful,
+but does not define any error conditions.
 This implementation checks for three cases:
 .bP
 the parameter is a 7-bit US\-ASCII code.
 This is the case that X/Open Curses documented.
 .bP
-the parameter is in the range 128\-159, i.e., a C1 control code.
+the parameter is in the range 128\-159,
+i.e.,
+a C1 control code.
 If \fBuse_legacy_coding\fP(3X) has been called with a \fB2\fP parameter,
-\fBunctrl\fP returns the parameter, i.e., a one-character string with
+\fBunctrl\fP returns the parameter,
+i.e.,
+a one-character string with
 the parameter as the first character.
-Otherwise, it returns \*(``~@\*('', \*(``~A\*('', etc.,
-analogous to \*(``^@\*('', \*(``^A\*('', C0 controls.
+Otherwise,
+it returns \*(``~@\*('',
+\*(``~A\*('',
+etc.,
+analogous to \*(``^@\*('',
+\*(``^A\*('',
+C0 controls.
 .IP
-X/Open Curses does not document whether \fBunctrl\fP can be called before
-initializing curses.
+X/Open Curses does not document whether \fBunctrl\fP can be called
+before initializing curses.
 This implementation permits that,
-and returns the \*(``~@\*('', etc., values in that case.
+and returns the \*(``~@\*('',
+etc.,
+values in that case.
 .bP
 parameter values outside the 0 to 255 range.
 \fBunctrl\fP returns a null pointer.
 .PP
-The strings returned by \fBunctrl\fP in this implementation are determined
-at compile time,
+The strings returned by \fBunctrl\fP in this implementation
+are determined at compile time,
 showing C1 controls from the upper-128 codes
 with a \*(``~\*('' prefix rather than \*(``^\*(''.
 Other implementations have different conventions.
-For example, they may show both sets of control characters with \*(``^\*('',
+For example,
+they may show both sets of control characters with \*(``^\*('',
 and strip the parameter to 7 bits.
 Or they may ignore C1 controls and treat all of the upper-128 codes as
 printable.
-This implementation uses 8 bits but does not modify the string to reflect
-locale.
+This implementation uses 8 bits
+but does not modify the string to reflect locale.
 The \fBuse_legacy_coding\fP(3X) function allows the caller to
 change the output of \fBunctrl\fP.
 .PP
-Likewise, the \fBmeta\fP(3X) function allows the caller to change the
-output of \fBkeyname\fP, i.e.,
+Likewise,
+the \fBmeta\fP(3X) function allows the caller to change the output
+of \fBkeyname\fP,
+i.e.,
 it determines whether to use the \*(``M\-\*('' prefix
 for \*(``meta\*('' keys (codes in the range 128 to 255).
 Both \fBuse_legacy_coding\fP(3X) and \fBmeta\fP(3X) succeed only after
@@ -414,11 +468,14 @@ curses is initialized.
 X/Open Curses does not document the treatment of codes 128 to 159.
 When treating them as \*(``meta\*('' keys
 (or if \fBkeyname\fP is called before initializing curses),
-this implementation returns strings \*(``M\-^@\*('', \*(``M\-^A\*('', etc.
+this implementation returns strings \*(``M\-^@\*('',
+\*(``M\-^A\*('',
+etc.
 .PP
 X/Open Curses documents \fBunctrl\fP as declared in \fB\fP,
 which \fI\%ncurses\fP does.
-However, \fI\%ncurses\fP' \fB\fP includes \fB\fP,
+However,
+\fI\%ncurses\fP' \fB\fP includes \fB\fP,
 matching the behavior of SVr4 curses.
 Other implementations may not do that.
 .SS "use_env, use_tioctl"
diff --git a/man/define_key.3x b/man/define_key.3x
index 6937d620..1e450207 100644
--- a/man/define_key.3x
+++ b/man/define_key.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1997
 .\"
-.\" $Id: define_key.3x,v 1.46 2024/05/25 20:15:04 tom Exp $
-.TH define_key 3X 2024-05-25 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: define_key.3x,v 1.48 2024/06/08 23:25:11 tom Exp $
+.TH define_key 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .
 .de bP
 .ie n  .IP \(bu 4
@@ -122,9 +122,8 @@ since 2.0 (2004) supports
 .SH AUTHORS
 Thomas Dickey
 .SH SEE ALSO
-\fB\%ncurses\fP(3X),
-\fB\%keyok\fP(3X),
-\fB\%key_defined\fP(3X),
+\fB\%curses\fP(3X),
 \fB\%keybound\fP(3X),
 \fB\%keyok\fP(3X),
+\fB\%key_defined\fP(3X),
 \fB\%terminfo\fP(5)
diff --git a/man/key_defined.3x b/man/key_defined.3x
index f5d9b447..c1e401ae 100644
--- a/man/key_defined.3x
+++ b/man/key_defined.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 2003
 .\"
-.\" $Id: key_defined.3x,v 1.36 2024/05/18 20:04:53 tom Exp $
-.TH key_defined 3X 2024-05-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: key_defined.3x,v 1.38 2024/06/08 23:25:34 tom Exp $
+.TH key_defined 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fB\%key_defined\fP \-
 test whether a \fIcurses\fP function key code is defined
@@ -79,8 +79,7 @@ preprocessor macro.
 .SH AUTHORS
 Thomas Dickey
 .SH SEE ALSO
-\fB\%ncurses\fP(3X),
+\fB\%curses\fP(3X),
 \fB\%define_key\fP(3X),
-\fB\%keyok\fP(3X),
 \fB\%keybound\fP(3X),
 \fB\%keyok\fP(3X)
diff --git a/man/keybound.3x b/man/keybound.3x
index 47692069..03725503 100644
--- a/man/keybound.3x
+++ b/man/keybound.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1999
 .\"
-.\" $Id: keybound.3x,v 1.38 2024/05/18 20:05:36 tom Exp $
-.TH keybound 3X 2024-05-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: keybound.3x,v 1.40 2024/06/08 23:25:57 tom Exp $
+.TH keybound 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .SH NAME
 \fB\%keybound\fP \-
 get definition of a \fIcurses\fP function key code
@@ -97,8 +97,8 @@ preprocessor macro.
 .SH AUTHORS
 Thomas Dickey
 .SH SEE ALSO
-\fB\%ncurses\fP(3X),
+\fB\%curses\fP(3X),
 \fB\%define_key\fP(3X),
-\fB\%key_defined\fP(3X),
 \fB\%keyok\fP(3X),
+\fB\%key_defined\fP(3X),
 \fB\%terminfo\fP(5)
diff --git a/man/keyok.3x b/man/keyok.3x
index a10da7bd..0459ab09 100644
--- a/man/keyok.3x
+++ b/man/keyok.3x
@@ -29,8 +29,8 @@
 .\"
 .\" Author: Thomas E. Dickey 1997
 .\"
-.\" $Id: keyok.3x,v 1.42 2024/05/18 20:06:09 tom Exp $
-.TH keyok 3X 2024-05-18 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $Id: keyok.3x,v 1.44 2024/06/08 23:26:27 tom Exp $
+.TH keyok 3X 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
 .
 .de bP
 .ie n  .IP \(bu 4
@@ -104,8 +104,8 @@ since 2.0 (2004) supports
 .SH AUTHORS
 Thomas Dickey
 .SH SEE ALSO
-\fB\%ncurses\fP(3X),
+\fB\%curses\fP(3X),
 \fB\%define_key\fP(3X),
-\fB\%key_defined\fP(3X),
 \fB\%keybound\fP(3X),
 \fB\%keyok\fP(3X),
+\fB\%key_defined\fP(3X).
diff --git a/man/man_db.renames.in b/man/man_db.renames.in
index 6198b02c..63768803 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.75 2024/05/25 20:26:02 tom Exp $
+# $Id: man_db.renames.in,v 1.76 2024/06/08 20:52:35 Branden.Robinson Exp $
 # Manual-page renamings for the man_db program
 #
 # Files:
@@ -195,6 +195,8 @@ derwin.3x			derwin.3ncurses
 doupdate.3x			doupdate.3ncurses
 echo.3x				echo.3ncurses
 endwin.3x			endwin.3ncurses
+erasechar.3x			erasechar.3ncurses
+erasewchar.3x			erasewchar.3ncurses
 extended_slk_color.3x		extended_slk_color.3ncurses
 filter.3x			filter.3ncurses
 flushinp.3x			flushinp.3ncurses
@@ -203,6 +205,7 @@ getattr.3x			getattr.3ncurses
 getcchar.3x			getcchar.3ncurses
 getch.3x			getch.3ncurses
 getwin.3x			getwin.3ncurses
+getyx.3x			getyx.3ncurses
 halfdelay.3x			halfdelay.3ncurses
 has_key.3x			has_key.3ncurses
 idcok.3x			idcok.3ncurses
@@ -227,6 +230,7 @@ nl.3x				nl.3ncurses
 nocbreak.3x			nocbreak.3ncurses
 nodelay.3x			nodelay.3ncurses
 nonl.3x				nonl.3ncurses
+noraw.3x			noraw.3ncurses
 notimeout.3x			notimeout.3ncurses
 pnoutrefresh.3x			pnoutrefresh.3ncurses
 prefresh.3x			prefresh.3ncurses
diff --git a/man/manhtml.aliases b/man/manhtml.aliases
index 7122bd4a..27a9b371 100644
--- a/man/manhtml.aliases
+++ b/man/manhtml.aliases
@@ -1,4 +1,4 @@
-# $Id: manhtml.aliases,v 1.37 2024/05/25 22:40:43 tom Exp $
+# $Id: manhtml.aliases,v 1.39 2024/06/08 23:34:02 tom Exp $
 #***************************************************************************
 # Copyright 2019-2023,2024 Thomas E. Dickey                                *
 # Copyright 2013,2017 Free Software Foundation, Inc.                       *
@@ -51,6 +51,8 @@ delscreen(3X)		curs_initscr(3X)
 doupdate(3X)		curs_refresh(3X)
 echo(3X)		curs_inopts(3X)
 endwin(3X)		curs_initscr(3X)
+erasechar(3X)		curs_termattrs(3X)
+erasewchar(3X)		curs_termattrs(3X)
 extended_slk_color(3X)	curs_slk(3X)
 filter(3X)		curs_util(3X)
 flushinp(3X)		curs_util(3X)
@@ -58,6 +60,7 @@ get_wch(3X)		curs_get_wch(3X)
 getcchar(3X)		curs_getcchar(3X)
 getch(3X)		curs_getch(3X)
 getwin(3X)		curs_util(3X)
+getyx(3X)		curs_getyx(3X)
 halfdelay(3X)		curs_inopts(3X)
 has_key(3X)		curs_getch(3X)
 immedok(3X)		curs_outopts(3X)
@@ -78,6 +81,7 @@ newwin(3X)		curs_window(3X)
 nl(3X)			curs_inopts(3X)
 nocbreak(3X)		curs_inopts(3X)
 nonl(3X)		curs_inopts(3X)
+noraw(3X)		curs_inopts(3X)
 pnoutrefresh(3X)	curs_pad(3X)
 prefresh(3X)		curs_pad(3X)
 printw(3X)		curs_printw(3X)
diff --git a/man/ncurses.3x b/man/ncurses.3x
index e94e10a4..b784cc07 100644
--- a/man/ncurses.3x
+++ b/man/ncurses.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: ncurses.3x,v 1.221 2024/06/01 22:29:08 tom Exp $
-.TH ncurses 3X 2024-06-01 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "Library calls"
+.\" $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"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -236,7 +236,7 @@ data structure.
 A
 .I window
 is a rectangular grid of character cells,
-addressed by row and column coordinates
+addressed by line and column coordinates
 .RI ( y ,
 .IR x ),
 with the upper left corner as (0, 0).
@@ -261,8 +261,7 @@ effects.
 .PP
 Functions permit manipulation of a window and the
 .I cursor
-identifying the cell within it at which the next output operation will
-occur.
+identifying the cell within it at which the next operation will occur.
 Among those,
 the most basic are \fB\%move\fP(3X) and \fB\%addch\fP(3X):
 these place the cursor within and write a character to
@@ -464,6 +463,17 @@ Each cell of a
 .I \%WINDOW
 is stored as a
 .IR \%chtype .
+X/Open Curses does not specify the sizes of the character code or
+color pair identifier,
+nor the quantity of attribute bits,
+in
+.IR chtype ";"
+these are implementation-dependent.
+.I \%ncurses
+uses eight bits for the character code.
+An application requiring a wider character type,
+for instance to represent Unicode,
+should use the wide-character API.
 .TP 10
 .I \%ncursesw
 is the library in its \*(``wide\*('' configuration,
@@ -484,6 +494,12 @@ For example,
 .BR \%addwstr ,
 .BR \%inwstr ,
 and their variants.)
+.\" This is because they operate on "plain" wide-character strings
+.\" (`wchar_t*`) and not curses complex character strings (`cchar_t*`).
+.\" SVID 4 did specify functions like `addwch()` and `inswch()` that
+.\" operated on `chtype`s assuming that they were wide enough for a
+.\" `wchar_t` plus attribute and color pair bits; X/Open Curses did not
+.\" standardize these.
 .IP
 This convention is inapplicable to some non-wide function names,
 so other transformations are used for the wide configuration:
@@ -499,7 +515,7 @@ and character attribute manipulation functions like
 corresponds to the non-wide configuration's
 .IR \%chtype .
 It is a structure type
-because it requires more storage than fits into a standard scalar type.
+because it requires more storage than a standard scalar type offers.
 A character code may not be representable as a
 .IR \%char ,
 and moreover more than one character may occupy a cell
diff --git a/man/terminfo.tail b/man/terminfo.tail
index f1a21355..74a27415 100644
--- a/man/terminfo.tail
+++ b/man/terminfo.tail
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: terminfo.tail,v 1.149 2024/05/11 20:28:54 tom Exp $
+.\" $Id: terminfo.tail,v 1.150 2024/06/08 20:42:50 Branden.Robinson Exp $
 .ps +1
 .SS "User-Defined Capabilities"
 .
@@ -348,7 +348,7 @@ and
 applies to storage scope terminals, such as \s-1TEKTRONIX\s+1 4010
 series, as well as hard copy and APL terminals.)
 If there is a code to move the cursor to the left edge of the current
-row, give this as
+line, give this as
 .BR cr .
 (Normally this will be carriage return, control/M.)
 If there is a code to produce an audible signal (bell, beep, etc)
@@ -412,7 +412,7 @@ The only local motion which is defined from the left edge is if
 .B bw
 is given, then a
 .B cub1
-from the left edge will move to the right edge of the previous row.
+from the left edge will move to the right edge of the previous line.
 If
 .B bw
 is not given, the effect is undefined.
@@ -462,8 +462,8 @@ with \fIprintf\fP-like escapes such as \fI%x\fP in it.
 For example, to address the cursor, the
 .B cup
 capability is given, using two parameters:
-the row and column to address to.
-(Rows and columns are numbered from zero and refer to the
+the line and column to address to.
+(Lines and columns are numbered from zero and refer to the
 physical screen visible to the user, not to any unseen memory.)
 If the terminal has memory relative cursor addressing,
 that can be indicated by
@@ -608,17 +608,17 @@ That is, to get x\-5 one would use \*(``%gx%{5}%\-\*(''.
 \fB%P\fP and \fB%g\fP variables are
 persistent across escape-string evaluations.
 .PP
-Consider the HP2645, which, to get to row 3 and column 12, needs
+Consider the HP2645, which, to get to line 3 and column 12, needs
 to be sent \eE&a12c03Y padded for 6 milliseconds.
-The order of the rows and columns is inverted here,
-and the row and column are printed as two digits.
+The order of the lines and columns is inverted here,
+and the lines and column are printed as two digits.
 The corresponding terminal description is expressed thus:
 .RS
 cup=\eE&a%p2%dc%p1%dY$<6>,
 .RE
 .PP
-The Microterm \s-1ACT-IV\s0 needs the current row and column sent
-preceded by a \fB\*^T\fP, with the row and column simply encoded in binary,
+The Microterm \s-1ACT-IV\s0 needs the current line and column sent
+preceded by a \fB\*^T\fP, with the line and column simply encoded in binary,
 .RS
 cup=\*^T%p1%c%p2%c
 .RE
@@ -632,7 +632,7 @@ This is necessary because it is not always safe to transmit \fB\en\fP
 tabs are never expanded, so \et is safe to send.
 This turns out to be essential for the Ann Arbor 4080.)
 .PP
-A final example is the \s-1LSI ADM\s0-3a, which uses row and column
+A final example is the \s-1LSI ADM\s0-3a, which uses line and column
 offset by a blank character, thus
 .RS
 cup=\eE=%p1%\*' \*'%+%c%p2%\*' \*'%+%c
@@ -656,7 +656,7 @@ to the top left corner of the screen, not of memory.
 (Thus, the \eEH sequence on HP terminals cannot be used for
 .BR home .)
 .PP
-If the terminal has row or column absolute cursor addressing,
+If the terminal has line or column absolute cursor addressing,
 these can be given as single parameter capabilities
 .B hpa
 (horizontal position absolute)
@@ -713,7 +713,7 @@ the ability to set a top and/or bottom margin using the current
 line position, and
 .bP
 parameterized capabilities for setting the top, bottom, left, right margins
-given the number of rows or columns.
+given the number of lines or columns.
 .RE
 .PP
 In practice, the categorization into \*(``terminal\*('' and \*(``printer\*(''
@@ -1446,7 +1446,7 @@ If there are commands to set and clear tab stops, they can be given as
 (clear all tab stops)
 and
 .B hts
-(set a tab stop in the current column of every row).
+(set a tab stop in the current column of every line).
 If a more complex sequence is needed to set the tabs than can be
 described by this, the sequence can be placed in
 .B is2
diff --git a/man/tput.1 b/man/tput.1
index bd25b0b5..ad930962 100644
--- a/man/tput.1
+++ b/man/tput.1
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tput.1,v 1.114 2024/05/11 20:39:53 tom Exp $
-.TH @TPUT@ 1 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $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"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -49,20 +49,20 @@
 \fB\%@TPUT@\fP \-
 initialize a terminal, exercise its capabilities, or query \fI\%term\%info\fP database
 .SH SYNOPSIS
-\fB@TPUT@\fP [\fB\-T\fP \fIterminal-type\fP]
+\fB@TPUT@\fP [\fB\-v\fP] [\fB\-T\fP \fIterminal-type\fP]
 {\fIcap-code\fP [\fIparameter\fP .\|.\|.\&]} .\|.\|.
 .PP
-\fB@TPUT@\fP [\fB\-T\fP \fIterminal-type\fP] [\fB\-x\fP] \fBclear\fP
+\fB@TPUT@\fP [\fB\-v\fP] [\fB\-T\fP \fIterminal-type\fP] [\fB\-x\fP] \fBclear\fP
 .PP
-\fB@TPUT@\fP [\fB\-T\fP \fIterminal-type\fP] \fBinit\fP
+\fB@TPUT@\fP [\fB\-v\fP] [\fB\-T\fP \fIterminal-type\fP] \fBinit\fP
 .PP
-\fB@TPUT@\fP [\fB\-T\fP \fIterminal-type\fP] \fB\%reset\fP
+\fB@TPUT@\fP [\fB\-v\fP] [\fB\-T\fP \fIterminal-type\fP] \fB\%reset\fP
 .PP
-\fB@TPUT@\fP [\fB\-T\fP \fIterminal-type\fP] \fB\%longname\fP
+\fB@TPUT@\fP [\fB\-v\fP] [\fB\-T\fP \fIterminal-type\fP] \fB\%longname\fP
 .PP
-\fB@TPUT@ \-S\fP
+\fB@TPUT@\fP [\fB\-v\fP] \fB\-S\fP
 .PP
-\fB@TPUT@ \-V\fP
+\fB@TPUT@\fP [\fB\-v\fP] \fB\-V\fP
 .SH DESCRIPTION
 \fB\%@TPUT@\fP uses the
 .I \%term\%info
@@ -373,6 +373,10 @@ and
 .I \%COLUMNS
 are also ignored.
 .TP
+.B \-v
+causes \fB\%@TPUT@\fP to operate verbosely,
+reporting warnings.
+.TP
 .B \-V
 reports the version of
 .I \%ncurses
@@ -913,7 +917,7 @@ environment variable.
 Set cursor to normal visibility.
 .TP
 .B "@TPUT@ home"
-Move the cursor to row 0,
+Move the cursor to line 0,
 column 0:
 the upper left corner of the screen,
 usually known as the \*(``home\*('' cursor position.
@@ -950,7 +954,7 @@ printf "${strong}Username:${normal} "
 Indicate via exit status whether the terminal is a hard copy device.
 .TP
 .B "@TPUT@ cup 23 4"
-Move the cursor to row 23,
+Move the cursor to line 23,
 column 4.
 .TP
 .B "@TPUT@ cup"
diff --git a/man/tset.1 b/man/tset.1
index 154d9158..8542bba4 100644
--- a/man/tset.1
+++ b/man/tset.1
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tset.1,v 1.86 2024/05/11 20:39:53 tom Exp $
-.TH @TSET@ 1 2024-05-11 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
+.\" $Id: tset.1,v 1.88 2024/06/08 20:51:12 tom Exp $
+.TH @TSET@ 1 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "User commands"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -123,7 +123,10 @@ the backspace, interrupt and line kill characters
 unless the \*(``\fB\-I\fP\*('' option is enabled,
 the terminal
 and tab \fIinitialization\fP strings are sent to the standard error output,
-and \fB@TSET@\fP waits one second (in case a hardware reset was issued).
+and,
+if the terminal device does not appear to be a pseudoterminal
+(as might be used by a terminal emulator program),
+\fB@TSET@\fP waits one second in case a hardware reset was issued.
 .bP
 Finally, if the erase, interrupt and line kill characters have changed,
 or are not set to their default values, their values are displayed to the
diff --git a/man/user_caps.5 b/man/user_caps.5
index 219bbf5f..cf5fa858 100644
--- a/man/user_caps.5
+++ b/man/user_caps.5
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: user_caps.5,v 1.49 2024/03/16 15:35:01 tom Exp $
-.TH user_caps 5 2024-03-16 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
+.\" $Id: user_caps.5,v 1.51 2024/06/08 21:01:53 tom Exp $
+.TH user_caps 5 2024-06-08 "ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" "File formats"
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -58,7 +58,12 @@ Before \fI\%ncurses\fP 5.0,
 terminfo databases used a \fIfixed repertoire\fP of terminal
 capabilities designed for the SVr2 terminal database in 1984,
 and extended in stages through SVr4 (1989),
-and standardized in the Single Unix Specification beginning in 1995.
+and standardized in X/Open Curses starting in 1995.
+.\" That date is a surmise based on the capability list appearing in
+.\" Issue 4, Version 2 (1996).  That list is not in man page format in
+.\" the standard, so lacks a "HISTORY" section.  However, `tigetstr()`
+.\" and `tputs()` are identified in the same document as new to Issue 4,
+.\" so GBR conjectures that the list came in at the same time.
 .PP
 Most of the \fIextensions\fP in this fixed repertoire were additions
 to the tables of Boolean, numeric and string capabilities.
diff --git a/ncurses/widechar/lib_inwstr.c b/ncurses/widechar/lib_inwstr.c
index b2fdaeac..abfc595f 100644
--- a/ncurses/widechar/lib_inwstr.c
+++ b/ncurses/widechar/lib_inwstr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2024 Thomas E. Dickey                                     *
  * Copyright 2002-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -40,7 +40,7 @@
 
 #include 
 
-MODULE_ID("$Id: lib_inwstr.c,v 1.9 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_inwstr.c,v 1.10 2024/06/08 21:22:24 tom Exp $")
 
 NCURSES_EXPORT(int)
 winnwstr(WINDOW *win, wchar_t *wstr, int n)
@@ -93,22 +93,15 @@ winnwstr(WINDOW *win, wchar_t *wstr, int n)
     returnCode(count);
 }
 
-/*
- * X/Open says winwstr() returns OK if not ERR.  If that is not a blunder, it
- * must have a null termination on the string (see above).  Unlike winnstr(),
- * it does not define what happens for a negative count with winnwstr().
- */
 NCURSES_EXPORT(int)
 winwstr(WINDOW *win, wchar_t *wstr)
 {
-    int result = OK;
+    int result = ERR;
 
     T((T_CALLED("winwstr(%p,%p)"), (void *) win, (void *) wstr));
-    if (win == 0) {
-	result = ERR;
-    } else if (winnwstr(win, wstr,
-			CCHARW_MAX * (win->_maxx - win->_curx + 1)) == ERR) {
-	result = ERR;
+    if (win != 0) {
+	result = winnwstr(win, wstr,
+			  CCHARW_MAX * (win->_maxx - win->_curx + 1));
     }
     returnCode(result);
 }
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 4fe2d816..122a65be 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.5+20240601) unstable; urgency=low
+ncurses6td (6.5+20240608) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Sat, 01 Jun 2024 07:06:41 -0400
+ -- Thomas E. Dickey   Sat, 08 Jun 2024 05:49:40 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw/control b/package/debian-mingw/control
index 6fb213fd..e442255c 100644
--- a/package/debian-mingw/control
+++ b/package/debian-mingw/control
@@ -1,4 +1,4 @@
-Source: ncurses6
+Source: ncurses6td
 Section: libdevel
 Priority: optional
 Maintainer: Thomas E. Dickey 
@@ -9,8 +9,11 @@ Build-Depends: debhelper (>= 7),
   binutils-mingw-w64-i686
 Standards-Version: 4.6.1.0
 
-Package: mingw32-ncurses6
+Package: mingw32-ncurses6td
 Architecture: any
+Conflicts: mingw32-ncurses6
+Provides: mingw32-ncurses6
+Replaces: mingw32-ncurses6
 Depends: ${misc:Depends}
 Description: shared libraries for terminal handling
  The ncurses library routines are a terminal-independent method of
diff --git a/package/debian-mingw/mingw32-ncurses6.lintian-overrides b/package/debian-mingw/mingw32-ncurses6.lintian-overrides
deleted file mode 100644
index ed565e43..00000000
--- a/package/debian-mingw/mingw32-ncurses6.lintian-overrides
+++ /dev/null
@@ -1,7 +0,0 @@
-mingw32-ncurses6: latest-debian-changelog-entry-changed-to-native
-
-mingw32-ncurses6: non-standard-dir-in-usr
-mingw32-ncurses6: file-in-unusual-dir
-
-mingw32-ncurses6: binary-without-manpage
-mingw32-ncurses6: executable-not-elf-or-script
diff --git a/package/debian-mingw/mingw32-ncurses6td.lintian-overrides b/package/debian-mingw/mingw32-ncurses6td.lintian-overrides
new file mode 100644
index 00000000..8dea2a95
--- /dev/null
+++ b/package/debian-mingw/mingw32-ncurses6td.lintian-overrides
@@ -0,0 +1,7 @@
+mingw32-ncurses6td: latest-debian-changelog-entry-changed-to-native
+
+mingw32-ncurses6td: non-standard-dir-in-usr
+mingw32-ncurses6td: file-in-unusual-dir
+
+mingw32-ncurses6td: binary-without-manpage
+mingw32-ncurses6td: executable-not-elf-or-script
diff --git a/package/debian-mingw/rules b/package/debian-mingw/rules
index 8c266a93..76fbf06d 100755
--- a/package/debian-mingw/rules
+++ b/package/debian-mingw/rules
@@ -21,7 +21,7 @@ CC_STRICT = $(CC_NORMAL) -W -Wbad-function-cast -Wcast-align -Wcast-qual -Wmissi
 TARGET    = i686-w64-mingw32
 MINGW_BIN = /usr/bin
 MINGW_TOP = /usr/$(TARGET)
-MINGW_TMP = $(CURDIR)/debian/mingw32-ncurses$(MY_ABI)
+MINGW_TMP = $(CURDIR)/debian/mingw32-ncurses$(MY_ABI)td
 
 CFLAGS = $(CC_NORMAL)
 
@@ -83,7 +83,7 @@ configure-stamp:
 		--target=$(TARGET) \
 		--prefix=$(MINGW_TOP) \
 		--with-build-cc=$(BUILD_CC) \
-		--with-pc-suffix=$(MY_ABI) \
+		--with-pc-suffix=$(MY_ABI)td \
 		--with-pkg-config-libdir=/usr/$(TARGET)/lib/pkgconfig \
 		$(CONFIG_OPTIONS)
 
diff --git a/package/debian-mingw/watch b/package/debian-mingw/watch
index f6b3987e..11c22c5a 100644
--- a/package/debian-mingw/watch
+++ b/package/debian-mingw/watch
@@ -1,4 +1,4 @@
 version=3
 
-opts=passive ftp://ftp.invisible-island.net/ncurses/current/ncurses\.tar.gz \
+opts=passive https://invisible-island.net/archives/ncurses/current/ncurses\.tar.gz \
  debian  uupdate
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 4fe2d816..122a65be 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.5+20240601) unstable; urgency=low
+ncurses6td (6.5+20240608) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Sat, 01 Jun 2024 07:06:41 -0400
+ -- Thomas E. Dickey   Sat, 08 Jun 2024 05:49:40 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/control b/package/debian-mingw64/control
index 74e8136a..7094a176 100644
--- a/package/debian-mingw64/control
+++ b/package/debian-mingw64/control
@@ -1,4 +1,4 @@
-Source: ncurses6
+Source: ncurses6td
 Section: libdevel
 Priority: optional
 Maintainer: Thomas E. Dickey 
@@ -9,8 +9,11 @@ Build-Depends: debhelper (>= 7),
   binutils-mingw-w64-x86-64
 Standards-Version: 4.6.1.0
 
-Package: mingw64-ncurses6
+Package: mingw64-ncurses6td
 Architecture: any
+Conflicts: mingw64-ncurses6
+Provides: mingw64-ncurses6
+Replaces: mingw64-ncurses6
 Depends: ${misc:Depends}
 Description: shared libraries for terminal handling
  The ncurses library routines are a terminal-independent method of
diff --git a/package/debian-mingw64/mingw64-ncurses6.lintian-overrides b/package/debian-mingw64/mingw64-ncurses6.lintian-overrides
deleted file mode 100644
index 9e8f8544..00000000
--- a/package/debian-mingw64/mingw64-ncurses6.lintian-overrides
+++ /dev/null
@@ -1,7 +0,0 @@
-mingw64-ncurses6: latest-debian-changelog-entry-changed-to-native
-
-mingw64-ncurses6: non-standard-dir-in-usr
-mingw64-ncurses6: file-in-unusual-dir
-
-mingw64-ncurses6: binary-without-manpage
-mingw64-ncurses6: executable-not-elf-or-script
diff --git a/package/debian-mingw64/mingw64-ncurses6td.lintian-overrides b/package/debian-mingw64/mingw64-ncurses6td.lintian-overrides
new file mode 100644
index 00000000..f475ec0f
--- /dev/null
+++ b/package/debian-mingw64/mingw64-ncurses6td.lintian-overrides
@@ -0,0 +1,7 @@
+mingw64-ncurses6td: latest-debian-changelog-entry-changed-to-native
+
+mingw64-ncurses6td: non-standard-dir-in-usr
+mingw64-ncurses6td: file-in-unusual-dir
+
+mingw64-ncurses6td: binary-without-manpage
+mingw64-ncurses6td: executable-not-elf-or-script
diff --git a/package/debian-mingw64/rules b/package/debian-mingw64/rules
index 3a79517c..b39fec67 100755
--- a/package/debian-mingw64/rules
+++ b/package/debian-mingw64/rules
@@ -21,7 +21,7 @@ CC_STRICT = $(CC_NORMAL) -W -Wbad-function-cast -Wcast-align -Wcast-qual -Wmissi
 TARGET    = x86_64-w64-mingw32
 MINGW_BIN = /usr/bin
 MINGW_TOP = /usr/$(TARGET)
-MINGW_TMP = $(CURDIR)/debian/mingw64-ncurses$(MY_ABI)
+MINGW_TMP = $(CURDIR)/debian/mingw64-ncurses$(MY_ABI)td
 
 CFLAGS = $(CC_NORMAL)
 
@@ -83,7 +83,7 @@ configure-stamp:
 		--target=$(TARGET) \
 		--prefix=$(MINGW_TOP) \
 		--with-build-cc=$(BUILD_CC) \
-		--with-pc-suffix=$(MY_ABI) \
+		--with-pc-suffix=$(MY_ABI)td \
 		--with-pkg-config-libdir=/usr/$(TARGET)/lib/pkgconfig \
 		$(CONFIG_OPTIONS)
 
diff --git a/package/debian-mingw64/watch b/package/debian-mingw64/watch
index f6b3987e..11c22c5a 100644
--- a/package/debian-mingw64/watch
+++ b/package/debian-mingw64/watch
@@ -1,4 +1,4 @@
 version=3
 
-opts=passive ftp://ftp.invisible-island.net/ncurses/current/ncurses\.tar.gz \
+opts=passive https://invisible-island.net/archives/ncurses/current/ncurses\.tar.gz \
  debian  uupdate
diff --git a/package/debian/changelog b/package/debian/changelog
index ae19371f..f04a8642 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.5+20240601) unstable; urgency=low
+ncurses6td (6.5+20240608) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Sat, 01 Jun 2024 07:06:41 -0400
+ -- Thomas E. Dickey   Sat, 08 Jun 2024 05:49:40 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/debian/control b/package/debian/control
index 35921910..3b99ac17 100644
--- a/package/debian/control
+++ b/package/debian/control
@@ -1,4 +1,4 @@
-Source: ncurses6
+Source: ncurses6td
 Section: libdevel
 Priority: optional
 Maintainer: Thomas E. Dickey 
@@ -6,8 +6,11 @@ Homepage: https://invisible-island.net/ncurses/
 Build-Depends: debhelper (>= 8.1.3)
 Standards-Version: 4.6.1.0
 
-Package: ncurses6
+Package: ncurses6td
 Architecture: any
+Conflicts: ncurses6 (>= 6.5)
+Provides: ncurses6 (= 6.5)
+Replaces: ncurses6 (>= 6.5)
 Depends: ${misc:Depends}, libc6 (>= 2.4)
 Description: shared libraries for terminal handling
  The ncurses library routines are a terminal-independent method of
@@ -15,8 +18,11 @@ Description: shared libraries for terminal handling
  .
  This package is used for testing ABI 6.
 
-Package: ncursest6
+Package: ncursest6td
 Architecture: any
+Conflicts: ncursest6 (>= 6.5)
+Provides: ncursest6 (= 6.5)
+Replaces: ncursest6 (>= 6.5)
 Depends: ${misc:Depends}, libc6 (>= 2.4)
 Description: shared libraries for terminal handling
  The ncurses library routines are a terminal-independent method of
@@ -24,9 +30,12 @@ Description: shared libraries for terminal handling
  .
  This package is used for testing ABI 6 with pthreads.
 
-Package: ncurses6-doc
+Package: ncurses6td-doc
 Section: doc
 Architecture: all
+Conflicts: ncurses6-doc
+Provides: ncurses6-doc
+Replaces: ncurses6-doc
 Depends: groff-base
 Description: shared libraries for terminal handling
  The ncurses library routines are a terminal-independent method of
@@ -34,9 +43,12 @@ Description: shared libraries for terminal handling
  .
  This package is used for testing ncurses6 document packaging.
 
-Package: ncurses6-doc-html
+Package: ncurses6td-doc-html
 Section: doc
 Architecture: all
+Conflicts: ncurses6-doc-html
+Provides: ncurses6-doc-html
+Replaces: ncurses6-doc-html
 Description: shared libraries for terminal handling
  The ncurses library routines are a terminal-independent method of
  updating character screens with reasonable optimization.
diff --git a/package/debian/ncurses6.lintian-overrides b/package/debian/ncurses6.lintian-overrides
deleted file mode 100644
index 20f1159e..00000000
--- a/package/debian/ncurses6.lintian-overrides
+++ /dev/null
@@ -1,9 +0,0 @@
-# This is intentional.
-ncurses6: package-name-doesnt-match-sonames libformw6-6 libmenuw6-6 libncurses++w6-6 libncursesw6-6 libpanelw6-6 libticw6-6 libtinfow6-6
-
-# This is intentional.
-ncurses6: binary-without-manpage
-ncurses6: non-dev-pkg-with-shlib-symlink
-ncurses6: embedded-library ncurses [usr/lib/x86_64-linux-gnu/libtinfow6.so.6.5]
-
-# vile: confmode
diff --git a/package/debian/ncurses6td.lintian-overrides b/package/debian/ncurses6td.lintian-overrides
new file mode 100644
index 00000000..dd49fcde
--- /dev/null
+++ b/package/debian/ncurses6td.lintian-overrides
@@ -0,0 +1,9 @@
+# This is intentional.
+ncurses6td: package-name-doesnt-match-sonames libformw6-6 libmenuw6-6 libncurses++w6-6 libncursesw6-6 libpanelw6-6 libticw6-6 libtinfow6-6
+
+# This is intentional.
+ncurses6td: binary-without-manpage
+ncurses6td: non-dev-pkg-with-shlib-symlink
+ncurses6td: embedded-library ncurses [usr/lib/x86_64-linux-gnu/libtinfow6.so.6.5]
+
+# vile: confmode
diff --git a/package/debian/ncurses6.triggers b/package/debian/ncurses6td.triggers
similarity index 100%
rename from package/debian/ncurses6.triggers
rename to package/debian/ncurses6td.triggers
diff --git a/package/debian/ncursest6.lintian-overrides b/package/debian/ncursest6.lintian-overrides
deleted file mode 100644
index c40acbbf..00000000
--- a/package/debian/ncursest6.lintian-overrides
+++ /dev/null
@@ -1,9 +0,0 @@
-# This is intentional.
-ncursest6: package-name-doesnt-match-sonames libformtw6-6 libmenutw6-6 libncurses++tw6-6 libncursestw6-6 libpaneltw6-6 libtictw6-6 libtinfotw6-6
-
-# This is intentional.
-ncursest6: binary-without-manpage
-ncursest6: non-dev-pkg-with-shlib-symlink
-ncursest6: embedded-library ncurses [usr/lib/x86_64-linux-gnu/libtinfotw6.so.6.5]
-
-# vile: confmode
diff --git a/package/debian/ncursest6td.lintian-overrides b/package/debian/ncursest6td.lintian-overrides
new file mode 100644
index 00000000..0a5eccc1
--- /dev/null
+++ b/package/debian/ncursest6td.lintian-overrides
@@ -0,0 +1,9 @@
+# This is intentional.
+ncursest6td: package-name-doesnt-match-sonames libformtw6-6 libmenutw6-6 libncurses++tw6-6 libncursestw6-6 libpaneltw6-6 libtictw6-6 libtinfotw6-6
+
+# This is intentional.
+ncursest6td: binary-without-manpage
+ncursest6td: non-dev-pkg-with-shlib-symlink
+ncursest6td: embedded-library ncurses [usr/lib/x86_64-linux-gnu/libtinfotw6.so.6.5]
+
+# vile: confmode
diff --git a/package/debian/ncursest6.triggers b/package/debian/ncursest6td.triggers
similarity index 100%
rename from package/debian/ncursest6.triggers
rename to package/debian/ncursest6td.triggers
diff --git a/package/debian/rules b/package/debian/rules
index 648939b2..f1f10fe6 100755
--- a/package/debian/rules
+++ b/package/debian/rules
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-# $Id: rules,v 1.53 2024/04/08 15:31:32 tom Exp $
+# $Id: rules,v 1.57 2024/06/08 17:51:52 tom Exp $
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -12,8 +12,8 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 include /usr/share/dpkg/buildflags.mk
 
 # packages
-PACKAGES.indep = ncurses6-doc ncurses6-doc-html
-PACKAGES.arch  = ncurses6 ncursest6
+PACKAGES.indep = ncurses6td-doc ncurses6td-doc-html
+PACKAGES.arch  = ncurses6td ncursest6td
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
@@ -86,7 +86,8 @@ configure = \
 		--program-suffix=$(MY_ABI) \
 		--verbose \
 		--with-abi-version=$(MY_ABI) \
-		--with-config-suffix=dev \
+		--with-config-suffix=td \
+		--with-pc-suffix=td \
 		--with-cxx-shared \
 		--with-default-terminfo-dir=$(MYDATA) \
 		--with-develop \
@@ -104,8 +105,8 @@ configure = \
 		--with-manpage-symlinks \
 		--without-normal
 
-NCURSES6_DIR = $(CURDIR)/debian/ncurses6
-NCURSEST6_DIR = $(CURDIR)/debian/ncursest6
+NCURSES6_DIR = $(CURDIR)/debian/ncurses6td
+NCURSEST6_DIR = $(CURDIR)/debian/ncursest6td
 
 .PHONY: all config build install binary clean config-indep config-arch \
     build-indep build-arch install-indep install-arch binary-indep \
@@ -118,6 +119,7 @@ build: build-indep build-arch
 install: install-indep install-arch
 binary: binary-indep binary-arch
 clean:
+	pwd; ls -l
 	dh_testdir
 	dh_testroot
 	dh_clean $(verbose)
@@ -133,7 +135,7 @@ install-indep: $(PACKAGES.indep:%=install-%-stamp)
 install-arch: $(PACKAGES.arch:%=install-%-stamp)
 
 # make the doc-package installable by renaming everything to avoid clashing
-patch-ncurses6-stamp:
+patch-ncurses6td-stamp:
 	dh_testdir
 	sed -i.bak \
 		-e 's/-config\.1$$/dev-config.1/;t' \
@@ -147,91 +149,91 @@ patch-ncurses6-stamp:
 	diff -u man/man_db.renames.in.bak man/man_db.renames.in || true
 	touch $@
 
-config-ncurses6-stamp: patch-ncurses6-stamp
+config-ncurses6td-stamp: patch-ncurses6td-stamp
 	dh_testdir
-	rm -rf t/ncurses6
-	mkdir -p t/ncurses6
-	cd t/ncurses6; $(configure)
+	rm -rf t/ncurses6td
+	mkdir -p t/ncurses6td
+	cd t/ncurses6td; $(configure)
 	touch $@
 
-config-ncursest6-stamp: patch-ncurses6-stamp
+config-ncursest6td-stamp: patch-ncurses6td-stamp
 	dh_testdir
-	rm -rf t/ncursest6
-	mkdir -p t/ncursest6
-	cd t/ncursest6; $(configure) \
+	rm -rf t/ncursest6td
+	mkdir -p t/ncursest6td
+	cd t/ncursest6td; $(configure) \
 		--enable-interop \
 		--enable-sp-funcs \
 		--program-suffix=t$(MY_ABI) \
 		--with-pthread
 	touch $@
 
-config-ncurses6-doc-stamp \
-config-ncurses6-doc-html-stamp: config-ncurses6-stamp
+config-ncurses6td-doc-stamp \
+config-ncurses6td-doc-html-stamp: config-ncurses6td-stamp
 	touch $@
 
-build-ncurses6-stamp: config-ncurses6-stamp
+build-ncurses6td-stamp: config-ncurses6td-stamp
 	dh_testdir
 
-	$(MAKE) -C t/ncurses6
+	$(MAKE) -C t/ncurses6td
 
 	touch $@
 
-build-ncursest6-stamp: config-ncursest6-stamp
+build-ncursest6td-stamp: config-ncursest6td-stamp
 	dh_testdir
 
-	$(MAKE) -C t/ncursest6
+	$(MAKE) -C t/ncursest6td
 
 	touch $@
 
-build-ncurses6-doc-stamp \
-build-ncurses6-doc-html-stamp: build-ncurses6-stamp
+build-ncurses6td-doc-stamp \
+build-ncurses6td-doc-html-stamp: build-ncurses6td-stamp
 	touch $@
 
-install-ncurses6-stamp: build-ncurses6-stamp
+install-ncurses6td-stamp: build-ncurses6td-stamp
 	dh_testdir
 	dh_testroot
 	dh_installdirs $(verbose)
-	dh_prep        $(verbose) -pncurses6
+	dh_prep        $(verbose) -pncurses6td
 
-	$(MAKE) -C t/ncurses6 install.libs install.progs DESTDIR=$(NCURSES6_DIR)
-	$(MAKE) -C t/ncurses6/test ncurses LOCAL_LIBDIR=$(LIBDIR)
+	$(MAKE) -C t/ncurses6td install.libs install.progs DESTDIR=$(NCURSES6_DIR)
+	$(MAKE) -C t/ncurses6td/test ncurses LOCAL_LIBDIR=$(LIBDIR)
 
-	mv t/ncurses6/test/ncurses $(NCURSES6_DIR)$(BINDIR)/ncurses$(MY_ABI)
+	mv t/ncurses6td/test/ncurses $(NCURSES6_DIR)$(BINDIR)/ncurses$(MY_ABI)
 
 	touch $@
 
-install-ncursest6-stamp: build-ncursest6-stamp
+install-ncursest6td-stamp: build-ncursest6td-stamp
 	dh_testdir
 	dh_testroot
 	dh_installdirs $(verbose)
-	dh_prep        $(verbose) -pncursest6
+	dh_prep        $(verbose) -pncursest6td
 
-	$(MAKE) -C t/ncursest6 install.libs install.progs DESTDIR=$(NCURSEST6_DIR)
-	$(MAKE) -C t/ncursest6/test ncurses LOCAL_LIBDIR=$(LIBDIR)
+	$(MAKE) -C t/ncursest6td install.libs install.progs DESTDIR=$(NCURSEST6_DIR)
+	$(MAKE) -C t/ncursest6td/test ncurses LOCAL_LIBDIR=$(LIBDIR)
 
-	mv t/ncursest6/test/ncurses $(NCURSEST6_DIR)$(BINDIR)/ncursest$(MY_ABI)
+	mv t/ncursest6td/test/ncurses $(NCURSEST6_DIR)$(BINDIR)/ncursest$(MY_ABI)
 
 	touch $@
 
-install-ncurses6-doc-stamp: build-ncurses6-stamp
+install-ncurses6td-doc-stamp: build-ncurses6td-stamp
 	dh_testdir
 	dh_testroot
 	dh_installdirs $(verbose)
-	dh_prep        $(verbose) -pncurses6-doc
+	dh_prep        $(verbose) -pncurses6td-doc
 
-	$(MAKE) -C t/ncurses6 install.man DESTDIR=$(NCURSES6_DIR)-doc
+	$(MAKE) -C t/ncurses6td install.man DESTDIR=$(NCURSES6_DIR)-doc
 	find $(NCURSES6_DIR)-doc -name 'ncursesw6-config.*' -print -delete
 
 	cd $(NCURSES6_DIR)-doc/usr/share/man/man1 && ln -sf tset6.1.gz reset6.1.gz
 
 	touch $@
 
-HTML_DESTDIR=$(NCURSES6_DIR)-doc-html/usr/share/doc/ncurses6-doc-html
-install-ncurses6-doc-html-stamp: build-ncurses6-stamp
+HTML_DESTDIR=$(NCURSES6_DIR)-doc-html/usr/share/doc/ncurses6td-doc-html
+install-ncurses6td-doc-html-stamp: build-ncurses6td-stamp
 	dh_testdir
 	dh_testroot
 	dh_installdirs $(verbose)
-	dh_prep        $(verbose) -pncurses6-doc-html
+	dh_prep        $(verbose) -pncurses6td-doc-html
 
 	cd doc/html && find * -type d | sort | xargs -I{} mkdir -p -v $(HTML_DESTDIR)/{}
 	cd doc/html && find * -type f -name '*.html' | sort | xargs -I{} install -m 644 -p -v -T {} $(HTML_DESTDIR)/{}
diff --git a/package/debian/watch b/package/debian/watch
index f6b3987e..11c22c5a 100644
--- a/package/debian/watch
+++ b/package/debian/watch
@@ -1,4 +1,4 @@
 version=3
 
-opts=passive ftp://ftp.invisible-island.net/ncurses/current/ncurses\.tar.gz \
+opts=passive https://invisible-island.net/archives/ncurses/current/ncurses\.tar.gz \
  debian  uupdate
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 278ed0cb..38c14836 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.651 2024/06/01 11:06:41 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.652 2024/06/08 09:49:40 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  "0601"
+!define VERSION_MMDD  "0608"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 23438cc2..60ecbf82 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: 20240601
+Release: 20240608
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 8dd480b6..fc93da6c 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: 20240601
+Release: 20240608
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index a777197d..cbe0c91d 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: 20240601
+Release: 20240608
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/test/package/debian-mingw/rules b/test/package/debian-mingw/rules
index 152cd3c7..3a791507 100755
--- a/test/package/debian-mingw/rules
+++ b/test/package/debian-mingw/rules
@@ -43,7 +43,7 @@ configure-stamp:
 		--prefix=$(MINGW_TOP) \
 		--bindir=\$${prefix}/bin/$(NCURSES_PKG) \
 		--datadir=\$${prefix}/share/$(NCURSES_PKG) \
-		--with-screen=ncursesw6 \
+		--with-screen=ncursesw6td \
 		--with-pkg-config-libdir=/usr/$(TARGET)/lib/pkgconfig
 
 	touch configure-stamp
diff --git a/test/package/debian-mingw/watch b/test/package/debian-mingw/watch
index ec075b18..c35c8e38 100644
--- a/test/package/debian-mingw/watch
+++ b/test/package/debian-mingw/watch
@@ -1,4 +1,4 @@
 version=3
 
-opts=passive ftp://ftp.invisible-island.net/ncurses-examples/ncurses-examples-([\d.]+)\.tgz \
+opts=passive https://invisible-island.net/archives/ncurses-examples/ncurses-examples-([\d.]+)\.tgz \
  debian  uupdate
diff --git a/test/package/debian-mingw64/rules b/test/package/debian-mingw64/rules
index 02175a66..571b9a7e 100755
--- a/test/package/debian-mingw64/rules
+++ b/test/package/debian-mingw64/rules
@@ -43,7 +43,7 @@ configure-stamp:
 		--prefix=$(MINGW_TOP) \
 		--bindir=\$${prefix}/bin/$(NCURSES_PKG) \
 		--datadir=\$${prefix}/share/$(NCURSES_PKG) \
-		--with-screen=ncursesw6 \
+		--with-screen=ncursesw6td \
 		--with-pkg-config-libdir=/usr/$(TARGET)/lib/pkgconfig
 
 	touch configure-stamp
diff --git a/test/package/debian-mingw64/watch b/test/package/debian-mingw64/watch
index ec075b18..c35c8e38 100644
--- a/test/package/debian-mingw64/watch
+++ b/test/package/debian-mingw64/watch
@@ -1,4 +1,4 @@
 version=3
 
-opts=passive ftp://ftp.invisible-island.net/ncurses-examples/ncurses-examples-([\d.]+)\.tgz \
+opts=passive https://invisible-island.net/archives/ncurses-examples/ncurses-examples-([\d.]+)\.tgz \
  debian  uupdate
diff --git a/test/package/debian/rules b/test/package/debian/rules
index e8e4eb15..842e5858 100755
--- a/test/package/debian/rules
+++ b/test/package/debian/rules
@@ -75,7 +75,7 @@ config-$(NCURSES_PKG)-stamp:
 
 	cd t/ncurses6; $(configure) \
 		--datadir=\$${datarootdir}/$(NCURSES_PKG) \
-		--with-screen=ncurses6
+		--with-screen=ncursesw6td
 
 	touch $@
 
@@ -87,7 +87,7 @@ config-$(NCURSEST_PKG)-stamp:
 
 	cd t/ncursest6; $(configure) \
 		--datadir=\$${datarootdir}/$(NCURSEST_PKG) \
-		--with-screen=ncursest6
+		--with-screen=ncursestw6td
 
 	touch $@
 
diff --git a/test/package/debian/watch b/test/package/debian/watch
index ec075b18..c35c8e38 100644
--- a/test/package/debian/watch
+++ b/test/package/debian/watch
@@ -1,4 +1,4 @@
 version=3
 
-opts=passive ftp://ftp.invisible-island.net/ncurses-examples/ncurses-examples-([\d.]+)\.tgz \
+opts=passive https://invisible-island.net/archives/ncurses-examples/ncurses-examples-([\d.]+)\.tgz \
  debian  uupdate