From: Thomas E. Dickey Date: Sat, 23 Mar 2024 23:41:05 +0000 (+0000) Subject: ncurses 6.4 - patch 20240323 X-Git-Tag: v6.5~6 X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=commitdiff_plain;h=725169bda4d3b4c3fde0d4a94f76d017812c7ea6 ncurses 6.4 - patch 20240323 + modify tput/tset reset feature to avoid 1-second sleep if running in a pseudo-terminal. + modify check-size feature to avoid using it in a pseudoterminal (cf: 20231016) + improve formatting/style of manpages (patches by Branden Robinson). + trim a space after some "-R" options, fixing builds for applications built using clang and ncurses on Solaris. --- diff --git a/NEWS b/NEWS index 710de1b8..ffa3b362 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.4091 2024/03/09 22:33:41 tom Exp $ +-- $Id: NEWS,v 1.4097 2024/03/23 10:33:40 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -46,6 +46,15 @@ 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. +20240323 + + modify tput/tset reset feature to avoid 1-second sleep if running in + a pseudo-terminal. + + modify check-size feature to avoid using it in a pseudoterminal + (cf: 20231016) + + improve formatting/style of manpages (patches by Branden Robinson). + + trim a space after some "-R" options, fixing builds for applications + built using clang and ncurses on Solaris. + 20240309 + modify xgterm to work around line-drawing bug -TD + use CSI 3J in vte-2017 (report by Sven Joachim) @@ -58,7 +67,7 @@ it is not possible to add this information. + update config.guess, config.sub 20240224 - + improve man/curs_mouse.3x style (Brandon Robinson, Sven Joachim). + + improve man/curs_mouse.3x style (Branden Robinson, Sven Joachim). + provide for CCHARW_MAX greater than 1 + eliminate use of PATH_MAX in lib_trace.c + work around misconfiguration of MacPorts gcc13, which exposes invalid diff --git a/VERSION b/VERSION index 89ea57d3..bd59079d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:10 6.4 20240309 +5:0:10 6.4 20240323 diff --git a/aclocal.m4 b/aclocal.m4 index 96d04519..8335b4fd 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -29,7 +29,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1995-on dnl -dnl $Id: aclocal.m4,v 1.1063 2024/03/02 20:46:07 tom Exp $ +dnl $Id: aclocal.m4,v 1.1065 2024/03/12 23:45:44 tom Exp $ dnl Macros used in NCURSES auto-configuration script. dnl dnl These macros are maintained separately from NCURSES. The copyright on @@ -7420,7 +7420,7 @@ do done ])dnl dnl --------------------------------------------------------------------------- -dnl CF_SHARED_OPTS version: 109 updated: 2023/12/03 09:21:34 +dnl CF_SHARED_OPTS version: 110 updated: 2024/03/12 19:44:02 dnl -------------- dnl -------------- dnl Attempt to determine the appropriate CC/LD options for creating a shared @@ -7880,11 +7880,11 @@ CF_EOF # tested with SunOS 5.5.1 (solaris 2.5.1) and gcc 2.7.2 # tested with SunOS 5.10 (solaris 10) and gcc 3.4.3 if test "$DFT_LWR_MODEL" = "shared" ; then - LOCAL_LDFLAGS="-R \$(LOCAL_LIBDIR):\${libdir}" + LOCAL_LDFLAGS="-R\$(LOCAL_LIBDIR):\${libdir}" LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" fi if test "$cf_cv_enable_rpath" = yes ; then - EXTRA_LDFLAGS="-R \${libdir} $EXTRA_LDFLAGS" + EXTRA_LDFLAGS="-R\${libdir} $EXTRA_LDFLAGS" fi CF_SHARED_SONAME if test "$GCC" != yes; then diff --git a/configure b/configure index c1632086..09733186 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.775 . +# From configure.in Revision: 1.776 . # Guess values for system-dependent variables and create Makefiles. # Generated by Autoconf 2.52.20231210. # @@ -836,12 +836,12 @@ Reentrant Code: --with-wrap-prefix=XXX override prefix used for public variables Development Code: --without-develop disable development options + --enable-check-size compile-in code to detect screensize of serial terminals --enable-hard-tabs compile with hard-tabs code --enable-xmc-glitch compile with support for xmc (magic-cookie) Experimental Code: --disable-assumed-color do not assume anything about default-colors --disable-hashmap compile without hashmap scrolling-optimization - --enable-check-size compile-in code to detect screensize --enable-colorfgbg compile-in experimental $COLORFGBG code --enable-fvisibility compile with -fvisibility=hidden --enable-interop compile-in interop bindings @@ -7070,11 +7070,11 @@ CF_EOF # tested with SunOS 5.5.1 (solaris 2.5.1) and gcc 2.7.2 # tested with SunOS 5.10 (solaris 10) and gcc 3.4.3 if test "$DFT_LWR_MODEL" = "shared" ; then - LOCAL_LDFLAGS="-R \$(LOCAL_LIBDIR):\${libdir}" + LOCAL_LDFLAGS="-R\$(LOCAL_LIBDIR):\${libdir}" LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" fi if test "$cf_cv_enable_rpath" = yes ; then - EXTRA_LDFLAGS="-R \${libdir} $EXTRA_LDFLAGS" + EXTRA_LDFLAGS="-R\${libdir} $EXTRA_LDFLAGS" fi test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel @@ -16375,8 +16375,26 @@ fi; echo "$as_me:16375: result: $with_develop" >&5 echo "${ECHO_T}$with_develop" >&6 +### use option --enable-check-size to detect screensize with CPR +echo "$as_me:16379: checking if you want to check screensize of serial terminals" >&5 +echo $ECHO_N "checking if you want to check screensize of serial terminals... $ECHO_C" >&6 + +# Check whether --enable-check-size or --disable-check-size was given. +if test "${enable_check_size+set}" = set; then + enableval="$enable_check_size" + +else + enable_check_size=$with_develop +fi; +echo "$as_me:16389: result: $enable_check_size" >&5 +echo "${ECHO_T}$enable_check_size" >&6 +test "x$enable_check_size" = xyes && +cat >>confdefs.h <<\EOF +#define USE_CHECK_SIZE 1 +EOF + ### use option --enable-hard-tabs to turn on use of hard-tabs optimize -echo "$as_me:16379: checking if you want hard-tabs code" >&5 +echo "$as_me:16397: checking if you want hard-tabs code" >&5 echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6 # Check whether --enable-hard-tabs or --disable-hard-tabs was given. @@ -16386,7 +16404,7 @@ if test "${enable_hard_tabs+set}" = set; then else enable_hard_tabs=$with_develop fi; -echo "$as_me:16389: result: $enable_hard_tabs" >&5 +echo "$as_me:16407: result: $enable_hard_tabs" >&5 echo "${ECHO_T}$enable_hard_tabs" >&6 test "x$enable_hard_tabs" = xyes && cat >>confdefs.h <<\EOF @@ -16394,7 +16412,7 @@ cat >>confdefs.h <<\EOF EOF ### use option --enable-xmc-glitch to turn on use of magic-cookie optimize -echo "$as_me:16397: checking if you want limited support for xmc" >&5 +echo "$as_me:16415: checking if you want limited support for xmc" >&5 echo $ECHO_N "checking if you want limited support for xmc... $ECHO_C" >&6 # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given. @@ -16404,7 +16422,7 @@ if test "${enable_xmc_glitch+set}" = set; then else enable_xmc_glitch=$with_develop fi; -echo "$as_me:16407: result: $enable_xmc_glitch" >&5 +echo "$as_me:16425: result: $enable_xmc_glitch" >&5 echo "${ECHO_T}$enable_xmc_glitch" >&6 test "x$enable_xmc_glitch" = xyes && cat >>confdefs.h <<\EOF @@ -16414,7 +16432,7 @@ EOF ############################################################################### # These are just experimental, probably should not be in a package: -echo "$as_me:16417: checking if you do not want to assume colors are white-on-black" >&5 +echo "$as_me:16435: checking if you do not want to assume colors are white-on-black" >&5 echo $ECHO_N "checking if you do not want to assume colors are white-on-black... $ECHO_C" >&6 # Check whether --enable-assumed-color or --disable-assumed-color was given. @@ -16424,7 +16442,7 @@ if test "${enable_assumed_color+set}" = set; then else with_assumed_color=yes fi; -echo "$as_me:16427: result: $with_assumed_color" >&5 +echo "$as_me:16445: result: $with_assumed_color" >&5 echo "${ECHO_T}$with_assumed_color" >&6 test "x$with_assumed_color" = xyes && cat >>confdefs.h <<\EOF @@ -16432,7 +16450,7 @@ cat >>confdefs.h <<\EOF EOF ### use option --enable-hashmap to turn on use of hashmap scrolling logic -echo "$as_me:16435: checking if you want hashmap scrolling-optimization code" >&5 +echo "$as_me:16453: checking if you want hashmap scrolling-optimization code" >&5 echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6 # Check whether --enable-hashmap or --disable-hashmap was given. @@ -16442,31 +16460,13 @@ if test "${enable_hashmap+set}" = set; then else with_hashmap=yes fi; -echo "$as_me:16445: result: $with_hashmap" >&5 +echo "$as_me:16463: result: $with_hashmap" >&5 echo "${ECHO_T}$with_hashmap" >&6 test "x$with_hashmap" = xyes && cat >>confdefs.h <<\EOF #define USE_HASHMAP 1 EOF -### use option --enable-colorfgbg to turn on use of $COLORFGBG environment -echo "$as_me:16453: checking if you want code to check screensize" >&5 -echo $ECHO_N "checking if you want code to check screensize... $ECHO_C" >&6 - -# Check whether --enable-check-size or --disable-check-size was given. -if test "${enable_check_size+set}" = set; then - enableval="$enable_check_size" - with_check_size=$enableval -else - with_check_size=no -fi; -echo "$as_me:16463: result: $with_check_size" >&5 -echo "${ECHO_T}$with_check_size" >&6 -test "x$with_check_size" = xyes && -cat >>confdefs.h <<\EOF -#define USE_CHECK_SIZE 1 -EOF - ### use option --enable-colorfgbg to turn on use of $COLORFGBG environment echo "$as_me:16471: checking if you want colorfgbg code" >&5 echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6 diff --git a/configure.in b/configure.in index 1d70ea0f..28031305 100644 --- a/configure.in +++ b/configure.in @@ -29,7 +29,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1995-on dnl -dnl $Id: configure.in,v 1.775 2024/03/02 20:22:33 tom Exp $ +dnl $Id: configure.in,v 1.776 2024/03/17 00:08:03 tom Exp $ dnl Process this file with autoconf to produce a configure script. dnl dnl For additional information, see @@ -38,7 +38,7 @@ dnl https://invisible-island.net/autoconf/my-autoconf.html dnl dnl --------------------------------------------------------------------------- AC_PREREQ(2.52.20210101) -AC_REVISION($Revision: 1.775 $) +AC_REVISION($Revision: 1.776 $) AC_INIT(ncurses/base/lib_initscr.c) AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) @@ -1470,6 +1470,14 @@ AC_ARG_WITH(develop, [with_develop=no]) AC_MSG_RESULT($with_develop) +### use option --enable-check-size to detect screensize with CPR +AC_MSG_CHECKING(if you want to check screensize of serial terminals) +AC_ARG_ENABLE(check-size, + [ --enable-check-size compile-in code to detect screensize of serial terminals],, + [enable_check_size=$with_develop]) +AC_MSG_RESULT($enable_check_size) +test "x$enable_check_size" = xyes && AC_DEFINE(USE_CHECK_SIZE,1,[Define to 1 to compile-in code to detect screensize]) + ### use option --enable-hard-tabs to turn on use of hard-tabs optimize AC_MSG_CHECKING(if you want hard-tabs code) AC_ARG_ENABLE(hard-tabs, @@ -1507,15 +1515,6 @@ AC_ARG_ENABLE(hashmap, AC_MSG_RESULT($with_hashmap) test "x$with_hashmap" = xyes && AC_DEFINE(USE_HASHMAP,1,[Define to 1 to compile with hashmap scrolling-optimization]) -### use option --enable-colorfgbg to turn on use of $COLORFGBG environment -AC_MSG_CHECKING(if you want code to check screensize) -AC_ARG_ENABLE(check-size, - [ --enable-check-size compile-in code to detect screensize], - [with_check_size=$enableval], - [with_check_size=no]) -AC_MSG_RESULT($with_check_size) -test "x$with_check_size" = xyes && AC_DEFINE(USE_CHECK_SIZE,1,[Define to 1 to compile-in code to detect screensize]) - ### use option --enable-colorfgbg to turn on use of $COLORFGBG environment AC_MSG_CHECKING(if you want colorfgbg code) AC_ARG_ENABLE(colorfgbg, diff --git a/dist.mk b/dist.mk index 510fc519..9f1a1f43 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.1601 2024/03/09 13:05:08 tom Exp $ +# $Id: dist.mk,v 1.1603 2024/03/23 10:33: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 = 4 -NCURSES_PATCH = 20240309 +NCURSES_PATCH = 20240323 # 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/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html index 7b12b0ee..fcf71ff7 100644 --- a/doc/html/man/captoinfo.1m.html +++ b/doc/html/man/captoinfo.1m.html @@ -28,19 +28,19 @@ * sale, use or other dealings in this Software without prior written * * authorization. * **************************************************************************** - * @Id: captoinfo.1m,v 1.59 2024/03/02 16:34:25 tom Exp @ + * @Id: captoinfo.1m,v 1.63 2024/03/23 20:37:25 tom Exp @ --> -captoinfo 1m 2024-03-02 ncurses 6.4 User commands +captoinfo 1m 2024-03-23 ncurses 6.4 User commands -

captoinfo 1m 2024-03-02 ncurses 6.4 User commands

+

captoinfo 1m 2024-03-23 ncurses 6.4 User commands

 captoinfo(1m)                    User commands                   captoinfo(1m)
 
@@ -67,7 +67,7 @@
        environment  variable  TERMCAP  as  a  file name, and extracts only the
        entry for the terminal named in the environment variable TERM from  it.
        If  the  environment  variable  TERMCAP  is  not  set,  captoinfo reads
-       /etc/termcap.
+       /etc/termcap.
 
        This utility is implemented as a link to tic(1m), with the latter's  -I
        option  implied.  You can use other tic options such as -1, -f, -v, -w,
@@ -178,7 +178,7 @@
        program.
 
        SVr4 systems provide captoinfo as a separate application from tic.  Its
-       -v option does not accept a trace level argument n; repeat -v  n  times
+       -v option does not accept a trace level argument n; repeat -v  n  times
        instead.
 
        NetBSD does not provide this application.
@@ -194,7 +194,7 @@
 
 
 
-ncurses 6.4                       2024-03-02                     captoinfo(1m)
+ncurses 6.4                       2024-03-23                     captoinfo(1m)