Skip to content

Commit

Permalink
ncurses 6.0 - patch 20171118
Browse files Browse the repository at this point in the history
+ add a note to curs_addch.3x on portability.
+ add a note to curs_pad.3x on the origin and portability of pads.
+ improve manpage description of getattrs (report by Midolikawa H).
+ improve manpage macros (prompted by discussion in Debian #880551.
+ reviewed test-programs using KEY_RESIZE, made fixes to test/worm.c
+ add a "-d" option to picsmap for default-colors.
+ modify old terminology entry and a few other terminal emulators to
  account for xon -TD
+ correct sgr string for tmux, which used screen's "standout" code
  rather than the standard code (patch by Roman Kagan)
+ correct sgr/sgr0 strings in a few other cases reported by tic, making
  those correspond to the non-sgr settings where they differ, but
  otherwise use ECMA-48 consistently:
  jaixterm, aixterm, att5420_2, att4424, att500, decansi, d410-7b,
  dm80, hpterm, emu-220, hp2, iTerm2.app, mterm-ansi, ncrvt100an,
  st-0.7, vi603, vwmterm -TD
+ build-fix for diagnostics warning in lib_mouse.c for pre-5.0 versions
  of gcc which did not recognize the diagnostic "push" pragma (patch by
  Vassili Courzakis).
  • Loading branch information
ThomasDickey committed Nov 19, 2017
1 parent d6760d8 commit 06078d3
Show file tree
Hide file tree
Showing 110 changed files with 962 additions and 532 deletions.
1 change: 1 addition & 0 deletions MANIFEST
Original file line number Diff line number Diff line change
Expand Up @@ -1173,6 +1173,7 @@
./test/package/ncurses-examples.spec
./test/padview.c
./test/picsmap.c
./test/picsmap.h
./test/popup_msg.c
./test/popup_msg.h
./test/programs
Expand Down
23 changes: 22 additions & 1 deletion NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
-- $Id: NEWS,v 1.2998 2017/11/11 20:35:53 tom Exp $
-- $Id: NEWS,v 1.3004 2017/11/19 01:32:47 tom Exp $
-------------------------------------------------------------------------------

This is a log of changes that ncurses has gone through since Zeyd started
Expand All @@ -45,6 +45,27 @@ 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.

20171118
+ add a note to curs_addch.3x on portability.
+ add a note to curs_pad.3x on the origin and portability of pads.
+ improve manpage description of getattrs (report by Midolikawa H).
+ improve manpage macros (prompted by discussion in Debian #880551.
+ reviewed test-programs using KEY_RESIZE, made fixes to test/worm.c
+ add a "-d" option to picsmap for default-colors.
+ modify old terminology entry and a few other terminal emulators to
account for xon -TD
+ correct sgr string for tmux, which used screen's "standout" code
rather than the standard code (patch by Roman Kagan)
+ correct sgr/sgr0 strings in a few other cases reported by tic, making
those correspond to the non-sgr settings where they differ, but
otherwise use ECMA-48 consistently:
jaixterm, aixterm, att5420_2, att4424, att500, decansi, d410-7b,
dm80, hpterm, emu-220, hp2, iTerm2.app, mterm-ansi, ncrvt100an,
st-0.7, vi603, vwmterm -TD
+ build-fix for diagnostics warning in lib_mouse.c for pre-5.0 versions
of gcc which did not recognize the diagnostic "push" pragma (patch by
Vassili Courzakis).

20171111
+ add "op" to xterm+256setaf -TD
+ reviewed terminology 1.0.0 -TD
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5:0:9 6.0 20171111
5:0:9 6.0 20171118
4 changes: 2 additions & 2 deletions dist.mk
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
# $Id: dist.mk,v 1.1191 2017/11/05 11:30:20 tom Exp $
# $Id: dist.mk,v 1.1192 2017/11/12 15:22:04 tom Exp $
# Makefile for creating ncurses distributions.
#
# This only needs to be used directly as a makefile by developers, but
Expand All @@ -37,7 +37,7 @@ SHELL = /bin/sh
# These define the major/minor/patch versions of ncurses.
NCURSES_MAJOR = 6
NCURSES_MINOR = 0
NCURSES_PATCH = 20171111
NCURSES_PATCH = 20171118

# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
Expand Down
2 changes: 1 addition & 1 deletion doc/html/man/adacurses6-config.1.html
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ <H1 class="no-header">ADACURSES 1 User Commands</H1>
</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.0 (patch 20171028).
This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20171118).



Expand Down
2 changes: 1 addition & 1 deletion doc/html/man/captoinfo.1m.html
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ <H1 class="no-header">captoinfo 1m</H1>
</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.0 (patch 20171028).
This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20171118).


</PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
Expand Down
14 changes: 7 additions & 7 deletions doc/html/man/clear.1.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
* sale, use or other dealings in this Software without prior written *
* authorization. *
****************************************************************************
* @Id: clear.1,v 1.18 2017/10/07 21:30:17 tom Exp @
* @Id: clear.1,v 1.19 2017/11/18 23:51:59 tom Exp @
* these would be fallbacks for DS/DE,
* but groff changed the meaning of the macros.
-->
Expand Down Expand Up @@ -90,13 +90,13 @@ <H1 class="no-header">clear 1</H1>
(<STRONG>tput</STRONG>), and used this to replace the <STRONG>clear</STRONG> command with a shell script
which calls <STRONG>tput</STRONG> <STRONG>clear</STRONG>, e.g.,

/usr/bin/tput ${1:+-T$1} clear 2&gt; /dev/null
exit
/usr/bin/tput ${1:+-T$1} clear 2&gt; /dev/null
exit

In 1989, when Keith Bostic revised the BSD <STRONG>tput</STRONG> command to make it sim-
ilar to the AT&amp;T <STRONG>tput</STRONG>, he added a shell script for the <STRONG>clear</STRONG> command:

exec tput clear
exec tput clear

The remainder of the script in each case is a copyright notice.

Expand All @@ -109,11 +109,11 @@ <H1 class="no-header">clear 1</H1>
sequence for clearing the screen. Rather than clearing just the
visible part of the screen using

printf '\033[2J'
printf '\033[2J'

one could clear the <EM>scrollback</EM> using

printf '\033[<STRONG>3</STRONG>J'
printf '\033[<STRONG>3</STRONG>J'

This is documented in <EM>XTerm</EM> <EM>Control</EM> <EM>Sequences</EM> as a feature origi-
nating with xterm.
Expand Down Expand Up @@ -148,7 +148,7 @@ <H1 class="no-header">clear 1</H1>
</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.0 (patch 20171028).
This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20171118).



Expand Down
2 changes: 1 addition & 1 deletion doc/html/man/curs_add_wch.3x.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
* sale, use or other dealings in this Software without prior written *
* authorization. *
****************************************************************************
* @Id: curs_add_wch.3x,v 1.23 2017/05/20 14:45:24 Sven.Joachim Exp @
* @Id: curs_add_wch.3x,v 1.24 2017/11/18 23:47:37 tom Exp @
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<HTML>
Expand Down
4 changes: 2 additions & 2 deletions doc/html/man/curs_add_wchstr.3x.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--
****************************************************************************
* Copyright (c) 2002-2010,2012 Free Software Foundation, Inc. *
* Copyright (c) 2002-2012,2017 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 *
Expand All @@ -26,7 +26,7 @@
* sale, use or other dealings in this Software without prior written *
* authorization. *
****************************************************************************
* @Id: curs_add_wchstr.3x,v 1.10 2012/11/03 22:54:43 tom Exp @
* @Id: curs_add_wchstr.3x,v 1.11 2017/11/18 23:56:00 tom Exp @
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<HTML>
Expand Down
53 changes: 48 additions & 5 deletions doc/html/man/curs_addch.3x.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
* sale, use or other dealings in this Software without prior written *
* authorization. *
****************************************************************************
* @Id: curs_addch.3x,v 1.41 2017/05/05 18:15:29 tom Exp @
* @Id: curs_addch.3x,v 1.43 2017/11/19 01:54:00 tom Exp @
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<HTML>
Expand Down Expand Up @@ -182,6 +182,8 @@ <H1 class="no-header">curs_addch 3x</H1>
The defaults specified for forms-drawing characters apply in the POSIX
locale.


</PRE><H3><a name="h3-ACS-Symbols">ACS Symbols</a></H3><PRE>
X/Open Curses states that the <EM>ACS</EM><STRONG>_</STRONG> definitions are <STRONG>char</STRONG> constants. For
the wide-character implementation (see <STRONG>curs_add_wch</STRONG>), there are analo-
gous <EM>WACS</EM><STRONG>_</STRONG> definitions which are <STRONG>cchar_t</STRONG> constants.
Expand All @@ -205,19 +207,54 @@ <H1 class="no-header">curs_addch 3x</H1>
acters except by using UTF-8 (see the discussion of <STRONG>NCURSES_NO_UTF8_ACS</STRONG>
in <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>).

