snapshot of project "ncurses", label v6_3_20220716

This commit is contained in:
Thomas E. Dickey 2022-07-16 21:16:43 +00:00
parent 4513e296eb
commit 7ec3644f5e
31 changed files with 684 additions and 649 deletions

View File

@ -1,7 +1,7 @@
#! /bin/sh
# $Id: adacurses-config.in,v 1.14 2020/02/02 23:34:34 tom Exp $
# $Id: adacurses-config.in,v 1.15 2022/07/16 21:16:43 tom Exp $
##############################################################################
# Copyright 2019,2020 Thomas E. Dickey #
# Copyright 2019-2020,2022 Thomas E. Dickey #
# Copyright 2007-2014,2016 Free Software Foundation, Inc. #
# #
# Permission is hereby granted, free of charge, to any person obtaining a #
@ -45,17 +45,17 @@ CFLAGS="-aI$ADA_INCLUDE -aO$ADA_OBJECTS"
LIBS="-L$ADA_OBJECTS -l@ADA_LIBNAME@"
THIS="@ADA_LIBNAME@"
THIS_CFG="$THIS@DFT_ARG_SUFFIX@-config"
THIS_CFG="${THIS}@DFT_ARG_SUFFIX@-config"
case "x$1" in
x--version)
echo @ADA_LIBNAME@ $VERSION
;;
x--cflags)
echo $CFLAGS
echo "$CFLAGS"
;;
x--libs)
echo $LIBS
echo "$LIBS"
;;
x)
# if no parameter is given, give what gnatmake needs
@ -77,7 +77,7 @@ If no options are given, echos the full set of flags needed by gnatmake.
ENDHELP
;;
*)
echo 'Usage: $THIS_CFG [--version | --cflags | --libs]' >&2
echo "Usage: ${THIS_CFG} [--version | --cflags | --libs]" >&2
exit 1
;;
esac

View File

@ -1,7 +1,7 @@
#! /bin/sh
# $Id: MKncurses_def.sh,v 1.4 2020/02/02 23:34:34 tom Exp $
# $Id: MKncurses_def.sh,v 1.5 2022/07/16 17:03:59 tom Exp $
##############################################################################
# Copyright 2020 Thomas E. Dickey #
# Copyright 2020,2022 Thomas E. Dickey #
# Copyright 2003 Free Software Foundation, Inc. #
# #
# Permission is hereby granted, free of charge, to any person obtaining a #
@ -56,7 +56,7 @@ cat <<EOF
EOF
${AWK-awk} <$DEFS '
"${AWK-awk}" <"$DEFS" '
!/^[@#]/ {
if ( NF == 1 )
{

View File

@ -1,6 +1,6 @@
#!/bin/sh
##############################################################################
# Copyright 2018-2019,2020 Thomas E. Dickey #
# Copyright 2018-2020,2022 Thomas E. Dickey #
# Copyright 2016,2018 Free Software Foundation, Inc. #
# #
# Permission is hereby granted, free of charge, to any person obtaining a #
@ -28,7 +28,7 @@
# authorization. #
##############################################################################
#
# $Id: library-cfg.sh,v 1.7 2020/02/02 23:34:34 tom Exp $
# $Id: library-cfg.sh,v 1.8 2022/07/16 17:03:59 tom Exp $
#
# Work around incompatible behavior introduced with gnat6, which causes
# gnatmake to attempt to compile all of the C objects which might be part of
@ -67,7 +67,7 @@ cat >$SCRIPT <<EOF
}
EOF
sed -f $SCRIPT $input
sed -f "$SCRIPT" "$input"
rc=$?
rm -f $SCRIPT
exit $?
rm -f "$SCRIPT"
exit $rc

7
NEWS
View File

@ -26,7 +26,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
-- $Id: NEWS,v 1.3828 2022/07/09 22:07:08 tom Exp $
-- $Id: NEWS,v 1.3831 2022/07/16 18:43:58 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.
20220716
+ build-fix for test_mouse.c, for non-standard cfmakeraw.
+ improve shell-scripts with shellcheck
+ fix typo in run_tic.in (report/patch by Jan Starke).
20220709
+ lock the prescreen data consistently in newterm, etc., for the
pthreads configuration (report by Tom de Vries).

View File

@ -1 +1 @@
5:0:10 6.3 20220709
5:0:10 6.3 20220716

View File

@ -1,7 +1,7 @@
#!/bin/sh
# $Id: edit_cfg.sh,v 1.18 2020/02/02 23:34:34 tom Exp $
# $Id: edit_cfg.sh,v 1.19 2022/07/16 18:00:59 tom Exp $
##############################################################################
# Copyright 2020 Thomas E. Dickey #
# Copyright 2020,2022 Thomas E. Dickey #
# Copyright 1998-2007,2008 Free Software Foundation, Inc. #
# #
# Permission is hereby granted, free of charge, to any person obtaining a #
@ -51,22 +51,22 @@ for name in \
HAVE_VALUES_H \
IOSTREAM_NAMESPACE
do
rm -f $2.bak
mv $2 $2.bak
if ( grep "[ ]$name[ ]1" $1 2>&1 >/dev/null)
rm -f "$2".bak
mv "$2" "$2".bak
if ( grep "[ ]${name}[ ]1" "$1" >/dev/null 2>&1)
then
value=1
sed -e 's/define '$name'.*$/define '$name' 1/' $2.bak >$2
sed -e 's/define '"$name"'.*$/define '"$name"' 1/' "$2".bak >"$2"
else
value=0
sed -e 's/define '$name'.*$/define '$name' 0/' $2.bak >$2
sed -e 's/define '"$name"'.*$/define '"$name"' 0/' "$2".bak >"$2"
fi
if (cmp -s $2 $2.bak)
if (cmp -s "$2" "$2".bak)
then
echo '... '$name $value
mv $2.bak $2
mv "$2".bak "$2"
else
echo '... '$name $value
rm -f $2.bak
rm -f "$2".bak
fi
done

View File

@ -26,7 +26,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
# $Id: dist.mk,v 1.1491 2022/07/09 12:55:00 tom Exp $
# $Id: dist.mk,v 1.1492 2022/07/16 10:45:29 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 = 3
NCURSES_PATCH = 20220709
NCURSES_PATCH = 20220716
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)

