ncurses 6.1 - patch 20191207

+ fix a few warnings for test-package builds
+ add curses_trace(), to replace trace().

diff --git a/Ada95/package/debian/compat b/Ada95/package/debian/compat
index 7f8f011eb73d6043d2e6db9d2c101195ae2801f2..ec635144f60048986bc560c5576355344005e6e7 100644 (file)
--- a/Ada95/package/debian/compat
+++ b/Ada95/package/debian/compat
@@ -1 +1 @@
-7
+9

diff --git a/Ada95/package/debian/control b/Ada95/package/debian/control
index 00a2e49a6207814642d492e635f0475a0d8dc4ab..030adb17a5d2913669fc5287d2e8ed9478344784 100644 (file)
--- a/Ada95/package/debian/control
+++ b/Ada95/package/debian/control
@@ -9,7 +9,7 @@ Homepage: https://invisible-island.net/adacurses/
 Package: adacurses
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Package: adacurses
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}

-Description: AdaCurses - Ada95 binding for ncurses
+Description: Ada95 binding for ncurses

  This package installs as "adacurses" to avoid conflict with other packages.
  This is the Ada95 binding from the ncurses distribution.
  .
  This package installs as "adacurses" to avoid conflict with other packages.
  This is the Ada95 binding from the ncurses distribution.
  .

diff --git a/NEWS b/NEWS
index 589465f24f862ea5d814be3d1a6002af0aafe095..b6414f8030e5af9245b54e80aa5ccd0f9b4abed4 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.3412 2019/11/30 22:27:28 tom Exp $
+-- $Id: NEWS,v 1.3415 2019/12/07 23:36:25 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,10 @@ 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.
 

+20191207
+       + fix a few warnings for test-package builds
+       + add curses_trace(), to replace trace().
+

 20191130
        + add portability section to curs_getcchar manpage (prompted by
          discussion with Nick Black).
 20191130
        + add portability section to curs_getcchar manpage (prompted by
          discussion with Nick Black).

diff --git a/VERSION b/VERSION
index 91680bf7fbb6235007debcc8c8702a32812e3b75..10b83589983c4833fd3607135ec100d00dc8c266 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10 6.1     20191130
+5:0:10 6.1     20191207

diff --git a/dist.mk b/dist.mk
index 66f6af101ad3f0f83f82ae2d361ca04f64d4b32a..c0e1e231947927bb1307577324f148517b9d5870 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.1317 2019/11/30 14:52:31 tom Exp $
+# $Id: dist.mk,v 1.1318 2019/12/07 10:19:49 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 = 20191130
+NCURSES_PATCH = 20191207

 
 # 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/doc/html/man/adacurses6-config.1.html b/doc/html/man/adacurses6-config.1.html
index ec53fe18afbfe826f7f92823c6c6e5e5e3ef45da..08ab84a5e9ec9fbe389bc61d8842248469e0c0fe 100644 (file)
--- a/doc/html/man/adacurses6-config.1.html
+++ b/doc/html/man/adacurses6-config.1.html
@@ -125,7 +125,7 @@
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
 

-       This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191130).
+       This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191207).

 
 
 
 
 
 

diff --git a/doc/html/man/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html
index f981ad1140c946a2e061da0445ef1bcea6c7a863..1b004380a02c9d3c43225c995900102f95d3e3e4 100644 (file)
--- a/doc/html/man/captoinfo.1m.html
+++ b/doc/html/man/captoinfo.1m.html
@@ -198,7 +198,7 @@
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 

-       This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191130).
+       This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191207).

 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>

diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html
index 53a70776b71c17954e58ab919543582c919fae3e..1358cdd6f11ad5251ba5375b2f1d001348a67ac5 100644 (file)
--- a/doc/html/man/clear.1.html
+++ b/doc/html/man/clear.1.html
@@ -148,7 +148,7 @@
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 

-       This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191130).
+       This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191207).

 
 
 
 
 
 

diff --git a/doc/html/man/curs_trace.3x.html b/doc/html/man/curs_trace.3x.html
index ebd47f86524125a89c2977a4e933d6b3a37c34d9..77ecbccec61f4b59a6cc1aa3fd6cd625944d0ae1 100644 (file)
--- a/doc/html/man/curs_trace.3x.html
+++ b/doc/html/man/curs_trace.3x.html
@@ -1,6 +1,6 @@
 <!-- 
   ****************************************************************************
 <!-- 
   ****************************************************************************

-  * Copyright (c) 2000-2016,2017 Free Software Foundation, Inc.              *
+  * Copyright (c) 2000-2017,2019 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            *


@@ -26,7 +26,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: curs_trace.3x,v 1.19 2017/11/18 23:47:37 tom Exp @
+  * @Id: curs_trace.3x,v 1.20 2019/12/07 18:55:02 tom Exp @

 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>


@@ -46,15 +46,15 @@
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>
 
 
 </PRE><H2><a name="h2-NAME">NAME</a></H2><PRE>

-       <STRONG>trace</STRONG>, <STRONG>_tracef</STRONG>, <STRONG>_traceattr</STRONG>, <STRONG>_traceattr2</STRONG>, <STRONG>_tracecchar_t</STRONG>, <STRONG>_tracecchar_t2</STRONG>,
-       <STRONG>_tracechar</STRONG>, <STRONG>_tracechtype</STRONG>, <STRONG>_tracechtype2</STRONG>, <STRONG>_nc_tracebits</STRONG>, <STRONG>_tracedump</STRONG>,
-       <STRONG>_tracemouse</STRONG> - <STRONG>curses</STRONG> debugging routines
+       <STRONG>curses_trace</STRONG>, <STRONG>trace</STRONG>, <STRONG>_tracef</STRONG>, <STRONG>_traceattr</STRONG>, <STRONG>_traceattr2</STRONG>, <STRONG>_tracecchar_t</STRONG>,
+       <STRONG>_tracecchar_t2</STRONG>, <STRONG>_tracechar</STRONG>, <STRONG>_tracechtype</STRONG>, <STRONG>_tracechtype2</STRONG>, <STRONG>_nc_tracebits</STRONG>,
+       <STRONG>_tracedump</STRONG>, <STRONG>_tracemouse</STRONG> - <STRONG>curses</STRONG> debugging routines

 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 
 
 
 </PRE><H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
 

-       <STRONG>void</STRONG> <STRONG>trace(const</STRONG> <STRONG>unsigned</STRONG> <STRONG>int</STRONG> <EM>param</EM><STRONG>);</STRONG>
+       <STRONG>unsigned</STRONG> <STRONG>curses_trace(const</STRONG> <STRONG>unsigned</STRONG> <EM>param</EM><STRONG>);</STRONG>

 
        <STRONG>void</STRONG> <STRONG>_tracef(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>format</EM><STRONG>,</STRONG> <STRONG>...);</STRONG>
 
 
        <STRONG>void</STRONG> <STRONG>_tracef(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>format</EM><STRONG>,</STRONG> <STRONG>...);</STRONG>
 


@@ -70,46 +70,64 @@
        <STRONG>char</STRONG> <STRONG>*_nc_tracebits(void);</STRONG>
        <STRONG>char</STRONG> <STRONG>*_tracemouse(const</STRONG> <STRONG>MEVENT</STRONG> <STRONG>*</STRONG><EM>event</EM><STRONG>);</STRONG>
 
        <STRONG>char</STRONG> <STRONG>*_nc_tracebits(void);</STRONG>
        <STRONG>char</STRONG> <STRONG>*_tracemouse(const</STRONG> <STRONG>MEVENT</STRONG> <STRONG>*</STRONG><EM>event</EM><STRONG>);</STRONG>
 

+       /* deprecated */
+       <STRONG>void</STRONG> <STRONG>trace(const</STRONG> <STRONG>unsigned</STRONG> <STRONG>int</STRONG> <EM>param</EM><STRONG>);</STRONG>
+

 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>

-       The  <STRONG>trace</STRONG>  routines  are  used for debugging the ncurses libraries, as
-       well as applications which use the ncurses libraries.  These  functions
-       are  normally available only with the debugging library e.g., <EM>libncurs-</EM>
-       <EM>es</EM><STRONG>_</STRONG><EM>g.a</EM>, but may be compiled into any model (shared, static, profile) by
-       defining  the  symbol  <STRONG>TRACE</STRONG>.   Additionally,  some  functions are only
-       available with the wide-character configuration of the libraries.
+       The <EM>curses</EM> <EM>trace</EM> routines are used for debugging the ncurses libraries,
+       as well as applications which use the ncurses libraries.  Some  limita-
+       tions apply:
+
+       <STRONG>o</STRONG>   Aside from <STRONG>curses_trace</STRONG>, the other functions are normally available
+           only with the debugging library e.g., <EM>libncurses</EM><STRONG>_</STRONG><EM>g.a</EM>.
+
+           All of the trace functions may be compiled into any model  (shared,
+           static, profile) by defining the symbol <STRONG>TRACE</STRONG>.
+
+       <STRONG>o</STRONG>   Additionally,  the  functions  which use <STRONG>cchar_t</STRONG> are only available
+           with the wide-character configuration of the libraries.

 
 
 </PRE><H3><a name="h3-Functions">Functions</a></H3><PRE>
        The principal parts of this interface are
 
 
 
 </PRE><H3><a name="h3-Functions">Functions</a></H3><PRE>
        The principal parts of this interface are
 

-       <STRONG>o</STRONG>   <STRONG>trace</STRONG>, which selectively enables different tracing features, and
+       <STRONG>o</STRONG>   <STRONG>curses_trace</STRONG>, which selectively enables different tracing features,
+           and

 
        <STRONG>o</STRONG>   <STRONG>_tracef</STRONG>, which writes formatted data to the <EM>trace</EM> file.
 
 
        <STRONG>o</STRONG>   <STRONG>_tracef</STRONG>, which writes formatted data to the <EM>trace</EM> file.
 

-       Calling <STRONG>trace</STRONG> with a nonzero parameter creates the file  <STRONG>trace</STRONG>  in  the
-       current  directory  for output.  If the file already exists, no tracing
-       is done.
+           The other functions either return a pointer to a string-area (allo-
+           cated by the corresponding function), or return no value  (such  as
+           <STRONG>_tracedump</STRONG>,  which  implements  the  screen dump for <STRONG>TRACE_UPDATE</STRONG>).
+           The caller should not free these strings, since the  allocation  is
+           reused on successive calls.  To work around the problem of a single
+           string-area per  function,  some  use  a  buffer-number  parameter,
+           telling the library to allocate additional string-areas.
+
+       The <STRONG>curses_trace</STRONG> function is always available, whether or not the other
+       trace functions are available:
+
+       <STRONG>o</STRONG>   If tracing is available, calling <STRONG>curses_trace</STRONG> with a nonzero param-
+           eter updates the trace mask, and returns the previous trace mask.

 
 

