ncurses 6.1 - patch 20181201

+ add midnightbsd to CF_XOPEN_SOURCE macro (patch by Urs Jansen).
+ add "@" command to test/ncurses F-test, to allow rapid jump to
  different character pages.
+ update config.guess, config.sub from
	http://git.savannah.gnu.org/cgit/config.git

diff --git a/Ada95/aclocal.m4 b/Ada95/aclocal.m4
index 3585e35eb6755a3a4231108f330e9e3805bb92aa..b16d222f476530395cd39a4831eeabc4efdec398 100644 (file)
--- a/Ada95/aclocal.m4
+++ b/Ada95/aclocal.m4
@@ -28,7 +28,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey
 dnl
 dnl
 dnl Author: Thomas E. Dickey
 dnl

-dnl $Id: aclocal.m4,v 1.139 2018/11/11 00:48:11 tom Exp $
+dnl $Id: aclocal.m4,v 1.140 2018/12/01 21:07:22 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


@@ -3051,7 +3051,7 @@ AC_SUBST(PROG_EXT)
 test -n "$PROG_EXT" && AC_DEFINE_UNQUOTED(PROG_EXT,"$PROG_EXT",[Define to the program extension (normally blank)])
 ])dnl
 dnl ---------------------------------------------------------------------------
 test -n "$PROG_EXT" && AC_DEFINE_UNQUOTED(PROG_EXT,"$PROG_EXT",[Define to the program extension (normally blank)])
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_PROG_GNAT version: 7 updated: 2018/11/10 18:37:39
+dnl CF_PROG_GNAT version: 8 updated: 2018/11/10 19:47:04

 dnl ------------
 dnl Check for gnatmake, ensure that it is complete.
 AC_DEFUN([CF_PROG_GNAT],[
 dnl ------------
 dnl Check for gnatmake, ensure that it is complete.
 AC_DEFUN([CF_PROG_GNAT],[


@@ -4154,7 +4154,7 @@ AC_ARG_WITH(system-type,
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_XOPEN_SOURCE version: 53 updated: 2018/06/16 18:58:58
+dnl CF_XOPEN_SOURCE version: 54 updated: 2018/11/07 07:43:44

 dnl ---------------
 dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
 dnl or adapt to the vendor's definitions to get equivalent functionality,
 dnl ---------------
 dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
 dnl or adapt to the vendor's definitions to get equivalent functionality,


@@ -4184,7 +4184,7 @@ case $host_os in
        cf_xopen_source="-D_DARWIN_C_SOURCE"
        cf_XOPEN_SOURCE=
        ;;
        cf_xopen_source="-D_DARWIN_C_SOURCE"
        cf_XOPEN_SOURCE=
        ;;

-(freebsd*|dragonfly*)
+(freebsd*|dragonfly*|midnightbsd*)

        # 5.x headers associate
        #       _XOPEN_SOURCE=600 with _POSIX_C_SOURCE=200112L
        #       _XOPEN_SOURCE=500 with _POSIX_C_SOURCE=199506L
        # 5.x headers associate
        #       _XOPEN_SOURCE=600 with _POSIX_C_SOURCE=200112L
        #       _XOPEN_SOURCE=500 with _POSIX_C_SOURCE=199506L

diff --git a/Ada95/configure b/Ada95/configure
index ec8f856a57f8cbca48dda1589caba4d12b291757..a4a277bb8a5163ad5c1aa01c72cc687ea5970a3b 100755 (executable)
--- a/Ada95/configure
+++ b/Ada95/configure
@@ -10940,7 +10940,7 @@ case $host_os in
        cf_xopen_source="-D_DARWIN_C_SOURCE"
        cf_XOPEN_SOURCE=
        ;;
        cf_xopen_source="-D_DARWIN_C_SOURCE"
        cf_XOPEN_SOURCE=
        ;;

-(freebsd*|dragonfly*)
+(freebsd*|dragonfly*|midnightbsd*)

        # 5.x headers associate
        #       _XOPEN_SOURCE=600 with _POSIX_C_SOURCE=200112L
        #       _XOPEN_SOURCE=500 with _POSIX_C_SOURCE=199506L
        # 5.x headers associate
        #       _XOPEN_SOURCE=600 with _POSIX_C_SOURCE=200112L
        #       _XOPEN_SOURCE=500 with _POSIX_C_SOURCE=199506L

diff --git a/NEWS b/NEWS
index 1b8d3af51a55652f2270b982e9fc14f0b6b648bf..27e2f56a70d00f059be5a8ac62d210c82a2c1132 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -25,7 +25,7 @@
 -- 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.3222 2018/11/25 11:29:51 tom Exp $
+-- $Id: NEWS,v 1.3225 2018/12/01 20:59:08 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


@@ -45,6 +45,13 @@ 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.
 
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 

+20181201
+       + add midnightbsd to CF_XOPEN_SOURCE macro (patch by Urs Jansen).
+       + add "@" command to test/ncurses F-test, to allow rapid jump to
+         different character pages.
+       + update config.guess, config.sub from
+               http://git.savannah.gnu.org/cgit/config.git
+

 20181125
        + build-fix (reports by Chih-Hsuan Yen, Sven Joachim).
 
 20181125
        + build-fix (reports by Chih-Hsuan Yen, Sven Joachim).
 

diff --git a/VERSION b/VERSION
index 4f05ff0adaf19b5192e277b0138d43c3fc7d9259..1cdeb4749d1bd65ad6a842e87867de87a816fdcc 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10 6.1     20181125
+5:0:10 6.1     20181201

diff --git a/aclocal.m4 b/aclocal.m4
index 19538de9534d8cfef93a78af2d1f489269e30c6b..4b0784a4f4640c20957e750547b99e098ca07b7f 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -28,7 +28,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl

-dnl $Id: aclocal.m4,v 1.857 2018/11/11 00:47:04 tom Exp $
+dnl $Id: aclocal.m4,v 1.858 2018/12/01 21:00:13 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


@@ -5643,7 +5643,7 @@ AC_DEFUN([CF_PROG_EGREP],
        test -z "$EGREP" && AC_MSG_ERROR(No egrep program found)
 ])dnl
 dnl ---------------------------------------------------------------------------
        test -z "$EGREP" && AC_MSG_ERROR(No egrep program found)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_PROG_GNAT version: 7 updated: 2018/11/10 18:37:39
+dnl CF_PROG_GNAT version: 8 updated: 2018/11/10 19:47:04

 dnl ------------
 dnl Check for gnatmake, ensure that it is complete.
 AC_DEFUN([CF_PROG_GNAT],[
 dnl ------------
 dnl Check for gnatmake, ensure that it is complete.
 AC_DEFUN([CF_PROG_GNAT],[


@@ -8326,7 +8326,7 @@ fi
 AC_SUBST(no_x11_rgb)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(no_x11_rgb)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_XOPEN_SOURCE version: 53 updated: 2018/06/16 18:58:58
+dnl CF_XOPEN_SOURCE version: 54 updated: 2018/11/07 07:43:44

 dnl ---------------
 dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
 dnl or adapt to the vendor's definitions to get equivalent functionality,
 dnl ---------------
 dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
 dnl or adapt to the vendor's definitions to get equivalent functionality,


@@ -8356,7 +8356,7 @@ case $host_os in
        cf_xopen_source="-D_DARWIN_C_SOURCE"
        cf_XOPEN_SOURCE=
        ;;
        cf_xopen_source="-D_DARWIN_C_SOURCE"
        cf_XOPEN_SOURCE=
        ;;

-(freebsd*|dragonfly*)
+(freebsd*|dragonfly*|midnightbsd*)

        # 5.x headers associate
        #       _XOPEN_SOURCE=600 with _POSIX_C_SOURCE=200112L
        #       _XOPEN_SOURCE=500 with _POSIX_C_SOURCE=199506L
        # 5.x headers associate
        #       _XOPEN_SOURCE=600 with _POSIX_C_SOURCE=200112L
        #       _XOPEN_SOURCE=500 with _POSIX_C_SOURCE=199506L

diff --git a/config.guess b/config.guess
index 18f8edc0ff54405d81247b07a34a647675a29b2e..47d7bed50c5c3bd01b82596451eef80529759591 100755 (executable)
--- a/config.guess
+++ b/config.guess
@@ -2,7 +2,7 @@
 # Attempt to guess a canonical system name.
 #   Copyright 1992-2018 Free Software Foundation, Inc.
 
 # Attempt to guess a canonical system name.
 #   Copyright 1992-2018 Free Software Foundation, Inc.
 

-timestamp='2018-08-29'
+timestamp='2018-11-28'

 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by


@@ -1424,6 +1424,9 @@ EOF
     amd64:Isilon\ OneFS:*:*)
        echo x86_64-unknown-onefs
        exit ;;
     amd64:Isilon\ OneFS:*:*)
        echo x86_64-unknown-onefs
        exit ;;

+    *:Unleashed:*:*)
+       echo "$UNAME_MACHINE"-unknown-unleashed"$UNAME_RELEASE"
+       exit ;;

 esac
 
 echo "$0: unable to guess system type" >&2
 esac
 
 echo "$0: unable to guess system type" >&2

diff --git a/config.sub b/config.sub
index f208558ec21f53223066d8d576dfb6c97c9465dd..46708056af382d6b4244f44ff5ee1441721dbd5d 100755 (executable)
--- a/config.sub
+++ b/config.sub
@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2018 Free Software Foundation, Inc.
 
 # Configuration validation subroutine script.
 #   Copyright 1992-2018 Free Software Foundation, Inc.
 

-timestamp='2018-08-29'
+timestamp='2018-11-28'

 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by


@@ -1161,6 +1161,7 @@ case $cpu-$vendor in
                        | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \
                        | alphapca5[67] | alpha64pca5[67] \
                        | am33_2.0 \
                        | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \
                        | alphapca5[67] | alpha64pca5[67] \
                        | am33_2.0 \

+                       | amdgcn \

                        | arc | arceb \
                        | arm  | arm[lb]e | arme[lb] | armv* \
                        | avr | avr32 \
                        | arc | arceb \
                        | arm  | arm[lb]e | arme[lb] | armv* \
                        | avr | avr32 \


@@ -1360,7 +1361,7 @@ case $os in
             | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
             | skyos* | haiku* | rdos* | toppers* | drops* | es* \
             | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
             | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
             | skyos* | haiku* | rdos* | toppers* | drops* | es* \
             | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \

-            | midnightbsd*)
+            | midnightbsd* | amdhsa* | unleashed*)

        # Remember, each alternative MUST END IN *, to match a version number.
                ;;
        qnx*)
        # Remember, each alternative MUST END IN *, to match a version number.
                ;;
        qnx*)

diff --git a/configure b/configure
index 50d6f90e06cc28a6bc72115c9cbb34907d042367..10dd946d9709821cd0bef40b4cc099fa8c563ed4 100755 (executable)
--- a/configure
+++ b/configure
@@ -8780,7 +8780,7 @@ case $host_os in
        cf_xopen_source="-D_DARWIN_C_SOURCE"
        cf_XOPEN_SOURCE=
        ;;
        cf_xopen_source="-D_DARWIN_C_SOURCE"
        cf_XOPEN_SOURCE=
        ;;

-(freebsd*|dragonfly*)
+(freebsd*|dragonfly*|midnightbsd*)

        # 5.x headers associate
        #       _XOPEN_SOURCE=600 with _POSIX_C_SOURCE=200112L
        #       _XOPEN_SOURCE=500 with _POSIX_C_SOURCE=199506L
        # 5.x headers associate
        #       _XOPEN_SOURCE=600 with _POSIX_C_SOURCE=200112L
        #       _XOPEN_SOURCE=500 with _POSIX_C_SOURCE=199506L

diff --git a/dist.mk b/dist.mk
index 9bb06b65cb62a23053f869868a3021f5a3a2b22b..fba98a8bb9d163e96a9139263e81b1ff4a832051 100644 (file)
--- a/dist.mk
+++ b/dist.mk
@@ -25,7 +25,7 @@
 # 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.1253 2018/11/25 11:25:14 tom Exp $
+# $Id: dist.mk,v 1.1254 2018/11/30 23:49:03 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


@@ -37,7 +37,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 1
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 1

-NCURSES_PATCH = 20181125
+NCURSES_PATCH = 20181201

 
 # 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)

diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index fd093f846477a96a84ce4059ea512c025519c65f..b2f3ea914731607c8f6056a63ff56f6b82fb4f6c 100644 (file)
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -34,7 +34,7 @@
  ****************************************************************************/
 
 /*
  ****************************************************************************/
 
 /*

- * $Id: curses.priv.h,v 1.608 2018/11/25 11:26:03 tom Exp $
+ * $Id: curses.priv.h,v 1.609 2018/12/01 22:04:24 tom Exp $

  *
  *     curses.priv.h
  *
  *
  *     curses.priv.h
  *


@@ -1623,6 +1623,7 @@ extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch;
 #define isWidecExt(ch) (0)
 #define if_WIDEC(code) /* nothing */
 
 #define isWidecExt(ch) (0)
 #define if_WIDEC(code) /* nothing */
 

+#define Charable(ch)   ((ch) >= ' ' && (ch) <= '~')

 #define L(ch)          ch
 #endif /* } */
 
 #define L(ch)          ch
 #endif /* } */
 

diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 7bad8b9dfa3f45423fb4436200779228c28b98b5..3ca5cb2ce62fcdf144f142dac9a425bc5391ea72 100644 (file)
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20181125) unstable; urgency=low
+ncurses6 (6.1+20181201) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 25 Nov 2018 06:25:14 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 30 Nov 2018 18:49:03 -0500

 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 

diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 7bad8b9dfa3f45423fb4436200779228c28b98b5..3ca5cb2ce62fcdf144f142dac9a425bc5391ea72 100644 (file)
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20181125) unstable; urgency=low
+ncurses6 (6.1+20181201) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 25 Nov 2018 06:25:14 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 30 Nov 2018 18:49:03 -0500

 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 

diff --git a/package/debian/changelog b/package/debian/changelog
index 1d8001ab96c2f94439533493fa18201c546b0f4c..6c78595b7b77815049770fd1b457b3172f9b1176 100644 (file)
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20181125) unstable; urgency=low
+ncurses6 (6.1+20181201) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 25 Nov 2018 06:25:14 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 30 Nov 2018 18:49:03 -0500

 
 ncurses6 (5.9-20120608) unstable; urgency=low
 
 
 ncurses6 (5.9-20120608) unstable; urgency=low
 

diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index ed8793fbde8e0d50a5677378e235f5f0ec699669..fa6af3869118aa7c5a0c1c9e14134cd868c2cbb3 100644 (file)
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.300 2018/11/25 11:25:14 tom Exp $\r
+; $Id: mingw-ncurses.nsi,v 1.301 2018/11/30 23:49:03 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


@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"\r
 !define VERSION_MINOR "1"\r
 !define VERSION_YYYY  "2018"\r
 !define VERSION_MAJOR "6"\r
 !define VERSION_MINOR "1"\r
 !define VERSION_YYYY  "2018"\r