View File

@ -1,5 +1,5 @@
#! /bin/sh
# $Id: MKkey_defs.sh,v 1.22 2022/02/05 20:38:31 tom Exp $
# $Id: MKkey_defs.sh,v 1.23 2022/07/16 16:54:02 tom Exp $
##############################################################################
# Copyright 2019-2020,2022 Thomas E. Dickey #
# Copyright 2001-2013,2017 Free Software Foundation, Inc. #
@ -35,7 +35,7 @@
#
# Extract function-key definitions from the Caps file
#
: ${AWK-awk}
: "${AWK-awk}"
test $# = 0 && set Caps
@ -67,7 +67,7 @@ cat >>$data <<EOF
key_resize kr1 str R1 KEY_RESIZE + NCURSES_EXT_FUNCS Terminal resize event
EOF
THIS=./`basename $0`
THIS=./`basename "$0"`
cat <<EOF
/*

View File

@ -1,7 +1,7 @@
#! /bin/sh
# $Id: MKncurses_def.sh,v 1.4 2020/02/02 23:34:34 tom Exp $
# $Id: MKncurses_def.sh,v 1.5 2022/07/16 17:03:59 tom Exp $
##############################################################################
# Copyright 2020 Thomas E. Dickey #
# Copyright 2020,2022 Thomas E. Dickey #
# Copyright 2000,2003 Free Software Foundation, Inc. #
# #
# Permission is hereby granted, free of charge, to any person obtaining a #
@ -56,7 +56,7 @@ cat <<EOF
EOF
${AWK-awk} <$DEFS '
"${AWK-awk}" <"$DEFS" '
!/^[@#]/ {
if ( NF == 1 )
{

View File

@ -1,5 +1,5 @@
#!/bin/sh
# $Id: edit_cfg.sh,v 1.15 2022/02/05 20:38:40 tom Exp $
# $Id: edit_cfg.sh,v 1.16 2022/07/16 18:02:32 tom Exp $
##############################################################################
# Copyright 2020,2022 Thomas E. Dickey #
# Copyright 1998-2001,2017 Free Software Foundation, Inc. #
@ -47,8 +47,8 @@ for name in \
HAVE_TERMIO_H \
BROKEN_LINKER
do
mv $2 $BAK
if ( grep "[ ]$name[ ]" $1 2>&1 >$TMP )
mv "$2" "$BAK"
if ( grep "[ ]${name}[ ]" "$1" >$TMP 2>&1 )
then
value=1
else
@ -59,11 +59,11 @@ do
-e "s@#define ${name}.*\$@#define $name $value@" \
-e "s@#if $name\$@#if $value /* $name */@" \
-e "s@#if !$name\$@#if $value /* !$name */@" \
$BAK >$2
if (cmp -s $2 $BAK)
"$BAK" >"$2"
if (cmp -s "$2" "$BAK")
then
mv $BAK $2
mv "$BAK" "$2"
else
rm -f $BAK
rm -f "$BAK"
fi
done

View File

