ncurses 5.9 - patch 20130816

+ add checks in tic to warn about terminals which lack cursor
  addressing, capabilities or having those, are marked as hard_copy or
  generic_type.
+ use --without-progs in mingw-ncurses rpm.
+ split out _nc_init_termtype() from alloc_entry.c to use in MinGW
  port when tic and other programs are not needed.

diff --git a/NEWS b/NEWS
index 30f2c021d671687cb222f7d8832e1d6226950d0d..12f933575002d1baaa4df2342b5af07cf8e89cc0 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.2085 2013/08/05 00:51:45 tom Exp $
+-- $Id: NEWS,v 1.2089 2013/08/17 21:17:42 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,14 @@ 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.
 

+20130816
+       + add checks in tic to warn about terminals which lack cursor
+         addressing, capabilities or having those, are marked as hard_copy or
+         generic_type.
+       + use --without-progs in mingw-ncurses rpm.
+       + split out _nc_init_termtype() from alloc_entry.c to use in MinGW
+         port when tic and other programs are not needed.
+

 20130805
        + minor fixes to the --disable-overwrite logic, to ensure that the
          configured $(includedir) is not cancelled by the mingwxx-filesystem
 20130805
        + minor fixes to the --disable-overwrite logic, to ensure that the
          configured $(includedir) is not cancelled by the mingwxx-filesystem

diff --git a/aclocal.m4 b/aclocal.m4
index 4a9f236044bef9bd99b2754f140b770aa2badf96..ca69d91937c47533a424deebe0381894f4670659 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.674 2013/08/03 22:18:08 tom Exp $
+dnl $Id: aclocal.m4,v 1.675 2013/08/17 18:43:56 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


@@ -3110,7 +3110,7 @@ ifelse($1,,,[$1=$LIB_PREFIX])
        AC_SUBST(LIB_PREFIX)
 ])dnl
 dnl ---------------------------------------------------------------------------
        AC_SUBST(LIB_PREFIX)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_LIB_RULES version: 72 updated: 2013/03/24 17:10:41
+dnl CF_LIB_RULES version: 73 updated: 2013/08/03 18:18:08

 dnl ------------
 dnl Append definitions and rules for the given models to the subdirectory
 dnl Makefiles, and the recursion rule for the top-level Makefile.  If the
 dnl ------------
 dnl Append definitions and rules for the given models to the subdirectory
 dnl Makefiles, and the recursion rule for the top-level Makefile.  If the