-!define VERSION_MMDD  "1125"\r
+!define VERSION_MMDD  "1201"\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

diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index def525caf85fe5e73eadf8af5324df706837011f..5d1a5b68602a4874050eb48607f2f4e647c40d23 100644 (file)
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.1
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.1

-Release: 20181125
+Release: 20181201

 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/package/ncurses.spec b/package/ncurses.spec
index 77e60e81527df6287c6f2e2459cf62254b0ec3cd..f8c4fbed9261a97b9429235fb476caab97ccf219 100644 (file)
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.1
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.1

-Release: 20181125
+Release: 20181201

 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/package/ncursest.spec b/package/ncursest.spec
index 05cbc6099d95bdd39c698a8136b21f202abc7ddb..6188b7028a38809d9eb9b6ce9ceb35bd9b725425 100644 (file)
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.1
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.1

-Release: 20181125
+Release: 20181201

 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/test/aclocal.m4 b/test/aclocal.m4
index 208b97cc4c63d242af61de21061bb5aae2dcd085..3cb8ac72915197cf3f79e7d0ed837a2fced22297 100644 (file)
--- a/test/aclocal.m4
+++ b/test/aclocal.m4
@@ -26,7 +26,7 @@ dnl sale, use or other dealings in this Software without prior written       *
 dnl authorization.                                                           *
 dnl***************************************************************************
 dnl
 dnl authorization.                                                           *
 dnl***************************************************************************
 dnl