@ -1,10 +1,10 @@
#!/bin/sh
# $Id: MKterminfo.sh,v 1.18 2020/02/02 23:34:34 tom Exp $
# $Id: MKterminfo.sh,v 1.19 2022/07/16 17:55:20 tom Exp $
#
# MKterminfo.sh -- generate terminfo.5 from Caps tabular data
#
#***************************************************************************
# Copyright 2018-2019,2020 Thomas E. Dickey *
# Copyright 2018-2020,2022 Thomas E. Dickey *
# Copyright 1998-2003,2017 Free Software Foundation, Inc. *
# *
# Permission is hereby granted, free of charge, to any person obtaining a *
@ -50,7 +50,7 @@ if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi
if test "${LC_COLLATE+set}" = set; then LC_COLLATE=C; export LC_COLLATE; fi
#
head=$1
head="$1"
shift 1
caps=
while test $# -gt 1
@ -58,7 +58,7 @@ do
caps="$caps $1"
shift 1
done
tail=$1
tail="$1"
cat <<EOF
'\\" t
.\\" DO NOT EDIT THIS FILE BY HAND!
@ -67,12 +67,12 @@ cat <<EOF
.\\" Note: this must be run through tbl before nroff.
.\\" The magic cookie on the first line triggers this under some man programs.
EOF
cat $head
cat "$head"
temp=temp$$
sorted=sorted$$
unsorted=unsorted$$
trap "code=\$?; rm -f $sorted $temp $unsorted; exit \$code" EXIT HUP INT QUIT TERM
trap 'code=$?; rm -f $sorted $temp $unsorted; exit $code' EXIT HUP INT QUIT TERM
rm -f $sorted $temp $unsorted
cat $caps | sed -n "\
@ -118,4 +118,4 @@ sed -e 's/^\.\.$//' $sorted | tr "\005\006" "\012\134"
sed -e '/^center expand;/s, expand,,' \
-e '/^\.TS/,/^\\/s, lw[1-9][0-9]*\., l.,' \
$tail
"$tail"

View File

@ -1,6 +1,6 @@
# $Id: Makefile.in,v 1.52 2021/07/03 18:57:29 tom Exp $
# $Id: Makefile.in,v 1.53 2022/07/16 20:14:28 tom Exp $
##############################################################################
# Copyright 2019-2020,2021 Thomas E. Dickey #
# Copyright 2019-2021,2022 Thomas E. Dickey #
# Copyright 1998-2013,2015 Free Software Foundation, Inc. #
# #
# Permission is hereby granted, free of charge, to any person obtaining a #
@ -99,7 +99,7 @@ mostlyclean :
clean: mostlyclean
rm -f terminfo.5
../edit_man.sed : make_sed.sh @MANPAGE_RENAMES@
../edit_man.sed : make_sed.sh
$(SHELL) $(srcdir)/make_sed.sh @MANPAGE_RENAMES@ >../edit_man.sed
distclean realclean: clean

View File

@ -1,5 +1,5 @@
#!/bin/sh
# $Id: make_sed.sh,v 1.14 2022/02/05 20:38:54 tom Exp $
# $Id: make_sed.sh,v 1.15 2022/07/16 20:20:00 tom Exp $
##############################################################################
# Copyright 2020-2021,2022 Thomas E. Dickey #
# Copyright 1998-2005,2017 Free Software Foundation, Inc. #
@ -48,7 +48,7 @@ RESULT=result$$
rm -f $UPPER $SCRIPT $RESULT
trap "rm -f $COL.* $INPUT $UPPER $SCRIPT $RESULT; exit 1" 1 2 3 15
trap "rm -f $COL.* $INPUT $UPPER $SCRIPT $RESULT" 0
fgrep -v \# $1 | \
fgrep -v \# "$1" | \
sed -e 's/[ ][ ]*/ /g' >$INPUT
for F in 1 2 3 4
@ -65,27 +65,29 @@ paste $COL.* | \
sed -e 's/^/s\/\\</' \
-e 's/$/\//' >$UPPER
echo "# Do the TH lines" >>$RESULT
{
echo "# Do the TH lines"
sed -e 's/\//\/TH /' \
-e 's/ / /' \
-e 's/ / ""\/TH /' \
-e 's/ / /' \
-e 's/\/$/ ""\//' \
$UPPER >>$RESULT
$UPPER
echo "# Do the embedded references" >>$RESULT
echo "# Do the embedded references"
sed -e 's/</<fB/' \
-e 's/ /\\\\fP(/' \
-e 's/ /)\/fB/' \
-e 's/ /\\\\fP(/' \
-e 's/\/$/)\//' \
$UPPER >>$RESULT
$UPPER
echo "# Do the \fBxxx\fP references in the .NAME section" >>$RESULT
echo '# Do the \\fBxxx\\fP references in the .NAME section'
sed -e 's/\\</^\\\\fB/' \
-e 's/ [^ ]* /\\\\f[RP] -\/\\\\fB/' \
-e 's/ .*$/\\\\fP -\//' \
$UPPER >>$RESULT
$UPPER
} >>$RESULT
# Finally, send the result to standard output
cat $RESULT