-       The other functions either return a pointer to a string-area (allocated
-       by the corresponding function), or return no value (such as <STRONG>_tracedump</STRONG>,
-       which implements the screen dump for <STRONG>TRACE_UPDATE</STRONG>).  The caller  should
-       not  free  these  strings, since the allocation is reused on successive
-       calls.  To work around the problem of a single  string-area  per  func-
-       tion,  some use a buffer-number parameter, telling the library to allo-
-       cate additional string-areas.
+           When the trace mask is nonzero, ncurses creates the file "trace" in
+           the current directory for output.  If the file already  exists,  no
+           tracing is done.
+
+       <STRONG>o</STRONG>   If tracing is not available, <STRONG>curses_trace</STRONG> returns zero (0).

 
 
 </PRE><H3><a name="h3-Trace-Parameter">Trace Parameter</a></H3><PRE>
 
 
 </PRE><H3><a name="h3-Trace-Parameter">Trace Parameter</a></H3><PRE>

-       The trace parameter is  formed  by  OR'ing  values  from  the  list  of
+       The  trace  parameter  is  formed  by  OR'ing  values  from the list of

        <STRONG>TRACE_</STRONG><EM>xxx</EM> definitions in <STRONG>&lt;curses.h&gt;</STRONG>.  These include:
 
        <STRONG>TRACE_DISABLE</STRONG>
             turn off tracing by passing a zero parameter.
 
        <STRONG>TRACE_</STRONG><EM>xxx</EM> definitions in <STRONG>&lt;curses.h&gt;</STRONG>.  These include:
 
        <STRONG>TRACE_DISABLE</STRONG>
             turn off tracing by passing a zero parameter.
 

-            The  library flushes the output file, but retains an open file-de-
-            scriptor to the trace file so that it can resume tracing later  if
-            a nonzero parameter is passed to the <STRONG>trace</STRONG> function.
+            The library flushes the output file, but retains an open  file-de-
+            scriptor  to the trace file so that it can resume tracing later if
+            a nonzero parameter is passed to the <STRONG>curses_trace</STRONG> function.

 
        <STRONG>TRACE_TIMES</STRONG>
             trace user and system times of updates.
 
        <STRONG>TRACE_TIMES</STRONG>
             trace user and system times of updates.


@@ -127,11 +145,11 @@
             trace all character outputs.
 
        <STRONG>TRACE_ORDINARY</STRONG>
             trace all character outputs.
 
        <STRONG>TRACE_ORDINARY</STRONG>

-            trace  all  update  actions.   The old and new screen contents are
+            trace all update actions.  The old and  new  screen  contents  are

             written to the trace file for each refresh.
 
        <STRONG>TRACE_CALLS</STRONG>
             written to the trace file for each refresh.
 
        <STRONG>TRACE_CALLS</STRONG>

-            trace all curses calls.  The parameters for each call are  traced,
+            trace  all curses calls.  The parameters for each call are traced,

             as well as return values.
 
        <STRONG>TRACE_VIRTPUT</STRONG>
             as well as return values.
 
        <STRONG>TRACE_VIRTPUT</STRONG>


@@ -158,14 +176,14 @@
        <STRONG>TRACE_MAXIMUM</STRONG>
             maximum trace level, enables all of the separate trace features.
 
        <STRONG>TRACE_MAXIMUM</STRONG>
             maximum trace level, enables all of the separate trace features.
 

-       Some  tracing  features  are  enabled  whenever  the <STRONG>trace</STRONG> parameter is
-       nonzero.  Some features overlap.  The specific  names  are  used  as  a
+       Some tracing features are enabled whenever the  <STRONG>curses_trace</STRONG>  parameter
+       is  nonzero.   Some features overlap.  The specific names are used as a

        guideline.
 
 
 </PRE><H3><a name="h3-Initialization">Initialization</a></H3><PRE>
        guideline.
 
 
 </PRE><H3><a name="h3-Initialization">Initialization</a></H3><PRE>

-       These  functions  check  the <STRONG>NCURSES_TRACE</STRONG> environment variable, to set
-       the tracing feature as if <STRONG>trace</STRONG> was called:
+       These functions check the <STRONG>NCURSES_TRACE</STRONG> environment  variable,  to  set
+       the tracing feature as if <STRONG>curses_trace</STRONG> was called:

 
            filter, initscr, new_prescr, newterm, nofilter, restartterm,
            ripoffline, setupterm, slk_init, tgetent, use_env,
 
            filter, initscr, new_prescr, newterm, nofilter, restartterm,
            ripoffline, setupterm, slk_init, tgetent, use_env,


@@ -173,38 +191,65 @@
 
 
 </PRE><H3><a name="h3-Command-line-Utilities">Command-line Utilities</a></H3><PRE>
 
 
 </PRE><H3><a name="h3-Command-line-Utilities">Command-line Utilities</a></H3><PRE>

-       The command-line utilities such as  <STRONG><A HREF="tic.1m.html">tic(1)</A></STRONG>  provide  a  verbose  option
-       which  extends  the  set  of messages written using the <STRONG>trace</STRONG> function.
-       Both of these (<STRONG>-v</STRONG> and <STRONG>trace</STRONG>) use the same variable (<STRONG>_nc_tracing</STRONG>), which
-       determines the messages which are written.
-
-       Because  the  command-line  utilities may call initialization functions
-       such as <STRONG>setupterm</STRONG>, <STRONG>tgetent</STRONG> or <STRONG>use_extended_names</STRONG>, some of their  debug-
-       ging  output may be directed to the <EM>trace</EM> file if the <STRONG>NCURSES_TRACE</STRONG> en-
+       The  command-line  utilities  such  as  <STRONG><A HREF="tic.1m.html">tic(1)</A></STRONG> provide a verbose option
+       which extends the set of messages written using the <STRONG>curses_trace</STRONG>  func-
+       tion.   Both  of  these  (<STRONG>-v</STRONG>  and  <STRONG>curses_trace</STRONG>)  use the same variable
+       (<STRONG>_nc_tracing</STRONG>), which determines the messages which are written.
+
+       Because the command-line utilities may  call  initialization  functions
+       such  as <STRONG>setupterm</STRONG>, <STRONG>tgetent</STRONG> or <STRONG>use_extended_names</STRONG>, some of their debug-
+       ging output may be directed to the <EM>trace</EM> file if the <STRONG>NCURSES_TRACE</STRONG>  en-

        vironment variable is set:
 
        <STRONG>o</STRONG>   messages produced in the utility are written to the standard error.
 
        <STRONG>o</STRONG>   messages produced by the underlying library are written to <EM>trace</EM>.
 
        vironment variable is set:
 
        <STRONG>o</STRONG>   messages produced in the utility are written to the standard error.
 
        <STRONG>o</STRONG>   messages produced by the underlying library are written to <EM>trace</EM>.
 

-       If ncurses is built without tracing, none of the latter  are  produced,
+       If  ncurses  is built without tracing, none of the latter are produced,

        and fewer diagnostics are provided by the command-line utilities.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
        and fewer diagnostics are provided by the command-line utilities.
 
 
 </PRE><H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>

-       Routines  which return a value are designed to be used as parameters to
+       Routines which return a value are designed to be used as parameters  to

        the <STRONG>_tracef</STRONG> routine.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
        the <STRONG>_tracef</STRONG> routine.
 
 
 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>

-       These functions are not part of the XSI interface.  Some  other  curses
-       implementations  are  known to have similar, undocumented features, but
-       they are not compatible with ncurses.
+       These  functions  are not part of the XSI interface.  Some other curses
+       implementations are known to have similar features, but  they  are  not
+       compatible with ncurses:
+
+       <STRONG>o</STRONG>   SVr4  provided  <STRONG>traceon</STRONG>  and <STRONG>traceoff</STRONG>, to control whether debugging
+           information was written to the "trace" file.  While  the  functions
+           were  always  available, this feature was only enabled if <STRONG>DEBUG</STRONG> was
+           defined when building the library.
+
+           The SVr4 tracing feature is undocumented.
+
+       <STRONG>o</STRONG>   PDCurses provides <STRONG>traceon</STRONG> and <STRONG>traceoff</STRONG>, which (like SVr4)  are  al-
+           ways  available, and enable tracing to the "trace" file only when a
+           debug-library is built.

 
 

-       A few functions are not provided when symbol versioning is used:
+           PDCurses has a short description of these functions,  with  a  note
+           that  they are not present in X/Open Curses, ncurses or NetBSD.  It
+           does not mention SVr4, but the functions'  inclusion  in  a  header
+           file section labeled "Quasi-standard" hints at the origin.
+
+       <STRONG>o</STRONG>   NetBSD  does  not  provide functions for enabling/disabling traces.
+           It  uses  environment   variables   <STRONG>CURSES_TRACE_MASK</STRONG>   and   <STRONG>CURS-</STRONG>
+           <STRONG>ES_TRACE_FILE</STRONG>  to  determine  what is traced, and where the results
+           are written.  This is available only when a debug-library is built.
+
+           The NetBSD tracing feature is undocumented.
+
+       A few ncurses functions are not  provided  when  symbol  versioning  is
+       used:

 
            _nc_tracebits, _tracedump, _tracemouse
 
 
            _nc_tracebits, _tracedump, _tracemouse
 

+       The  original  <STRONG>trace</STRONG> routine was deprecated because it often conflicted
+       with application names.
+

 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>.
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>.

diff --git a/doc/html/man/form.3x.html b/doc/html/man/form.3x.html
index 2024a71ea8a399478b8e4e470f6741c8a16f50b5..917df4452657dd2f4259fba3e75885e98a4c6364 100644 (file)
--- a/doc/html/man/form.3x.html
+++ b/doc/html/man/form.3x.html
@@ -246,7 +246,7 @@
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>  and  related  pages  whose names begin "form_" for detailed
        descriptions of the entry points.
 
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>  and  related  pages  whose names begin "form_" for detailed
        descriptions of the entry points.
 

-       This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191130).
+       This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191207).

 
 
 
 
 
 

diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index 4a407d8998b18a6a697b67e1612a7087a8d765c8..62d84873871abd967a13bcb8483bc94db3fc9bb7 100644 (file)
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -512,7 +512,7 @@
 
        https://invisible-island.net/ncurses/tctest.html
 
 
        https://invisible-island.net/ncurses/tctest.html
 

