mirror of
https://github.com/ThomasDickey/ncurses-snapshots.git
synced 2026-01-26 11:04:35 +00:00
snapshot of project "ncurses", label v6_4_20230121
This commit is contained in:
Thomas E. Dickey
parent
7144200303
commit
12505477c0
8
NEWS
8
NEWS
@ -26,7 +26,7 @@
|
||||
-- sale, use or other dealings in this Software without prior written --
|
||||
-- authorization. --
|
||||
-------------------------------------------------------------------------------
|
||||
-- $Id: NEWS,v 1.3902 2023/01/15 00:27:12 tom Exp $
|
||||
-- $Id: NEWS,v 1.3904 2023/01/21 21:31:13 tom Exp $
|
||||
-------------------------------------------------------------------------------
|
||||
|
||||
This is a log of changes that ncurses has gone through since Zeyd started
|
||||
@ -46,6 +46,12 @@ 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.
|
||||
|
||||
20230121
|
||||
+ correct limit-check when dumping tc/use clause via tic -I (report by
|
||||
Gabriel Ravier).
|
||||
+ correct a check for manpage-alias in edit_man.sh, to work with out of
|
||||
tree builds (report by Sven Joachim).
|
||||
|
||||
20230114
|
||||
+ change RV to XR/xr, to avoid conflict with pre-existing usage in vim,
|
||||
to use RV/rv to denote DA2 and its response (discussion with Bram
|
||||
|
||||
118
aclocal.m4
vendored
118
aclocal.m4
vendored
@ -29,7 +29,7 @@ dnl***************************************************************************
|
||||
dnl
|
||||
dnl Author: Thomas E. Dickey 1995-on
|
||||
dnl
|
||||
dnl $Id: aclocal.m4,v 1.1026 2023/01/14 14:00:15 tom Exp $
|
||||
dnl $Id: aclocal.m4,v 1.1028 2023/01/21 21:51:33 tom Exp $
|
||||
dnl Macros used in NCURSES auto-configuration script.
|
||||
dnl
|
||||
dnl These macros are maintained separately from NCURSES. The copyright on
|
||||
@ -5586,7 +5586,7 @@ AC_SUBST(MAKE_UPPER_TAGS)
|
||||
AC_SUBST(MAKE_LOWER_TAGS)
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_MANPAGE_FORMAT version: 16 updated: 2022/11/05 16:12:11
|
||||
dnl CF_MANPAGE_FORMAT version: 17 updated: 2023/01/21 16:49:25
|
||||
dnl -----------------
|
||||
dnl Option to allow user to override automatic configuration of manpage format.
|
||||
dnl There are several special cases:
|
||||
@ -5699,6 +5699,42 @@ AC_MSG_RESULT($MANPAGE_FORMAT)
|
||||
if test -n "$cf_unknown" ; then
|
||||
AC_MSG_WARN(Unexpected manpage-format $cf_unknown)
|
||||
fi
|
||||
|
||||
cf_manpage_format=no
|
||||
cf_manpage_inboth=no
|
||||
cf_manpage_so_strip=
|
||||
cf_manpage_compress=
|
||||
|
||||
for cf_item in $MANPAGE_FORMAT
|
||||
do
|
||||
case "$cf_item" in
|
||||
(catonly)
|
||||
cf_manpage_format=yes
|
||||
cf_manpage_inboth=no
|
||||
;;
|
||||
(formatted)
|
||||
cf_manpage_format=yes
|
||||
cf_manpage_inboth=yes
|
||||
;;
|
||||
(compress)
|
||||
cf_manpage_so_strip="Z"
|
||||
cf_manpage_compress=compress
|
||||
;;
|
||||
(gzip)
|
||||
cf_manpage_so_strip="gz"
|
||||
cf_manpage_compress=gzip
|
||||
;;
|
||||
(bzip2)
|
||||
cf_manpage_so_strip="bz2"
|
||||
cf_manpage_compress=bzip2
|
||||
;;
|
||||
(xz)
|
||||
cf_manpage_so_strip="xz"
|
||||
cf_manpage_compress=xz
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_MANPAGE_RENAMES version: 17 updated: 2022/10/23 07:46:29
|
||||
@ -5740,7 +5776,7 @@ AC_MSG_RESULT($MANPAGE_RENAMES)
|
||||
AC_SUBST(MANPAGE_RENAMES)
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_MANPAGE_SYMLINKS version: 6 updated: 2015/04/17 21:13:04
|
||||
dnl CF_MANPAGE_SYMLINKS version: 7 updated: 2023/01/21 16:37:17
|
||||
dnl -------------------
|
||||
dnl Some people expect each tool to make all aliases for manpages in the
|
||||
dnl man-directory. This accommodates the older, less-capable implementations
|
||||
@ -5774,7 +5810,7 @@ AC_ARG_WITH(manpage-symlinks,
|
||||
[MANPAGE_SYMLINKS=$withval],
|
||||
[MANPAGE_SYMLINKS=$cf_use_symlinks])
|
||||
|
||||
if test "$$cf_use_symlinks" = no; then
|
||||
if test "$cf_use_symlinks" = no; then
|
||||
if test "$MANPAGE_SYMLINKS" = yes ; then
|
||||
AC_MSG_WARN(cannot make symlinks, will use .so files)
|
||||
MANPAGE_SYMLINKS=no
|
||||
@ -5802,7 +5838,7 @@ AC_ARG_WITH(manpage-tbl,
|
||||
AC_MSG_RESULT($MANPAGE_TBL)
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_MAN_PAGES version: 54 updated: 2022/11/05 16:12:11
|
||||
dnl CF_MAN_PAGES version: 56 updated: 2023/01/21 16:49:25
|
||||
dnl ------------
|
||||
dnl Try to determine if the man-pages on the system are compressed, and if
|
||||
dnl so, what format is used. Use this information to construct a script that
|
||||
@ -5821,47 +5857,8 @@ else
|
||||
cf_prefix="$prefix"
|
||||
fi
|
||||
|
||||
case "$MANPAGE_FORMAT" in
|
||||
(*catonly*)
|
||||
cf_format=yes
|
||||
cf_inboth=no
|
||||
;;
|
||||
(*formatted*)
|
||||
cf_format=yes
|
||||
cf_inboth=yes
|
||||
;;
|
||||
(*)
|
||||
cf_format=no
|
||||
cf_inboth=no
|
||||
;;
|
||||
esac
|
||||
|
||||
test ! -d man && mkdir man
|
||||
|
||||
cf_so_strip=
|
||||
cf_compress=
|
||||
for cf_manpage_format in $MANPAGE_FORMAT
|
||||
do
|
||||
case "$cf_manpage_format" in
|
||||
(compress)
|
||||
cf_so_strip="Z"
|
||||
cf_compress=compress
|
||||
;;
|
||||
(gzip)
|
||||
cf_so_strip="gz"
|
||||
cf_compress=gzip
|
||||
;;
|
||||
(bzip2)
|
||||
cf_so_strip="bz2"
|
||||
cf_compress=bzip2
|
||||
;;
|
||||
(xz)
|
||||
cf_so_strip="xz"
|
||||
cf_compress=xz
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
cf_edit_man=./edit_man.sh
|
||||
cf_man_alias=`pwd`/man_alias.sed
|
||||
|
||||
@ -5903,8 +5900,8 @@ top_srcdir=\[$]srcdir/..
|
||||
shift || exit 1
|
||||
|
||||
if test "\$form" = normal ; then
|
||||
if test "$cf_format" = yes ; then
|
||||
if test "$cf_inboth" = no ; then
|
||||
if test "$cf_manpage_format" = yes ; then
|
||||
if test "$cf_manpage_inboth" = no ; then
|
||||
$SHELL "\[$]0" format "\$verb" "\$mandir" "\$srcdir" "\[$]@"
|
||||
exit $?
|
||||
fi
|
||||
@ -5956,9 +5953,9 @@ CF_EOF2
|
||||
|
||||
aliases=
|
||||
cf_source=\`basename "\$i"\`
|
||||
inalias=\$cf_source
|
||||
test ! -f "\$inalias" && inalias="\$srcdir/\$inalias"
|
||||
if test ! -f "\$inalias" ; then
|
||||
cf_full_alias=\$cf_source
|
||||
test ! -f "\$cf_full_alias" && cf_full_alias="\$srcdir/\$cf_full_alias"
|
||||
if test ! -f "\$cf_full_alias" ; then
|
||||
echo ".. skipped \$cf_source"
|
||||
continue
|
||||
fi
|
||||
@ -5967,8 +5964,9 @@ CF_EOF
|
||||
if test "$MANPAGE_ALIASES" != no ; then
|
||||
cat >>$cf_edit_man <<CF_EOF
|
||||
nCurses=ignore.3x
|
||||
cf_part_alias=\`echo \$cf_full_alias| sed -e 's,^.*/,,'\`
|
||||
test "$with_curses_h" = yes && nCurses=ncurses.3x
|
||||
aliases=\`sed -f "\$top_srcdir/man/manlinks.sed" "\$inalias" |sed -f "$cf_man_alias" | sort -u; test "\$inalias" = "\$nCurses" && echo curses\`
|
||||
aliases=\`sed -f "\$top_srcdir/man/manlinks.sed" "\$cf_full_alias" |sed -f "$cf_man_alias" | sort -u; test "\$cf_part_alias" = "\$nCurses" && echo curses\`
|
||||
CF_EOF
|
||||
fi
|
||||
|
||||
@ -6035,15 +6033,15 @@ cat >>$cf_edit_man <<CF_EOF
|
||||
fi
|
||||
CF_EOF
|
||||
|
||||
if test -n "$cf_compress" ; then
|
||||
if test -n "$cf_manpage_compress" ; then
|
||||
cat >>$cf_edit_man <<CF_EOF
|
||||
if test "\$verb" = installing ; then
|
||||
if ( "$cf_compress" -f \$TMP )
|
||||
if ( "$cf_manpage_compress" -f \$TMP )
|
||||
then
|
||||
mv \$TMP.$cf_so_strip \$TMP
|
||||
mv \$TMP.$cf_manpage_so_strip \$TMP
|
||||
fi
|
||||
fi
|
||||
cf_target="\$cf_target.$cf_so_strip"
|
||||
cf_target="\$cf_target.$cf_manpage_so_strip"
|
||||
CF_EOF
|
||||
fi
|
||||
|
||||
@ -6067,7 +6065,7 @@ cat >>$cf_edit_man <<CF_EOF
|
||||
test -n "\$aliases" && (
|
||||
cd "\$cf_subdir\${section}" && (
|
||||
cf_source=\`echo "\$cf_target" |sed -e 's%^.*/\\([[^/]][[^/]]*/[[^/]][[^/]]*$\\)%\\1%'\`
|
||||
test -n "$cf_so_strip" && cf_source=\`echo "\$cf_source" |sed -e 's%\\.$cf_so_strip\$%%'\`
|
||||
test -n "$cf_manpage_so_strip" && cf_source=\`echo "\$cf_source" |sed -e 's%\\.$cf_manpage_so_strip\$%%'\`
|
||||
cf_target=\`basename "\$cf_target"\`
|
||||
for cf_alias in \$aliases
|
||||
do
|
||||
@ -6101,11 +6099,11 @@ cat >>$cf_edit_man <<CF_EOF
|
||||
elif test "\$cf_target" != "\$cf_alias\${suffix}" ; then
|
||||
echo ".so \$cf_source" >\$TMP
|
||||
CF_EOF
|
||||
if test -n "$cf_compress" ; then
|
||||
if test -n "$cf_manpage_compress" ; then
|
||||
cat >>$cf_edit_man <<CF_EOF
|
||||
if test -n "$cf_so_strip" ; then
|
||||
"$cf_compress" -f \$TMP
|
||||
mv \$TMP.$cf_so_strip \$TMP
|
||||
if test -n "$cf_manpage_so_strip" ; then
|
||||
"$cf_manpage_compress" -f \$TMP
|
||||
mv \$TMP.$cf_manpage_so_strip \$TMP
|
||||
fi
|
||||
CF_EOF
|
||||
fi
|
||||
@ -6144,7 +6142,7 @@ cat >>$cf_edit_man <<CF_EOF
|
||||
esac
|
||||
done
|
||||
|
||||
if test "$cf_inboth" = yes ; then
|
||||
if test "$cf_manpage_inboth" = yes ; then
|
||||
if test "\$form" != format ; then
|
||||
$SHELL "\[$]0" format "\$verb" "\$mandir" "\$srcdir" "\[$]@"
|
||||
fi
|
||||
|
||||
4
dist.mk
4
dist.mk
@ -26,7 +26,7 @@
|
||||
# use or other dealings in this Software without prior written #
|
||||
# authorization. #
|
||||
##############################################################################
|
||||
# $Id: dist.mk,v 1.1522 2023/01/14 12:04:16 tom Exp $
|
||||
# $Id: dist.mk,v 1.1523 2023/01/21 13:51:01 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 = 20230114
|
||||
NCURSES_PATCH = 20230121
|
||||
|
||||
# We don't append the patch to the version, since this only applies to releases
|
||||
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
ncurses6 (6.4+20230114) unstable; urgency=low
|
||||
ncurses6 (6.4+20230121) unstable; urgency=low
|
||||
|
||||
* latest weekly patch
|
||||
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 14 Jan 2023 07:04:16 -0500
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Fri, 20 Jan 2023 17:19:57 -0500
|
||||
|
||||
ncurses6 (5.9+20131005) unstable; urgency=low
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
ncurses6 (6.4+20230114) unstable; urgency=low
|
||||
ncurses6 (6.4+20230121) unstable; urgency=low
|
||||
|
||||
* latest weekly patch
|
||||
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 14 Jan 2023 07:04:16 -0500
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Fri, 20 Jan 2023 17:19:57 -0500
|
||||
|
||||
ncurses6 (5.9+20131005) unstable; urgency=low
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
ncurses6 (6.4+20230114) unstable; urgency=low
|
||||
ncurses6 (6.4+20230121) unstable; urgency=low
|
||||
|
||||
* latest weekly patch
|
||||
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 14 Jan 2023 07:04:16 -0500
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Fri, 20 Jan 2023 17:19:57 -0500
|
||||
|
||||
ncurses6 (5.9+20120608) unstable; urgency=low
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; $Id: mingw-ncurses.nsi,v 1.561 2023/01/14 12:04:16 tom Exp $
|
||||
; $Id: mingw-ncurses.nsi,v 1.562 2023/01/21 13:51:01 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 "0114"
|
||||
!define VERSION_MMDD "0121"
|
||||
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
|
||||
|
||||
!define MY_ABI "5"
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
Summary: shared libraries for terminal handling
|
||||
Name: mingw32-ncurses6
|
||||
Version: 6.4
|
||||
Release: 20230114
|
||||
Release: 20230121
|
||||
License: X11
|
||||
Group: Development/Libraries
|
||||
Source: ncurses-%{version}-%{release}.tgz
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
Summary: shared libraries for terminal handling
|
||||
Name: ncurses6
|
||||
Version: 6.4
|
||||
Release: 20230114
|
||||
Release: 20230121
|
||||
License: X11
|
||||
Group: Development/Libraries
|
||||
Source: ncurses-%{version}-%{release}.tgz
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
Summary: Curses library with POSIX thread support.
|
||||
Name: ncursest6
|
||||
Version: 6.4
|
||||
Release: 20230114
|
||||
Release: 20230121
|
||||
License: X11
|
||||
Group: Development/Libraries
|
||||
Source: ncurses-%{version}-%{release}.tgz
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/****************************************************************************
|
||||
* Copyright 2018-2021,2022 Thomas E. Dickey *
|
||||
* Copyright 2018-2022,2023 Thomas E. Dickey *
|
||||
* Copyright 1998-2016,2017 Free Software Foundation, Inc. *
|
||||
* *
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a *
|
||||
@ -40,7 +40,7 @@
|
||||
#include <termsort.h> /* this C file is generated */
|
||||
#include <parametrized.h> /* so is this */
|
||||
|
||||
MODULE_ID("$Id: dump_entry.c,v 1.190 2022/01/22 21:23:58 tom Exp $")
|
||||
MODULE_ID("$Id: dump_entry.c,v 1.195 2023/01/21 21:25:21 tom Exp $")
|
||||
|
||||
#define DISCARD(string) string = ABSENT_STRING
|
||||
#define PRINTF (void) printf
|
||||
@ -933,7 +933,7 @@ fmt_entry(TERMTYPE2 *tterm,
|
||||
|
||||
strcpy_DYN(&outbuf, 0);
|
||||
if (content_only) {
|
||||
column = indent; /* FIXME: workaround to prevent empty lines */
|
||||
column = indent; /* workaround to prevent empty lines */
|
||||
} else {
|
||||
strcpy_DYN(&outbuf, tterm->term_names);
|
||||
|
||||
@ -1553,6 +1553,7 @@ dump_entry(TERMTYPE2 *tterm,
|
||||
save_sgr = set_attributes;
|
||||
|
||||
if ((FMT_ENTRY() > critlen)
|
||||
&& TcOutput()
|
||||
&& limited) {
|
||||
|
||||
save_tterm = *tterm;
|
||||
@ -1651,15 +1652,25 @@ dump_entry(TERMTYPE2 *tterm,
|
||||
}
|
||||
|
||||
void
|
||||
dump_uses(const char *name, bool infodump)
|
||||
dump_uses(const char *value, bool infodump)
|
||||
/* dump "use=" clauses in the appropriate format */
|
||||
{
|
||||
char buffer[MAX_TERMINFO_LENGTH];
|
||||
char buffer[MAX_TERMINFO_LENGTH + EXTRA_CAP];
|
||||
int limit = (VALID_STRING(value) ? (int) strlen(value) : 0);
|
||||
const char *cap = infodump ? "use" : "tc";
|
||||
|
||||
if (TcOutput())
|
||||
trim_trailing();
|
||||
if (limit == 0) {
|
||||
_nc_warning("empty \"%s\" field", cap);
|
||||
value = "";
|
||||
} else if (limit > MAX_ALIAS) {
|
||||
_nc_warning("\"%s\" field too long (%d), limit to %d",
|
||||
cap, limit, MAX_ALIAS);
|
||||
limit = MAX_ALIAS;
|
||||
}
|
||||
_nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer))
|
||||
"%s%s", infodump ? "use=" : "tc=", name);
|
||||
"%s=%.*s", cap, limit, value);
|
||||
wrap_concat1(buffer);
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user