View File

@ -1,5 +1,5 @@
.\"***************************************************************************
.\" Copyright 2018-2020,2021 Thomas E. Dickey *
.\" Copyright 2018-2021,2022 Thomas E. Dickey *
.\" Copyright 2017 Free Software Foundation, Inc. *
.\" *
.\" Permission is hereby granted, free of charge, to any person obtaining a *
@ -27,7 +27,7 @@
.\" authorization. *
.\"***************************************************************************
.\"
.\" $Id: user_caps.5,v 1.21 2022/07/03 20:01:04 tom Exp $
.\" $Id: user_caps.5,v 1.22 2022/07/03 20:01:04 tom Exp $
.TH user_caps 5
.ie \n(.g .ds `` \(lq
.el .ds `` ``

View File

@ -1,7 +1,7 @@
#!@SHELL@
# $Id: gen-pkgconfig.in,v 1.52 2021/08/07 21:36:33 tom Exp $
# $Id: gen-pkgconfig.in,v 1.53 2022/07/16 17:07:38 tom Exp $
##############################################################################
# Copyright 2018-2020,2021 Thomas E. Dickey #
# Copyright 2018-2021,2022 Thomas E. Dickey #
# Copyright 2009-2015,2018 Free Software Foundation, Inc. #
# #
# Permission is hereby granted, free of charge, to any person obtaining a #
@ -219,7 +219,7 @@ do
echo "** creating ${name}${suffix}.pc"
cat >${name}${suffix}.pc <<EOF
# pkg-config file generated by `basename $0`
# pkg-config file generated by `basename "$0"`
# vile:makemode
prefix=$show_prefix

View File

@ -1,7 +1,7 @@
#!@SHELL@
# $Id: ncurses-config.in,v 1.50 2021/08/07 21:36:14 tom Exp $
# $Id: ncurses-config.in,v 1.51 2022/07/16 17:07:38 tom Exp $
##############################################################################
# Copyright 2018-2020,2021 Thomas E. Dickey #
# Copyright 2018-2021,2022 Thomas E. Dickey #
# Copyright 2006-2015,2017 Free Software Foundation, Inc. #
# #
# Permission is hereby granted, free of charge, to any person obtaining a #
@ -170,7 +170,7 @@ do
lib_flags="$lib_flags $opt"
done
[ $# = 0 ] && exec @SHELL@ $0 --error
[ $# = 0 ] && exec @SHELL@ "$0" --error
while [ $# -gt 0 ]; do
case "$1" in
@ -201,7 +201,7 @@ ENDECHO
[ -n "$OPTS" ] && OPTS="$OPTS "
OPTS="${OPTS}${opt}"
done
printf "%s\n" "$OPTS"
printf '%s\n' "$OPTS"
;;
--libs-only-L)
OPTS=
@ -214,7 +214,7 @@ ENDECHO
;;
esac
done
printf "%s\n" "$OPTS"
printf '%s\n' "$OPTS"
;;
--libs-only-l)
OPTS=
@ -227,7 +227,7 @@ ENDECHO
;;
esac
done
printf "%s\n" "$OPTS"
printf '%s\n' "$OPTS"
;;
--libs-only-other)
OPTS=
@ -242,7 +242,7 @@ ENDECHO
;;
esac
done
printf "%s\n" "$OPTS"
printf '%s\n' "$OPTS"
;;
# identification
--version)
@ -268,7 +268,7 @@ ENDECHO
elif [ "${includedir}" != /usr/include ]; then
INCS="${includedir}"
fi
echo $INCS
echo "$INCS"
;;
--libdir)
echo "${libdir}"
@ -288,7 +288,7 @@ ENDECHO
# general info
--help)
cat <<ENDHELP
Usage: `basename $0` [options]
Usage: `basename "$0"` [options]
Options:
--prefix echos the package-prefix of ${THIS}
@ -318,7 +318,7 @@ Options:
ENDHELP
;;
--error|*)
@SHELL@ $0 --help 1>&2
@SHELL@ "$0" --help 1>&2
exit 1
;;
esac

View File