-       This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191130).
+       This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191207).

 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>

diff --git a/doc/html/man/infotocap.1m.html b/doc/html/man/infotocap.1m.html
index 3aa5f275756ff54414891b7d060d15e17f4f51c6..7ccc743df77f42a44d9697ec40842491de51c8a6 100644 (file)
--- a/doc/html/man/infotocap.1m.html
+++ b/doc/html/man/infotocap.1m.html
@@ -90,7 +90,7 @@
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 

-       This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191130).
+       This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191207).

 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>

diff --git a/doc/html/man/menu.3x.html b/doc/html/man/menu.3x.html
index af724a3c2f21212a9fa0375d06bdccabd8b2e064..6bd6e6835ed6daebc290c80c386adb214a9bf1b0 100644 (file)
--- a/doc/html/man/menu.3x.html
+++ b/doc/html/man/menu.3x.html
@@ -221,7 +221,7 @@
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>  and  related  pages  whose names begin "menu_" for detailed
        descriptions of the entry points.
 
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>  and  related  pages  whose names begin "menu_" for detailed
        descriptions of the entry points.
 

-       This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191130).
+       This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191207).

 
 
 
 
 
 

diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index 7386b7e140a82d5878ce05f1d3ccae230eb522e7..2f792e7e85056a3e8885ff378f1105f9d009374c 100644 (file)
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -59,7 +59,7 @@
        method of updating  character  screens  with  reasonable  optimization.
        This  implementation  is  "new  curses"  (ncurses)  and is the approved
        replacement for 4.4BSD classic curses,  which  has  been  discontinued.
        method of updating  character  screens  with  reasonable  optimization.
        This  implementation  is  "new  curses"  (ncurses)  and is the approved
        replacement for 4.4BSD classic curses,  which  has  been  discontinued.

-       This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191130).
+       This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191207).

 
        The  <STRONG>ncurses</STRONG>  library emulates the curses library of System V Release 4
        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
 
        The  <STRONG>ncurses</STRONG>  library emulates the curses library of System V Release 4
        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI

diff --git a/doc/html/man/ncurses6-config.1.html b/doc/html/man/ncurses6-config.1.html
index a5ae6016d215409d685da08ed33f6a6208aec0b0..eb222cadc9bff42ef953645a1a61fe61c0d1d0f3 100644 (file)
--- a/doc/html/man/ncurses6-config.1.html
+++ b/doc/html/man/ncurses6-config.1.html
@@ -112,7 +112,7 @@
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
 

-       This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191130).
+       This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191207).

 
 
 
 
 
 

diff --git a/doc/html/man/panel.3x.html b/doc/html/man/panel.3x.html
index 02b6a31e6764c92f96d476bd9cc3fdc0141abf68..60ffea23e8ae2442ce5d02807945e6f6b640b498 100644 (file)
--- a/doc/html/man/panel.3x.html
+++ b/doc/html/man/panel.3x.html
@@ -204,7 +204,7 @@
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
 

-       This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191130).
+       This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191207).

 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>

diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index 24481d0116391a653e900deef87630fe6435395c..82bcf4e0f046ef84410267767bc54fca27d90b72 100644 (file)
--- a/doc/html/man/tabs.1.html
+++ b/doc/html/man/tabs.1.html
@@ -205,7 +205,7 @@
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 

-       This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191130).
+       This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191207).

 
 
 
 
 
 

diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index 44be6e63f2c59eb34014af9fdb254365299c6be0..6d485950decf3b4dc974d1ca4d79c6ffb1b64fca 100644 (file)
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -103,7 +103,7 @@
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 

-       This manual describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191130).
+       This manual describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191207).

 
 
 </PRE><H3><a name="h3-Terminfo-Entry-Syntax">Terminfo Entry Syntax</a></H3><PRE>
 
 
 </PRE><H3><a name="h3-Terminfo-Entry-Syntax">Terminfo Entry Syntax</a></H3><PRE>

diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html
index 9f668c0e40978cb509d34088d5751e99841f79fc..afb04ddaa5976e50957c816403df399374d167a0 100644 (file)
--- a/doc/html/man/tic.1m.html
+++ b/doc/html/man/tic.1m.html
@@ -460,7 +460,7 @@
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>,   <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
        <STRONG><A HREF="term.5.html">term(5)</A></STRONG>.  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.  <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>.
 
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>,   <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
        <STRONG><A HREF="term.5.html">term(5)</A></STRONG>.  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.  <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>.
 

-       This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191130).
+       This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191207).

 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>

diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
index 4af0db2f818b95612d52893547a7d5d05dd3578e..d4944f7b5dda5d849296c7f393d34fe0cd67d1a4 100644 (file)
--- a/doc/html/man/toe.1m.html
+++ b/doc/html/man/toe.1m.html
@@ -170,7 +170,7 @@
        <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,  <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,  <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,  <STRONG>ter-</STRONG>
        <STRONG><A HREF="terminfo.5.html">minfo(5)</A></STRONG>.
 
        <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,  <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,  <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,  <STRONG>ter-</STRONG>
        <STRONG><A HREF="terminfo.5.html">minfo(5)</A></STRONG>.
 

-       This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191130).
+       This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191207).

 
 
 
 
 
 

diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index 2a787002e1b9ba1a0c03c9f16e8d8768222a9c5a..65758db9ab38bddc90f4c2d40a37cbd5f76a8895 100644 (file)
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -522,7 +522,7 @@
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>, <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>.
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>, <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>.
 

-       This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191130).
+       This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191207).

 
 
 
 
 
 

diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index 2ea928cf3823105687dde1561db0cd578857e68e..8be2c86a96c163b175578815654ddf149160413b 100644 (file)
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -389,7 +389,7 @@
        <STRONG>csh(1)</STRONG>,  <STRONG>sh(1)</STRONG>,  <STRONG>stty(1)</STRONG>,   <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>,   <STRONG>tty(4)</STRONG>,   <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>,
        <STRONG>ttys(5)</STRONG>, <STRONG>environ(7)</STRONG>
 
        <STRONG>csh(1)</STRONG>,  <STRONG>sh(1)</STRONG>,  <STRONG>stty(1)</STRONG>,   <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>,   <STRONG>tty(4)</STRONG>,   <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>,
        <STRONG>ttys(5)</STRONG>, <STRONG>environ(7)</STRONG>
 

-       This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191130).
+       This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191207).

 
 
 
 
 
 

diff --git a/include/curses.tail b/include/curses.tail
index 831a8f4c26dea5458147b524dca582c22b1d5eb9..b44b3d0e5be7cca1f6959cf32e9b756ab5cf8224 100644 (file)
--- a/include/curses.tail
+++ b/include/curses.tail
@@ -1,4 +1,4 @@
-/* $Id: curses.tail,v 1.23 2016/02/13 16:37:45 tom Exp $ */
+/* $Id: curses.tail,v 1.24 2019/12/07 16:10:32 tom Exp $ */

 /*
  * vile:cmode:
  * This file is part of ncurses, designed to be appended after curses.h.in
 /*
  * vile:cmode:
  * This file is part of ncurses, designed to be appended after curses.h.in


@@ -142,7 +142,8 @@ extern NCURSES_EXPORT(char *) _tracecchar_t2 (int, const cchar_t *);
 #define _tracech_t             _tracechtype
 #define _tracech_t2            _tracechtype2
 #endif
 #define _tracech_t             _tracechtype
 #define _tracech_t2            _tracechtype2
 #endif

-extern NCURSES_EXPORT(void) trace (const unsigned int);
+extern NCURSES_EXPORT(void) trace (const unsigned) GCC_DEPRECATED("use curses_trace");
+extern NCURSES_EXPORT(unsigned) curses_trace (const unsigned);

 
 /* trace masks */
 #define TRACE_DISABLE  0x0000  /* turn off tracing */
 
 /* trace masks */
 #define TRACE_DISABLE  0x0000  /* turn off tracing */

diff --git a/include/term_entry.h b/include/term_entry.h
index 1571b17fd3b895aa939995dea3cb700f5ccb815b..513bd97d483287db1eda8ca13f70b44cee5b48e2 100644 (file)
--- a/include/term_entry.h
+++ b/include/term_entry.h
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2018,2019 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            *


@@ -32,7 +32,7 @@
  *     and: Thomas E. Dickey                        1998-on                 *
  ****************************************************************************/
 
  *     and: Thomas E. Dickey                        1998-on                 *
  ****************************************************************************/
 

-/* $Id: term_entry.h,v 1.57 2018/05/26 13:50:53 tom Exp $ */
+/* $Id: term_entry.h,v 1.58 2019/12/07 16:11:15 tom Exp $ */

 
 /*
  *     term_entry.h -- interface to entry-manipulation code
 
 /*
  *     term_entry.h -- interface to entry-manipulation code


@@ -208,7 +208,7 @@ extern NCURSES_EXPORT(void) _nc_trace_xnames (TERMTYPE *);
 #endif /* NCURSES_INTERNALS */
 
 /*
 #endif /* NCURSES_INTERNALS */
 
 /*

- * These entrypoints are used by tack.
+ * These entrypoints were used by tack before 1.08.

  */
 
 #undef  NCURSES_TACK_1_08
  */
 
 #undef  NCURSES_TACK_1_08

diff --git a/include/tic.h b/include/tic.h
index 66252aec035516a7f3c6d1e7a024f4c243fc8583..f878df09fcd493d07d0bf8a11c229cb1b295e3b1 100644 (file)
--- a/include/tic.h
+++ b/include/tic.h
@@ -33,7 +33,7 @@
  ****************************************************************************/
 
 /*
  ****************************************************************************/
 
 /*

- * $Id: tic.h,v 1.79 2019/07/20 20:19:54 tom Exp $
+ * $Id: tic.h,v 1.80 2019/12/07 16:05:22 tom Exp $

  *     tic.h - Global variables and structures for the terminfo compiler.
  */
 
  *     tic.h - Global variables and structures for the terminfo compiler.
  */
 


@@ -361,7 +361,7 @@ extern NCURSES_EXPORT(int) _nc_tic_written (void);
 #endif /* NCURSES_INTERNALS */
 
 /*
 #endif /* NCURSES_INTERNALS */
 
 /*

- * These entrypoints are used by tack.
+ * These entrypoints were used by tack before 1.08.

  */
 
 #undef  NCURSES_TACK_1_08
  */
 
 #undef  NCURSES_TACK_1_08

diff --git a/man/curs_trace.3x b/man/curs_trace.3x
index 792b7e95a4ab381d96b2dab3313946e9105cae18..186601c9785c4d4ae1b03c92e24054e196bee932 100644 (file)
--- a/man/curs_trace.3x
+++ b/man/curs_trace.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
 .\"***************************************************************************

