From d1a029866f6d84087781eaa81de19949d8533426 Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Sun, 6 Aug 2023 00:30:20 +0000 Subject: [PATCH] ncurses 6.4 - patch 20230805 + fix a few manpages needing tbl marker, seen by lintian warning. + fixes for compiler-warnings. + minor grammatical fix for manpages (Branden Robinson). --- NEWS | 7 ++++++- VERSION | 2 +- dist.mk | 4 ++-- doc/html/man/adacurses6-config.1.html | 2 +- doc/html/man/captoinfo.1m.html | 2 +- doc/html/man/clear.1.html | 2 +- doc/html/man/curs_add_wch.3x.html | 9 ++++---- doc/html/man/curs_get_wstr.3x.html | 12 +++++------ doc/html/man/curs_getstr.3x.html | 12 +++++------ doc/html/man/curs_terminfo.3x.html | 9 ++++---- doc/html/man/curs_threads.3x.html | 9 ++++---- doc/html/man/curs_util.3x.html | 16 +++++++------- doc/html/man/form.3x.html | 2 +- doc/html/man/form_driver.3x.html | 9 ++++---- doc/html/man/infocmp.1m.html | 2 +- doc/html/man/infotocap.1m.html | 2 +- doc/html/man/menu.3x.html | 2 +- doc/html/man/ncurses.3x.html | 2 +- doc/html/man/ncurses6-config.1.html | 2 +- doc/html/man/panel.3x.html | 2 +- doc/html/man/tabs.1.html | 2 +- doc/html/man/terminfo.5.html | 2 +- doc/html/man/tic.1m.html | 2 +- doc/html/man/toe.1m.html | 2 +- doc/html/man/tput.1.html | 2 +- doc/html/man/tset.1.html | 2 +- doc/html/man/user_caps.5.html | 3 ++- include/curses.tail | 14 ++++++------- man/curs_add_wch.3x | 5 +++-- man/curs_get_wstr.3x | 8 +++---- man/curs_getstr.3x | 8 +++---- man/curs_terminfo.3x | 5 +++-- man/curs_threads.3x | 5 +++-- man/curs_util.3x | 16 +++++++------- man/form_driver.3x | 5 +++-- man/user_caps.5 | 5 +++-- ncurses/tinfo/lib_win32con.c | 30 +++++++-------------------- ncurses/win32con/win_driver.c | 14 ++++++------- 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 +- 45 files changed, 133 insertions(+), 128 deletions(-) diff --git a/NEWS b/NEWS index 84d5c41d..c44cc39b 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.3981 2023/07/29 16:35:02 tom Exp $ +-- $Id: NEWS,v 1.3984 2023/08/06 00:01:18 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -46,6 +46,11 @@ 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. +20230805 + + fix a few manpages needing tbl marker, seen by lintian warning. + + fixes for compiler-warnings. + + minor grammatical fix for manpages (Branden Robinson). + 20230729 + improve manpages for wgetnstr() and wget_wnstr(). + modify MinGW configuration to provide for running in MSYS/MSYS2 diff --git a/VERSION b/VERSION index bc3b6d01..e37bff00 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:10 6.4 20230729 +5:0:10 6.4 20230805 diff --git a/dist.mk b/dist.mk index 3db7d42b..917239bd 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.1557 2023/07/29 10:00:25 tom Exp $ +# $Id: dist.mk,v 1.1558 2023/08/05 09:51:18 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 = 4 -NCURSES_PATCH = 20230729 +NCURSES_PATCH = 20230805 # 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/adacurses6-config.1.html b/doc/html/man/adacurses6-config.1.html index 257ebb88..a5eb9176 100644 --- a/doc/html/man/adacurses6-config.1.html +++ b/doc/html/man/adacurses6-config.1.html @@ -126,7 +126,7 @@

SEE ALSO

        curses(3x)
 
-       This describes ncurses version 6.4 (patch 20230729).
+       This describes ncurses version 6.4 (patch 20230805).
 
 
 
diff --git a/doc/html/man/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html
index fdf1acc2..4c9032c2 100644
--- a/doc/html/man/captoinfo.1m.html
+++ b/doc/html/man/captoinfo.1m.html
@@ -199,7 +199,7 @@

SEE ALSO

        infocmp(1m), curses(3x), terminfo(5)
 