-dnl $Id: aclocal.m4,v 1.160 2018/08/18 20:39:24 tom Exp $
+dnl $Id: aclocal.m4,v 1.161 2018/12/01 21:05:05 tom Exp $

 dnl
 dnl Author: Thomas E. Dickey
 dnl
 dnl
 dnl Author: Thomas E. Dickey
 dnl


@@ -3831,7 +3831,7 @@ esac
 
 ])dnl
 dnl ---------------------------------------------------------------------------
 
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_XOPEN_SOURCE version: 53 updated: 2018/06/16 18:58:58
+dnl CF_XOPEN_SOURCE version: 54 updated: 2018/11/07 07:43:44

 dnl ---------------
 dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
 dnl or adapt to the vendor's definitions to get equivalent functionality,
 dnl ---------------
 dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
 dnl or adapt to the vendor's definitions to get equivalent functionality,


@@ -3861,7 +3861,7 @@ case $host_os in
        cf_xopen_source="-D_DARWIN_C_SOURCE"
        cf_XOPEN_SOURCE=
        ;;
        cf_xopen_source="-D_DARWIN_C_SOURCE"
        cf_XOPEN_SOURCE=
        ;;

-(freebsd*|dragonfly*)
+(freebsd*|dragonfly*|midnightbsd*)

        # 5.x headers associate
        #       _XOPEN_SOURCE=600 with _POSIX_C_SOURCE=200112L
        #       _XOPEN_SOURCE=500 with _POSIX_C_SOURCE=199506L
        # 5.x headers associate
        #       _XOPEN_SOURCE=600 with _POSIX_C_SOURCE=200112L
        #       _XOPEN_SOURCE=500 with _POSIX_C_SOURCE=199506L