-.\" Copyright (c) 2000-2016,2017 Free Software Foundation, Inc.              *
+.\" Copyright (c) 2000-2017,2019 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            *


@@ -26,7 +26,11 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"

-.\" $Id: curs_trace.3x,v 1.19 2017/11/18 23:47:37 tom Exp $
+.\" $Id: curs_trace.3x,v 1.20 2019/12/07 18:55:02 tom Exp $
+.ie \n(.g .ds `` \(lq
+.el       .ds `` ``
+.ie \n(.g .ds '' \(rq
+.el       .ds '' ''

 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2


@@ -35,6 +39,7 @@
 .na
 .hy 0
 .SH NAME
 .na
 .hy 0
 .SH NAME

+\fBcurses_trace\fR,

 \fBtrace\fR,
 \fB_tracef\fR,
 \fB_traceattr\fR,
 \fBtrace\fR,
 \fB_tracef\fR,
 \fB_traceattr\fR,


@@ -52,7 +57,7 @@
 .SH SYNOPSIS
 \fB#include <curses.h>\fR
 .sp
 .SH SYNOPSIS
 \fB#include <curses.h>\fR
 .sp

-\fBvoid trace(const unsigned int \fP\fIparam\fP\fB);\fR
+\fBunsigned curses_trace(const unsigned \fP\fIparam\fP\fB);\fR

 .sp
 \fBvoid _tracef(const char *\fP\fIformat\fP\fB, ...);\fR
 .sp
 .sp
 \fBvoid _tracef(const char *\fP\fIformat\fP\fB, ...);\fR
 .sp


@@ -75,34 +80,54 @@
 \fBchar *_nc_tracebits(void);\fR
 .br
 \fBchar *_tracemouse(const MEVENT *\fP\fIevent\fP\fB);\fR
 \fBchar *_nc_tracebits(void);\fR
 .br
 \fBchar *_tracemouse(const MEVENT *\fP\fIevent\fP\fB);\fR

+.sp
+/* deprecated */
+.br
+\fBvoid trace(const unsigned int \fP\fIparam\fP\fB);\fR

 .SH DESCRIPTION
 .SH DESCRIPTION

-The \fBtrace\fR routines are used for debugging the ncurses libraries,
+The \fIcurses trace\fR routines are used for debugging the ncurses libraries,

 as well as applications which use the ncurses libraries.
 as well as applications which use the ncurses libraries.

-These functions are normally available only with the debugging library
-e.g., \fIlibncurses_g.a\fR, but may be compiled into any model (shared, static,
+Some limitations apply:
+.bP
+Aside from \fBcurses_trace\fP,
+the other functions are normally available only with the debugging library
+e.g., \fIlibncurses_g.a\fR.
+.IP
+All of the trace functions may be compiled into any model (shared, static,

 profile) by defining the symbol \fBTRACE\fR.
 profile) by defining the symbol \fBTRACE\fR.

-Additionally, some functions are only available with the wide-character
-configuration of the libraries.
+.bP
+Additionally, the functions which use \fBcchar_t\fP
+are only available with the wide-character configuration of the libraries.

 .SS Functions
 The principal parts of this interface are
 .bP
 .SS Functions
 The principal parts of this interface are
 .bP

-\fBtrace\fR, which selectively enables different tracing features, and
+\fBcurses_trace\fR, which selectively enables different tracing features, and

 .bP
 \fB_tracef\fR, which writes formatted data to the \fItrace\fR file.
 .bP
 \fB_tracef\fR, which writes formatted data to the \fItrace\fR file.

-.PP
-Calling \fBtrace\fR with a nonzero parameter creates the file \fBtrace\fR
-in the current directory for output.
-If the file already exists, no tracing is done.
-.PP
+.IP

 The other functions either return a pointer to a string-area
 The other functions either return a pointer to a string-area

-(allocated by the corresponding function),
-or return no value (such as \fB_tracedump\fP, which implements the
-screen dump for \fBTRACE_UPDATE\fP).
-The caller should not free these
-strings, since the allocation is reused on successive calls.
+(allocated by the corresponding function), or return no value
+(such as \fB_tracedump\fP,
+which implements the screen dump for \fBTRACE_UPDATE\fP).
+The caller should not free these strings,
+since the allocation is reused on successive calls.

 To work around the problem of a single string-area per function,
 some use a buffer-number parameter, telling the library to allocate
 additional string-areas.
 To work around the problem of a single string-area per function,
 some use a buffer-number parameter, telling the library to allocate
 additional string-areas.

+.PP
+The \fBcurses_trace\fR function is always available,
+whether or not the other trace functions are available:
+.bP
+If tracing is available,
+calling \fBcurses_trace\fR with a nonzero parameter
+updates the trace mask,
+and returns the previous trace mask.
+.IP
+When the trace mask is nonzero,
+ncurses creates the file \*(``trace\*('' in the current directory for output.
+If the file already exists, no tracing is done.
+.bP
+If tracing is not available, \fBcurses_trace\fP returns zero (0).

 .SS Trace Parameter
 The trace parameter is formed by OR'ing
 values from the list of \fBTRACE_\fP\fIxxx\fR definitions in \fB<curses.h>\fR.
 .SS Trace Parameter
 The trace parameter is formed by OR'ing
 values from the list of \fBTRACE_\fP\fIxxx\fR definitions in \fB<curses.h>\fR.


@@ -114,7 +139,7 @@ turn off tracing by passing a zero parameter.
 The library flushes the output file,
 but retains an open file-descriptor to the trace file
 so that it can resume tracing later if a nonzero parameter is passed
 The library flushes the output file,
 but retains an open file-descriptor to the trace file
 so that it can resume tracing later if a nonzero parameter is passed

-to the \fBtrace\fP function.
+to the \fBcurses_trace\fP function.

 .TP 5
 .B TRACE_TIMES
 trace user and system times of updates.
 .TP 5
 .B TRACE_TIMES
 trace user and system times of updates.


@@ -164,13 +189,13 @@ trace changes to video attributes and colors.
 .B TRACE_MAXIMUM
 maximum trace level, enables all of the separate trace features.
 .PP
 .B TRACE_MAXIMUM
 maximum trace level, enables all of the separate trace features.
 .PP

-Some tracing features are enabled whenever the \fBtrace\fR parameter
+Some tracing features are enabled whenever the \fBcurses_trace\fR parameter

 is nonzero.
 Some features overlap.
 The specific names are used as a guideline.
 .SS Initialization
 These functions check the \fBNCURSES_TRACE\fP environment variable,
 is nonzero.
 Some features overlap.
 The specific names are used as a guideline.
 .SS Initialization
 These functions check the \fBNCURSES_TRACE\fP environment variable,

-to set the tracing feature as if \fBtrace\fP was called:
+to set the tracing feature as if \fBcurses_trace\fP was called:

 .RS 4
 .PP
 .na
 .RS 4
 .PP
 .na


@@ -194,8 +219,8 @@ use_tioctl
 .SS Command-line Utilities
 .PP
 The command-line utilities such as \fBtic\fP(1) provide a verbose option
 .SS Command-line Utilities
 .PP
 The command-line utilities such as \fBtic\fP(1) provide a verbose option

-which extends the set of messages written using the \fBtrace\fP function.
-Both of these (\fB\-v\fP and \fBtrace\fP)
+which extends the set of messages written using the \fBcurses_trace\fP function.
+Both of these (\fB\-v\fP and \fBcurses_trace\fP)

 use the same variable (\fB_nc_tracing\fP),
 which determines the messages which are written.
 .PP
 use the same variable (\fB_nc_tracing\fP),
 which determines the messages which are written.
 .PP


@@ -216,15 +241,49 @@ to the \fB_tracef\fR routine.
 .SH PORTABILITY
 These functions are not part of the XSI interface.
 Some other curses implementations are known to
 .SH PORTABILITY
 These functions are not part of the XSI interface.
 Some other curses implementations are known to

-have similar, undocumented features,
-but they are not compatible with ncurses.
+have similar features,
+but they are not compatible with ncurses:
+.bP
+SVr4 provided \fBtraceon\fP and \fBtraceoff\fP,
+to control whether debugging information was written
+to the \*(``trace\*('' file.
+While the functions were always available,
+this feature was only enabled
+if \fBDEBUG\fP was defined when building the library.
+.IP
+The SVr4 tracing feature is undocumented.
+.bP
+PDCurses provides \fBtraceon\fP and \fBtraceoff\fP,
+which (like SVr4) are always available,
+and enable tracing
+to the \*(``trace\*('' file
+only when a debug-library is built.
+.IP
+PDCurses has a short description of these functions,
+with a note that they are not present in X/Open Curses,
+ncurses or NetBSD.
+It does not mention SVr4,
+but the functions' inclusion in a header file section
+labeled \*(``Quasi-standard\*('' hints at the origin.
+.bP
+NetBSD does not provide functions for enabling/disabling traces.
+It uses environment variables
+\fBCURSES_TRACE_MASK\fP and
+\fBCURSES_TRACE_FILE\fP to determine what is traced,
+and where the results are written.
+This is available only when a debug-library is built.
+.IP
+The NetBSD tracing feature is undocumented.

 .PP
 .PP

-A few functions are not provided when symbol versioning is used:
+A few ncurses functions are not provided when symbol versioning is used:

 .RS 4
 .PP
 _nc_tracebits,
 _tracedump,
 _tracemouse
 .RE
 .RS 4
 .PP
 _nc_tracebits,
 _tracedump,
 _tracemouse
 .RE

+.PP
+The original \fBtrace\fP routine was deprecated because
+it often conflicted with application names.

 .SH SEE ALSO
 \fBcurses\fR(3X).
 .SH SEE ALSO
 \fBcurses\fR(3X).

diff --git a/ncurses/base/lib_freeall.c b/ncurses/base/lib_freeall.c
index 75c3ec3ea6215566312de88ceca6720ab00bc155..d2d5870eeed3aaf498aa22481eba1a66a09317df 100644 (file)
--- a/ncurses/base/lib_freeall.c
+++ b/ncurses/base/lib_freeall.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2018,2019 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            *


@@ -39,7 +39,7 @@
 extern int malloc_errfd;       /* FIXME */
 #endif
 
 extern int malloc_errfd;       /* FIXME */
 #endif
 

-MODULE_ID("$Id: lib_freeall.c,v 1.69 2018/03/01 15:02:12 tom Exp $")
+MODULE_ID("$Id: lib_freeall.c,v 1.70 2019/12/07 20:28:03 tom Exp $")

 
 /*
  * Free all ncurses data.  This is used for testing only (there's no practical
 
 /*
  * Free all ncurses data.  This is used for testing only (there's no practical


@@ -150,7 +150,7 @@ NCURSES_SP_NAME(_nc_free_and_exit) (NCURSES_SP_DCLx int code)
     NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_ARG);
     NCURSES_SP_NAME(_nc_freeall) (NCURSES_SP_ARG);
 #ifdef TRACE
     NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_ARG);
     NCURSES_SP_NAME(_nc_freeall) (NCURSES_SP_ARG);
 #ifdef TRACE

-    trace(0);                  /* close trace file, freeing its setbuf */
+    curses_trace(0);           /* close trace file, freeing its setbuf */

     {
        static va_list fake;
        free(_nc_varargs("?", fake));
     {
        static va_list fake;
        free(_nc_varargs("?", fake));

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

- * $Id: curses.priv.h,v 1.625 2019/07/28 18:32:05 tom Exp $
+ * $Id: curses.priv.h,v 1.626 2019/12/07 20:08:06 tom Exp $

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


@@ -1771,7 +1771,7 @@ extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch;
        if ((_nc_tracing & TRACE_MAXIMUM) == 0) { \
            int t = _nc_getenv_num("NCURSES_TRACE"); \
            if (t >= 0) \
        if ((_nc_tracing & TRACE_MAXIMUM) == 0) { \
            int t = _nc_getenv_num("NCURSES_TRACE"); \
            if (t >= 0) \

-               trace((unsigned) t); \
+               curses_trace((unsigned) t); \

        }
 #else
 #define START_TRACE() /* nothing */
        }
 #else
 #define START_TRACE() /* nothing */

diff --git a/ncurses/tinfo/entries.c b/ncurses/tinfo/entries.c
index 0f86cab3c770e0630eeba50f54e402d167da2feb..219ec3d1ea352a863ac8367b9ee5bdeeca89749e 100644 (file)
--- a/ncurses/tinfo/entries.c
+++ b/ncurses/tinfo/entries.c
@@ -37,7 +37,7 @@
 
 #include <tic.h>
 
 
 #include <tic.h>
 

-MODULE_ID("$Id: entries.c,v 1.27 2019/03/09 23:41:08 tom Exp $")
+MODULE_ID("$Id: entries.c,v 1.28 2019/12/07 20:28:55 tom Exp $")

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


@@ -148,7 +148,7 @@ _nc_leaks_tinfo(void)
 
 #ifdef TRACE
     T((T_RETURN("")));
 
 #ifdef TRACE
     T((T_RETURN("")));

-    trace(0);
+    curses_trace(0);

     _nc_trace_buf(-1, (size_t) 0);
 #endif
 
     _nc_trace_buf(-1, (size_t) 0);
 #endif
 

diff --git a/ncurses/trace/lib_trace.c b/ncurses/trace/lib_trace.c
index 717c7da1608701b5bd431f3dfed1c45933c6feb0..7e2ca854e656e158a4538dc174ba73ea50d1da9d 100644 (file)
--- a/ncurses/trace/lib_trace.c
+++ b/ncurses/trace/lib_trace.c
@@ -47,7 +47,7 @@
 
 #include <ctype.h>
 
 
 #include <ctype.h>
 

-MODULE_ID("$Id: lib_trace.c,v 1.92 2019/03/23 23:47:16 tom Exp $")
+MODULE_ID("$Id: lib_trace.c,v 1.94 2019/12/07 22:32:36 tom Exp $")

 
 NCURSES_EXPORT_VAR(unsigned) _nc_tracing = 0; /* always define this */
 
 
 NCURSES_EXPORT_VAR(unsigned) _nc_tracing = 0; /* always define this */
 


@@ -91,10 +91,14 @@ NCURSES_EXPORT_VAR(long) _nc_outchars = 0;
 #define MyPath         _nc_globals.trace_fname
 #define MyLevel                _nc_globals.trace_level
 #define MyNested       _nc_globals.nested_tracef
 #define MyPath         _nc_globals.trace_fname
 #define MyLevel                _nc_globals.trace_level
 #define MyNested       _nc_globals.nested_tracef

+#endif /* TRACE */

 
 

-NCURSES_EXPORT(void)
-trace(const unsigned int tracelevel)
+NCURSES_EXPORT(unsigned)
+curses_trace(unsigned tracelevel)

 {
 {

+    unsigned result;
+#if defined(TRACE)
+    result = _nc_tracing;

     if ((MyFP == 0) && tracelevel) {
        MyInit = TRUE;
        if (MyFD >= 0) {
     if ((MyFP == 0) && tracelevel) {
        MyInit = TRUE;
        if (MyFD >= 0) {


@@ -146,6 +150,18 @@ trace(const unsigned int tracelevel)
        _nc_tracing = tracelevel;
        _tracef("tracelevel=%#x", tracelevel);
     }
        _nc_tracing = tracelevel;
        _tracef("tracelevel=%#x", tracelevel);
     }

+#else
+    (void) tracelevel;
+    result = 0;
+#endif
+    return result;
+}
+
+#if defined(TRACE)
+NCURSES_EXPORT(void)
+trace(const unsigned int tracelevel)
+{
+    curses_trace(tracelevel);

 }
 
 static void
 }
 
 static void

diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 13ce4d8b454a5bff264d17d68d7a3cd87c617c3d..8c43494d24a84813e51f5cd0140bdd13c177cf90 100644 (file)
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20191130) unstable; urgency=low
+ncurses6 (6.1+20191207) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 30 Nov 2019 09:52:31 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 07 Dec 2019 05:19:49 -0500

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

diff --git a/package/debian-mingw/compat b/package/debian-mingw/compat
index 7f8f011eb73d6043d2e6db9d2c101195ae2801f2..ec635144f60048986bc560c5576355344005e6e7 100644 (file)
--- a/package/debian-mingw/compat
+++ b/package/debian-mingw/compat
@@ -1 +1 @@
-7
+9

diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 13ce4d8b454a5bff264d17d68d7a3cd87c617c3d..8c43494d24a84813e51f5cd0140bdd13c177cf90 100644 (file)
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20191130) unstable; urgency=low
+ncurses6 (6.1+20191207) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 30 Nov 2019 09:52:31 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 07 Dec 2019 05:19:49 -0500

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

diff --git a/package/debian-mingw64/compat b/package/debian-mingw64/compat
index 7f8f011eb73d6043d2e6db9d2c101195ae2801f2..ec635144f60048986bc560c5576355344005e6e7 100644 (file)
--- a/package/debian-mingw64/compat
+++ b/package/debian-mingw64/compat
@@ -1 +1 @@
-7
+9

diff --git a/package/debian/changelog b/package/debian/changelog
index b89024b775d46cf445dafb9f64349656dd6a7fa7..acf2e78eb422ad71ac68462e23d63ed396713cf0 100644 (file)
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20191130) unstable; urgency=low
+ncurses6 (6.1+20191207) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 30 Nov 2019 09:52:31 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 07 Dec 2019 05:19:49 -0500

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

diff --git a/package/debian/compat b/package/debian/compat
index 7f8f011eb73d6043d2e6db9d2c101195ae2801f2..ec635144f60048986bc560c5576355344005e6e7 100644 (file)
--- a/package/debian/compat
+++ b/package/debian/compat
@@ -1 +1 @@
-7
+9

diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index c47423d618e25b87f08ba9c98ab762b51277da28..f5e457696586e566a79b8c106d6e6403e8da3757 100644 (file)
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.363 2019/11/30 14:52:31 tom Exp $\r
+; $Id: mingw-ncurses.nsi,v 1.364 2019/12/07 10:19:49 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  "2019"\r
 !define VERSION_MAJOR "6"\r
 !define VERSION_MINOR "1"\r
 !define VERSION_YYYY  "2019"\r

-!define VERSION_MMDD  "1130"\r
+!define VERSION_MMDD  "1207"\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 ed7b91f5cd166845e4781aaa22a4ae4553417e89..40172e694d00f4d78b7d962e1c825e2f56540e65 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: 20191130
+Release: 20191207

 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.map b/package/ncurses.map
index 85230f6c8fc2980cf8b3196a6c8d1808c347e76a..06a187383f56d97337ec9aee21a7772dcf7b16bf 100644 (file)
--- a/package/ncurses.map
+++ b/package/ncurses.map
@@ -1,4 +1,4 @@
-# $Id: ncurses.map,v 1.47 2019/05/04 22:35:46 tom Exp $
+# $Id: ncurses.map,v 1.48 2019/12/07 18:03:20 tom Exp $

 # script for shared library symbol-versioning using ld
 #
 # This file was generated by ncu-mapsyms
 # script for shared library symbol-versioning using ld
 #
 # This file was generated by ncu-mapsyms


@@ -1198,6 +1198,7 @@ NCURSES_TINFO_6.1.current {
                _nc_find_user_entry;
                _nc_fmt_funcptr;
                _nc_wacs_width;
                _nc_find_user_entry;
                _nc_fmt_funcptr;
                _nc_wacs_width;

+               curses_trace;

        local:
                _*;
 } NCURSES_TINFO_6.1.20171230;
        local:
                _*;
 } NCURSES_TINFO_6.1.20171230;

diff --git a/package/ncurses.spec b/package/ncurses.spec
index 3f20cce34b4477238eda14fc059fce43a45d6c25..9aebd1c40baae9c2d77740cba73fdca6c45863e7 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: 20191130
+Release: 20191207

 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.sym b/package/ncurses.sym
index 76e6c0f2829370984fd0f60566d065eea2f8c1f7..33ea31765e63a494a32fdb011199ec95adb1f541 100644 (file)
--- a/package/ncurses.sym
+++ b/package/ncurses.sym
@@ -1,4 +1,4 @@
-# $Id: ncurses.sym,v 1.33 2019/05/04 21:54:44 tom Exp $
+# $Id: ncurses.sym,v 1.34 2019/12/07 18:03:20 tom Exp $

 # script for shared library symbol-visibility using libtool
 #
 # This file was generated by ncu-mapsyms
 # script for shared library symbol-visibility using libtool
 #
 # This file was generated by ncu-mapsyms


@@ -295,6 +295,7 @@ current_item
 curs_set
 curs_set_sp
 curscr
 curs_set
 curs_set_sp
 curscr

+curses_trace

 curses_version
 data_ahead
 data_behind
 curses_version
 data_ahead
 data_behind

diff --git a/package/ncursest.map b/package/ncursest.map
index 838ee7cf8d93bd2e1993d3db550291ac37f9106d..2f0ebf41c93d87753c5ac83c8515998f708a09dd 100644 (file)
--- a/package/ncursest.map
+++ b/package/ncursest.map
@@ -1,4 +1,4 @@
-# $Id: ncursest.map,v 1.45 2019/05/04 22:36:26 tom Exp $
+# $Id: ncursest.map,v 1.46 2019/12/07 18:03:20 tom Exp $

 # script for shared library symbol-versioning using ld
 #
 # This file was generated by ncu-mapsyms
 # script for shared library symbol-versioning using ld
 #
 # This file was generated by ncu-mapsyms


@@ -483,6 +483,7 @@ NCURSES_TINFO_6.1.current {
                _nc_find_user_entry;
                _nc_fmt_funcptr;
                _nc_wacs_width;
                _nc_find_user_entry;
                _nc_fmt_funcptr;
                _nc_wacs_width;

+               curses_trace;

        local:
                _*;
 } NCURSES_TINFO_6.1.20171230;
        local:
                _*;
 } NCURSES_TINFO_6.1.20171230;

diff --git a/package/ncursest.spec b/package/ncursest.spec
index b3881b01ae345bfaa53be93d417dfd8441f9ebb7..ee17e3b5b8711404f7a3964e360e0b2c931a631b 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: 20191130
+Release: 20191207

 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.sym b/package/ncursest.sym
index f9ba0ddebcb5c3eb264c27f8c02f4ee3d33effd0..e137cde4e66690e7fd7786464e8d955edc530883 100644 (file)
--- a/package/ncursest.sym
+++ b/package/ncursest.sym
@@ -1,4 +1,4 @@
-# $Id: ncursest.sym,v 1.37 2019/05/04 22:29:26 tom Exp $
+# $Id: ncursest.sym,v 1.38 2019/12/07 18:03:20 tom Exp $

 # script for shared library symbol-visibility using libtool
 #
 # This file was generated by ncu-mapsyms
 # script for shared library symbol-visibility using libtool
 #
 # This file was generated by ncu-mapsyms


@@ -304,6 +304,7 @@ current_field
 current_item
 curs_set
 curs_set_sp
 current_item
 curs_set
 curs_set_sp

+curses_trace

 curses_version
 data_ahead
 data_behind
 curses_version
 data_ahead
 data_behind

diff --git a/package/ncursestw.map b/package/ncursestw.map
index 836c64a2dfbcdc9b17e7b72a66efde569485f6ff..247df944fbb33141aba2adc42cfc099bc8eeb5b7 100644 (file)
--- a/package/ncursestw.map
+++ b/package/ncursestw.map
@@ -1,4 +1,4 @@
-# $Id: ncursestw.map,v 1.47 2019/05/04 22:36:56 tom Exp $
+# $Id: ncursestw.map,v 1.48 2019/12/07 18:03:20 tom Exp $

 # script for shared library symbol-versioning using ld
 #
 # This file was generated by ncu-mapsyms
 # script for shared library symbol-versioning using ld
 #
 # This file was generated by ncu-mapsyms


@@ -489,6 +489,7 @@ NCURSES_TINFO_6.1.current {
                _nc_find_user_entry;
                _nc_fmt_funcptr;
                _nc_wacs_width;
                _nc_find_user_entry;
                _nc_fmt_funcptr;
                _nc_wacs_width;

+               curses_trace;

        local:
                _*;
 } NCURSES_TINFO_6.1.20171230;
        local:
                _*;
 } NCURSES_TINFO_6.1.20171230;

diff --git a/package/ncursestw.sym b/package/ncursestw.sym
index f5d1ca45d25d5d46960dc44a7140a5165e3255ef..ab655d496e3e750a228efd059ed0321de9afd216 100644 (file)
--- a/package/ncursestw.sym
+++ b/package/ncursestw.sym
@@ -1,4 +1,4 @@
-# $Id: ncursestw.sym,v 1.36 2019/05/04 22:29:12 tom Exp $
+# $Id: ncursestw.sym,v 1.37 2019/12/07 18:03:20 tom Exp $

 # script for shared library symbol-visibility using libtool
 #
 # This file was generated by ncu-mapsyms
 # script for shared library symbol-visibility using libtool
 #
 # This file was generated by ncu-mapsyms


@@ -320,6 +320,7 @@ current_field
 current_item
 curs_set
 curs_set_sp
 current_item
 curs_set
 curs_set_sp

+curses_trace

 curses_version
 data_ahead
 data_behind
 curses_version
 data_ahead
 data_behind

diff --git a/package/ncursesw.map b/package/ncursesw.map
index 6474c68994c91a4913fe38f4bc83031ef363a95e..356d6c9be400606eea7cf835f0cefeda79d916f1 100644 (file)
--- a/package/ncursesw.map
+++ b/package/ncursesw.map
@@ -1,4 +1,4 @@
-# $Id: ncursesw.map,v 1.50 2019/05/04 22:37:14 tom Exp $
+# $Id: ncursesw.map,v 1.51 2019/12/07 18:03:20 tom Exp $

 # script for shared library symbol-versioning using ld
 #
 # This file was generated by ncu-mapsyms
 # script for shared library symbol-versioning using ld
 #
 # This file was generated by ncu-mapsyms


@@ -483,6 +483,7 @@ NCURSES_TINFO_6.1.current {
                _nc_find_user_entry;
                _nc_fmt_funcptr;
                _nc_wacs_width;
                _nc_find_user_entry;
                _nc_fmt_funcptr;
                _nc_wacs_width;

+               curses_trace;

        local:
                _*;
 } NCURSES_TINFO_6.1.20171230;
        local:
                _*;
 } NCURSES_TINFO_6.1.20171230;

diff --git a/package/ncursesw.sym b/package/ncursesw.sym
index 65f09c9608689017296127a2cbfe32af9dd8faf9..6c254d03d923870131e236e679cabd9422c85dae 100644 (file)
--- a/package/ncursesw.sym
+++ b/package/ncursesw.sym
@@ -1,4 +1,4 @@
-# $Id: ncursesw.sym,v 1.35 2019/05/04 21:54:38 tom Exp $
+# $Id: ncursesw.sym,v 1.36 2019/12/07 18:03:20 tom Exp $

 # script for shared library symbol-visibility using libtool
 #
 # This file was generated by ncu-mapsyms
 # script for shared library symbol-visibility using libtool
 #
 # This file was generated by ncu-mapsyms


@@ -308,6 +308,7 @@ current_item
 curs_set
 curs_set_sp
 curscr
 curs_set
 curs_set_sp
 curscr

+curses_trace

 curses_version
 data_ahead
 data_behind
 curses_version
 data_ahead
 data_behind

diff --git a/test/demo_menus.c b/test/demo_menus.c
index 857dfd626f365afe01d13c276194a90c3bce3246..765732338122c2f3f5a784cc314df06b068a38ca 100644 (file)
--- a/test/demo_menus.c
+++ b/test/demo_menus.c
@@ -26,7 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
  * authorization.                                                           *
  ****************************************************************************/
 /*

- * $Id: demo_menus.c,v 1.69 2019/08/24 21:41:50 tom Exp $
+ * $Id: demo_menus.c,v 1.70 2019/12/07 18:06:12 tom Exp $

  *
  * Demonstrate a variety of functions from the menu library.
  * Thomas Dickey - 2005/4/9
  *
  * Demonstrate a variety of functions from the menu library.
  * Thomas Dickey - 2005/4/9


@@ -139,7 +139,7 @@ wGetchar(WINDOW *win)
        } else {
            _nc_tracing = save_trace;
        }
        } else {
            _nc_tracing = save_trace;
        }

-       trace(_nc_tracing);
+       curses_trace(_nc_tracing);

        if (_nc_tracing)
            Trace(("TOGGLE-TRACING ON"));
     }
        if (_nc_tracing)
            Trace(("TOGGLE-TRACING ON"));
     }


@@ -631,7 +631,7 @@ perform_trace_menu(int cmd)
                    newtrace |= td->mask;
                }
            }
                    newtrace |= td->mask;
                }
            }

-           trace(newtrace);
+           curses_trace(newtrace);

            Trace(("trace level interactively set to %s", tracetrace(_nc_tracing)));
 
            MvWPrintw(status, 1, 0,
            Trace(("trace level interactively set to %s", tracetrace(_nc_tracing)));
 
            MvWPrintw(status, 1, 0,


@@ -1016,7 +1016,7 @@ main(int argc, char *argv[])
 #endif /* HAVE_RIPOFFLINE */
 #ifdef TRACE
        case 't':
 #endif /* HAVE_RIPOFFLINE */
 #ifdef TRACE
        case 't':

-           trace((unsigned) strtoul(optarg, 0, 0));
+           curses_trace((unsigned) strtoul(optarg, 0, 0));

            break;
 #endif
        default:
            break;
 #endif
        default:

diff --git a/test/hashtest.c b/test/hashtest.c
index 9a3300b26b9b64fda5d90e6212f07ef7deafcd62..e11348d8aadcab36a1a31b31d76970edd959c68f 100644 (file)
--- a/test/hashtest.c
+++ b/test/hashtest.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2013,2017 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2017,2019 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            *


@@ -30,7 +30,7 @@
  *
  * Generate timing statistics for vertical-motion optimization.
  *
  *
  * Generate timing statistics for vertical-motion optimization.
  *

- * $Id: hashtest.c,v 1.34 2017/09/30 15:42:53 tom Exp $
+ * $Id: hashtest.c,v 1.35 2019/12/07 18:07:04 tom Exp $

  */
 
 #include <test.priv.h>
  */
 
 #include <test.priv.h>


@@ -222,7 +222,7 @@ main(int argc, char *argv[])
        test_optimize = TRUE;
     }
 #if USE_TRACE
        test_optimize = TRUE;
     }
 #if USE_TRACE

-    trace(TRACE_TIMES);
+    curses_trace(TRACE_TIMES);

 #endif
 
     InitAndCatch(initscr(), finish);
 #endif
 
     InitAndCatch(initscr(), finish);

diff --git a/test/lrtest.c b/test/lrtest.c
index ae47b4e74c04197942eea782b6730f10206fb35c..0215c2a4fba8f48736dcf88319e7c5775892daa1 100644 (file)
--- a/test/lrtest.c
+++ b/test/lrtest.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2010,2017 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2017,2019 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            *


@@ -34,7 +34,7 @@
  * This can't be part of the ncurses test-program, because ncurses rips off the
  * bottom line to do labels.
  *
  * This can't be part of the ncurses test-program, because ncurses rips off the
  * bottom line to do labels.
  *

- * $Id: lrtest.c,v 1.24 2017/09/04 11:28:19 tom Exp $
+ * $Id: lrtest.c,v 1.25 2019/12/07 18:07:04 tom Exp $

  */
 
 #include <test.priv.h>
  */
 
 #include <test.priv.h>


@@ -148,9 +148,9 @@ main(
                nodelay(stdscr, TRUE);
 #ifdef TRACE
            else if (ch == 'T')
                nodelay(stdscr, TRUE);
 #ifdef TRACE
            else if (ch == 'T')

-               trace(0);
+               curses_trace(0);

            else if (ch == 't')
            else if (ch == 't')

-               trace(TRACE_CALLS | TRACE_ICALLS | TRACE_UPDATE);
+               curses_trace(TRACE_CALLS | TRACE_ICALLS | TRACE_UPDATE);

 #endif
 #ifdef KEY_RESIZE
            else if (ch == KEY_RESIZE) {
 #endif
 #ifdef KEY_RESIZE
            else if (ch == KEY_RESIZE) {

diff --git a/test/ncurses.c b/test/ncurses.c
index b896bc4f3dd1cdb2c874173d0be4893ad2b26c36..c813123acdfbb2aefb5ed5ea91eb710ef0ed0f78 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.519 2019/09/22 19:12:40 tom Exp $
+$Id: ncurses.c,v 1.520 2019/12/07 19:04:52 tom Exp $

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


@@ -210,7 +210,7 @@ wGetchar(WINDOW *win)
        } else {
            _nc_tracing = save_trace;
        }
        } else {
            _nc_tracing = save_trace;
        }

-       trace(_nc_tracing);
+       curses_trace(_nc_tracing);

        if (_nc_tracing)
            Trace(("TOGGLE-TRACING ON"));
     }
        if (_nc_tracing)
            Trace(("TOGGLE-TRACING ON"));
     }


@@ -344,7 +344,7 @@ wGet_wchar(WINDOW *win, wint_t *result)
        } else {
            _nc_tracing = save_trace;
        }
        } else {
            _nc_tracing = save_trace;
        }

-       trace(_nc_tracing);
+       curses_trace(_nc_tracing);

        if (_nc_tracing)
            Trace(("TOGGLE-TRACING ON"));
     }
        if (_nc_tracing)
            Trace(("TOGGLE-TRACING ON"));
     }


@@ -3734,7 +3734,6 @@ show_box_chars(int repeat, attr_t attr, NCURSES_PAIRS_T pair)
     MvAddCh(LINES / 2, 0,        colored_chtype(ACS_LTEE,  attr, pair));
     MvAddCh(LINES / 2, COLS - 1, colored_chtype(ACS_RTEE,  attr, pair));
     /* *INDENT-ON* */
     MvAddCh(LINES / 2, 0,        colored_chtype(ACS_LTEE,  attr, pair));
     MvAddCh(LINES / 2, COLS - 1, colored_chtype(ACS_RTEE,  attr, pair));
     /* *INDENT-ON* */

-

 }
 
 static int
 }
 
 static int