-       This describes ncurses version 6.4 (patch 20230729).
+       This describes ncurses version 6.4 (patch 20230805).

AUTHOR

diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html
index 07166e61..67fb5da5 100644
--- a/doc/html/man/clear.1.html
+++ b/doc/html/man/clear.1.html
@@ -150,7 +150,7 @@

SEE ALSO

        tput(1), xterm(1), terminfo(5).
 
-       This describes ncurses version 6.4 (patch 20230729).
+       This describes ncurses version 6.4 (patch 20230805).
 
 
 
diff --git a/doc/html/man/curs_add_wch.3x.html b/doc/html/man/curs_add_wch.3x.html
index 36cfcef9..bc213e87 100644
--- a/doc/html/man/curs_add_wch.3x.html
+++ b/doc/html/man/curs_add_wch.3x.html
@@ -1,4 +1,5 @@
 
 
 
 
 
 
-curs_add_wch 3x 2023-07-15 ncurses 6.4 Library calls
+curs_add_wch 3x 2023-08-05 ncurses 6.4 Library calls
 
 
 
 
-
curs_add_wch 3x 2023-07-15 ncurses 6.4 Library calls

+
curs_add_wch 3x 2023-08-05 ncurses 6.4 Library calls

 
 curs_add_wch(3x)                 Library calls                curs_add_wch(3x)
 
@@ -320,7 +321,7 @@
 
 
 
-ncurses 6.4                       2023-07-15                  curs_add_wch(3x)
+ncurses 6.4                       2023-08-05                  curs_add_wch(3x)
 

 

 
    
diff --git a/doc/html/man/curs_get_wstr.3x.html b/doc/html/man/curs_get_wstr.3x.html
index 9bf39184..ae0fe1fe 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.29 2023/07/29 16:52:52 tom Exp @
+  * @Id: curs_get_wstr.3x,v 1.30 2023/08/05 12:14:30 tom Exp @
 -->
 
 
 
 
 
-curs_get_wstr 3x 2023-07-29 ncurses 6.4 Library calls
+curs_get_wstr 3x 2023-08-05 ncurses 6.4 Library calls
 
 
 
 
-
    curs_get_wstr 3x 2023-07-29 ncurses 6.4 Library calls
    
+
    curs_get_wstr 3x 2023-08-05 ncurses 6.4 Library calls
    
 
     curs_get_wstr(3x)                Library calls               curs_get_wstr(3x)
 
@@ -130,9 +130,9 @@
 
        In this implementation, these functions return an error
 
-       o   if the window pointer is null, or
+       o   if the window pointer is null,
 
-       o   if its timeout expires without having any data.
+       o   if its timeout expires without having any data, or
 
        o   if the associated call to wget_wch failed.
 
@@ -186,7 +186,7 @@
 
 
 
-ncurses 6.4                       2023-07-29                 curs_get_wstr(3x)
+ncurses 6.4                       2023-08-05                 curs_get_wstr(3x)
 
    
 
    
 
      
diff --git a/doc/html/man/curs_getstr.3x.html b/doc/html/man/curs_getstr.3x.html
index 32d1a2f4..01c347fb 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.41 2023/07/29 16:32:52 tom Exp @
+  * @Id: curs_getstr.3x,v 1.42 2023/08/05 12:14:30 tom Exp @
 -->
 
 
 
 
 
-curs_getstr 3x 2023-07-29 ncurses 6.4 Library calls
+curs_getstr 3x 2023-08-05 ncurses 6.4 Library calls
 
 
 
 
-
      curs_getstr 3x 2023-07-29 ncurses 6.4 Library calls
      
+
      curs_getstr 3x 2023-08-05 ncurses 6.4 Library calls
      
 
       curs_getstr(3x)                  Library calls                 curs_getstr(3x)
 
@@ -123,9 +123,9 @@
 
        In this implementation, these functions return an error
 
-       o   if the window pointer is null, or
+       o   if the window pointer is null,
 
-       o   if its timeout expires without having any data.
+       o   if its timeout expires without having any data, or
 
        o   if the associated call to wgetch failed.
 
@@ -237,7 +237,7 @@
 
 
 
