From 5fa5aea6d020750dbe601c1136c7cc35a8a53dd8 Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Sat, 15 Mar 2025 23:56:46 +0000 Subject: [PATCH] snapshot of project "ncurses", label v6_5_20250315 --- NEWS | 5 +- VERSION | 2 +- dist.mk | 4 +- doc/html/man/curs_add_wch.3x.html | 90 ++++++------ doc/html/man/curs_add_wchstr.3x.html | 29 ++-- doc/html/man/curs_addch.3x.html | 54 +++---- doc/html/man/curs_addchstr.3x.html | 21 +-- doc/html/man/curs_addstr.3x.html | 25 ++-- doc/html/man/curs_addwstr.3x.html | 27 ++-- doc/html/man/curs_getch.3x.html | 173 ++++++++++++---------- doc/html/man/curs_initscr.3x.html | 12 +- doc/html/man/curs_inopts.3x.html | 206 +++++++++++++-------------- doc/html/man/ncurses.3x.html | 2 +- doc/html/man/resizeterm.3x.html | 16 +-- doc/html/man/terminfo.5.html | 2 +- man/curs_add_wch.3x | 47 +++--- man/curs_add_wchstr.3x | 25 ++-- man/curs_addch.3x | 59 ++++---- man/curs_addchstr.3x | 25 ++-- man/curs_addstr.3x | 23 +-- man/curs_addwstr.3x | 23 +-- man/curs_getch.3x | 77 +++++++--- man/curs_initscr.3x | 10 +- man/curs_inopts.3x | 14 +- man/resizeterm.3x | 20 ++- package/debian-mingw/changelog | 4 +- package/debian-mingw64/changelog | 4 +- package/debian/changelog | 4 +- package/mingw-ncurses.nsi | 4 +- package/mingw-ncurses.spec | 2 +- package/ncurses.spec | 2 +- package/ncursest.spec | 2 +- 32 files changed, 545 insertions(+), 468 deletions(-) diff --git a/NEWS b/NEWS index 40276e52..897a40aa 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.4259 2025/03/09 00:39:13 tom Exp $ +-- $Id: NEWS,v 1.4261 2025/03/15 23:56:46 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -46,6 +46,9 @@ 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. +20250315 + + improve formatting/style of manpages (patches by Branden Robinson). + 20250308 + remove test in wgetch which applied notimeout to the initial read of a character (patch by Branden Robinson). diff --git a/VERSION b/VERSION index 1b814429..bf596890 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:10 6.5 20250308 +5:0:10 6.5 20250315 diff --git a/dist.mk b/dist.mk index 01dffe29..804bc3cc 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.1659 2025/03/08 11:56:38 tom Exp $ +# $Id: dist.mk,v 1.1660 2025/03/15 11:18:45 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 = 20250308 +NCURSES_PATCH = 20250315 # 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_add_wch.3x.html b/doc/html/man/curs_add_wch.3x.html index 39dcae02..e4092d94 100644 --- a/doc/html/man/curs_add_wch.3x.html +++ b/doc/html/man/curs_add_wch.3x.html @@ -28,19 +28,19 @@ * sale, use or other dealings in this Software without prior written * * authorization. * **************************************************************************** - * @Id: curs_add_wch.3x,v 1.110 2025/03/08 23:01:20 tom Exp @ + * @Id: curs_add_wch.3x,v 1.112 2025/03/15 20:38:41 tom Exp @ --> -curs_add_wch 3x 2025-03-08 ncurses 6.5 Library calls +curs_add_wch 3x 2025-03-15 ncurses 6.5 Library calls -

curs_add_wch 3x 2025-03-08 ncurses 6.5 Library calls

+

curs_add_wch 3x 2025-03-15 ncurses 6.5 Library calls

 curs_add_wch(3x)                 Library calls                curs_add_wch(3x)
 
@@ -133,62 +133,62 @@
        function.
 
        Construct  a curses complex character from a wchar_t with setcchar(3x).
+       A cchar_t can be copied from  place  to  place  using  win_wch(3x)  and
+       wadd_wch.   See  curs_attr(3x)  for values of predefined constants that
+       can be usefully "or"ed with characters.  A complex character whose only
+       character  component  is  a  wide  space,  and  whose only attribute is
+       WA_NORMAL, is a  blank  character,  and  therefore  combines  with  the
+       window's background character; see curs_bkgrnd(3x).
+
        Much behavior depends on whether the wide characters in wch are spacing
        or non-spacing; see subsection "Complex Characters" below.
 
-       o   If  wch  contains  a  spacing  character, then any character at the
-           cursor is first removed.   The  complex  character  wch,  with  its
-           attributes  and  color  pair  identifier,  becomes  the base of the
+       o   If wch contains a spacing character,  then  any  character  at  the
+           cursor  is  first  removed.   The  complex  character wch, with its
+           attributes and color pair  identifier,  becomes  the  base  of  the
            active complex character.
 
        o   If wch contains only non-spacing characters, they are combined with
-           the  active  complex  character.  curses ignores its attributes and
+           the active complex character.  curses ignores  its  attributes  and
            color pair identifier, and does not advance the cursor.
 
-       Further non-spacing characters added with wadd_wch are not  written  at
-       the  new  cursor position but combine with the active complex character
-       until another spacing character is written to the window or the  cursor
+       Further  non-spacing  characters added with wadd_wch are not written at
+       the new cursor position but combine with the active  complex  character
+       until  another spacing character is written to the window or the cursor
        is moved.
 