@@ -4282,7 +4281,6 @@ show_wbox_chars(int repeat, attr_t attr, NCURSES_PAIRS_T pair)
     (void) mvadd_wch(LINES / 2,   0,        MERGE_ATTR(0, WACS_LTEE));
     (void) mvadd_wch(LINES / 2,   COLS - 1, MERGE_ATTR(0, WACS_RTEE));
     /* *INDENT-ON* */
     (void) mvadd_wch(LINES / 2,   0,        MERGE_ATTR(0, WACS_LTEE));
     (void) mvadd_wch(LINES / 2,   COLS - 1, MERGE_ATTR(0, WACS_RTEE));
     /* *INDENT-ON* */

-

 }
 
 #undef MERGE_ATTR
 }
 
 #undef MERGE_ATTR


@@ -4355,7 +4353,6 @@ show_utf8_chars(int repeat, attr_t attr, NCURSES_PAIRS_T pair)
     n = SHOW_UTF8(n, "WACS_S7",                "\342\216\274");
     (void) SHOW_UTF8(n, "WACS_S9",     "\342\216\275");
     /* *INDENT-ON* */
     n = SHOW_UTF8(n, "WACS_S7",                "\342\216\274");
     (void) SHOW_UTF8(n, "WACS_S9",     "\342\216\275");
     /* *INDENT-ON* */