-ncurses 6.4                       2023-07-29                   curs_getstr(3x)
+ncurses 6.4                       2023-08-05                   curs_getstr(3x)
 
      
 
      
 
        
diff --git a/doc/html/man/curs_terminfo.3x.html b/doc/html/man/curs_terminfo.3x.html
index 56d6aad1..c7485aea 100644
--- a/doc/html/man/curs_terminfo.3x.html
+++ b/doc/html/man/curs_terminfo.3x.html
@@ -1,4 +1,5 @@
 
@@ -36,12 +37,12 @@
 
 
 
-curs_threads 3x 2023-07-01 ncurses 6.4 Library calls
+curs_threads 3x 2023-08-05 ncurses 6.4 Library calls
 
 
 
 
-
        curs_threads 3x 2023-07-01 ncurses 6.4 Library calls
        
+
        curs_threads 3x 2023-08-05 ncurses 6.4 Library calls
        
 
         curs_threads(3x)                 Library calls                curs_threads(3x)
 
@@ -608,7 +609,7 @@
 
 
 
-ncurses 6.4                       2023-07-01                  curs_threads(3x)
+ncurses 6.4                       2023-08-05                  curs_threads(3x)
 
        
 
        
 
          
diff --git a/doc/html/man/curs_util.3x.html b/doc/html/man/curs_util.3x.html
index 6fdfed3f..362169c2 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.71 2023/07/15 18:01:08 tom Exp @
+  * @Id: curs_util.3x,v 1.72 2023/08/05 13:34:35 tom Exp @
 -->
 
 
 
 
 
-curs_util 3x 2023-07-15 ncurses 6.4 Library calls
+curs_util 3x 2023-08-05 ncurses 6.4 Library calls
 
 
 
 
-
          curs_util 3x 2023-07-15 ncurses 6.4 Library calls
          
+
          curs_util 3x 2023-08-05 ncurses 6.4 Library calls
          
 
           curs_util(3x)                    Library calls                   curs_util(3x)
 
@@ -63,10 +63,8 @@
        const char *key_name(wchar_t w);
 
        void filter(void);
-       void nofilter(void);
 
        void use_env(bool f);
-       void use_tioctl(bool f);
 
        int putwin(WINDOW *win, FILE *filep);
        WINDOW *getwin(FILE *filep);
@@ -74,6 +72,10 @@
        int delay_output(int ms);
        int flushinp(void);
 
+       /* extensions */
+       void nofilter(void);
+       void use_tioctl(bool f);
+
 
 
          DESCRIPTION
           
@@ -359,7 +361,7 @@
        If ncurses is configured to provide  the  sp-functions  extension,  the
        state  of  use_env  and  use_tioctl may be updated before creating each
        screen rather than once  only  (curs_sp_funcs(3x)).   This  feature  of
-       use_env is not provided by other implementation of curses.
+       use_env is not provided by other implementations of curses.
 
 
 
          SEE ALSO
          @@ -369,7 +371,7 @@
 
 
 
-ncurses 6.4                       2023-07-15                     curs_util(3x)
+ncurses 6.4                       2023-08-05                     curs_util(3x)
 
          
 
          
 
            
diff --git a/doc/html/man/form.3x.html b/doc/html/man/form.3x.html
index 1ca7eb54..6c7df9ef 100644
--- a/doc/html/man/form.3x.html
+++ b/doc/html/man/form.3x.html
@@ -248,7 +248,7 @@
        curses(3x) and related pages whose names  begin  "form_"  for  detailed
        descriptions of the entry points.
 
-       This describes ncurses version 6.4 (patch 20230729).
+       This describes ncurses version 6.4 (patch 20230805).
 
 
 
diff --git a/doc/html/man/form_driver.3x.html b/doc/html/man/form_driver.3x.html
index 6b7ceb39..678ade6f 100644
--- a/doc/html/man/form_driver.3x.html
+++ b/doc/html/man/form_driver.3x.html
@@ -1,4 +1,5 @@
 
 
 
 
 
 
-form_driver 3x 2023-07-01 ncurses 6.4 Library calls
+form_driver 3x 2023-08-05 ncurses 6.4 Library calls
 
 
 
 
-
            form_driver 3x 2023-07-01 ncurses 6.4 Library calls
            
+
            form_driver 3x 2023-08-05 ncurses 6.4 Library calls
            
 
             form_driver(3x)                  Library calls                 form_driver(3x)
 