@ -1,7 +1,7 @@
#!@SHELL@
# $Id: run_tic.in,v 1.38 2020/02/15 15:30:53 tom Exp $
# $Id: run_tic.in,v 1.40 2022/07/16 19:37:03 tom Exp $
##############################################################################
# Copyright 2019,2020 Thomas E. Dickey #
# Copyright 2019-2020,2022 Thomas E. Dickey #
# Copyright 2000-2012,2017 Free Software Foundation, Inc. #
# #
# Permission is hereby granted, free of charge, to any person obtaining a #
@ -42,21 +42,20 @@ echo "** Building terminfo database, please wait..."
# The script is designed to be run from the misc/Makefile as
# make install.data
: ${suffix:=@EXEEXT@}
: ${DESTDIR:=@DESTDIR@}
: ${prefix:=@prefix@}
: ${exec_prefix:=@exec_prefix@}
: ${bindir:=@bindir@}
: ${top_srcdir:=@top_srcdir@}
: ${srcdir:=@srcdir@}
: ${datarootdir:=@datarootdir@}
: ${datadir:=@datadir@}
: ${TIC_PATH:=@TIC@}
: ${ticdir:=@TERMINFO@}
: ${source:=@TERMINFO_SRC@}
: ${LN_S:="@LN_S@"}
: ${cross_compiling:=no}
: ${ext_funcs:=@NCURSES_EXT_FUNCS@}
: "${suffix:=@EXEEXT@}"
: "${DESTDIR:=@DESTDIR@}"
: "${prefix:=@prefix@}"
: "${exec_prefix:=@exec_prefix@}"
: "${bindir:=@bindir@}"
: "${top_srcdir:=@top_srcdir@}"
: "${srcdir:=@srcdir@}"
: "${datarootdir:=@datarootdir@}"
: "${datadir:=@datadir@}"
: "${TIC_PATH:=@TIC@}"
: "${ticdir:=@TERMINFO@}"
: "${source:=@TERMINFO_SRC@}"
: "${cross_compiling:=no}"
: "${ext_funcs:=@NCURSES_EXT_FUNCS@}"
test -z "${DESTDIR}" && DESTDIR=
@ -118,7 +117,7 @@ TICDIR=`echo "$TERMINFO" | sed -e 's%/share/\([^/]*\)$%/lib/\1%'`
PARENT=`echo "$TERMINFO" | sed -e 's%/[^/]*$%%'`
if test -n "$PARENT"
then
test -d $PARENT || mkdir -p $PARENT
mkdir -p "$PARENT"
fi
# Remove the old terminfo stuff; we don't care if it existed before, and it
@ -127,7 +126,7 @@ fi
# the directory is actually a symbolic link.
if test -d "$TERMINFO"
then
( cd "$TERMINFO" && rm -fr ? 2>/dev/null )
( cd "$TERMINFO" && rm -fr ./? 2>/dev/null )
elif test -f "$TERMINFO.db"
then
( rm -f "$TERMINFO.db" 2>/dev/null )
@ -183,9 +182,9 @@ if test "$TICDIR" != "$TERMINFO" ; then
( rm -f "$TICDIR" 2>/dev/null )
if ( cd "$TICDIR" 2>/dev/null )
then
cd "$TICDIR"
cd "$TICDIR" || exit
TICDIR=`pwd`
if test "$TICDIR "!= "$TERMINFO "; then
if test "$TICDIR " != "$TERMINFO "; then
# Well, we tried. Some systems lie to us, so the
# installer will have to double-check.
echo "Verify if $TICDIR and $TERMINFO are the same."
@ -193,7 +192,7 @@ if test "$TICDIR" != "$TERMINFO" ; then
echo "Otherwise, remove $TICDIR and link it to $TERMINFO."
fi
else
cd ${DESTDIR}$prefix
cd ${DESTDIR}$prefix || exit
# Construct a symbolic link that only assumes $ticdir has the
# same $prefix as the other installed directories.
RELATIVE=`echo $ticdir|sed -e 's%^'$prefix'/%%'`

View File

@ -1,8 +1,8 @@
ncurses6 (6.3+20220709) unstable; urgency=low
ncurses6 (6.3+20220716) unstable; urgency=low
* latest weekly patch
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 09 Jul 2022 08:55:00 -0400
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 16 Jul 2022 06:45:29 -0400
ncurses6 (5.9-20131005) unstable; urgency=low

View File

@ -1,8 +1,8 @@
ncurses6 (6.3+20220709) unstable; urgency=low
ncurses6 (6.3+20220716) unstable; urgency=low
* latest weekly patch
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 09 Jul 2022 08:55:00 -0400
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 16 Jul 2022 06:45:29 -0400
ncurses6 (5.9-20131005) unstable; urgency=low

View File