-

 }
 
 /* display the wide-ACS character set */
 }
 
 /* display the wide-ACS character set */


@@ -6345,7 +6342,7 @@ trace_set(bool recur GCC_UNUSED)
     for (ip = menu_items(m); *ip; ip++)
        if (item_value(*ip))
            newtrace |= t_tbl[item_index(*ip)].mask;
     for (ip = menu_items(m); *ip; ip++)
        if (item_value(*ip))
            newtrace |= t_tbl[item_index(*ip)].mask;

-    trace(newtrace);
+    curses_trace(newtrace);

     Trace(("trace level interactively set to %s", tracetrace(_nc_tracing)));
 
     MvPrintw(LINES - 2, 0,
     Trace(("trace level interactively set to %s", tracetrace(_nc_tracing)));
 
     MvPrintw(LINES - 2, 0,


@@ -7992,10 +7989,10 @@ main(int argc, char *argv[])
 #ifdef TRACE
     /* enable debugging */
 #if !USE_LIBMENU
 #ifdef TRACE
     /* enable debugging */
 #if !USE_LIBMENU

-    trace(save_trace);
+    curses_trace(save_trace);

 #else
     if (!isatty(fileno(stdin)))
 #else
     if (!isatty(fileno(stdin)))

-       trace(save_trace);
+       curses_trace(save_trace);

 #endif /* USE_LIBMENU */
 #endif /* TRACE */
 
 #endif /* USE_LIBMENU */
 #endif /* TRACE */
 

diff --git a/test/package/debian-mingw/compat b/test/package/debian-mingw/compat
index 7f8f011eb73d6043d2e6db9d2c101195ae2801f2..ec635144f60048986bc560c5576355344005e6e7 100644 (file)
--- a/test/package/debian-mingw/compat
+++ b/test/package/debian-mingw/compat
@@ -1 +1 @@
-7
+9

diff --git a/test/package/debian-mingw/control b/test/package/debian-mingw/control
index 9bd26219eb328ac9c816b364316476511243fa9b..64bd01b1832d871d980ebc27f6d64444954eddb6 100644 (file)
--- a/test/package/debian-mingw/control
+++ b/test/package/debian-mingw/control
@@ -9,7 +9,7 @@ Homepage: https://invisible-island.net/ncurses/ncurses-examples.html
 Package: mingw32-ncurses-examples
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Package: mingw32-ncurses-examples
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}

-Description: ncurses-examples - example/test programs from ncurses
+Description: example/test programs from ncurses

  These are the example/test programs from the ncurses distribution.
  .
  This package is used for testing ABI 6 with the MinGW 32-bit port.
  These are the example/test programs from the ncurses distribution.
  .
  This package is used for testing ABI 6 with the MinGW 32-bit port.

diff --git a/test/package/debian-mingw64/compat b/test/package/debian-mingw64/compat
index 7f8f011eb73d6043d2e6db9d2c101195ae2801f2..ec635144f60048986bc560c5576355344005e6e7 100644 (file)
--- a/test/package/debian-mingw64/compat
+++ b/test/package/debian-mingw64/compat
@@ -1 +1 @@
-7
+9

diff --git a/test/package/debian-mingw64/control b/test/package/debian-mingw64/control
index bda22836fd75bbd2e823ae252163f387b3a0c965..c22f262a8bf9f32171027e89ed03f3f0f74f111a 100644 (file)
--- a/test/package/debian-mingw64/control
+++ b/test/package/debian-mingw64/control
@@ -9,7 +9,7 @@ Homepage: https://invisible-island.net/ncurses/ncurses-examples.html
 Package: mingw64-ncurses-examples
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Package: mingw64-ncurses-examples
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}