diff --git a/test/configure b/test/configure
index 7b7cac88b52ed215fe12ba4628f2b9916a0f9fc1..4c6117272c772fd6a96c88a3ce0a90b0a8e6b57b 100755 (executable)
--- a/test/configure
+++ b/test/configure
@@ -3408,7 +3408,7 @@ case $host_os in
        cf_xopen_source="-D_DARWIN_C_SOURCE"
        cf_XOPEN_SOURCE=
        ;;
        cf_xopen_source="-D_DARWIN_C_SOURCE"
        cf_XOPEN_SOURCE=
        ;;

-(freebsd*|dragonfly*)
+(freebsd*|dragonfly*|midnightbsd*)

        # 5.x headers associate
        #       _XOPEN_SOURCE=600 with _POSIX_C_SOURCE=200112L
        #       _XOPEN_SOURCE=500 with _POSIX_C_SOURCE=199506L
        # 5.x headers associate
        #       _XOPEN_SOURCE=600 with _POSIX_C_SOURCE=200112L
        #       _XOPEN_SOURCE=500 with _POSIX_C_SOURCE=199506L

diff --git a/test/ncurses.c b/test/ncurses.c
index c9367296ace95f6ea3be339a00aa3f44ae2803fa..259daf47dd242ef2cf31606d926142d5f73db5f9 100644 (file)
--- a/test/ncurses.c
+++ b/test/ncurses.c
@@ -40,7 +40,7 @@ AUTHOR
    Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993
            Thomas E. Dickey (beginning revision 1.27 in 1996).
 
    Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993
            Thomas E. Dickey (beginning revision 1.27 in 1996).
 