@ -1,8 +1,8 @@
ncurses6 (6.3+20220709) unstable; urgency=low
ncurses6 (6.3+20220716) unstable; urgency=low
* latest weekly patch
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 09 Jul 2022 08:55:00 -0400
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 16 Jul 2022 06:45:29 -0400
ncurses6 (5.9-20120608) unstable; urgency=low

View File

@ -1,4 +1,4 @@
; $Id: mingw-ncurses.nsi,v 1.531 2022/07/09 12:55:00 tom Exp $
; $Id: mingw-ncurses.nsi,v 1.532 2022/07/16 10:45:29 tom Exp $
; TODO add examples
; TODO bump ABI to 6
@ -10,7 +10,7 @@
!define VERSION_MAJOR "6"
!define VERSION_MINOR "3"
!define VERSION_YYYY "2022"
!define VERSION_MMDD "0709"
!define VERSION_MMDD "0716"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"

View File

@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.3
Release: 20220709
Release: 20220716
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz

View File

@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.3
Release: 20220709
Release: 20220716
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz

View File

@ -1,7 +1,7 @@
Summary: Curses library with POSIX thread support.
Name: ncursest6
Version: 6.3
Release: 20220709
Release: 20220716
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz

View File

@ -27,7 +27,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
# $Id: capconvert,v 1.11 2022/02/05 20:39:49 tom Exp $
# $Id: capconvert,v 1.12 2022/07/16 21:00:27 tom Exp $
#
# capconvert -- automated conversion from termcap to terminfo
#
@ -47,7 +47,7 @@ then
echo "TERMINFO is already defined in your environment. This means"
echo "you already have a local terminfo tree, so you do not need any"
echo "conversion."
if test ! -d $TERMINFO ; then
if test ! -d "$TERMINFO" ; then
echo "Caution: TERMINFO does not point to a directory!"
fi
exit;
@ -62,7 +62,7 @@ for p in $TERMINFO \
/usr/local/lib/terminfo \
/usr/local/share/terminfo
do
if test -d $p ; then
if test -d "$p" ; then
terminfo=yes
break
fi
@ -111,13 +111,13 @@ TIC=
IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:"
for x in $PATH .
do
if test $OPT $x/tic
if test "$OPT" "$x"/tic
then
TIC=$x/tic
break
fi
done
IFS="$ac_save_ifs"
IFS="$save_ifs"
if test -n "$TIC"
then
@ -140,7 +140,7 @@ echo "";
#
# Make the user a terminfo directory
if test -d $HOME/.terminfo
if test -d "$HOME"/.terminfo
then
echo "It appears you already have a private terminfo directory"
echo "at $HOME/.terminfo; this seems odd, because TERMINFO"
@ -150,7 +150,7 @@ then
exit;
else
echo "I am creating your private terminfo directory at $HOME/.terminfo"
mkdir $HOME/.terminfo
mkdir "$HOME"/.terminfo
# Ensure that that's where tic's compilation results.
# This isn't strictly necessary with a 1.9.7 or later tic.
TERMINFO="$HOME/.terminfo"; export TERMINFO
@ -165,8 +165,8 @@ then
else
# Ooops...looks like we're running from somewhere other than the
# progs directory of an ncurses source tree.
master=`find $HOME -name "*terminfo.src" -print`
mcount=`echo $master | wc -l`
master=`find "$HOME" -name "*terminfo.src" -print`
mcount=`find "$HOME" -name "*terminfo.src" | wc -l`
case $mcount in
0)
echo "I can not find a terminfo source file anywhere under your home directory."
@ -184,12 +184,12 @@ else
;;
2)
echo "I see more than one possible terminfo source. Here they are:"
echo $master | sed "/^/s// /";
echo "$master" | sed "/^/s// /";
while :
do
echo "Please tell me which one to use:"
read master;
if test -f $master
if test -f "$master"
then
break
else
@ -206,13 +206,13 @@ echo "OK, now I will make your private terminfo tree. This may take a bit..."
#
# Kluge alert: we compile terminfo.src in two pieces because a lot of machines
# with < 16MB RAM choke on tic's core-hog habits.
trap "rm -f tsplit$$.*; exit 1" 1 2 3 15
trap "rm -f tsplit$$.*" 0
sed -n $master \
trap 'rm -f tsplit$$.*; exit 1' 1 2 3 15
trap 'rm -f tsplit$$.*' 0
sed -n "$master" \
-e '1,/SPLIT HERE/w 'tsplit$$.01 \
-e '/SPLIT HERE/,$w 'tsplit$$.02 \
2>/dev/null
for x in tsplit$$.*; do eval $TIC $x; done
for x in tsplit$$.*; do eval $TIC "$x"; done
rm tsplit$$.*
trap EXIT INT QUIT TERM HUP
#
@ -232,22 +232,22 @@ fi
# we don't actually know what TERM will be nor even if it always has
# the same value for this user) we do the following three steps...
if test -f $HOME/.termcap
if test -f "$HOME"/.termcap
then
echo 'I see you have a $HOME/.termcap file. I will compile that.'
eval $TIC $HOME/.termcap
echo "I see you have a \$HOME/.termcap file. I will compile that."
eval $TIC "$HOME"/.termcap
echo "Done."
echo "Note that editing $HOME/.termcap will no longer change the data curses sees."
elif test -f "$TERMCAP"
then
echo "Your TERMCAP names the file $TERMCAP. I will compile that."
eval $TIC $TERMCAP
eval $TIC "$TERMCAP"
echo "Done."
echo "Note that editing $TERMCAP will no longer change the data curses sees."
else
echo "Your TERMCAP value appears to be an entry in termcap format."
echo "I will compile it."
echo $TERMCAP >myterm$$
echo "$TERMCAP" >myterm$$
eval $TIC myterm$$
rm myterm$$
echo "Done."