-Description: ncurses-examples - example/test programs from ncurses
+Description: example/test programs from ncurses

  These are the example/test programs from the ncurses distribution.
  .
  This package is used for testing ABI 6 with the MinGW 64-bit port.
  These are the example/test programs from the ncurses distribution.
  .
  This package is used for testing ABI 6 with the MinGW 64-bit port.

diff --git a/test/package/debian/compat b/test/package/debian/compat
index 7f8f011eb73d6043d2e6db9d2c101195ae2801f2..ec635144f60048986bc560c5576355344005e6e7 100644 (file)
--- a/test/package/debian/compat
+++ b/test/package/debian/compat
@@ -1 +1 @@
-7
+9

diff --git a/test/package/debian/control b/test/package/debian/control
index 19180b584f586cbefed7a90a5ffdabbc7c4eeb75..d7647b3fdb8b80615fa20e8363c6cc46c56dc1d1 100644 (file)
--- a/test/package/debian/control
+++ b/test/package/debian/control
@@ -9,7 +9,7 @@ Homepage: https://invisible-island.net/ncurses/ncurses-examples.html
 Package: ncurses-examples
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Package: ncurses-examples
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}

-Description: ncurses-examples - example/test programs from ncurses
+Description: example/test programs from ncurses

  These are the example/test programs from the ncurses distribution.
  .
  This package installs in "bin/ncurses-examples" to avoid conflict with other
  These are the example/test programs from the ncurses distribution.
  .
  This package installs in "bin/ncurses-examples" to avoid conflict with other


@@ -18,7 +18,7 @@ Description: ncurses-examples - example/test programs from ncurses
 Package: ncursest-examples
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Package: ncursest-examples
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}

-Description: ncurses-examples - example/test programs from ncurses
+Description: example/test programs from ncurses

  These are the example/test programs from the ncurses distribution, using
  the thread configuration.
  .
  These are the example/test programs from the ncurses distribution, using
  the thread configuration.
  .

diff --git a/test/padview.c b/test/padview.c
index 7bc136d51fb8aa0a0def3c4a2012418d79356510..60f800ffac7539da97da76d6ac91061f54375fca 100644 (file)
--- a/test/padview.c
+++ b/test/padview.c
@@ -28,7 +28,7 @@
 /*
  * clone of view.c, using pads
  *
 /*
  * clone of view.c, using pads
  *

- * $Id: padview.c,v 1.14 2019/07/13 20:41:47 tom Exp $
+ * $Id: padview.c,v 1.15 2019/12/07 18:06:12 tom Exp $

  */
 
 #include <test.priv.h>
  */
 
 #include <test.priv.h>