The <STRONG>TABSIZE</STRONG> variable is implemented in some versions of curses, but is

</PRE><H3><a name="h3-Character-Set">Character Set</a></H3><PRE>
X/Open Curses assumes that the parameter passed to <STRONG>waddch</STRONG> contains a
single character. As discussed in <STRONG>curs_attr(3x)</STRONG>, that character may
have been more than eight bits in an SVr3 or SVr4 implementation, but
in the X/Open Curses model, the details are not given. The important
distinction between SVr4 curses and X/Open Curses is that the non-char-
acter information (attributes and color) was separated from the charac-
ter information which is packed in a <STRONG>chtype</STRONG> to pass to <STRONG>waddch</STRONG>.

In this implementation, <STRONG>chtype</STRONG> holds eight bits. But ncurses allows
multibyte characters to be passed in a succession of calls to <STRONG>waddch</STRONG>.
The other implementations do not do this; a call to <STRONG>waddch</STRONG> passes
exactly one character which may be rendered as one or more cells on the
screen depending on whether it is printable.

Depending on the locale settings, ncurses will inspect the byte passed
in each call to <STRONG>waddch</STRONG>, and check if the latest call will continue a
multibyte sequence. When a character is <EM>complete</EM>, ncurses displays the
character and moves to the next position in the screen.

If the calling application interrupts the succession of bytes in a
multibyte character by moving the current location (e.g., using <STRONG>wmove</STRONG>),
ncurses discards the partially built character, starting over again.

For portability to other implementations, do not rely upon this behav-
ior:

<STRONG>o</STRONG> check if a character can be represented as a single byte in the
current locale before attempting call <STRONG>waddch</STRONG>, and

<STRONG>o</STRONG> call <STRONG>wadd_wch</STRONG> for characters which cannot be handled by <STRONG>waddch</STRONG>.


</PRE><H3><a name="h3-TABSIZE">TABSIZE</a></H3><PRE>
The <STRONG>TABSIZE</STRONG> variable is implemented in some versions of curses, but is
not part of X/Open curses.

If <EM>ch</EM> is a carriage return, the cursor is moved to the beginning of the
current row of the window. This is true of other implementations, but
current row of the window. This is true of other implementations, but
is not documented.