@@ -279,7 +280,7 @@
 
 
 
-ncurses 6.4                       2023-07-01                   form_driver(3x)
+ncurses 6.4                       2023-08-05                   form_driver(3x)
 
            
 
            
 
              
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index d25d957d..53934565 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -521,7 +521,7 @@
 
        https://invisible-island.net/ncurses/tctest.html
 
-       This describes ncurses version 6.4 (patch 20230729).
+       This describes ncurses version 6.4 (patch 20230805).

AUTHOR

diff --git a/doc/html/man/infotocap.1m.html b/doc/html/man/infotocap.1m.html
index c993d880..9890ab45 100644
--- a/doc/html/man/infotocap.1m.html
+++ b/doc/html/man/infotocap.1m.html
@@ -91,7 +91,7 @@

SEE ALSO

        infocmp(1m), tic(1m), curses(3x), terminfo(5)
 
-       This describes ncurses version 6.4 (patch 20230729).
+       This describes ncurses version 6.4 (patch 20230805).

AUTHOR

diff --git a/doc/html/man/menu.3x.html b/doc/html/man/menu.3x.html
index e899194b..00d879b8 100644
--- a/doc/html/man/menu.3x.html
+++ b/doc/html/man/menu.3x.html
@@ -223,7 +223,7 @@
        curses(3x) and related pages whose names  begin  "menu_"  for  detailed
        descriptions of the entry points.
 
-       This describes ncurses version 6.4 (patch 20230729).
+       This describes ncurses version 6.4 (patch 20230805).
 
 
 
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index 769df325..f5bc89b4 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -60,7 +60,7 @@
        method of updating  character  screens  with  reasonable  optimization.
        This  implementation  is  "new  curses"  (ncurses)  and is the approved
        replacement for 4.4BSD classic curses,  which  has  been  discontinued.
-       This describes ncurses version 6.4 (patch 20230729).
+       This describes ncurses version 6.4 (patch 20230805).
 
        The  ncurses  library emulates the curses library of System V Release 4
        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
diff --git a/doc/html/man/ncurses6-config.1.html b/doc/html/man/ncurses6-config.1.html
index 10c591f9..1a3ce1db 100644
--- a/doc/html/man/ncurses6-config.1.html
+++ b/doc/html/man/ncurses6-config.1.html
@@ -113,7 +113,7 @@

SEE ALSO

        curses(3x)
 
-       This describes ncurses version 6.4 (patch 20230729).
+       This describes ncurses version 6.4 (patch 20230805).
 
 
 
diff --git a/doc/html/man/panel.3x.html b/doc/html/man/panel.3x.html
index 9ad908ed..9914722f 100644
--- a/doc/html/man/panel.3x.html
+++ b/doc/html/man/panel.3x.html
@@ -281,7 +281,7 @@

SEE ALSO

        curses(3x), curs_variables(3x),
 
-       This describes ncurses version 6.4 (patch 20230729).
+       This describes ncurses version 6.4 (patch 20230805).

AUTHOR

diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index 0ce2b742..59311170 100644
--- a/doc/html/man/tabs.1.html
+++ b/doc/html/man/tabs.1.html
@@ -252,7 +252,7 @@

SEE ALSO

        infocmp(1m), tset(1), curses(3x), terminfo(5).
 
-       This describes ncurses version 6.4 (patch 20230729).
+       This describes ncurses version 6.4 (patch 20230805).
 
 
 
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index 12f49c4a..28e7be77 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -106,7 +106,7 @@
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This manual describes ncurses version 6.4 (patch 20230729).
+       This manual describes ncurses version 6.4 (patch 20230805).

Terminfo Entry Syntax

diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html
index 4998a866..75446361 100644
--- a/doc/html/man/tic.1m.html
+++ b/doc/html/man/tic.1m.html
@@ -469,7 +469,7 @@
        captoinfo(1m),   infocmp(1m),   infotocap(1m),   toe(1m),   curses(3x),
        term(5).  terminfo(5).  user_caps(5).
 
-       This describes ncurses version 6.4 (patch 20230729).
+       This describes ncurses version 6.4 (patch 20230805).

AUTHOR

diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
index 85a3956a..f0ac6292 100644
--- a/doc/html/man/toe.1m.html
+++ b/doc/html/man/toe.1m.html
@@ -171,7 +171,7 @@
        captoinfo(1m),   infocmp(1m),   infotocap(1m),   tic(1m),   curses(3x),
        terminfo(5).
 
-       This describes ncurses version 6.4 (patch 20230729).
+       This describes ncurses version 6.4 (patch 20230805).
 
 
 
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index d48da4c1..e7a78cd0 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -545,7 +545,7 @@

SEE ALSO

        clear(1), stty(1), tabs(1), tset(1), curs_termcap(3x), terminfo(5).
 
-       This describes ncurses version 6.4 (patch 20230729).
+       This describes ncurses version 6.4 (patch 20230805).
 
 
 
diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index 0e4ec7e1..1b1a6d63 100644
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -392,7 +392,7 @@
        csh(1),  sh(1),  stty(1),   curs_terminfo(3x),   tty(4),   terminfo(5),
        ttys(5), environ(7)
 
-       This describes ncurses version 6.4 (patch 20230729).
+       This describes ncurses version 6.4 (patch 20230805).
 
 
 
diff --git a/doc/html/man/user_caps.5.html b/doc/html/man/user_caps.5.html
index 5ec68523..a939b949 100644
--- a/doc/html/man/user_caps.5.html
+++ b/doc/html/man/user_caps.5.html
@@ -1,4 +1,5 @@
 
 
 
diff --git a/include/curses.tail b/include/curses.tail
index 11514498..9c913565 100644
--- a/include/curses.tail
+++ b/include/curses.tail
@@ -1,4 +1,4 @@
-/* $Id: curses.tail,v 1.26 2021/03/20 15:49:25 tom Exp $ */
+/* $Id: curses.tail,v 1.27 2023/08/05 19:43:46 tom Exp $ */
 /*
  * vile:cmode:
  * This file is part of ncurses, designed to be appended after curses.h.in
@@ -13,12 +13,12 @@
 #define NCURSES_MOUSE_MASK(b,m) ((m) << (((b) - 1) * 6))
 #endif
 
-#define	NCURSES_BUTTON_RELEASED	001L
-#define	NCURSES_BUTTON_PRESSED	002L
-#define	NCURSES_BUTTON_CLICKED	004L
-#define	NCURSES_DOUBLE_CLICKED	010L
-#define	NCURSES_TRIPLE_CLICKED	020L
-#define	NCURSES_RESERVED_EVENT	040L
+#define	NCURSES_BUTTON_RELEASED	001UL
+#define	NCURSES_BUTTON_PRESSED	002UL
+#define	NCURSES_BUTTON_CLICKED	004UL
+#define	NCURSES_DOUBLE_CLICKED	010UL
+#define	NCURSES_TRIPLE_CLICKED	020UL
+#define	NCURSES_RESERVED_EVENT	040UL
 
 /* event masks */
 #define	BUTTON1_RELEASED	NCURSES_MOUSE_MASK(1, NCURSES_BUTTON_RELEASED)
diff --git a/man/curs_add_wch.3x b/man/curs_add_wch.3x
index c729c792..f97ae53b 100644
--- a/man/curs_add_wch.3x
+++ b/man/curs_add_wch.3x
@@ -1,3 +1,4 @@
+'\" t
 .\"***************************************************************************
 .\" Copyright 2019-2021,2023 Thomas E. Dickey                                *
 .\" Copyright 2001-2015,2017 Free Software Foundation, Inc.                  *
@@ -27,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_add_wch.3x,v 1.37 2023/07/15 16:45:14 tom Exp $
-.TH curs_add_wch 3X 2023-07-15 "ncurses 6.4" "Library calls"
+.\" $Id: curs_add_wch.3x,v 1.38 2023/08/06 00:03:38 tom Exp $
+.TH curs_add_wch 3X 2023-08-05 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/curs_get_wstr.3x b/man/curs_get_wstr.3x
index 9edc4242..2d632522 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.29 2023/07/29 16:52:52 tom Exp $
-.TH curs_get_wstr 3X 2023-07-29 "ncurses 6.4" "Library calls"
+.\" $Id: curs_get_wstr.3x,v 1.30 2023/08/05 12:14:30 tom Exp $
+.TH curs_get_wstr 3X 2023-08-05 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -166,9 +166,9 @@ X/Open defines no error conditions.
 In this implementation,
 these functions return an error
 .bP