@@ -324,11 +324,11 @@ main(int argc, char *argv[])
                int tvalue = (int) strtol(optarg, &next, 0);
                if (tvalue < 0 || (next != 0 && *next != 0))
                    usage();
                int tvalue = (int) strtol(optarg, &next, 0);
                if (tvalue < 0 || (next != 0 && *next != 0))
                    usage();

-               trace((unsigned) tvalue);
+               curses_trace((unsigned) tvalue);

            }
            break;
        case 't':
            }
            break;
        case 't':

-           trace(TRACE_CALLS);
+           curses_trace(TRACE_CALLS);

            break;
 #endif
        default:
            break;
 #endif
        default:

diff --git a/test/test.priv.h b/test/test.priv.h
index b9c5dc651b0905cab2d8c8b48cc3ae0b4af70723..7814b9599d7f95349608892766ca127f300e4b3c 100644 (file)
--- a/test/test.priv.h
+++ b/test/test.priv.h
@@ -29,7 +29,7 @@
 /****************************************************************************
  *  Author: Thomas E. Dickey                    1996-on                     *
  ****************************************************************************/
 /****************************************************************************
  *  Author: Thomas E. Dickey                    1996-on                     *
  ****************************************************************************/

-/* $Id: test.priv.h,v 1.182 2019/04/20 20:15:39 tom Exp $ */
+/* $Id: test.priv.h,v 1.183 2019/12/07 19:03:20 tom Exp $ */

 
 #ifndef __TEST_PRIV_H
 #define __TEST_PRIV_H 1
 
 #ifndef __TEST_PRIV_H
 #define __TEST_PRIV_H 1


@@ -976,9 +976,9 @@ extern int TABSIZE;
 #endif
 
 #if !HAVE_STRSTR
 #endif
 
 #if !HAVE_STRSTR

-extern char * _nc_strstr (const char *, const char *);
+extern char *_nc_strstr(const char *, const char *);

 #define strstr(a,b) _nc_strstr((a),(b))
 #define strstr(a,b) _nc_strstr((a),(b))

-#endif /* !HAVE_STRSTR */
+#endif /* !HAVE_STRSTR */

 
 /* Use this to quiet gcc's -Wwrite-strings warnings, but accommodate SVr4
  * curses which doesn't have const parameters declared (so far) in the places
 
 /* Use this to quiet gcc's -Wwrite-strings warnings, but accommodate SVr4
  * curses which doesn't have const parameters declared (so far) in the places


@@ -1129,7 +1129,7 @@ extern char *tgoto(char *, int, int);     /* available, but not prototyped */
        if ((_nc_tracing & TRACE_MAXIMUM) == 0) { \
            int t = _nc_getenv_num("NCURSES_TRACE"); \
            if (t >= 0) \
        if ((_nc_tracing & TRACE_MAXIMUM) == 0) { \
            int t = _nc_getenv_num("NCURSES_TRACE"); \
            if (t >= 0) \

-               trace((unsigned) t); \
+               curses_trace((unsigned) t); \

        }
 extern unsigned _nc_tracing;
 extern int _nc_getenv_num(const char *);
        }
 extern unsigned _nc_tracing;
 extern int _nc_getenv_num(const char *);

diff --git a/test/testcurs.c b/test/testcurs.c
index fd3431ce1d9987234cc7426e808430a104cc0e22..ab7e1718cb1bdaaa610c4ea54f1b93a0ef3c9418 100644 (file)
--- a/test/testcurs.c
+++ b/test/testcurs.c
@@ -6,7 +6,7 @@
  *  wrs(5/28/93) -- modified to be consistent (perform identically) with either
  *                  PDCurses or under Unix System V, R4
  *
  *  wrs(5/28/93) -- modified to be consistent (perform identically) with either
  *                  PDCurses or under Unix System V, R4
  *

- * $Id: testcurs.c,v 1.53 2017/12/23 21:38:26 tom Exp $
+ * $Id: testcurs.c,v 1.54 2019/12/07 18:06:12 tom Exp $

  */
 
 #include <test.priv.h>
  */
 
 #include <test.priv.h>


@@ -59,7 +59,7 @@ initTest(WINDOW **win)
     PDC_debug("initTest called\n");
 #endif
 #ifdef TRACE
     PDC_debug("initTest called\n");
 #endif
 #ifdef TRACE

-    trace(TRACE_MAXIMUM);
+    curses_trace(TRACE_MAXIMUM);

 #endif
     initscr();
 #ifdef PDCDEBUG
 #endif
     initscr();
 #ifdef PDCDEBUG

diff --git a/test/testscanw.c b/test/testscanw.c
index 79589c20386d76d31a886080672e8e255e1861b3..96758f14e2fdeb9ed55c911728dae75cec1ce96b 100644 (file)
--- a/test/testscanw.c
+++ b/test/testscanw.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2002,2006 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2006,2019 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            *


@@ -29,7 +29,7 @@
  * Date:  1997/03/17
  * From:  bayern@morpheus.cis.yale.edu
  *
  * Date:  1997/03/17
  * From:  bayern@morpheus.cis.yale.edu
  *

- * $Id: testscanw.c,v 1.11 2006/04/01 19:08:03 tom Exp $
+ * $Id: testscanw.c,v 1.12 2019/12/07 18:07:04 tom Exp $

  */
 #include <test.priv.h>
 
  */
 #include <test.priv.h>
 


@@ -47,7 +47,7 @@ main(int argc, char *argv[])
     echo();
 
 #if 0
     echo();
 
 #if 0

-    trace(TRACE_UPDATE | TRACE_CALLS);
+    curses_trace(TRACE_UPDATE | TRACE_CALLS);

 #endif
     while (argc > 1) {
        if (isdigit(UChar(*argv[1])))
 #endif
     while (argc > 1) {
        if (isdigit(UChar(*argv[1])))

diff --git a/test/view.c b/test/view.c
index 2772a2773dde3a74645ff8b72ae3e31def214974..eb7786e1a36d171b6d78f6f5fe8ad227f18cb487 100644 (file)
--- a/test/view.c
+++ b/test/view.c
@@ -51,7 +51,7 @@
  * scroll operation worked, and the refresh() code only had to do a
  * partial repaint.
  *
  * scroll operation worked, and the refresh() code only had to do a
  * partial repaint.
  *

- * $Id: view.c,v 1.136 2019/01/27 00:52:06 tom Exp $
+ * $Id: view.c,v 1.137 2019/12/07 19:03:07 tom Exp $

  */
 
 #include <test.priv.h>
  */
 
 #include <test.priv.h>


@@ -88,7 +88,7 @@ failed(const char *msg)
 }
 
 static int
 }
 
 static int

-ch_len(NCURSES_CH_T * src)
+ch_len(NCURSES_CH_T *src)

 {
     int result = 0;
 #if USE_WIDEC_SUPPORT
 {
     int result = 0;
 #if USE_WIDEC_SUPPORT


@@ -299,11 +299,13 @@ read_file(const char *filename)
     }
     width = (width + 1) * 5;
     my_win = newwin(2, width, 0, 0);
     }
     width = (width + 1) * 5;
     my_win = newwin(2, width, 0, 0);

-    if (my_win == 0)
+    if (my_win == 0) {

        failed("cannot allocate temporary window");
        failed("cannot allocate temporary window");

+    }

 
 

-    if ((vec_lines = typeCalloc(NCURSES_CH_T *, (size_t) num_lines + 2)) == 0)
+    if ((vec_lines = typeCalloc(NCURSES_CH_T *, (size_t) num_lines + 2)) == 0) {

        failed("cannot allocate line-vector #2");
        failed("cannot allocate line-vector #2");

+    }

 
     /*
      * Use the curses library for rendering, including tab-conversion.  This
 
     /*
      * Use the curses library for rendering, including tab-conversion.  This


@@ -348,8 +350,9 @@ read_file(const char *filename)
            x = width - 1;
        wmove(my_win, 0, 0);
        /* "x + 1" works with standard curses; some implementations are buggy */
            x = width - 1;
        wmove(my_win, 0, 0);
        /* "x + 1" works with standard curses; some implementations are buggy */

-       if ((vec_lines[k] = typeCalloc(NCURSES_CH_T, x + width + 1)) == 0)
+       if ((vec_lines[k] = typeCalloc(NCURSES_CH_T, x + width + 1)) == 0) {

            failed("cannot allocate line-vector #3");
            failed("cannot allocate line-vector #3");

+       }

 #if USE_WIDEC_SUPPORT
        win_wchnstr(my_win, vec_lines[k], x);
 #else
 #if USE_WIDEC_SUPPORT
        win_wchnstr(my_win, vec_lines[k], x);
 #else


@@ -450,11 +453,11 @@ main(int argc, char *argv[])
                int tvalue = (int) strtol(optarg, &next, 0);
                if (tvalue < 0 || (next != 0 && *next != 0))
                    usage();
                int tvalue = (int) strtol(optarg, &next, 0);
                if (tvalue < 0 || (next != 0 && *next != 0))
                    usage();

-               trace((unsigned) tvalue);
+               curses_trace((unsigned) tvalue);

            }
            break;
        case 't':
            }
            break;
        case 't':

-           trace(TRACE_CALLS);
+           curses_trace(TRACE_CALLS);

            break;
 #endif
        default:
            break;
 #endif
        default:

diff --git a/test/worm.c b/test/worm.c
index 8cac9e223c90132a29bded4c1c20dd1595dc6b16..d618e3bb050fee51440a5c2a492e988024fa3ece 100644 (file)
--- a/test/worm.c
+++ b/test/worm.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2018,2019 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            *


@@ -52,7 +52,7 @@
   traces will be dumped.  The program stops and waits for one character of
   input at the beginning and end of the interval.
 
   traces will be dumped.  The program stops and waits for one character of
   input at the beginning and end of the interval.
 

-  $Id: worm.c,v 1.79 2018/07/21 21:40:00 tom Exp $
+  $Id: worm.c,v 1.80 2019/12/07 19:04:09 tom Exp $

 */
 
 #include <test.priv.h>
 */
 
 #include <test.priv.h>


@@ -608,10 +608,10 @@ main(int argc, char *argv[])
 #ifdef TRACE
            if (trace_start || trace_end) {
                if (generation == trace_start) {
 #ifdef TRACE
            if (trace_start || trace_end) {
                if (generation == trace_start) {

-                   trace(TRACE_CALLS);
+                   curses_trace(TRACE_CALLS);

                    get_input();
                } else if (generation == trace_end) {
                    get_input();
                } else if (generation == trace_end) {

-                   trace(0);
+                   curses_trace(0);

                    get_input();
                }
 
                    get_input();
                }