981
test/configure vendored

File diff suppressed because it is too large Load Diff

View File

@ -29,7 +29,7 @@ dnl***************************************************************************
dnl
dnl Author: Thomas E. Dickey 1996-on
dnl
dnl $Id: configure.in,v 1.164 2022/04/09 21:31:37 tom Exp $
dnl $Id: configure.in,v 1.165 2022/07/16 18:44:46 tom Exp $
dnl This is a simple configuration-script for the ncurses test programs that
dnl allows the test-directory to be separately configured against a reference
dnl system (i.e., sysvr4 curses)
@ -255,6 +255,7 @@ unistd.h \
CF_GETOPT_HEADER
AC_CHECK_FUNCS( \
cfmakeraw \
getopt \
gettimeofday \
snprintf \

View File

@ -27,7 +27,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
# $Id: listused.sh,v 1.11 2022/04/09 23:03:25 tom Exp $
# $Id: listused.sh,v 1.12 2022/07/16 16:33:38 tom Exp $
# A very simple script to list all entrypoints that are used by either a test
# program, or within the libraries. This relies on the output format of 'nm',
# and assumes that the libraries are configured with TRACE defined, and using
@ -67,7 +67,7 @@ do
;;
*)
NAME=../objects/${name}.o
if test -f $NAME
if test -f "$NAME"
then
PROGS="$PROGS $NAME"
fi
@ -78,19 +78,19 @@ done
# For each library -
for lib in ../lib/*.a
do
LIB=`basename $lib .a`
LIB=`basename "$lib" .a`
case $LIB in
*_*|*+*)
continue
;;
esac
tmp=`echo $LIB|sed -e 's/w$//'`
tmp=`echo "$LIB"|sed -e 's/w$//'`
echo
echo "${tmp}:"
echo $tmp |sed -e 's/./-/g'
echo "$tmp" |sed -e 's/./-/g'
# Construct a list of public externals provided by the library.
WANT=`nm $NM_OPTS $lib |\
WANT=`nm $NM_OPTS "$lib" |\
sed -e 's/^[^ ]*//' \
-e 's/^ *//' \
-e '/^[ a-z] /d' \
@ -113,7 +113,7 @@ do
tags=$prog
;;
*)
TEST=`nm $NM_OPTS $prog |\
TEST=`nm $NM_OPTS "$prog" |\
sed -e 's/^[^ ]*//' \
-e 's/^ *//' \
-e '/^[ a-z] /d' \
@ -125,7 +125,7 @@ do
-e '/^[^_]/d'`
if test -n "$TEST"
then
have=`basename $prog .o`
have=`basename "$prog" .o`
if test -n "$HAVE"
then
if test "$last" = "$tags"
@ -153,7 +153,7 @@ do
continue
;;
esac
TEST=`nm $NM_OPTS $tmp |\
TEST=`nm $NM_OPTS "$tmp" |\
sed -e 's/^[^ ]*//' \
-e 's/^ *//' \
-e '/^[ a-z] /d' \
@ -166,20 +166,20 @@ do
-e '/^[^_]/d'`
if test -n "$TEST"
then
tmp=`basename $tmp .a |sed -e 's/w$//'`
HAVE=`echo $tmp | sed -e 's/lib/lib: /'`
tmp=`basename "$tmp" .a |sed -e 's/w$//'`
HAVE=`echo "$tmp" | sed -e 's/lib/lib: /'`
break
fi
done
fi
test -z "$HAVE" && HAVE="-"
lenn=`expr 39 - length $name`
lenn=`expr $lenn / 8`
lenn=`expr 39 - length "$name"`
lenn=`expr "$lenn" / 8`
tabs=
while test $lenn != 0
while test "$lenn" != 0
do
tabs="${tabs} "
lenn=`expr $lenn - 1`
lenn=`expr "$lenn" - 1`
done
echo "${name}${tabs}${HAVE}"
done