-if the window pointer is null, or
+if the window pointer is null,
 .bP
-if its timeout expires without having any data.
+if its timeout expires without having any data, or
 .bP
 if the associated call to
 \fBwget_wch\fP
diff --git a/man/curs_getstr.3x b/man/curs_getstr.3x
index 4901a025..b6648033 100644
--- a/man/curs_getstr.3x
+++ b/man/curs_getstr.3x
@@ -27,8 +27,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getstr.3x,v 1.41 2023/07/29 16:32:52 tom Exp $
-.TH curs_getstr 3X 2023-07-29 "ncurses 6.4" "Library calls"
+.\" $Id: curs_getstr.3x,v 1.42 2023/08/05 12:14:30 tom Exp $
+.TH curs_getstr 3X 2023-08-05 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -158,9 +158,9 @@ X/Open defines no error conditions.
 In this implementation,
 these functions return an error
 .bP
-if the window pointer is null, or
+if the window pointer is null,
 .bP
-if its timeout expires without having any data.
+if its timeout expires without having any data, or
 .bP
 if the associated call to
 \fBwgetch\fP
diff --git a/man/curs_terminfo.3x b/man/curs_terminfo.3x
index 4f89b20b..3c3fcdba 100644
--- a/man/curs_terminfo.3x
+++ b/man/curs_terminfo.3x
@@ -1,3 +1,4 @@
+'\" t
 .\"***************************************************************************
 .\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
@@ -27,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_terminfo.3x,v 1.93 2023/07/01 15:33:35 tom Exp $
-.TH curs_terminfo 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: curs_terminfo.3x,v 1.94 2023/08/06 00:03:04 tom Exp $
+.TH curs_terminfo 3X 2023-08-05 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/man/curs_threads.3x b/man/curs_threads.3x
index bd8a5c96..86f7c236 100644
--- a/man/curs_threads.3x
+++ b/man/curs_threads.3x
@@ -1,3 +1,4 @@
+'\" t
 .\"***************************************************************************
 .\" Copyright 2021-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 2008-2015,2017 Free Software Foundation, Inc.                  *
@@ -27,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_threads.3x,v 1.35 2023/07/01 15:43:20 tom Exp $
-.TH curs_threads 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: curs_threads.3x,v 1.36 2023/08/06 00:02:33 tom Exp $
+.TH curs_threads 3X 2023-08-05 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
diff --git a/man/curs_util.3x b/man/curs_util.3x
index ba75fe91..12372dd2 100644
--- a/man/curs_util.3x
+++ b/man/curs_util.3x
@@ -28,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_util.3x,v 1.71 2023/07/15 18:01:08 tom Exp $
-.TH curs_util 3X 2023-07-15 "ncurses 6.4" "Library calls"
+.\" $Id: curs_util.3x,v 1.72 2023/08/05 13:34:35 tom Exp $
+.TH curs_util 3X 2023-08-05 "ncurses 6.4" "Library calls"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
@@ -67,12 +67,8 @@
 \fBconst char *key_name(wchar_t \fIw\fB);\fR
 .sp
 \fBvoid filter(void);\fP
-.br
-\fBvoid nofilter(void);\fP
 .sp
 \fBvoid use_env(bool \fIf\fB);\fR
-.br
-\fBvoid use_tioctl(bool \fIf\fB);\fR
 .sp
 \fBint putwin(WINDOW *\fIwin\fB, FILE *\fIfilep\fB);\fR
 .br
@@ -81,6 +77,12 @@
 \fBint delay_output(int \fIms\fB);\fR
 .br
 \fBint flushinp(void);\fP
+.sp
+/* extensions */
+.br
+\fBvoid nofilter(void);\fP
+.br
+\fBvoid use_tioctl(bool \fIf\fB);\fR
 .SH DESCRIPTION
 .SS unctrl
 The \fBunctrl\fP routine returns a character string which is a printable
@@ -394,7 +396,7 @@ the state of \fBuse_env\fP and \fBuse_tioctl\fP may be updated before
 creating each \fIscreen\fP rather than once only
 (\fBcurs_sp_funcs\fP(3X)).
 This feature of \fBuse_env\fP