</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_attr.3x.html">curs_attr(3x)</A></STRONG>, <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>, <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>, <STRONG>curs_out-</STRONG>
<STRONG><A HREF="curs_outopts.3x.html">opts(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, <STRONG>putc(3)</STRONG>.

Comparable functions in the wide-character (ncursesw) library are
Comparable functions in the wide-character (ncursesw) library are
described in <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>.


Expand All @@ -237,7 +274,13 @@ <H1 class="no-header">curs_addch 3x</H1>
</li>
<li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
<li><a href="#h2-NOTES">NOTES</a></li>
<li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
<li><a href="#h2-PORTABILITY">PORTABILITY</a>
<ul>
<li><a href="#h3-ACS-Symbols">ACS Symbols</a></li>
<li><a href="#h3-Character-Set">Character Set</a></li>
<li><a href="#h3-TABSIZE">TABSIZE</a></li>
</ul>
</li>
<li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
</ul>
</div>
Expand Down
4 changes: 2 additions & 2 deletions doc/html/man/curs_addchstr.3x.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--
****************************************************************************
* Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. *
* Copyright (c) 1998-2012,2017 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 *
Expand All @@ -26,7 +26,7 @@
* sale, use or other dealings in this Software without prior written *
* authorization. *
****************************************************************************
* @Id: curs_addchstr.3x,v 1.16 2012/11/03 22:54:43 tom Exp @
* @Id: curs_addchstr.3x,v 1.17 2017/11/18 23:56:00 tom Exp @
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<HTML>
Expand Down
4 changes: 2 additions & 2 deletions doc/html/man/curs_addstr.3x.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--
****************************************************************************
* Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. *
* Copyright (c) 1998-2012,2017 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 *
Expand All @@ -26,7 +26,7 @@
* sale, use or other dealings in this Software without prior written *
* authorization. *
****************************************************************************
* @Id: curs_addstr.3x,v 1.17 2012/11/03 22:57:31 tom Exp @
* @Id: curs_addstr.3x,v 1.18 2017/11/18 23:56:00 tom Exp @
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<HTML>
Expand Down
4 changes: 2 additions & 2 deletions doc/html/man/curs_addwstr.3x.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--
****************************************************************************
* Copyright (c) 2002-2010,2012 Free Software Foundation, Inc. *
* Copyright (c) 2002-2012,2017 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 *
Expand All @@ -26,7 +26,7 @@
* sale, use or other dealings in this Software without prior written *
* authorization. *
****************************************************************************
* @Id: curs_addwstr.3x,v 1.11 2012/11/03 22:57:31 tom Exp @
* @Id: curs_addwstr.3x,v 1.12 2017/11/18 23:56:00 tom Exp @
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<HTML>
Expand Down
2 changes: 1 addition & 1 deletion doc/html/man/curs_attr.3x.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
* sale, use or other dealings in this Software without prior written *
* authorization. *
****************************************************************************
* @Id: curs_attr.3x,v 1.60 2017/10/14 20:01:13 tom Exp @
* @Id: curs_attr.3x,v 1.61 2017/11/18 23:47:37 tom Exp @
* ---------------------------------------------------------------------------
* attr_get
* .br
Expand Down
4 changes: 2 additions & 2 deletions doc/html/man/curs_bkgd.3x.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--
****************************************************************************
* Copyright (c) 1998-2010,2015 Free Software Foundation, Inc. *
* Copyright (c) 1998-2015,2017 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 *
Expand All @@ -26,7 +26,7 @@
* sale, use or other dealings in this Software without prior written *
* authorization. *
****************************************************************************
* @Id: curs_bkgd.3x,v 1.24 2015/11/21 01:53:42 tom Exp @
* @Id: curs_bkgd.3x,v 1.25 2017/11/18 23:56:00 tom Exp @
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<HTML>
Expand Down
2 changes: 1 addition & 1 deletion doc/html/man/curs_bkgrnd.3x.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
* sale, use or other dealings in this Software without prior written *
* authorization. *
****************************************************************************
* @Id: curs_bkgrnd.3x,v 1.7 2017/03/25 21:49:00 tom Exp @
* @Id: curs_bkgrnd.3x,v 1.8 2017/11/18 23:47:37 tom Exp @
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<HTML>
Expand Down
2 changes: 1 addition & 1 deletion doc/html/man/curs_color.3x.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
* sale, use or other dealings in this Software without prior written *
* authorization. *
****************************************************************************
* @Id: curs_color.3x,v 1.51 2017/08/12 21:40:14 tom Exp @
* @Id: curs_color.3x,v 1.52 2017/11/18 23:47:37 tom Exp @
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<HTML>
Expand Down
4 changes: 2 additions & 2 deletions doc/html/man/curs_get_wch.3x.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--
****************************************************************************
* Copyright (c) 2002-2012,2016 Free Software Foundation, Inc. *
* Copyright (c) 2002-2016,2017 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 *
Expand All @@ -26,7 +26,7 @@
* sale, use or other dealings in this Software without prior written *
* authorization. *
****************************************************************************
* @Id: curs_get_wch.3x,v 1.9 2016/05/15 01:12:50 tom Exp @
* @Id: curs_get_wch.3x,v 1.10 2017/11/18 23:56:00 tom Exp @
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<HTML>
Expand Down
2 changes: 1 addition & 1 deletion doc/html/man/curs_getcchar.3x.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
* sale, use or other dealings in this Software without prior written *
* authorization. *
****************************************************************************
* @Id: curs_getcchar.3x,v 1.18 2017/03/31 10:50:54 tom Exp @
* @Id: curs_getcchar.3x,v 1.19 2017/11/18 23:47:37 tom Exp @
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<HTML>
Expand Down
4 changes: 2 additions & 2 deletions doc/html/man/curs_getch.3x.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!--
* t
****************************************************************************
* Copyright (c) 1998-2015,2016 Free Software Foundation, Inc. *
* Copyright (c) 1998-2016,2017 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 *
Expand All @@ -27,7 +27,7 @@
* sale, use or other dealings in this Software without prior written *
* authorization. *
****************************************************************************
* @Id: curs_getch.3x,v 1.49 2016/10/15 16:44:01 tom Exp @
* @Id: curs_getch.3x,v 1.50 2017/11/18 23:56:00 tom Exp @
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<HTML>
Expand Down
Loading

0 comments on commit 06078d3

Please sign in to comment.