-$Id: ncurses.c,v 1.508 2018/09/22 21:21:43 tom Exp $
+$Id: ncurses.c,v 1.510 2018/12/02 01:11:05 tom Exp $

 
 ***************************************************************************/
 
 
 ***************************************************************************/
 


@@ -4367,7 +4367,10 @@ x_acs_test(bool recur GCC_UNUSED)
     void (*last_show_wacs) (int, attr_t, NCURSES_PAIRS_T) = 0;
     W_ATTR_TBL my_list[SIZEOF(w_attrs_to_test)];
     unsigned my_size = init_w_attr_list(my_list, term_attrs());
     void (*last_show_wacs) (int, attr_t, NCURSES_PAIRS_T) = 0;
     W_ATTR_TBL my_list[SIZEOF(w_attrs_to_test)];
     unsigned my_size = init_w_attr_list(my_list, term_attrs());

+    char at_page[5];
+    bool pending_code = FALSE;

 
 

+    at_page[0] = '\0';

     do {
        switch (c) {
        case CTRL('L'):
     do {
        switch (c) {
        case CTRL('L'):


@@ -4399,15 +4402,39 @@ x_acs_test(bool recur GCC_UNUSED)
        case 'u':
            ToggleAcs(last_show_wacs, show_utf8_chars);
            break;
        case 'u':
            ToggleAcs(last_show_wacs, show_utf8_chars);
            break;

+       case '@':
+           pending_code = !pending_code;
+           if (pending_code) {
+               sprintf(at_page, "%02x", digit);
+           } else if (at_page[0] != '\0') {
+               sscanf(at_page, "%x", &digit);
+           }
+           break;

        default:
        default:

-           if (c < 256 && isdigit(c)) {
+           if (pending_code && isxdigit(c)) {
+               size_t len = strlen(at_page);
+               if (len && at_page[0] == '0') {
+                   memmove(at_page, at_page + 1, len--);
+               }
+               if (len < sizeof(at_page) - 1) {
+                   at_page[len++] = (char) c;
+                   at_page[len] = '\0';
+               }
+           } else if (pending_code
+                      && (c == '\b' || c == KEY_BACKSPACE || c == KEY_DC)) {
+               size_t len = strlen(at_page);
+               if (len)
+                   at_page[--len] = '\0';
+           } else if (c < 256 && isdigit(c)) {

                digit = (c - '0');
                last_show_wacs = 0;
            } else if (c == '+') {
                ++digit;
                digit = (c - '0');
                last_show_wacs = 0;
            } else if (c == '+') {
                ++digit;

+               sprintf(at_page, "%02x", digit);

                last_show_wacs = 0;
            } else if (c == '-' && digit > 0) {
                --digit;
                last_show_wacs = 0;
            } else if (c == '-' && digit > 0) {
                --digit;

+               sprintf(at_page, "%02x", digit);

                last_show_wacs = 0;
            } else if (c == '>' && repeat < (COLS / 4)) {
                ++repeat;
                last_show_wacs = 0;
            } else if (c == '>' && repeat < (COLS / 4)) {
                ++repeat;


@@ -4435,7 +4462,11 @@ x_acs_test(bool recur GCC_UNUSED)
        }
 
        MvPrintw(LINES - 4, 0,
        }
 
        MvPrintw(LINES - 4, 0,

-                "Select: a/d/t WACS, w=all x=box, u UTF-8, ^L repaint");
+                "Select: a/d/t WACS, w=%d/page, @",
+                pagesize);
+       printw("%s",
+              pending_code ? at_page : "page");
+       addstr(", x=box, u UTF-8, ^L repaint");

        MvPrintw(LINES - 3, 2,
                 "0-9,+/- non-ASCII, </> repeat, _ space, ESC=quit");
        if (UseColors) {
        MvPrintw(LINES - 3, 2,
                 "0-9,+/- non-ASCII, </> repeat, _ space, ESC=quit");
        if (UseColors) {