-is not provided by other implementation of curses.
+is not provided by other implementations of curses.
 .SH SEE ALSO
 \fBcurses\fP(3X),
 \fBcurs_initscr\fP(3X),
diff --git a/man/form_driver.3x b/man/form_driver.3x
index 3863387c..bf801c3c 100644
--- a/man/form_driver.3x
+++ b/man/form_driver.3x
@@ -1,3 +1,4 @@
+'\" t
 .\"***************************************************************************
 .\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
@@ -27,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_driver.3x,v 1.43 2023/07/01 15:46:10 tom Exp $
-.TH form_driver 3X 2023-07-01 "ncurses 6.4" "Library calls"
+.\" $Id: form_driver.3x,v 1.44 2023/08/06 00:02:02 tom Exp $
+.TH form_driver 3X 2023-08-05 "ncurses 6.4" "Library calls"
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
diff --git a/man/user_caps.5 b/man/user_caps.5
index 1c8ae368..6430ac40 100644
--- a/man/user_caps.5
+++ b/man/user_caps.5
@@ -1,3 +1,4 @@
+'\" t
 .\"***************************************************************************
 .\" Copyright 2018-2022,2023 Thomas E. Dickey                                *
 .\" Copyright 2017 Free Software Foundation, Inc.                            *
@@ -27,8 +28,8 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: user_caps.5,v 1.27 2023/07/01 15:46:10 tom Exp $
-.TH user_caps 5 2023-07-01 "ncurses 6.4" "File formats"
+.\" $Id: user_caps.5,v 1.29 2023/08/06 00:00:22 tom Exp $
+.TH user_caps 5 2023-08-05 "ncurses 6.4" "File formats"
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
diff --git a/ncurses/tinfo/lib_win32con.c b/ncurses/tinfo/lib_win32con.c
index 49b6cd6a..2d6857ae 100644
--- a/ncurses/tinfo/lib_win32con.c
+++ b/ncurses/tinfo/lib_win32con.c
@@ -38,7 +38,7 @@
 
 #include 
 
-MODULE_ID("$Id: lib_win32con.c,v 1.12 2023/02/26 19:55:10 tom Exp $")
+MODULE_ID("$Id: lib_win32con.c,v 1.14 2023/08/05 20:44:38 tom Exp $")
 
 #ifdef _NC_WINDOWS
 
@@ -58,19 +58,7 @@ MODULE_ID("$Id: lib_win32con.c,v 1.12 2023/02/26 19:55:10 tom Exp $")
 #define read_screen  ReadConsoleOutput
 #endif
 
-static BOOL IsConsoleHandle(HANDLE hdl);
-static bool save_original_screen(void);
-static bool restore_original_screen(void) GCC_UNUSED;
 static bool read_screen_data(void);
-static int Adjust(int milliseconds, int diff);
-static int decode_mouse(SCREEN *sp, int mask);
-static bool handle_mouse(SCREEN *sp, MOUSE_EVENT_RECORD mer);
-static int rkeycompare(const void *el1, const void *el2);
-static int keycompare(const void *el1, const void *el2);
-static int MapKey(WORD vKey);
-static int AnsiKey(WORD vKey);
-
-static ULONGLONG tdiff(FILETIME fstart, FILETIME fend);
 
 #define GenMap(vKey,key) MAKELONG(key, vKey)
 static const LONG keylist[] =
@@ -416,6 +404,7 @@ save_original_screen(void)
     return result;
 }
 
+#if 0
 static bool
 restore_original_screen(void)
 {
@@ -450,6 +439,7 @@ restore_original_screen(void)
     }
     return result;
 }
+#endif
 
 static bool
 read_screen_data(void)
@@ -641,10 +631,10 @@ Adjust(int milliseconds, int diff)
                      FROM_LEFT_4TH_BUTTON_PRESSED | \
                      RIGHTMOST_BUTTON_PRESSED)
 