@@ -5340,7 +5340,7 @@ CF_VERBOSE(...checked $1 [$]$1)
 AC_SUBST(EXTRA_LDFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(EXTRA_LDFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_SHARED_OPTS version: 79 updated: 2013/07/27 17:57:16
+dnl CF_SHARED_OPTS version: 81 updated: 2013/08/03 18:18:08

 dnl --------------
 dnl --------------
 dnl Attempt to determine the appropriate CC/LD options for creating a shared
 dnl --------------
 dnl --------------
 dnl Attempt to determine the appropriate CC/LD options for creating a shared


@@ -5918,7 +5918,7 @@ if test "$cf_cv_sizechange" != no ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_SRC_MODULES version: 26 updated: 2012/01/07 15:08:24
+dnl CF_SRC_MODULES version: 27 updated: 2013/08/03 18:18:08

 dnl --------------
 dnl For each parameter, test if the source-directory exists, and if it contains
 dnl a 'modules' file.  If so, add to the list $cf_cv_src_modules which we'll
 dnl --------------
 dnl For each parameter, test if the source-directory exists, and if it contains
 dnl a 'modules' file.  If so, add to the list $cf_cv_src_modules which we'll

diff --git a/dist.mk b/dist.mk
index a1f840cbb4e82703413240204da5e1641157c5af..ba3e315bbbdc137d39c017d052cab30c1cd1c3bb 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.940 2013/08/05 00:52:17 tom Exp $
+# $Id: dist.mk,v 1.941 2013/08/17 17:15:43 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 = 5
 NCURSES_MINOR = 9
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 5
 NCURSES_MINOR = 9

-NCURSES_PATCH = 20130805
+NCURSES_PATCH = 20130816

 
 # 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/include/MKterm.h.awk.in b/include/MKterm.h.awk.in
index c9419bc47e8fff2bbb87e15b75ee45e917188530..587ee52123884d97a98e3bc8273e1a8b37c75484 100644 (file)
--- a/include/MKterm.h.awk.in
+++ b/include/MKterm.h.awk.in
@@ -34,7 +34,7 @@ BEGIN         {
                    print  "/*    and: Thomas E. Dickey                        1995-on                  */"
                    print  "/****************************************************************************/"
                    print  ""
                    print  "/*    and: Thomas E. Dickey                        1995-on                  */"
                    print  "/****************************************************************************/"
                    print  ""

-                   print  "/* $Id: MKterm.h.awk.in,v 1.61 2013/05/25 20:04:51 tom Exp $ */"
+                   print  "/* $Id: MKterm.h.awk.in,v 1.62 2013/08/17 19:21:56 tom Exp $ */"

                    print  ""
                    print  "/*"
                    print  "**  term.h -- Definition of struct term"
                    print  ""
                    print  "/*"
                    print  "**  term.h -- Definition of struct term"


@@ -252,6 +252,7 @@ END         {
                        print  "extern NCURSES_EXPORT(int) _nc_get_tty_mode (TTY *buf);"
                        print  "extern NCURSES_EXPORT(int) _nc_read_entry (const char * const, char * const, TERMTYPE *const);"
                        print  "extern NCURSES_EXPORT(int) _nc_read_file_entry (const char *const, TERMTYPE *);"
                        print  "extern NCURSES_EXPORT(int) _nc_get_tty_mode (TTY *buf);"
                        print  "extern NCURSES_EXPORT(int) _nc_read_entry (const char * const, char * const, TERMTYPE *const);"
                        print  "extern NCURSES_EXPORT(int) _nc_read_file_entry (const char *const, TERMTYPE *);"

+                       print  "extern NCURSES_EXPORT(void) _nc_init_termtype (TERMTYPE *const);"

                        print  "extern NCURSES_EXPORT(int) _nc_read_termtype (TERMTYPE *, char *, int);"
                        print  "extern NCURSES_EXPORT(char *) _nc_first_name (const char *const);"
                        print  "extern NCURSES_EXPORT(int) _nc_name_match (const char *const, const char *const, const char *const);"
                        print  "extern NCURSES_EXPORT(int) _nc_read_termtype (TERMTYPE *, char *, int);"
                        print  "extern NCURSES_EXPORT(char *) _nc_first_name (const char *const);"
                        print  "extern NCURSES_EXPORT(int) _nc_name_match (const char *const, const char *const, const char *const);"

diff --git a/ncurses/tinfo/alloc_entry.c b/ncurses/tinfo/alloc_entry.c
index 88edb0faa61ad46ed76fb01e9a2483cb3a0cc34f..14ea391188378882b7b7587dffb326b27337ae08 100644 (file)
--- a/ncurses/tinfo/alloc_entry.c
+++ b/ncurses/tinfo/alloc_entry.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2012,2013 Free Software Foundation, Inc.              *

  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -47,7 +47,7 @@
 
 #include <tic.h>
 
 
 #include <tic.h>
 

-MODULE_ID("$Id: alloc_entry.c,v 1.57 2012/10/27 21:32:23 tom Exp $")
+MODULE_ID("$Id: alloc_entry.c,v 1.58 2013/08/17 19:20:38 tom Exp $")

 
 #define ABSENT_OFFSET    -1
 #define CANCELLED_OFFSET -2
 
 #define ABSENT_OFFSET    -1
 #define CANCELLED_OFFSET -2


@@ -61,8 +61,6 @@ NCURSES_EXPORT(void)
 _nc_init_entry(TERMTYPE *const tp)
 /* initialize a terminal type data block */
 {
 _nc_init_entry(TERMTYPE *const tp)
 /* initialize a terminal type data block */
 {

-    unsigned i;
-

 #if NO_LEAKS
     if (tp == 0) {
        if (stringbuf != 0) {
 #if NO_LEAKS
     if (tp == 0) {
        if (stringbuf != 0) {


@@ -75,31 +73,9 @@ _nc_init_entry(TERMTYPE *const tp)
     if (stringbuf == 0)
        TYPE_MALLOC(char, (size_t) MAX_STRTAB, stringbuf);
 
     if (stringbuf == 0)
        TYPE_MALLOC(char, (size_t) MAX_STRTAB, stringbuf);
 

-#if NCURSES_XNAMES
-    tp->num_Booleans = BOOLCOUNT;
-    tp->num_Numbers = NUMCOUNT;
-    tp->num_Strings = STRCOUNT;
-    tp->ext_Booleans = 0;
-    tp->ext_Numbers = 0;
-    tp->ext_Strings = 0;
-#endif
-    if (tp->Booleans == 0)
-       TYPE_MALLOC(NCURSES_SBOOL, BOOLCOUNT, tp->Booleans);
-    if (tp->Numbers == 0)
-       TYPE_MALLOC(short, NUMCOUNT, tp->Numbers);
-    if (tp->Strings == 0)
-       TYPE_MALLOC(char *, STRCOUNT, tp->Strings);
-
-    for_each_boolean(i, tp)
-       tp->Booleans[i] = FALSE;
-
-    for_each_number(i, tp)
-       tp->Numbers[i] = ABSENT_NUMERIC;
-
-    for_each_string(i, tp)
-       tp->Strings[i] = ABSENT_STRING;
-

     next_free = 0;
     next_free = 0;

+
+    _nc_init_termtype(tp);

 }
 
 NCURSES_EXPORT(ENTRY *)
 }
 
 NCURSES_EXPORT(ENTRY *)


@@ -137,7 +113,7 @@ _nc_save_str(const char *const string)
        next_free += len;
        result = (stringbuf + old_next_free);
     } else {
        next_free += len;
        result = (stringbuf + old_next_free);
     } else {

-       _nc_warning("Too much data, some is lost");
+       _nc_warning("Too much data, some is lost: %s", string);

     }
     return result;
 }
     }
     return result;
 }

diff --git a/ncurses/tinfo/read_entry.c b/ncurses/tinfo/read_entry.c
index 4d1cb116d06bdab9a0733b3e251be5dc8b6f7235..0c825d537e4c6e8106515b001fccf4e8547a5c3d 100644 (file)
--- a/ncurses/tinfo/read_entry.c
+++ b/ncurses/tinfo/read_entry.c
@@ -41,7 +41,7 @@
 
 #include <tic.h>
 
 
 #include <tic.h>
 

-MODULE_ID("$Id: read_entry.c,v 1.124 2013/07/13 20:06:43 tom Exp $")
+MODULE_ID("$Id: read_entry.c,v 1.125 2013/08/17 19:06:59 tom Exp $")

 
 #define TYPE_CALLOC(type,elts) typeCalloc(type, (unsigned)(elts))
 
 
 #define TYPE_CALLOC(type,elts) typeCalloc(type, (unsigned)(elts))
 


@@ -115,6 +115,36 @@ fake_read(char *src, int *offset, int limit, char *dst, unsigned want)
 #define even_boundary(value) \
     if ((value) % 2 != 0) Read(buf, 1)
 
 #define even_boundary(value) \
     if ((value) % 2 != 0) Read(buf, 1)
 

+NCURSES_EXPORT(void)
+_nc_init_termtype(TERMTYPE *const tp)
+{
+    unsigned i;
+
+#if NCURSES_XNAMES
+    tp->num_Booleans = BOOLCOUNT;
+    tp->num_Numbers = NUMCOUNT;
+    tp->num_Strings = STRCOUNT;
+    tp->ext_Booleans = 0;
+    tp->ext_Numbers = 0;
+    tp->ext_Strings = 0;
+#endif
+    if (tp->Booleans == 0)
+       TYPE_MALLOC(NCURSES_SBOOL, BOOLCOUNT, tp->Booleans);
+    if (tp->Numbers == 0)
+       TYPE_MALLOC(short, NUMCOUNT, tp->Numbers);
+    if (tp->Strings == 0)
+       TYPE_MALLOC(char *, STRCOUNT, tp->Strings);
+
+    for_each_boolean(i, tp)
+       tp->Booleans[i] = FALSE;
+
+    for_each_number(i, tp)
+       tp->Numbers[i] = ABSENT_NUMERIC;
+
+    for_each_string(i, tp)
+       tp->Strings[i] = ABSENT_STRING;
+}
+

 /*
  * Return TGETENT_YES if read, TGETENT_NO if not found or garbled.
  */
 /*
  * Return TGETENT_YES if read, TGETENT_NO if not found or garbled.
  */

diff --git a/ncurses/win32con/win_driver.c b/ncurses/win32con/win_driver.c
index 6feb16601ec4c466319124b272b62c9f96aabcac..d3660d24abd602f02ef98b26ac9658f95e009d1e 100644 (file)
--- a/ncurses/win32con/win_driver.c
+++ b/ncurses/win32con/win_driver.c
@@ -38,7 +38,7 @@
 #include <curses.priv.h>
 #define CUR my_term.type.
 
 #include <curses.priv.h>
 #define CUR my_term.type.
 

-MODULE_ID("$Id: win_driver.c,v 1.19 2013/05/25 20:16:46 tom Exp $")
+MODULE_ID("$Id: win_driver.c,v 1.20 2013/08/17 19:25:30 tom Exp $")

 
 #define WINMAGIC NCDRV_MAGIC(NCDRV_WINCONSOLE)
 
 
 #define WINMAGIC NCDRV_MAGIC(NCDRV_WINCONSOLE)
 


@@ -492,7 +492,7 @@ drv_CanHandle(TERMINAL_CONTROL_BLOCK * TCB,
 
     if (code) {
        if ((TCB->term.type.Booleans) == 0) {
 
     if (code) {
        if ((TCB->term.type.Booleans) == 0) {

-           _nc_init_entry(&(TCB->term.type));
+           _nc_init_termtype(&(TCB->term.type));

        }
     }
 
        }
     }
 

diff --git a/package/debian/changelog b/package/debian/changelog
index b5b02d0a48f01f28368189b7be3f453dd36514f6..3d2b8c3f0b17bcd8ecba3df0957bef8245f45c34 100644 (file)
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (5.9-20130805) unstable; urgency=low
+ncurses6 (5.9-20130816) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 03 Aug 2013 13:17:35 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 17 Aug 2013 13:15:43 -0400

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

diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index b4fcf8c0020e6ac5299b1ae5877f7a3fb3a976c8..ea75336d1b35fd2917e2511b9e53e96a54b6bd3f 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
 Release: 5.9
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Release: 5.9

-Version: 20130805
+Version: 20130816

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


@@ -70,6 +70,7 @@ This package is used for testing ABI 6 with cross-compiles to MinGW.
        --without-debug \\\
        --with-install-prefix=$RPM_BUILD_ROOT \\\
        --without-manpages \\\
        --without-debug \\\
        --with-install-prefix=$RPM_BUILD_ROOT \\\
        --without-manpages \\\

+       --without-progs \\\

        --without-tests
 
 %define debug_package %{nil}
        --without-tests
 
 %define debug_package %{nil}

diff --git a/package/ncurses.spec b/package/ncurses.spec
index 03627f268f91c7ef0ec5fe92a626874ba8071a05..0b7cf27bc0c329fdbf902c6f637f100542993348 100644 (file)
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Release: 5.9
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Release: 5.9

-Version: 20130805
+Version: 20130816

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

diff --git a/progs/tic.c b/progs/tic.c
index 4d265eb1fed5a1ee55ce48ab6ba3338c232c30a8..e1eb7e095567f624dd311b7f8be734d7d6962dfe 100644 (file)
--- a/progs/tic.c
+++ b/progs/tic.c
@@ -46,7 +46,7 @@
 #include <hashed_db.h>
 #include <transform.h>
 
 #include <hashed_db.h>
 #include <transform.h>
 

-MODULE_ID("$Id: tic.c,v 1.186 2013/06/08 16:50:47 tom Exp $")
+MODULE_ID("$Id: tic.c,v 1.187 2013/08/17 21:15:15 tom Exp $")

 
 #define STDIN_NAME "<stdin>"
 
 
 #define STDIN_NAME "<stdin>"
 


@@ -1224,6 +1224,19 @@ check_ansi_cursor(char *list[4])
 }
 
 #define EXPECTED(name) if (!PRESENT(name)) _nc_warning("expected " #name)
 }
 
 #define EXPECTED(name) if (!PRESENT(name)) _nc_warning("expected " #name)

+#define UNEXPECTED(name) if (PRESENT(name)) _nc_warning("unexpected " #name ", for %s", why)
+
+static void
+check_noaddress(TERMTYPE *tp, const char *why)
+{
+    UNEXPECTED(column_address);
+    UNEXPECTED(cursor_address);
+    UNEXPECTED(cursor_home);
+    UNEXPECTED(cursor_mem_address);
+    UNEXPECTED(cursor_to_ll);
+    UNEXPECTED(row_address);
+    UNEXPECTED(row_address);
+}

 
 static void
 check_cursor(TERMTYPE *tp)
 
 static void
 check_cursor(TERMTYPE *tp)


@@ -1231,6 +1244,43 @@ check_cursor(TERMTYPE *tp)
     int count;
     char *list[4];
 
     int count;
     char *list[4];
 

+    if (hard_copy) {
+       check_noaddress(tp, "hard_copy");
+    } else if (generic_type) {
+       check_noaddress(tp, "generic_type");
+    } else if (strchr(tp->term_names, '+') == 0) {
+       int y = 0;
+       int x = 0;
+       if (PRESENT(column_address))
+           ++y;
+       if (PRESENT(cursor_address))
+           y = x = 10;
+       if (PRESENT(cursor_home))
+           ++y, ++x;
+       if (PRESENT(cursor_mem_address))
+           y = x = 10;
+       if (PRESENT(cursor_to_ll))
+           ++y, ++x;
+       if (PRESENT(row_address))
+           ++x;
+       if (PRESENT(cursor_down))
+           ++y;
+       if (PRESENT(cursor_up))
+           ++y;
+       if (PRESENT(cursor_left))
+           ++x;
+       if (PRESENT(cursor_right))
+           ++x;
+       if (x < 2 && y < 2) {
+           _nc_warning("terminal lacks cursor addressing");
+       } else {
+           if (x < 2)
+               _nc_warning("terminal lacks cursor column-addressing");
+           if (y < 2)
+               _nc_warning("terminal lacks cursor row-addressing");
+       }
+    }
+

     /* it is rare to have an insert-line feature without a matching delete */
     ANDMISSING(parm_insert_line, insert_line);
     ANDMISSING(parm_delete_line, delete_line);
     /* it is rare to have an insert-line feature without a matching delete */
     ANDMISSING(parm_insert_line, insert_line);
     ANDMISSING(parm_delete_line, delete_line);


@@ -1412,7 +1462,7 @@ check_keypad(TERMTYPE *tp)
 
     /*
      * These warnings are useful for consistency checks - it is possible that
 
     /*
      * These warnings are useful for consistency checks - it is possible that

-     * there are real terminals with mismatches in these 
+     * there are real terminals with mismatches in these

      */
     ANDMISSING(key_ic, key_dc);
 }
      */
     ANDMISSING(key_ic, key_dc);
 }