mirror of
https://github.com/ThomasDickey/ncurses-snapshots.git
synced 2026-01-26 11:04:35 +00:00
snapshot of project "ncurses", label v6_2_20200229
This commit is contained in:
Thomas E. Dickey
parent
3d480d566e
commit
ea93d58674
44
Ada95/aclocal.m4
vendored
44
Ada95/aclocal.m4
vendored
@ -29,7 +29,7 @@ dnl***************************************************************************
|
||||
dnl
|
||||
dnl Author: Thomas E. Dickey
|
||||
dnl
|
||||
dnl $Id: aclocal.m4,v 1.153 2020/02/08 21:04:00 tom Exp $
|
||||
dnl $Id: aclocal.m4,v 1.154 2020/02/27 10:21:59 tom Exp $
|
||||
dnl Macros used in NCURSES Ada95 auto-configuration script.
|
||||
dnl
|
||||
dnl These macros are maintained separately from NCURSES. The copyright on
|
||||
@ -2576,7 +2576,7 @@ printf("old\n");
|
||||
,[$1=no])
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_NCURSES_CONFIG version: 21 updated: 2018/06/20 20:23:13
|
||||
dnl CF_NCURSES_CONFIG version: 23 updated: 2020/02/27 05:21:59
|
||||
dnl -----------------
|
||||
dnl Tie together the configure-script macros for ncurses, preferring these in
|
||||
dnl order:
|
||||
@ -2598,11 +2598,47 @@ if test "x${PKG_CONFIG:=none}" != xnone; then
|
||||
AC_MSG_CHECKING(if the $cf_ncuconfig_root package files work)
|
||||
cf_have_ncuconfig=unknown
|
||||
|
||||
cf_save_CFLAGS="$CFLAGS"
|
||||
cf_save_CPPFLAGS="$CPPFLAGS"
|
||||
cf_save_LIBS="$LIBS"
|
||||
|
||||
CF_ADD_CFLAGS(`$PKG_CONFIG --cflags $cf_ncuconfig_root`)
|
||||
CF_ADD_LIBS(`$PKG_CONFIG --libs $cf_ncuconfig_root`)
|
||||
cf_pkg_cflags=`$PKG_CONFIG --cflags $cf_ncuconfig_root`
|
||||
cf_pkg_libs=`$PKG_CONFIG --libs $cf_ncuconfig_root`
|
||||
|
||||
# while -W for passing linker flags is prevalent, it is not "standard".
|
||||
# At least one wrapper for c89/c99 (in Apple's xcode) has its own
|
||||
# incompatible _and_ non-standard -W option which gives an error. Work
|
||||
# around that pitfall.
|
||||
case "x${CC}@@${cf_pkg_libs}@${cf_pkg_cflags}" in
|
||||
(x*c[[89]]9@@*-W*)
|
||||
CF_ADD_CFLAGS($cf_pkg_cflags)
|
||||
CF_ADD_LIBS($cf_pkg_libs)
|
||||
|
||||
AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
|
||||
[initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);],
|
||||
[AC_TRY_RUN([#include <${cf_cv_ncurses_header:-curses.h}>
|
||||
int main(void)
|
||||
{ char *xx = curses_version(); return (xx == 0); }],
|
||||
[cf_test_ncuconfig=yes],
|
||||
[cf_test_ncuconfig=no],
|
||||
[cf_test_ncuconfig=maybe])],
|
||||
[cf_test_ncuconfig=no])
|
||||
|
||||
CFLAGS="$cf_save_CFLAGS"
|
||||
CPPFLAGS="$cf_save_CPPFLAGS"
|
||||
LIBS="$cf_save_LIBS"
|
||||
|
||||
if test "x$cf_test_ncuconfig" != xyes; then
|
||||
cf_temp=`echo "x$cf_pkg_cflags" | sed -e s/^x// -e 's/-W[[^ ]]*//g'`
|
||||
cf_pkg_cflags="$cf_temp"
|
||||
cf_temp=`echo "x$cf_pkg_libs" | sed -e s/^x// -e 's/-W[[^ ]]*//g'`
|
||||
cf_pkg_libs="$cf_temp"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
CF_ADD_CFLAGS($cf_pkg_cflags)
|
||||
CF_ADD_LIBS($cf_pkg_libs)
|
||||
|
||||
AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
|
||||
[initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);],
|
||||
|
||||
2631
Ada95/configure
vendored
2631
Ada95/configure
vendored
File diff suppressed because it is too large
Load Diff
20
NEWS
20
NEWS
@ -26,7 +26,7 @@
|
||||
-- sale, use or other dealings in this Software without prior written --
|
||||
-- authorization. --
|
||||
-------------------------------------------------------------------------------
|
||||
-- $Id: NEWS,v 1.3453 2020/02/23 01:08:47 tom Exp $
|
||||
-- $Id: NEWS,v 1.3455 2020/02/29 23:15:52 tom Exp $
|
||||
-------------------------------------------------------------------------------
|
||||
|
||||
This is a log of changes that ncurses has gone through since Zeyd started
|
||||
@ -46,6 +46,24 @@ 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.
|
||||
|
||||
20200229
|
||||
+ modify CF_NCURSES_CONFIG to work around xcode's c99 "-W" option,
|
||||
which conflicts with conventional use for passing linker options.
|
||||
> fixes for building with Visual Studio C++ and msys2 (patches by
|
||||
"Maarten Anonymous"):
|
||||
+ check for pcre2posix.h instead of pcre2-posix.h
|
||||
+ add case in CF_SHARED_OPTS for msys2 + msvc
|
||||
+ add fallback definition for STDIN_FILENO in progs.priv.h
|
||||
+ modify win_driver.c to use _alloca() rather than gcc's variable
|
||||
length array feature.
|
||||
+ add NCURSES_IMPEXP to ncurses wrapped-variable declarations
|
||||
+ remove NCURSES_IMPEXP from class variables in c++/cursslk.h
|
||||
+ remove fallback prototype for exit() from c++/etip.h.in
|
||||
+ use configured check for <sys/time.h> in a couple of places
|
||||
+ conditionally include winsock.h in ncurses/win32con/gettimeofday.c,
|
||||
because Visual Studio needs this for the timestruct declaration.
|
||||
+ adjust syntax in a couple of files using the NCURSES_API symbol.
|
||||
|
||||
20200222
|
||||
+ expanded note in ncurses.3x regarding automatically-included headers
|
||||
+ improve vt50h and vt52 based on DECScope manual -TD
|
||||
|
||||
39
aclocal.m4
vendored
39
aclocal.m4
vendored
@ -29,7 +29,7 @@ dnl***************************************************************************
|
||||
dnl
|
||||
dnl Author: Thomas E. Dickey 1995-on
|
||||
dnl
|
||||
dnl $Id: aclocal.m4,v 1.896 2020/02/08 21:01:07 tom Exp $
|
||||
dnl $Id: aclocal.m4,v 1.897 2020/02/29 21:30:04 anonymous.maarten Exp $
|
||||
dnl Macros used in NCURSES auto-configuration script.
|
||||
dnl
|
||||
dnl These macros are maintained separately from NCURSES. The copyright on
|
||||
@ -6533,7 +6533,7 @@ do
|
||||
done
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_SHARED_OPTS version: 93 updated: 2018/08/18 16:36:35
|
||||
dnl CF_SHARED_OPTS version: 94 updated: 2020/02/29 16:09:19
|
||||
dnl --------------
|
||||
dnl --------------
|
||||
dnl Attempt to determine the appropriate CC/LD options for creating a shared
|
||||
@ -6759,6 +6759,37 @@ CF_EOF
|
||||
CF_SHARED_SONAME
|
||||
MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]'
|
||||
;;
|
||||
(mingw*msvc*)
|
||||
cf_cv_shlib_version=mingw
|
||||
cf_cv_shlib_version_infix=mingw
|
||||
shlibdir=$bindir
|
||||
MAKE_DLLS=
|
||||
if test "$DFT_LWR_MODEL" = "shared" ; then
|
||||
LOCAL_LDFLAGS="-link -dll"
|
||||
LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
|
||||
EXTRA_LDFLAGS="-link -dll $EXTRA_LDFLAGS"
|
||||
fi
|
||||
CC_SHARED_OPTS=
|
||||
MK_SHARED_LIB=$SHELL' '$rel_builddir'/mk_shared_lib.sh $@ ${LD} ${CFLAGS}'
|
||||
RM_SHARED_OPTS="$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dll.a"
|
||||
cat >mk_shared_lib.sh <<-CF_EOF
|
||||
#!$SHELL
|
||||
SHARED_LIB=\$1
|
||||
IMPORT_LIB=\`echo "\$1" | sed -e 's/[0-9]*\.dll$\.dll.a/'\`
|
||||
shift
|
||||
my_ld=\$1
|
||||
shift
|
||||
cat <<-EOF
|
||||
Linking shared library
|
||||
** SHARED LIB \$SHARED_LIB
|
||||
** IMPORT_LIB \$IMPORT_LIB
|
||||
EOF
|
||||
args=\$(echo \$* | sed -E "s#-l(\w*)#lib\1.a#g" | sed -E "s#-L(\w*)#-LIBPATH:\1#g")
|
||||
exec \$my_ld -DLL -IMPLIB:"\${IMPORT_LIB}" -OUT:"\${SHARED_LIB}" ${LDFLAGS} \$args
|
||||
mv "\${IMPORT_LIB}" "\${IMPORT_LIB}"
|
||||
CF_EOF
|
||||
chmod +x mk_shared_lib.sh
|
||||
;;
|
||||
(mingw*)
|
||||
cf_cv_shlib_version=mingw
|
||||
cf_cv_shlib_version_infix=mingw
|
||||
@ -8468,7 +8499,7 @@ AC_ARG_WITH($2-path,
|
||||
])
|
||||
])
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_WITH_PCRE2 version: 2 updated: 2018/07/14 16:47:56
|
||||
dnl CF_WITH_PCRE2 version: 3 updated: 2020/02/29 16:09:19
|
||||
dnl -------------
|
||||
dnl Add PCRE2 (Perl-compatible regular expressions v2) to the build if it is
|
||||
dnl available and the user requests it. Assume the application will otherwise
|
||||
@ -8506,7 +8537,7 @@ if test "x$with_pcre2" != xno ; then
|
||||
esac
|
||||
|
||||
# either way, check for the library header files
|
||||
AC_CHECK_HEADERS(pcre2-posix.h pcreposix.h)
|
||||
AC_CHECK_HEADERS(pcre2posix.h pcreposix.h)
|
||||
fi
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
* Author: Juergen Pfeifer, 1997 *
|
||||
****************************************************************************/
|
||||
|
||||
// $Id: cursslk.h,v 1.15 2020/02/02 23:34:34 tom Exp $
|
||||
// $Id: cursslk.h,v 1.16 2020/02/29 15:46:00 anonymous.maarten Exp $
|
||||
|
||||
#ifndef NCURSES_CURSSLK_H_incl
|
||||
#define NCURSES_CURSSLK_H_incl
|
||||
@ -101,10 +101,10 @@ public:
|
||||
} Label_Layout;
|
||||
|
||||
private:
|
||||
static long NCURSES_IMPEXP count; // Number of Key Sets
|
||||
static Label_Layout NCURSES_IMPEXP format; // Layout of the Key Sets
|
||||
static int NCURSES_IMPEXP num_labels; // Number Of Labels in Key Sets
|
||||
bool NCURSES_IMPEXP b_attrInit; // Are attributes initialized
|
||||
static long count; // Number of Key Sets
|
||||
static Label_Layout format; // Layout of the Key Sets
|
||||
static int num_labels; // Number Of Labels in Key Sets
|
||||
bool b_attrInit; // Are attributes initialized
|
||||
|
||||
Soft_Label_Key *slk_array; // The array of SLK's
|
||||
|
||||
@ -144,7 +144,7 @@ public:
|
||||
|
||||
// This constructor assumes, that you already constructed a Key Set
|
||||
// with a layout by the constructor above. This layout will be reused.
|
||||
NCURSES_IMPEXP Soft_Label_Key_Set();
|
||||
Soft_Label_Key_Set();
|
||||
|
||||
Soft_Label_Key_Set& operator=(const Soft_Label_Key_Set& rhs)
|
||||
{
|
||||
@ -165,7 +165,7 @@ public:
|
||||
virtual ~Soft_Label_Key_Set() THROWS(NCursesException);
|
||||
|
||||
// Get Label# i. Label counting starts with 1!
|
||||
NCURSES_IMPEXP Soft_Label_Key& operator[](int i);
|
||||
Soft_Label_Key& operator[](int i);
|
||||
|
||||
// Retrieve number of Labels
|
||||
inline int labels() const { return num_labels; }
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
* Author: Juergen Pfeifer, 1997 *
|
||||
****************************************************************************/
|
||||
|
||||
// $Id: etip.h.in,v 1.43 2020/02/02 23:34:34 tom Exp $
|
||||
// $Id: etip.h.in,v 1.44 2020/02/29 15:46:00 anonymous.maarten Exp $
|
||||
|
||||
#ifndef NCURSES_ETIP_H_incl
|
||||
#define NCURSES_ETIP_H_incl 1
|
||||
@ -341,7 +341,6 @@ using std::endl;
|
||||
# else
|
||||
# include <iostream.h>
|
||||
# endif
|
||||
extern "C" void exit(int);
|
||||
#endif
|
||||
|
||||
inline void THROW(const NCursesException *e) {
|
||||
|
||||
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.1336 2020/02/22 13:49:45 tom Exp $
|
||||
# $Id: dist.mk,v 1.1337 2020/02/29 12:43:09 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 = 2
|
||||
NCURSES_PATCH = 20200222
|
||||
NCURSES_PATCH = 20200229
|
||||
|
||||
# We don't append the patch to the version, since this only applies to releases
|
||||
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
|
||||
|
||||
@ -35,12 +35,12 @@
|
||||
|
||||
#include "form.priv.h"
|
||||
|
||||
MODULE_ID("$Id: fty_regex.c,v 1.28 2020/02/02 23:34:34 tom Exp $")
|
||||
MODULE_ID("$Id: fty_regex.c,v 1.29 2020/02/29 15:46:00 anonymous.maarten Exp $")
|
||||
|
||||
#if HAVE_REGEX_H_FUNCS || HAVE_LIB_PCRE2 /* We prefer POSIX regex */
|
||||
|
||||
#if HAVE_PCRE2_POSIX_H
|
||||
#include <pcre2-posix.h>
|
||||
#if HAVE_PCRE2POSIX_H
|
||||
#include <pcre2posix.h>
|
||||
#elif HAVE_PCREPOSIX_H
|
||||
#include <pcreposix.h>
|
||||
#else
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
* Author: Thomas Dickey, 2008-on *
|
||||
****************************************************************************/
|
||||
|
||||
/* $Id: nc_mingw.h,v 1.7 2020/02/02 23:34:34 tom Exp $ */
|
||||
/* $Id: nc_mingw.h,v 1.8 2020/02/29 15:46:00 anonymous.maarten Exp $ */
|
||||
|
||||
#ifndef NC_MINGW_H
|
||||
#define NC_MINGW_H 1
|
||||
@ -52,7 +52,9 @@
|
||||
#undef gettimeofday
|
||||
#define gettimeofday(tv,tz) _nc_gettimeofday(tv,tz)
|
||||
|
||||
#if HAVE_SYS_TIME_H
|
||||
#include <sys/time.h> /* for struct timeval */
|
||||
#endif
|
||||
|
||||
extern int _nc_gettimeofday(struct timeval *, void *);
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $Id: ncurses_defs,v 1.92 2020/02/02 23:34:34 tom Exp $
|
||||
# $Id: ncurses_defs,v 1.93 2020/02/29 15:46:00 anonymous.maarten Exp $
|
||||
##############################################################################
|
||||
# Copyright 2018-2019,2020 Thomas E. Dickey #
|
||||
# Copyright 2000-2016,2017 Free Software Foundation, Inc. #
|
||||
@ -120,7 +120,7 @@ HAVE_NANOSLEEP
|
||||
HAVE_NC_ALLOC_H
|
||||
HAVE_NEWPAD 1
|
||||
HAVE_PANEL_H
|
||||
HAVE_PCRE2_POSIX_H
|
||||
HAVE_PCRE2POSIX_H
|
||||
HAVE_PCREPOSIX_H
|
||||
HAVE_POLL
|
||||
HAVE_POLL_H
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
* sale, use or other dealings in this Software without prior written *
|
||||
* authorization. *
|
||||
****************************************************************************/
|
||||
/* $Id: ncurses_dll.h.in,v 1.12 2020/02/02 23:34:34 tom Exp $ */
|
||||
/* $Id: ncurses_dll.h.in,v 1.13 2020/02/29 21:53:14 tom Exp $ */
|
||||
|
||||
#ifndef NCURSES_DLL_H_incl
|
||||
#define NCURSES_DLL_H_incl 1
|
||||
@ -66,7 +66,7 @@
|
||||
* using functions to access them.
|
||||
*/
|
||||
#define NCURSES_PUBLIC_VAR(name) @NCURSES_WRAP_PREFIX@##name
|
||||
#define NCURSES_WRAPPED_VAR(type,name) extern type NCURSES_PUBLIC_VAR(name)(void)
|
||||
#define NCURSES_WRAPPED_VAR(type,name) extern NCURSES_IMPEXP type NCURSES_PUBLIC_VAR(name)(void)
|
||||
|
||||
/* no longer needed on cygwin or mingw, thanks to auto-import */
|
||||
/* but this structure may be useful at some point for an MSVC build */
|
||||
|
||||
@ -33,7 +33,7 @@
|
||||
* and: Thomas E. Dickey 1998-on *
|
||||
****************************************************************************/
|
||||
|
||||
/* $Id: term_entry.h,v 1.59 2020/02/02 23:34:34 tom Exp $ */
|
||||
/* $Id: term_entry.h,v 1.60 2020/02/29 15:46:00 anonymous.maarten Exp $ */
|
||||
|
||||
/*
|
||||
* term_entry.h -- interface to entry-manipulation code
|
||||
@ -200,8 +200,8 @@ extern NCURSES_EXPORT(bool) _nc_entry_match (char *, char *);
|
||||
extern NCURSES_EXPORT(int) _nc_resolve_uses (bool); /* obs 20040705 */
|
||||
extern NCURSES_EXPORT(int) _nc_resolve_uses2 (bool, bool);
|
||||
extern NCURSES_EXPORT(void) _nc_free_entries (ENTRY *);
|
||||
extern NCURSES_IMPEXP void NCURSES_API (*_nc_check_termtype)(TERMTYPE *); /* obs 20040705 */
|
||||
extern NCURSES_IMPEXP void NCURSES_API (*_nc_check_termtype2)(TERMTYPE2 *, bool);
|
||||
extern NCURSES_IMPEXP void (NCURSES_API *_nc_check_termtype)(TERMTYPE *); /* obs 20040705 */
|
||||
extern NCURSES_IMPEXP void (NCURSES_API *_nc_check_termtype2)(TERMTYPE2 *, bool);
|
||||
|
||||
/* trace_xnames.c */
|
||||
extern NCURSES_EXPORT(void) _nc_trace_xnames (TERMTYPE *);
|
||||
|
||||
@ -48,10 +48,10 @@
|
||||
|
||||
#include <tic.h>
|
||||
|
||||
MODULE_ID("$Id: comp_parse.c,v 1.109 2020/02/02 23:34:34 tom Exp $")
|
||||
MODULE_ID("$Id: comp_parse.c,v 1.110 2020/02/29 15:46:00 anonymous.maarten Exp $")
|
||||
|
||||
static void sanity_check2(TERMTYPE2 *, bool);
|
||||
NCURSES_IMPEXP void NCURSES_API(*_nc_check_termtype2) (TERMTYPE2 *, bool) = sanity_check2;
|
||||
NCURSES_IMPEXP void (NCURSES_API *_nc_check_termtype2) (TERMTYPE2 *, bool) = sanity_check2;
|
||||
|
||||
static void fixup_acsc(TERMTYPE2 *, int);
|
||||
|
||||
|
||||
@ -71,12 +71,12 @@
|
||||
# include <sys/select.h>
|
||||
# endif
|
||||
#endif
|
||||
#ifdef _WIN32
|
||||
#if HAVE_SYS_TIME_H
|
||||
# include <sys/time.h>
|
||||
#endif
|
||||
#undef CUR
|
||||
|
||||
MODULE_ID("$Id: lib_twait.c,v 1.74 2020/02/02 23:34:34 tom Exp $")
|
||||
MODULE_ID("$Id: lib_twait.c,v 1.75 2020/02/29 15:46:00 anonymous.maarten Exp $")
|
||||
|
||||
static long
|
||||
_nc_gettime(TimeType * t0, int first)
|
||||
|
||||
@ -36,10 +36,14 @@
|
||||
|
||||
#include <windows.h>
|
||||
|
||||
MODULE_ID("$Id: gettimeofday.c,v 1.4 2020/02/02 23:34:34 tom Exp $")
|
||||
MODULE_ID("$Id: gettimeofday.c,v 1.5 2020/02/29 15:46:00 anonymous.maarten Exp $")
|
||||
|
||||
#define JAN1970 116444736000000000LL /* the value for 01/01/1970 00:00 */
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#include <winsock2.h>
|
||||
#endif
|
||||
|
||||
int
|
||||
gettimeofday(struct timeval *tv, void *tz GCC_UNUSED)
|
||||
{
|
||||
|
||||
@ -55,11 +55,9 @@
|
||||
|
||||
#define CUR TerminalType(my_term).
|
||||
|
||||
MODULE_ID("$Id: win_driver.c,v 1.63 2020/02/02 23:34:34 tom Exp $")
|
||||
MODULE_ID("$Id: win_driver.c,v 1.66 2020/03/01 00:18:49 tom Exp $")
|
||||
|
||||
#ifndef __GNUC__
|
||||
# error We need GCC to compile for MinGW
|
||||
#endif
|
||||
#define TypeAlloca(type,count) (type*) _alloca(sizeof(type) * (size_t) (count))
|
||||
|
||||
#define WINMAGIC NCDRV_MAGIC(NCDRV_WINCONSOLE)
|
||||
|
||||
@ -262,7 +260,7 @@ static BOOL
|
||||
con_write16(TERMINAL_CONTROL_BLOCK * TCB, int y, int x, cchar_t *str, int limit)
|
||||
{
|
||||
int actual = 0;
|
||||
CHAR_INFO ci[limit];
|
||||
CHAR_INFO *ci = TypeAlloca(CHAR_INFO, limit);
|
||||
COORD loc, siz;
|
||||
SMALL_RECT rec;
|
||||
int i;
|
||||
@ -311,7 +309,7 @@ con_write16(TERMINAL_CONTROL_BLOCK * TCB, int y, int x, cchar_t *str, int limit)
|
||||
static BOOL
|
||||
con_write8(TERMINAL_CONTROL_BLOCK * TCB, int y, int x, chtype *str, int n)
|
||||
{
|
||||
CHAR_INFO ci[n];
|
||||
CHAR_INFO *ci = TypeAlloca(CHAR_INFO, n);
|
||||
COORD loc, siz;
|
||||
SMALL_RECT rec;
|
||||
int i;
|
||||
@ -510,7 +508,7 @@ wcon_doupdate(TERMINAL_CONTROL_BLOCK * TCB)
|
||||
if ((CurScreen(sp)->_clear || NewScreen(sp)->_clear)) {
|
||||
int x;
|
||||
#if USE_WIDEC_SUPPORT
|
||||
cchar_t empty[Width];
|
||||
cchar_t *empty = TypeAlloca(cchar_t, Width);
|
||||
wchar_t blank[2] =
|
||||
{
|
||||
L' ', L'\0'
|
||||
@ -519,7 +517,7 @@ wcon_doupdate(TERMINAL_CONTROL_BLOCK * TCB)
|
||||
for (x = 0; x < Width; x++)
|
||||
setcchar(&empty[x], blank, 0, 0, 0);
|
||||
#else
|
||||
chtype empty[Width];
|
||||
chtype *empty = TypeAlloca(chtype, Width);
|
||||
|
||||
for (x = 0; x < Width; x++)
|
||||
empty[x] = ' ';
|
||||
@ -675,8 +673,8 @@ wcon_dobeepflash(TERMINAL_CONTROL_BLOCK * TCB,
|
||||
int max_cells = (high * wide);
|
||||
int i;
|
||||
|
||||
CHAR_INFO this_screen[max_cells];
|
||||
CHAR_INFO that_screen[max_cells];
|
||||
CHAR_INFO *this_screen = TypeAlloca(CHAR_INFO, max_cells);
|
||||
CHAR_INFO *that_screen = TypeAlloca(CHAR_INFO, max_cells);
|
||||
COORD this_size;
|
||||
SMALL_RECT this_region;
|
||||
COORD bufferCoord;
|
||||
@ -701,7 +699,9 @@ wcon_dobeepflash(TERMINAL_CONTROL_BLOCK * TCB,
|
||||
bufferCoord,
|
||||
&this_region)) {
|
||||
|
||||
memcpy(that_screen, this_screen, sizeof(that_screen));
|
||||
memcpy(that_screen,
|
||||
this_screen,
|
||||
sizeof(CHAR_INFO) * (size_t) max_cells);
|
||||
|
||||
for (i = 0; i < max_cells; i++) {
|
||||
that_screen[i].Attributes = RevAttr(that_screen[i].Attributes);
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
ncurses6 (6.2+20200222) unstable; urgency=low
|
||||
ncurses6 (6.2+20200229) unstable; urgency=low
|
||||
|
||||
* latest weekly patch
|
||||
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 22 Feb 2020 08:49:45 -0500
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 29 Feb 2020 07:43:09 -0500
|
||||
|
||||
ncurses6 (5.9-20131005) unstable; urgency=low
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
ncurses6 (6.2+20200222) unstable; urgency=low
|
||||
ncurses6 (6.2+20200229) unstable; urgency=low
|
||||
|
||||
* latest weekly patch
|
||||
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 22 Feb 2020 08:49:45 -0500
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 29 Feb 2020 07:43:09 -0500
|
||||
|
||||
ncurses6 (5.9-20131005) unstable; urgency=low
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
ncurses6 (6.2+20200222) unstable; urgency=low
|
||||
ncurses6 (6.2+20200229) unstable; urgency=low
|
||||
|
||||
* latest weekly patch
|
||||
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 22 Feb 2020 08:49:45 -0500
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 29 Feb 2020 07:43:09 -0500
|
||||
|
||||
ncurses6 (5.9-20120608) unstable; urgency=low
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; $Id: mingw-ncurses.nsi,v 1.379 2020/02/22 13:49:45 tom Exp $
|
||||
; $Id: mingw-ncurses.nsi,v 1.380 2020/02/29 12:43:09 tom Exp $
|
||||
|
||||
; TODO add examples
|
||||
; TODO bump ABI to 6
|
||||
@ -10,7 +10,7 @@
|
||||
!define VERSION_MAJOR "6"
|
||||
!define VERSION_MINOR "2"
|
||||
!define VERSION_YYYY "2020"
|
||||
!define VERSION_MMDD "0222"
|
||||
!define VERSION_MMDD "0229"
|
||||
!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.2
|
||||
Release: 20200222
|
||||
Release: 20200229
|
||||
License: X11
|
||||
Group: Development/Libraries
|
||||
Source: ncurses-%{version}-%{release}.tgz
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
Summary: shared libraries for terminal handling
|
||||
Name: ncurses6
|
||||
Version: 6.2
|
||||
Release: 20200222
|
||||
Release: 20200229
|
||||
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.2
|
||||
Release: 20200222
|
||||
Release: 20200229
|
||||
License: X11
|
||||
Group: Development/Libraries
|
||||
Source: ncurses-%{version}-%{release}.tgz
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
* Author: Thomas E. Dickey 1997-on *
|
||||
****************************************************************************/
|
||||
/*
|
||||
* $Id: progs.priv.h,v 1.48 2020/02/02 23:34:34 tom Exp $
|
||||
* $Id: progs.priv.h,v 1.49 2020/02/29 20:57:36 tom Exp $
|
||||
*
|
||||
* progs.priv.h
|
||||
*
|
||||
@ -155,6 +155,10 @@ extern int optind;
|
||||
#endif /* gcc workarounds */
|
||||
|
||||
/* usually in <unistd.h> */
|
||||
#ifndef STDIN_FILENO
|
||||
#define STDIN_FILENO 0
|
||||
#endif
|
||||
|
||||
#ifndef STDOUT_FILENO
|
||||
#define STDOUT_FILENO 1
|
||||
#endif
|
||||
|
||||
44
test/aclocal.m4
vendored
44
test/aclocal.m4
vendored
@ -27,7 +27,7 @@ dnl sale, use or other dealings in this Software without prior written *
|
||||
dnl authorization. *
|
||||
dnl***************************************************************************
|
||||
dnl
|
||||
dnl $Id: aclocal.m4,v 1.176 2020/02/09 02:02:53 tom Exp $
|
||||
dnl $Id: aclocal.m4,v 1.177 2020/02/27 10:21:59 tom Exp $
|
||||
dnl
|
||||
dnl Author: Thomas E. Dickey
|
||||
dnl
|
||||
@ -2349,7 +2349,7 @@ printf("old\n");
|
||||
,[$1=no])
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_NCURSES_CONFIG version: 21 updated: 2018/06/20 20:23:13
|
||||
dnl CF_NCURSES_CONFIG version: 23 updated: 2020/02/27 05:21:59
|
||||
dnl -----------------
|
||||
dnl Tie together the configure-script macros for ncurses, preferring these in
|
||||
dnl order:
|
||||
@ -2371,11 +2371,47 @@ if test "x${PKG_CONFIG:=none}" != xnone; then
|
||||
AC_MSG_CHECKING(if the $cf_ncuconfig_root package files work)
|
||||
cf_have_ncuconfig=unknown
|
||||
|
||||
cf_save_CFLAGS="$CFLAGS"
|
||||
cf_save_CPPFLAGS="$CPPFLAGS"
|
||||
cf_save_LIBS="$LIBS"
|
||||
|
||||
CF_ADD_CFLAGS(`$PKG_CONFIG --cflags $cf_ncuconfig_root`)
|
||||
CF_ADD_LIBS(`$PKG_CONFIG --libs $cf_ncuconfig_root`)
|
||||
cf_pkg_cflags=`$PKG_CONFIG --cflags $cf_ncuconfig_root`
|
||||
cf_pkg_libs=`$PKG_CONFIG --libs $cf_ncuconfig_root`
|
||||
|
||||
# while -W for passing linker flags is prevalent, it is not "standard".
|
||||
# At least one wrapper for c89/c99 (in Apple's xcode) has its own
|
||||
# incompatible _and_ non-standard -W option which gives an error. Work
|
||||
# around that pitfall.
|
||||
case "x${CC}@@${cf_pkg_libs}@${cf_pkg_cflags}" in
|
||||
(x*c[[89]]9@@*-W*)
|
||||
CF_ADD_CFLAGS($cf_pkg_cflags)
|
||||
CF_ADD_LIBS($cf_pkg_libs)
|
||||
|
||||
AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
|
||||
[initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);],
|
||||
[AC_TRY_RUN([#include <${cf_cv_ncurses_header:-curses.h}>
|
||||
int main(void)
|
||||
{ char *xx = curses_version(); return (xx == 0); }],
|
||||
[cf_test_ncuconfig=yes],
|
||||
[cf_test_ncuconfig=no],
|
||||
[cf_test_ncuconfig=maybe])],
|
||||
[cf_test_ncuconfig=no])
|
||||
|
||||
CFLAGS="$cf_save_CFLAGS"
|
||||
CPPFLAGS="$cf_save_CPPFLAGS"
|
||||
LIBS="$cf_save_LIBS"
|
||||
|
||||
if test "x$cf_test_ncuconfig" != xyes; then
|
||||
cf_temp=`echo "x$cf_pkg_cflags" | sed -e s/^x// -e 's/-W[[^ ]]*//g'`
|
||||
cf_pkg_cflags="$cf_temp"
|
||||
cf_temp=`echo "x$cf_pkg_libs" | sed -e s/^x// -e 's/-W[[^ ]]*//g'`
|
||||
cf_pkg_libs="$cf_temp"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
CF_ADD_CFLAGS($cf_pkg_cflags)
|
||||
CF_ADD_LIBS($cf_pkg_libs)
|
||||
|
||||
AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
|
||||
[initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);],
|
||||
|
||||
2584
test/configure
vendored
2584
test/configure
vendored
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user