-static int
+static mmask_t
 decode_mouse(SCREEN *sp, int mask)
 {
-    int result = 0;
+    mmask_t result = 0;
 
     (void) sp;
     assert(sp && console_initialized);
@@ -699,15 +689,11 @@ handle_mouse(SCREEN *sp, MOUSE_EVENT_RECORD mer)
 	memset(&work, 0, sizeof(work));
 
 	if (sp->_drv_mouse_new_buttons) {
-	    work.bstate |=
-		(mmask_t) decode_mouse(sp,
-				       sp->_drv_mouse_new_buttons);
+	    work.bstate |= decode_mouse(sp, sp->_drv_mouse_new_buttons);
 	} else {
 	    /* cf: BUTTON_PRESSED, BUTTON_RELEASED */
-	    work.bstate |=
-		(mmask_t) (decode_mouse(sp,
-					sp->_drv_mouse_old_buttons)
-			   >> 1);
+	    work.bstate |= (decode_mouse(sp, sp->_drv_mouse_old_buttons)
+			    >> 1);
 	    result = TRUE;
 	}
 
diff --git a/ncurses/win32con/win_driver.c b/ncurses/win32con/win_driver.c
index d55bab7d..2945d8dc 100644
--- a/ncurses/win32con/win_driver.c
+++ b/ncurses/win32con/win_driver.c
@@ -57,7 +57,7 @@
 
 #define CONTROL_PRESSED (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)
 
-MODULE_ID("$Id: win_driver.c,v 1.72 2023/07/22 20:13:04 Pavel.Fedin Exp $")
+MODULE_ID("$Id: win_driver.c,v 1.73 2023/08/05 19:02:24 tom Exp $")
 
 #define TypeAlloca(type,count) (type*) _alloca(sizeof(type) * (size_t) (count))
 
@@ -1486,10 +1486,10 @@ Adjust(int milliseconds, int diff)
 		     FROM_LEFT_4TH_BUTTON_PRESSED | \
 		     RIGHTMOST_BUTTON_PRESSED)
 
-static int
+static mmask_t
 decode_mouse(SCREEN *sp, int mask)
 {
-    int result = 0;
+    mmask_t result = 0;
 
     (void) sp;
     assert(sp && console_initialized);
@@ -1678,14 +1678,14 @@ handle_mouse(SCREEN *sp, MOUSE_EVENT_RECORD mer)
 
 	if (sp->_drv_mouse_new_buttons) {
 
-	    work.bstate |= (mmask_t) decode_mouse(sp, sp->_drv_mouse_new_buttons);
+	    work.bstate |= decode_mouse(sp, sp->_drv_mouse_new_buttons);
 
 	} else {
 
 	    /* cf: BUTTON_PRESSED, BUTTON_RELEASED */
-	    work.bstate |= (mmask_t) (decode_mouse(sp,
-						   sp->_drv_mouse_old_buttons)
-				      >> 1);
+	    work.bstate |= (decode_mouse(sp,
+					 sp->_drv_mouse_old_buttons)
+			    >> 1);
 
 	    result = TRUE;
 	}
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 9de25e07..65c9e206 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230729) unstable; urgency=low
+ncurses6 (6.4+20230805) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Fri, 28 Jul 2023 19:42:48 -0400
+ -- Thomas E. Dickey   Sat, 05 Aug 2023 05:51:18 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 9de25e07..65c9e206 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230729) unstable; urgency=low
+ncurses6 (6.4+20230805) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Fri, 28 Jul 2023 19:42:48 -0400
+ -- Thomas E. Dickey   Sat, 05 Aug 2023 05:51:18 -0400
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index ff729501..648b9270 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.4+20230729) unstable; urgency=low
+ncurses6 (6.4+20230805) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Fri, 28 Jul 2023 19:42:48 -0400
+ -- Thomas E. Dickey   Sat, 05 Aug 2023 05:51:18 -0400
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 3b3e0bf4..d14a3851 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.597 2023/07/29 10:00:25 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.598 2023/08/05 09:51:18 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "4"
 !define VERSION_YYYY  "2023"
-!define VERSION_MMDD  "0729"
+!define VERSION_MMDD  "0805"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 686afd26..27678539 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.4
-Release: 20230729
+Release: 20230805
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 591f803e..2d0571c3 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.4
-Release: 20230729
+Release: 20230805
 License: X11
 Group: Development/Libraries
 URL: https://invisible-island.net/ncurses/
diff --git a/package/ncursest.spec b/package/ncursest.spec
index c900da85..ecc8372d 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.4
-Release: 20230729
+Release: 20230805
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
-- 
2.45.0