-       If  the  cursor  is  not  at  the  bottom  of  the scrolling region and
-       advancement occurs at the right margin, the cursor automatically  wraps
+       If the cursor is  not  at  the  bottom  of  the  scrolling  region  and
+       advancement  occurs at the right margin, the cursor automatically wraps
        to the beginning of the next line.
 
        If the cursor is at the bottom of the scrolling region when advancement
-       occurs at the right margin, and scrollok(3x) is enabled  for  win,  the
-       cursor  wraps  as  above  and the scrolling region scrolls up one line.
-       Otherwise, advancement and scrolling do not occur, and  waddch  returns
+       occurs  at  the  right margin, and scrollok(3x) is enabled for win, the
+       cursor wraps as above and the scrolling region  scrolls  up  one  line.
+       Otherwise,  advancement  and scrolling do not occur, and waddch returns
        ERR.
 
-       If  wch  is a backspace, carriage return, line feed, or tab, the cursor
+       If wch is a backspace, carriage return, line feed, or tab,  the  cursor
        moves appropriately within the window.
 
-       o   Backspace moves the cursor one character left; at the  left  margin
+       o   Backspace  moves  the cursor one character left; at the left margin
            of a window, it does nothing.
 
-       o   Carriage  return  moves  the  cursor to the left margin on the same
+       o   Carriage return moves the cursor to the left  margin  on  the  same
            line of the window.
 
-       o   Line feed does a clrtoeol(3x), then advances as if from  the  right
+       o   Line  feed  does a clrtoeol(3x), then advances as if from the right
            margin.
 
-       o   Tab  advances the cursor to the next tab stop (possibly on the next
-           line); these are placed at every eighth column by  default.   Alter
-           the    tab    interval    with    the    TABSIZE   extension;   see
+       o   Tab advances the cursor to the next tab stop (possibly on the  next
+           line);  these  are placed at every eighth column by default.  Alter
+           the   tab   interval    with    the    TABSIZE    extension;    see
            curs_variables(3x).
 
-       If wch is any other nonprintable character, it is  drawn  in  printable
-       form  using the same convention as wunctrl(3x).  Calling win_wch(3x) on
-       the location of a nonprintable character does not return the  character
+       If  wch  is  any other nonprintable character, it is drawn in printable
+       form using the same convention as wunctrl(3x).  Calling win_wch(3x)  on
+       the  location of a nonprintable character does not return the character
        itself, but its wunctrl(3x) representation.
 
-       A  cchar_t  can  be  copied  from  place to place using win_wch(3x) and
-       wadd_wch.  See curs_attr(3x) for values of  predefined  constants  that
-       can be usefully "or"ed with characters.  A complex character whose only
-       character component is a  wide  space,  and  whose  only  attribute  is
-       WA_NORMAL,  is  a  blank  character,  and  therefore  combines with the
-       background character; see curs_bkgrnd(3x).
-

wecho_wchar

        echo_wchar  and  wecho_wchar  are  equivalent  to  calling   (w)add_wch
@@ -201,16 +201,16 @@

Forms-Drawing Characters

        curses defines macros  starting  with  WACS_  that  can  be  used  with
        wadd_wch  to  write  line-drawing  and  other  symbols  to  the screen.
-       ncurses terms these forms-drawing characters.  The ACS  default  listed
-       below  is  used  if  the  acs_chars (acsc) terminfo capability does not
-       define a terminal-specific replacement for it, or if the terminal  type
-       and locale configuration require Unicode to access these characters but
-       the  library  is  unable  to  use  Unicode.   The  "acsc  char"  column
-       corresponds to how the characters are specified in the acs_chars (acsc)
-       string capability, and the characters in it may appear on the screen if
-       the  terminal type's database entry incorrectly advertises ACS support.
-       The name "ACS" originates in the Alternate Character Set feature of the
-       DEC VT100 terminal.
+       ncurses terms these forms-drawing  characters.   curses  uses  the  ACS
+       default  listed  below  if the terminal type lacks the acs_chars (acsc)
+       capability; that capability does  not  define  a  replacement  for  the
+       character;  or  if  the  terminal type and locale configuration require
+       Unicode to access these characters, but the library is  unable  to  use
+       Unicode.   The "acsc char" column corresponds to how the characters are
+       specified in the acs_chars (acsc) string capability, and the characters
+       in  it  may  appear on the screen if the terminal type's database entry
+       incorrectly advertises ACS support.  The name "ACS" originates  in  the
+       Alternate Character Set feature of the DEC VT100 terminal.
 
                        Unicode   ACS       acsc
        Symbol          Default   Default   char   Glyph Name
@@ -299,7 +299,7 @@

RETURN VALUE

        These functions return OK on success and ERR on failure.
 
-       In ncurses, they return ERR if
+       In ncurses, these functions fail if
 
        o   the curses screen has not been initialized,
 
@@ -325,7 +325,7 @@

EXTENSIONS

        The   symbols  WACS_S3,  WACS_S7,  WACS_LEQUAL,  WACS_GEQUAL,  WACS_PI,
        WACS_NEQUAL,  and  WACS_STERLING  are  not  standard.   However,   many
-       publicly   available   terminfo   entries   include   acs_chars  (acsc)
+       publicly   available   terminfo   entries   include   acs_chars  (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 WACS-prefixed names for them.
@@ -450,7 +450,7 @@
 
 
 
-ncurses 6.5                       2025-03-08                  curs_add_wch(3x)
+ncurses 6.5                       2025-03-15                  curs_add_wch(3x)