View File

@ -27,13 +27,13 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
# $Id: savescreen.sh,v 1.7 2022/02/05 17:58:06 tom Exp $
# $Id: savescreen.sh,v 1.8 2022/07/16 16:34:34 tom Exp $
#
# Use this script to exercise "savescreen".
# It starts by generating a series of temporary-filenames, which are passed
# to the test-program. Loop as long as the first file named exists.
: ${TMPDIR:=/tmp}
: "${TMPDIR:=/tmp}"
# "mktemp -d" would be preferable, but is not standard.
MY_DIR=$TMPDIR/savescreen$$
@ -59,7 +59,7 @@ if test -f $BEGINS
then
while test -f $BEGINS
do
${0%.sh} -r $PARAMS
"${0%.sh}" -r $PARAMS
test $? != 0 && break
done
else

View File

@ -30,7 +30,7 @@
/****************************************************************************
* Author: Thomas E. Dickey 1996-on *
****************************************************************************/
/* $Id: test.priv.h,v 1.201 2022/05/21 20:37:38 tom Exp $ */
/* $Id: test.priv.h,v 1.202 2022/07/16 18:49:01 tom Exp $ */
#ifndef __TEST_PRIV_H
#define __TEST_PRIV_H 1
@ -67,16 +67,8 @@
#define HAVE_ASSUME_DEFAULT_COLORS 0
#endif
#ifndef HAVE_BSD_STRING_H
#define HAVE_BSD_STRING_H 0
#endif
#ifndef HAVE_CURSES_VERSION
#define HAVE_CURSES_VERSION 0
#endif
#ifndef HAVE_CURSCR
#define HAVE_CURSCR 0
#ifndef HAVE_CFMAKERAW
#define HAVE_CFMAKERAW 0
#endif
#ifndef HAVE_CHGAT
@ -95,6 +87,18 @@
#define HAVE_COLOR_SET 0
#endif
#ifndef HAVE_BSD_STRING_H
#define HAVE_BSD_STRING_H 0
#endif
#ifndef HAVE_CURSES_VERSION
#define HAVE_CURSES_VERSION 0
#endif
#ifndef HAVE_CURSCR
#define HAVE_CURSCR 0
#endif
#ifndef HAVE_DELSCREEN
#define HAVE_DELSCREEN 0
#endif
@ -123,6 +127,10 @@
#define HAVE_GETMAXX 0
#endif
#ifndef HAVE_GETTIMEOFDAY
#define HAVE_GETTIMEOFDAY 0
#endif
#ifndef HAVE_GETOPT_H
#define HAVE_GETOPT_H 0
#endif
@ -726,10 +734,18 @@ extern int optind;
#define HAVE_SNPRINTF 0
#endif
#ifndef HAVE_STRDUP
#define HAVE_STRDUP 0
#endif
#ifndef USE_STRING_HACKS
#define USE_STRING_HACKS 0
#endif
#ifndef HAVE_STRSTR
#define HAVE_STRSTR 0
#endif
#ifndef NCURSES_CAST
#ifdef __cplusplus
extern "C" {

View File

@ -22,7 +22,7 @@
* THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************/
/*
* $Id: test_mouse.c,v 1.19 2022/05/15 16:41:20 tom Exp $
* $Id: test_mouse.c,v 1.20 2022/07/16 18:52:09 tom Exp $
*
* Author: Leonid S Usov
*
@ -43,7 +43,18 @@ raw_loop(void)
char *xtermcap;
tcgetattr(0, &old);
#if HAVE_CFMAKERAW
cfmakeraw(&tty);
#else
tty = old;
tty.c_iflag &= ~(IGNBRK | BRKINT | PARMRK | ISTRIP
| INLCR | IGNCR | ICRNL | IXON);
tty.c_oflag &= ~OPOST;
tty.c_lflag &= ~(ECHO | ECHONL | ICANON | ISIG | IEXTEN);
tty.c_cflag &= ~(CSIZE | PARENB);
tty.c_cflag |= CS8;
tcsetattr(0, TCSANOW, &tty);
#endif
setupterm(NULL, 0, 0);
xtermcap = tigetstr("XM");
@ -57,7 +68,7 @@ raw_loop(void)
tcsetattr(0, TCSANOW, &tty);
while (true) {
while (1) {
int c = getc(stdin);
const char *pretty;