summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
14d46fa)
+ fix some compiler-warnings in experimental Windows-10 driver.
+ modify a check for parameters in terminfo capabilities to handle the
special case where short extended capability strings were not
converted from terminfo to termcap format.
+ modify CF_MIXEDCASE_FILENAMES macro, adding darwin as special case
when cross-compiling (report by Eli Rykoff).
23 files changed:
dnl
dnl Author: Thomas E. Dickey
dnl
dnl
dnl Author: Thomas E. Dickey
dnl
-dnl $Id: aclocal.m4,v 1.163 2020/10/31 20:04:06 tom Exp $
+dnl $Id: aclocal.m4,v 1.164 2020/11/14 15:25:46 tom Exp $
dnl Macros used in NCURSES Ada95 auto-configuration script.
dnl
dnl These macros are maintained separately from NCURSES. The copyright on
dnl Macros used in NCURSES Ada95 auto-configuration script.
dnl
dnl These macros are maintained separately from NCURSES. The copyright on
AC_SUBST(MAKE_LOWER_TAGS)
])dnl
dnl ---------------------------------------------------------------------------
AC_SUBST(MAKE_LOWER_TAGS)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_MIXEDCASE_FILENAMES version: 7 updated: 2015/04/12 15:39:00
+dnl CF_MIXEDCASE_FILENAMES version: 8 updated: 2020/11/14 10:12:15
dnl ----------------------
dnl Check if the file-system supports mixed-case filenames. If we're able to
dnl create a lowercase name and see it as uppercase, it doesn't support that.
dnl ----------------------
dnl Check if the file-system supports mixed-case filenames. If we're able to
dnl create a lowercase name and see it as uppercase, it doesn't support that.
AC_CACHE_CHECK(if filesystem supports mixed-case filenames,cf_cv_mixedcase,[
if test "$cross_compiling" = yes ; then
case $target_alias in
AC_CACHE_CHECK(if filesystem supports mixed-case filenames,cf_cv_mixedcase,[
if test "$cross_compiling" = yes ; then
case $target_alias in
- (*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*)
+ (*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*|darwin*)
cf_cv_mixedcase=no
;;
(*)
cf_cv_mixedcase=no
;;
(*)
if test "$cross_compiling" = yes ; then
case $target_alias in
if test "$cross_compiling" = yes ; then
case $target_alias in
- (*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*)
+ (*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*|darwin*)
cf_cv_mixedcase=no
;;
(*)
cf_cv_mixedcase=no
;;
(*)
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3589 2020/11/07 23:52:28 tom Exp $
+-- $Id: NEWS,v 1.3593 2020/11/15 00:33:38 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
Changes through 1.9.9e did not credit all contributions;
it is not possible to add this information.
Changes through 1.9.9e did not credit all contributions;
it is not possible to add this information.
+20201114
+ + fix some compiler-warnings in experimental Windows-10 driver.
+ + modify a check for parameters in terminfo capabilities to handle the
+ special case where short extended capability strings were not
+ converted from terminfo to termcap format.
+ + modify CF_MIXEDCASE_FILENAMES macro, adding darwin as special case
+ when cross-compiling (report by Eli Rykoff).
+
20201107
+ update kitty+common -TD
+ add putty+screen and putty-screen (suggested by Alexandre Montaron).
20201107
+ update kitty+common -TD
+ add putty+screen and putty-screen (suggested by Alexandre Montaron).
dnl
dnl Author: Thomas E. Dickey 1995-on
dnl
dnl
dnl Author: Thomas E. Dickey 1995-on
dnl
-dnl $Id: aclocal.m4,v 1.938 2020/10/31 19:51:56 tom Exp $
+dnl $Id: aclocal.m4,v 1.939 2020/11/14 15:25:03 tom Exp $
dnl Macros used in NCURSES auto-configuration script.
dnl
dnl These macros are maintained separately from NCURSES. The copyright on
dnl Macros used in NCURSES auto-configuration script.
dnl
dnl These macros are maintained separately from NCURSES. The copyright on
fi
])
dnl ---------------------------------------------------------------------------
fi
])
dnl ---------------------------------------------------------------------------
-dnl CF_MIXEDCASE_FILENAMES version: 7 updated: 2015/04/12 15:39:00
+dnl CF_MIXEDCASE_FILENAMES version: 8 updated: 2020/11/14 10:12:15
dnl ----------------------
dnl Check if the file-system supports mixed-case filenames. If we're able to
dnl create a lowercase name and see it as uppercase, it doesn't support that.
dnl ----------------------
dnl Check if the file-system supports mixed-case filenames. If we're able to
dnl create a lowercase name and see it as uppercase, it doesn't support that.
AC_CACHE_CHECK(if filesystem supports mixed-case filenames,cf_cv_mixedcase,[
if test "$cross_compiling" = yes ; then
case $target_alias in
AC_CACHE_CHECK(if filesystem supports mixed-case filenames,cf_cv_mixedcase,[
if test "$cross_compiling" = yes ; then
case $target_alias in
- (*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*)
+ (*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*|darwin*)
cf_cv_mixedcase=no
;;
(*)
cf_cv_mixedcase=no
;;
(*)
if test "$cross_compiling" = yes ; then
case $target_alias in
if test "$cross_compiling" = yes ; then
case $target_alias in
- (*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*)
+ (*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*|darwin*)
cf_cv_mixedcase=no
;;
(*)
cf_cv_mixedcase=no
;;
(*)
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.1384 2020/11/07 12:57:22 tom Exp $
+# $Id: dist.mk,v 1.1385 2020/11/14 13:10:13 tom Exp $
# Makefile for creating ncurses distributions.
#
# This only needs to be used directly as a makefile by developers, but
# Makefile for creating ncurses distributions.
#
# This only needs to be used directly as a makefile by developers, but
# These define the major/minor/patch versions of ncurses.
NCURSES_MAJOR = 6
NCURSES_MINOR = 2
# These define the major/minor/patch versions of ncurses.
NCURSES_MAJOR = 6
NCURSES_MINOR = 2
-NCURSES_PATCH = 20201107
+NCURSES_PATCH = 20201114
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
* Author: Juergen Pfeifer, 2008-on *
****************************************************************************/
* Author: Juergen Pfeifer, 2008-on *
****************************************************************************/
-/* $Id: win32_curses.h,v 1.1 2020/08/14 21:57:01 juergen Exp $ */
+/* $Id: win32_curses.h,v 1.2 2020/11/14 23:52:46 tom Exp $ */
/*
* This is the interface we use on Windows to mimic the control of the settings
/*
* This is the interface we use on Windows to mimic the control of the settings
- unsigned int dwFlagIn;
- unsigned int dwFlagOut;
+ unsigned long dwFlagIn;
+ unsigned long dwFlagOut;
};
extern NCURSES_EXPORT(void*) _nc_console_fd2handle(int fd);
};
extern NCURSES_EXPORT(void*) _nc_console_fd2handle(int fd);
****************************************************************************/
/*
****************************************************************************/
/*
- * $Id: curses.priv.h,v 1.638 2020/09/12 17:58:55 tom Exp $
+ * $Id: curses.priv.h,v 1.639 2020/11/14 23:37:54 tom Exp $
extern NCURSES_EXPORT(WINDOW *) _nc_retrace_win (WINDOW *);
extern NCURSES_EXPORT(attr_t) _nc_retrace_attr_t (attr_t);
extern NCURSES_EXPORT(char *) _nc_retrace_ptr (char *);
extern NCURSES_EXPORT(WINDOW *) _nc_retrace_win (WINDOW *);
extern NCURSES_EXPORT(attr_t) _nc_retrace_attr_t (attr_t);
extern NCURSES_EXPORT(char *) _nc_retrace_ptr (char *);
-extern NCURSES_EXPORT(char *) _nc_trace_ttymode(TTY *tty);
+extern NCURSES_EXPORT(char *) _nc_trace_ttymode(const TTY *tty);
extern NCURSES_EXPORT(char *) _nc_varargs (const char *, va_list);
extern NCURSES_EXPORT(chtype) _nc_retrace_chtype (chtype);
extern NCURSES_EXPORT(const char *) _nc_altcharset_name(attr_t, chtype);
extern NCURSES_EXPORT(char *) _nc_varargs (const char *, va_list);
extern NCURSES_EXPORT(chtype) _nc_retrace_chtype (chtype);
extern NCURSES_EXPORT(const char *) _nc_altcharset_name(attr_t, chtype);
-MODULE_ID("$Id: lib_win32con.c,v 1.3 2020/10/10 19:07:10 tom Exp $")
+MODULE_ID("$Id: lib_win32con.c,v 1.4 2020/11/14 23:37:16 tom Exp $")
T(("twait:err GetNumberOfConsoleInputEvents"));
}
if (isNoDelay && b) {
T(("twait:err GetNumberOfConsoleInputEvents"));
}
if (isNoDelay && b) {
- T(("twait: Events Available: %d",nRead));
+ T(("twait: Events Available: %ld", nRead));
if (nRead==0) {
code=0;
goto end;
if (nRead==0) {
code=0;
goto end;
INPUT_RECORD* pInpRec =
TypeAlloca(INPUT_RECORD,nRead);
if (pInpRec != NULL) {
INPUT_RECORD* pInpRec =
TypeAlloca(INPUT_RECORD,nRead);
if (pInpRec != NULL) {
BOOL f;
memset(pInpRec,0,sizeof(INPUT_RECORD)*nRead);
f = PeekConsoleInput(hdl, pInpRec, nRead, &n);
BOOL f;
memset(pInpRec,0,sizeof(INPUT_RECORD)*nRead);
f = PeekConsoleInput(hdl, pInpRec, nRead, &n);
switch (inp_rec.EventType) {
case KEY_EVENT:
if (mode & TW_INPUT) {
switch (inp_rec.EventType) {
case KEY_EVENT:
if (mode & TW_INPUT) {
- T(("twait:event KEY_EVENT"));
WORD vk =
inp_rec.Event.KeyEvent.wVirtualKeyCode;
char ch =
inp_rec.Event.KeyEvent.uChar.AsciiChar;
WORD vk =
inp_rec.Event.KeyEvent.wVirtualKeyCode;
char ch =
inp_rec.Event.KeyEvent.uChar.AsciiChar;
+ T(("twait:event KEY_EVENT"));
T(("twait vk=%d, ch=%d, keydown=%d",
vk,ch,inp_rec.Event.KeyEvent.bKeyDown));
if (inp_rec.Event.KeyEvent.bKeyDown) {
T(("twait vk=%d, ch=%d, keydown=%d",
vk,ch,inp_rec.Event.KeyEvent.bKeyDown));
if (inp_rec.Event.KeyEvent.bKeyDown) {
-MODULE_ID("$Id: lib_tracebits.c,v 1.30 2020/09/05 22:54:47 tom Exp $")
+MODULE_ID("$Id: lib_tracebits.c,v 1.31 2020/11/14 23:38:11 tom Exp $")
#if HAVE_SYS_TERMIO_H
#include <sys/termio.h> /* needed for ISC */
#if HAVE_SYS_TERMIO_H
#include <sys/termio.h> /* needed for ISC */
-_nc_trace_ttymode(TTY * tty)
+_nc_trace_ttymode(const TTY * tty)
/* describe the state of the terminal control bits exactly */
{
char *buf;
/* describe the state of the terminal control bits exactly */
{
char *buf;
-ncurses6 (6.2+20201107) unstable; urgency=low
+ncurses6 (6.2+20201114) unstable; urgency=low
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 07 Nov 2020 07:57:22 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 14 Nov 2020 08:10:13 -0500
ncurses6 (5.9-20131005) unstable; urgency=low
ncurses6 (5.9-20131005) unstable; urgency=low
-ncurses6 (6.2+20201107) unstable; urgency=low
+ncurses6 (6.2+20201114) unstable; urgency=low
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 07 Nov 2020 07:57:22 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 14 Nov 2020 08:10:13 -0500
ncurses6 (5.9-20131005) unstable; urgency=low
ncurses6 (5.9-20131005) unstable; urgency=low
-ncurses6 (6.2+20201107) unstable; urgency=low
+ncurses6 (6.2+20201114) unstable; urgency=low
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 07 Nov 2020 07:57:22 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 14 Nov 2020 08:10:13 -0500
ncurses6 (5.9-20120608) unstable; urgency=low
ncurses6 (5.9-20120608) unstable; urgency=low
-; $Id: mingw-ncurses.nsi,v 1.428 2020/11/07 12:57:22 tom Exp $\r
+; $Id: mingw-ncurses.nsi,v 1.429 2020/11/14 13:10:13 tom Exp $\r
\r
; TODO add examples\r
; TODO bump ABI to 6\r
\r
; TODO add examples\r
; TODO bump ABI to 6\r
!define VERSION_MAJOR "6"\r
!define VERSION_MINOR "2"\r
!define VERSION_YYYY "2020"\r
!define VERSION_MAJOR "6"\r
!define VERSION_MINOR "2"\r
!define VERSION_YYYY "2020"\r
-!define VERSION_MMDD "1107"\r
+!define VERSION_MMDD "1114"\r
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}\r
\r
!define MY_ABI "5"\r
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}\r
\r
!define MY_ABI "5"\r
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.2
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.2
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.2
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.2
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
Summary: Curses library with POSIX thread support.
Name: ncursest6
Version: 6.2
Summary: Curses library with POSIX thread support.
Name: ncursest6
Version: 6.2
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz
#include "termsort.c" /* this C file is generated */
#include <parametrized.h> /* so is this */
#include "termsort.c" /* this C file is generated */
#include <parametrized.h> /* so is this */
-MODULE_ID("$Id: dump_entry.c,v 1.179 2020/07/08 21:21:11 tom Exp $")
+MODULE_ID("$Id: dump_entry.c,v 1.180 2020/11/14 18:18:13 tom Exp $")
#define DISCARD(string) string = ABSENT_STRING
#define PRINTF (void) printf
#define DISCARD(string) string = ABSENT_STRING
#define PRINTF (void) printf
-has_params(const char *src)
+has_params(const char *src, bool formatting)
{
bool result = FALSE;
int len = (int) strlen(src);
{
bool result = FALSE;
int len = (int) strlen(src);
- result = ((len > 50) && params);
+ if (formatting) {
+ result = ((len > 50) && params);
+ } else {
+ result = params;
+ }
fmt_complex(TERMTYPE2 *tterm, const char *capability, char *src, int level)
{
bool percent = FALSE;
fmt_complex(TERMTYPE2 *tterm, const char *capability, char *src, int level)
{
bool percent = FALSE;
- bool params = has_params(src);
+ bool params = has_params(src, TRUE);
while (*src != '\0') {
switch (*src) {
while (*src != '\0') {
switch (*src) {
strncpy_DYN(&tmpbuf, "%", (size_t) 1);
strncpy_DYN(&tmpbuf, src, (size_t) 1);
src++;
strncpy_DYN(&tmpbuf, "%", (size_t) 1);
strncpy_DYN(&tmpbuf, src, (size_t) 1);
src++;
- params = has_params(src);
+ params = has_params(src, TRUE);
if (!params && *src != '\0' && *src != '%') {
strncpy_DYN(&tmpbuf, "\n", (size_t) 1);
indent_DYN(&tmpbuf, level + 1);
if (!params && *src != '\0' && *src != '%') {
strncpy_DYN(&tmpbuf, "\n", (size_t) 1);
indent_DYN(&tmpbuf, level + 1);
? parametrized[i]
: ((*srccap == 'k')
? 0
? parametrized[i]
: ((*srccap == 'k')
? 0
- : has_params(srccap)));
+ : has_params(srccap, FALSE)));
char *cv = _nc_infotocap(name, srccap, params);
if (cv == 0) {
char *cv = _nc_infotocap(name, srccap, params);
if (cv == 0) {
****************************************************************************/
/*
****************************************************************************/
/*
- * $Id: dump_entry.h,v 1.42 2020/02/02 23:34:34 tom Exp $
+ * $Id: dump_entry.h,v 1.43 2020/11/14 18:16:57 tom Exp $
*
* Dump control definitions and variables
*/
*
* Dump control definitions and variables
*/
typedef void (*PredHook) (PredType, PredIdx, const char *);
extern NCURSES_CONST char *nametrans(const char *);
typedef void (*PredHook) (PredType, PredIdx, const char *);
extern NCURSES_CONST char *nametrans(const char *);
-extern bool has_params(const char *src);
+extern bool has_params(const char *, bool);
extern int fmt_entry(TERMTYPE2 *, PredFunc, int, int, int, int);
extern int show_entry(void);
extern void compare_entry(PredHook, TERMTYPE2 *, bool);
extern int fmt_entry(TERMTYPE2 *, PredFunc, int, int, int, int);
extern int show_entry(void);
extern void compare_entry(PredHook, TERMTYPE2 *, bool);
#include <parametrized.h>
#include <transform.h>
#include <parametrized.h>
#include <transform.h>
-MODULE_ID("$Id: tic.c,v 1.289 2020/10/31 22:15:55 tom Exp $")
+MODULE_ID("$Id: tic.c,v 1.290 2020/11/14 18:16:33 tom Exp $")
#define STDIN_NAME "<stdin>"
#define STDIN_NAME "<stdin>"
? parametrized[i]
: ((*value == 'k')
? 0
? parametrized[i]
: ((*value == 'k')
? 0
+ : has_params(value, FALSE)));
char *ti_value;
char *tc_value;
bool embedded;
char *ti_value;
char *tc_value;
bool embedded;
dnl authorization. *
dnl***************************************************************************
dnl
dnl authorization. *
dnl***************************************************************************
dnl
-dnl $Id: aclocal.m4,v 1.184 2020/10/31 20:05:07 tom Exp $
+dnl $Id: aclocal.m4,v 1.185 2020/11/14 15:26:19 tom Exp $
dnl
dnl Author: Thomas E. Dickey
dnl
dnl
dnl Author: Thomas E. Dickey
dnl
fi
])
dnl ---------------------------------------------------------------------------
fi
])
dnl ---------------------------------------------------------------------------
-dnl CF_MIXEDCASE_FILENAMES version: 7 updated: 2015/04/12 15:39:00
+dnl CF_MIXEDCASE_FILENAMES version: 8 updated: 2020/11/14 10:12:15
dnl ----------------------
dnl Check if the file-system supports mixed-case filenames. If we're able to
dnl create a lowercase name and see it as uppercase, it doesn't support that.
dnl ----------------------
dnl Check if the file-system supports mixed-case filenames. If we're able to
dnl create a lowercase name and see it as uppercase, it doesn't support that.
AC_CACHE_CHECK(if filesystem supports mixed-case filenames,cf_cv_mixedcase,[
if test "$cross_compiling" = yes ; then
case $target_alias in
AC_CACHE_CHECK(if filesystem supports mixed-case filenames,cf_cv_mixedcase,[
if test "$cross_compiling" = yes ; then
case $target_alias in
- (*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*)
+ (*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*|darwin*)
cf_cv_mixedcase=no
;;
(*)
cf_cv_mixedcase=no
;;
(*)
if test "$cross_compiling" = yes ; then
case $target_alias in
if test "$cross_compiling" = yes ; then
case $target_alias in
- (*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*)
+ (*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*|darwin*)
cf_cv_mixedcase=no
;;
(*)
cf_cv_mixedcase=no
;;
(*)