From 5dbe81a41e3c75806996cd762b9e55dcc9edb835 Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Sun, 15 May 2016 01:40:05 +0000 Subject: [PATCH] ncurses 6.0 - patch 20160514 + regenerate HTML manpages. + improve manual pages for wgetch and wget_wch to point out that they might return values without names in curses.h (Debian #822426). + make linux3.0 entry the default linux entry (Debian #823658) -TD + modify linux2.6 entry to improve line-drawing so that the linux3.0 entry can be used in non-UTF-8 mode -TD + document return value of use_extended_names (report by Mike Gran). --- NEWS | 11 +++- VERSION | 2 +- dist.mk | 4 +- doc/html/man/captoinfo.1m.html | 2 +- doc/html/man/clear.1.html | 2 +- doc/html/man/curs_extend.3x.html | 24 +++++++-- doc/html/man/curs_get_wch.3x.html | 89 +++++++++++++++++-------------- doc/html/man/curs_getch.3x.html | 24 ++++++--- doc/html/man/form.3x.html | 2 +- doc/html/man/infocmp.1m.html | 2 +- doc/html/man/infotocap.1m.html | 2 +- doc/html/man/menu.3x.html | 2 +- doc/html/man/ncurses.3x.html | 2 +- doc/html/man/panel.3x.html | 2 +- doc/html/man/tabs.1.html | 2 +- doc/html/man/terminfo.5.html | 2 +- doc/html/man/tic.1m.html | 2 +- doc/html/man/toe.1m.html | 2 +- doc/html/man/tput.1.html | 2 +- doc/html/man/tset.1.html | 35 +++++++----- man/curs_extend.3x | 13 ++++- man/curs_get_wch.3x | 32 +++++++---- man/curs_getch.3x | 19 ++++--- misc/terminfo.src | 26 +++++---- package/debian-mingw/changelog | 4 +- package/debian-mingw64/changelog | 4 +- package/debian/changelog | 4 +- package/mingw-ncurses.nsi | 4 +- package/mingw-ncurses.spec | 2 +- package/ncurses.spec | 2 +- 30 files changed, 210 insertions(+), 115 deletions(-) diff --git a/NEWS b/NEWS index f2c8b786..4538903d 100644 --- a/NEWS +++ b/NEWS @@ -25,7 +25,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: NEWS,v 1.2600 2016/05/07 23:49:50 tom Exp $ +-- $Id: NEWS,v 1.2606 2016/05/15 01:20:32 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -45,6 +45,15 @@ 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. +20160514 + + regenerate HTML manpages. + + improve manual pages for wgetch and wget_wch to point out that they + might return values without names in curses.h (Debian #822426). + + make linux3.0 entry the default linux entry (Debian #823658) -TD + + modify linux2.6 entry to improve line-drawing so that the linux3.0 + entry can be used in non-UTF-8 mode -TD + + document return value of use_extended_names (report by Mike Gran). + 20160507 + amend change to _nc_do_color to restore the early return for the special case used in _nc_screen_wrap (report by Dick Streefland, diff --git a/VERSION b/VERSION index 88b60d61..38770d64 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:9 6.0 20160507 +5:0:9 6.0 20160514 diff --git a/dist.mk b/dist.mk index 35dde3f0..94ea1f44 100644 --- a/dist.mk +++ b/dist.mk @@ -25,7 +25,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: dist.mk,v 1.1104 2016/05/07 17:04:36 tom Exp $ +# $Id: dist.mk,v 1.1106 2016/05/14 16:50:48 tom Exp $ # 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 = 0 -NCURSES_PATCH = 20160507 +NCURSES_PATCH = 20160514 # 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/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html index 41199b65..c8f22d64 100644 --- a/doc/html/man/captoinfo.1m.html +++ b/doc/html/man/captoinfo.1m.html @@ -198,7 +198,7 @@

SEE ALSO

        infocmp(1m), curses(3x), terminfo(5)
 
-       This describes ncurses version 6.0 (patch 20160402).
+       This describes ncurses version 6.0 (patch 20160514).

AUTHOR

diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html
index a35a8ebb..6399bab9 100644
--- a/doc/html/man/clear.1.html
+++ b/doc/html/man/clear.1.html
@@ -67,7 +67,7 @@

SEE ALSO

        tput(1), terminfo(5)
 
-       This describes ncurses version 6.0 (patch 20160402).
+       This describes ncurses version 6.0 (patch 20160514).
 
 
 
diff --git a/doc/html/man/curs_extend.3x.html b/doc/html/man/curs_extend.3x.html
index 224f5ade..2ad268f8 100644
--- a/doc/html/man/curs_extend.3x.html
+++ b/doc/html/man/curs_extend.3x.html
@@ -1,6 +1,6 @@
 
 
 
@@ -62,9 +62,13 @@
        These functions are extensions to the curses library which
        do not fit easily into other categories.
 
+
+

curses_version

        Use  curses_version() to get the version number, including
        patch level of the library, e.g., 5.0.19991023
 
+
+

use_extended_names

        The use_extended_names()  function  controls  whether  the
        calling  application  is  able to use user-defined or non-
        standard names which may be  compiled  into  the  terminfo
@@ -76,6 +80,14 @@
        implementations of curses.
 
 
+

RETURN VALUE

+       curses_version returns a pointer  to  static  memory;  you
+       should not free this in your application.
+
+       use_extended_names  returns  the  previous state, allowing
+       you to save this and restore it.
+
+

PORTABILITY

        These routines are specific to  ncurses.   They  were  not
        supported  on  Version 7, BSD or System V implementations.
@@ -100,7 +112,13 @@

NAME

-       get_wch,  wget_wch, mvget_wch, mvwget_wch, unget_wch - get
-       (or push back) a wide character from curses terminal  key-
-       board
+       get_wch, wget_wch, mvget_wch, mvwget_wch, unget_wch - get
+       (or push back) a wide character from curses terminal
+       keyboard

SYNOPSIS

@@ -64,14 +64,14 @@

DESCRIPTION

        The get_wch, wget_wch, mvget_wch, and mvwget_wch functions
        read a character from the  terminal  associated  with  the
-       current  or  specified  window.   In  no-delay mode, if no
-       input is waiting, the value ERR  is  returned.   In  delay
-       mode,  the  program  waits  until  the  system passes text
-       through to the  program.   Depending  on  the  setting  of
-       cbreak,  this  is  after  one  character (cbreak mode), or
-       after the first newline (nocbreak  mode).   In  half-delay
-       mode,  the  program waits until the user types a character
-       or the specified timeout interval has elapsed.
+       current  or specified window.  In no-delay mode, if no in-
+       put is waiting, the value ERR is returned.  In delay mode,
+       the  program waits until the system passes text through to
+       the program.  Depending on the setting of cbreak, this  is
+       after one character (cbreak mode), or after the first new-
+       line (nocbreak mode).  In  half-delay  mode,  the  program
+       waits  until  the  user types a character or the specified
+       timeout interval has elapsed.
 
        Unless noecho has been set, these routines echo the  char-
        acter into the designated window.
@@ -82,59 +82,70 @@
 
        If  keypad  is  enabled,  these  functions  respond to the
        pressing of a function key by setting the  object  pointed
-       to  by  wch  to  the  corresponding  KEY_ value defined in
-       <curses.h> and returning  KEY_CODE_YES.   If  a  character
-       (such as escape) that could be the beginning of a function
-       key is received, curses sets a timer.  If the remainder of
-       the  sequence  does  arrive  within  the  designated time,
-       curses passes through  the  character;  otherwise,  curses
-       returns  the  function  key  value.  For this reason, many
-       terminals experience a  delay  between  the  time  a  user
-       presses the escape key and the time the escape is returned
-       to the program.
-
-       The unget_wch function pushes the wide character wch  back
+       to by wch to the keycode assigned to the function key, and
+       returning KEY_CODE_YES.  If a character (such  as  escape)
+       that could be the beginning of a function key is received,
+       curses sets a timer.  If the  remainder  of  the  sequence
+       does  arrive  within  the  designated  time, curses passes
+       through the character; otherwise, curses returns the func-
+       tion  key  value.  For this reason, many terminals experi-
+       ence a delay between the time a user  presses  the  escape
+       key and the time the escape is returned to the program.
+
+       The  keycodes  returned by these functions are the same as
+       those returned by wgetch:
+
+       o   The predefined function keys are listed in  <curses.h>
+           as macros with values outside the range of 8-bit char-
+           acters.  Their names begin with KEY_.
+
+       o   Other (user-defined) function keys which  may  be  de-
+           fined using define_key(3x) have no names, but also are
+           expected to have values outside  the  range  of  8-bit
+           characters.
+
+       The  unget_wch function pushes the wide character wch back
        onto the head of the input queue, so the wide character is
        returned by the next call to get_wch.  The pushback of one
-       character  is  guaranteed.  If the program calls unget_wch
+       character is guaranteed.  If the program  calls  unget_wch
        too many times without an intervening call to get_wch, the
        operation may fail.

NOTES

-       The  header  file  <curses.h>  automatically  includes the
+       The header  file  <curses.h>  automatically  includes  the
        header file <stdio.h>.
 
        Applications should not define the escape key by itself as
        a single-character function.
 
-       When  using  get_wch,  wget_wch, mvget_wch, or mvwget_wch,
+       When using get_wch, wget_wch,  mvget_wch,  or  mvwget_wch,
        applications should not use nocbreak mode and echo mode at
-       the  same  time.  Depending on the state of the tty driver
-       when each character is  typed,  the  program  may  produce
-       undesirable results.
+       the same time.  Depending on the state of the  tty  driver
+       when  each character is typed, the program may produce un-
+       desirable results.
 
        All functions except wget_wch and unget_wch may be macros.

RETURN VALUE

-       When  get_wch,  wget_wch,  mvget_wch, and mvwget_wch func-
-       tions successfully report the pressing of a function  key,
+       When get_wch, wget_wch, mvget_wch,  and  mvwget_wch  func-
+       tions  successfully report the pressing of a function key,
        they return KEY_CODE_YES.  When they successfully report a
-       wide character, they return OK.   Otherwise,  they  return
+       wide  character,  they  return OK.  Otherwise, they return
        ERR.
 
-       Upon  successful completion, unget_wch returns OK.  Other-
+       Upon successful completion, unget_wch returns OK.   Other-
        wise, the function returns ERR.
 
-       Functions with a "mv" prefix first perform a cursor  move-
-       ment  using  wmove, and return an error if the position is
+       Functions  with a "mv" prefix first perform a cursor move-
+       ment using wmove, and return an error if the  position  is
        outside the window, or if the window pointer is null.

SEE ALSO

-       curses(3x),       curs_getch(3x),        curs_ins_wch(3x),
-       curs_inopts(3x), curs_move(3x), curs_refresh(3x)
+       curses(3x),   curs_getch(3x),  curs_ins_wch(3x),  curs_in-
+       opts(3x), curs_move(3x), curs_refresh(3x)
 
 
 
diff --git a/doc/html/man/curs_getch.3x.html b/doc/html/man/curs_getch.3x.html
index 1a3b3764..90d336f9 100644
--- a/doc/html/man/curs_getch.3x.html
+++ b/doc/html/man/curs_getch.3x.html
@@ -1,7 +1,7 @@
 
 
 
@@ -102,11 +102,19 @@

Keypad mode

        If  keypad is TRUE, and a function key is pressed, the to-
        ken for that function key is returned instead of  the  raw
-       characters.   Possible function keys are defined in <curs-
-       es.h> as macros with values outside  the  range  of  8-bit
-       characters  whose names begin with KEY_.  Thus, a variable
-       intended to hold the return value of a function  key  must
-       be of short size or larger.
+       characters:
+
+       o   The  predefined function keys are listed in <curses.h>
+           as macros with values outside the range of 8-bit char-
+           acters.  Their names begin with KEY_.
+
+       o   Other  (user-defined)  function  keys which may be de-
+           fined using define_key(3x) have no names, but also are
+           expected  to  have  values  outside the range of 8-bit
+           characters.
+
+       Thus, a variable intended to hold the return  value  of  a
+       function key must be of short size or larger.
 
        When a character that could be the beginning of a function
        key is received (which, on modern terminals, means an  es-
@@ -171,6 +179,7 @@
             KEY_RESET       Reset or hard reset
             KEY_PRINT       Print or copy
             KEY_LL          Home down or bottom (lower left)
+
             KEY_A1          Upper left of keypad
             KEY_A3          Upper right of keypad
             KEY_B2          Center of keypad
@@ -179,7 +188,6 @@
             KEY_BTAB        Back tab key
             KEY_BEG         Beg(inning) key
             KEY_CANCEL      Cancel key
-
             KEY_CLOSE       Close key
             KEY_COMMAND     Cmd (command) key
             KEY_COPY        Copy key
diff --git a/doc/html/man/form.3x.html b/doc/html/man/form.3x.html
index f157f61c..e2191d24 100644
--- a/doc/html/man/form.3x.html
+++ b/doc/html/man/form.3x.html
@@ -235,7 +235,7 @@
        curses(3x) and related pages whose names begin "form_" for
        detailed descriptions of the entry points.
 
-       This describes ncurses version 6.0 (patch 20160402).
+       This describes ncurses version 6.0 (patch 20160514).
 
 
 
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index 979e3b4f..32a24bdf 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -475,7 +475,7 @@
 
        http://invisible-island.net/ncurses/tctest.html
 
-       This describes ncurses version 6.0 (patch 20160402).
+       This describes ncurses version 6.0 (patch 20160514).

AUTHOR

diff --git a/doc/html/man/infotocap.1m.html b/doc/html/man/infotocap.1m.html
index 2451209a..fa07eac8 100644
--- a/doc/html/man/infotocap.1m.html
+++ b/doc/html/man/infotocap.1m.html
@@ -88,7 +88,7 @@

SEE ALSO

        curses(3x), tic(1m), infocmp(1m), terminfo(5)
 
-       This describes ncurses version 6.0 (patch 20160402).
+       This describes ncurses version 6.0 (patch 20160514).

AUTHOR

diff --git a/doc/html/man/menu.3x.html b/doc/html/man/menu.3x.html
index a0d1e650..4704f59d 100644
--- a/doc/html/man/menu.3x.html
+++ b/doc/html/man/menu.3x.html
@@ -217,7 +217,7 @@
        curses(3x) and related pages whose names begin "menu_" for
        detailed descriptions of the entry points.
 
-       This describes ncurses version 6.0 (patch 20160402).
+       This describes ncurses version 6.0 (patch 20160514).
 
 
 
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index 52c3eac5..6a0f8f92 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -60,7 +60,7 @@
        sonable optimization.  This implementation is "new curses"
        (ncurses) and is the approved replacement for 4.4BSD clas-
        sic  curses,  which has been discontinued.  This describes
-       ncurses version 6.0 (patch 20160402).
+       ncurses version 6.0 (patch 20160514).
 
        The ncurses library emulates the curses library of  System
        V  Release  4  UNIX,  and  XPG4 (X/Open Portability Guide)
diff --git a/doc/html/man/panel.3x.html b/doc/html/man/panel.3x.html
index f69ccea6..e2700434 100644
--- a/doc/html/man/panel.3x.html
+++ b/doc/html/man/panel.3x.html
@@ -209,7 +209,7 @@

SEE ALSO

        curses(3x), curs_variables(3x),
 
-       This describes ncurses version 6.0 (patch 20160402).
+       This describes ncurses version 6.0 (patch 20160514).

AUTHOR

diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index 1c34f9d2..8fbe88ee 100644
--- a/doc/html/man/tabs.1.html
+++ b/doc/html/man/tabs.1.html
@@ -164,7 +164,7 @@

SEE ALSO

        tset(1), infocmp(1m), curses(3x), terminfo(5).
 
-       This describes ncurses version 6.0 (patch 20160402).
+       This describes ncurses version 6.0 (patch 20160514).
 
 
 
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index 5a6c87f2..d7d88a2f 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -75,7 +75,7 @@
        nals by giving a set of capabilities which they  have,  by
        specifying how to perform screen operations, and by speci-
        fying padding requirements and  initialization  sequences.
-       This describes ncurses version 6.0 (patch 20160402).
+       This describes ncurses version 6.0 (patch 20160514).
 
        Entries in terminfo consist of a sequence of `,' separated
        fields (embedded commas may be escaped with a backslash or
diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html
index 94dcec03..5146836c 100644
--- a/doc/html/man/tic.1m.html
+++ b/doc/html/man/tic.1m.html
@@ -398,7 +398,7 @@
        infocmp(1m),    captoinfo(1m),   infotocap(1m),   toe(1m),
        curses(3x), term(5).  terminfo(5).
 
-       This describes ncurses version 6.0 (patch 20160402).
+       This describes ncurses version 6.0 (patch 20160514).

AUTHOR

diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
index 3c52f4d7..4130b7f8 100644
--- a/doc/html/man/toe.1m.html
+++ b/doc/html/man/toe.1m.html
@@ -117,7 +117,7 @@
        tic(1m),   infocmp(1m),   captoinfo(1m),    infotocap(1m),
        curses(3x), terminfo(5).
 
-       This describes ncurses version 6.0 (patch 20160402).
+       This describes ncurses version 6.0 (patch 20160514).
 
 
 
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index 3bd8ea6c..362db56e 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -383,7 +383,7 @@
        clear(1),    stty(1),   tabs(1),   tset(1),   terminfo(5),
        curs_termcap(3x).
 
-       This describes ncurses version 6.0 (patch 20160402).
+       This describes ncurses version 6.0 (patch 20160514).
 
 
 
diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index e68112f8..3ecc39a2 100644
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -26,7 +26,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tset.1,v 1.31 2016/01/30 15:41:41 tom Exp @
+  * @Id: tset.1,v 1.33 2016/04/16 18:48:44 tom Exp @
 -->
 
 
@@ -245,6 +245,10 @@

COMPATIBILITY

+       Neither IEEE Std 1003.1/The Open Group Base Specifications
+       Issue 7 (POSIX.1-2008) nor X/Open Curses Issue 7 documents
+       tset or reset.
+
        The  tset  utility has been provided for backward-compati-
        bility with BSD environments (under  most  modern  UNIXes,
        /etc/inittab  and  getty(1) can set TERM appropriately for
@@ -270,16 +274,23 @@
        -d, and -p options are similarly not documented or useful,
        but were retained as they appear to be in widespread  use.
        It  is  strongly recommended that any usage of these three
-       options be changed to use the -m option instead.   The  -n
-       option  remains, but has no effect.  The -adnp options are
-       therefore omitted from the usage summary above.
-
-       It is still permissible to specify  the  -e,  -i,  and  -k
-       options  without arguments, although it is strongly recom-
-       mended that such usage be fixed to explicitly specify  the
+       options be changed to use the -m option instead.  The  -a,
+       -d,  and  -p  options are therefore omitted from the usage
+       summary above.
+
+       Very old systems, e.g., 3BSD, used  a  different  terminal
+       driver  which was replaced in 4BSD in the early 1980s.  To
+       accommodate these older systems, the 4BSD tset provided  a
+       -n  option  to specify that the new terminal driver should
+       be  used.   This  implementation  does  not  provide  that
+       choice.
+
+       It  is  still  permissible  to  specify the -e, -i, and -k
+       options without arguments, although it is strongly  recom-
+       mended  that such usage be fixed to explicitly specify the
        character.
 
-       As  of  4.4BSD,  executing tset as reset no longer implies
+       As of 4.4BSD, executing tset as reset  no  longer  implies
        the -Q option.  Also, the interaction between the - option
        and the terminal argument in some historic implementations
        of tset has been removed.
@@ -292,7 +303,7 @@
             tells tset whether to initialize TERM using sh or csh
             syntax.
 
-       TERM Denotes  your  terminal  type.  Each terminal type is
+       TERM Denotes your terminal type.  Each  terminal  type  is
             distinct, though many are similar.
 
        TERMCAP
@@ -304,7 +315,7 @@

FILES

        /etc/ttys
-            system  port  name  to terminal type mapping database
+            system port name to terminal  type  mapping  database
             (BSD versions only).
 
        /usr/share/terminfo
@@ -315,7 +326,7 @@
        csh(1),   sh(1),   stty(1),   curs_terminfo(3x),   tty(4),
        terminfo(5), ttys(5), environ(7)
 
-       This describes ncurses version 6.0 (patch 20160402).
+       This describes ncurses version 6.0 (patch 20160514).
 
 
 
diff --git a/man/curs_extend.3x b/man/curs_extend.3x
index 9a52f930..6c5309eb 100644
--- a/man/curs_extend.3x
+++ b/man/curs_extend.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright (c) 1999-2006,2010 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1999-2010,2016 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            *
@@ -28,7 +28,7 @@
 .\"
 .\" Author: Thomas E. Dickey 1999-on
 .\"
-.\" $Id: curs_extend.3x,v 1.19 2010/12/04 18:36:44 tom Exp $
+.\" $Id: curs_extend.3x,v 1.20 2016/05/14 23:10:54 tom Exp $
 .TH curs_extend 3X ""
 .SH NAME
 \fBcurses_version\fP,
@@ -43,11 +43,13 @@
 .SH DESCRIPTION
 These functions are extensions to the curses library
 which do not fit easily into other categories.
+.SS curses_version
 .PP
 Use
 .I curses_version()
 to get the version number, including patch level of the library, e.g.,
 .B 5.0.19991023
+.SS use_extended_names
 .PP
 The
 .I use_extended_names()
@@ -60,6 +62,13 @@ is made by using the \fB\-x\fP option of \fB@TIC@\fP to compile
 extended terminal definitions.
 However you can disable this feature
 to ensure compatibility with other implementations of curses.
+.SH RETURN VALUE
+.PP
+\fBcurses_version\fP returns a pointer to static memory; you should not free
+this in your application.
+.PP
+\fBuse_extended_names\fP returns the previous state, allowing you to
+save this and restore it.
 .SH PORTABILITY
 These routines are specific to ncurses.  They were not supported on
 Version 7, BSD or System V implementations.  It is recommended that
diff --git a/man/curs_get_wch.3x b/man/curs_get_wch.3x
index df9bc6a6..fd55b374 100644
--- a/man/curs_get_wch.3x
+++ b/man/curs_get_wch.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright (c) 2002-2010,2012 Free Software Foundation, Inc.              *
+.\" Copyright (c) 2002-2012,2016 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            *
@@ -26,14 +26,21 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_get_wch.3x,v 1.8 2012/11/03 23:03:59 tom Exp $
+.\" $Id: curs_get_wch.3x,v 1.9 2016/05/15 01:12:50 tom Exp $
 .TH curs_get_wch 3X ""
+.na
+.hy 0
+.de bP
+.IP \(bu 4
+..
 .SH NAME
 \fBget_wch\fR,
 \fBwget_wch\fR,
 \fBmvget_wch\fR,
 \fBmvwget_wch\fR,
 \fBunget_wch\fR \- get (or push back) a wide character from curses terminal keyboard
+.ad
+.hy
 .SH SYNOPSIS
 \fB#include \fR
 .sp
@@ -76,13 +83,8 @@ If \fBkeypad\fR is enabled,
 these functions respond to
 the pressing of a function key by setting the object pointed to by
 \fIwch\fR
-to the corresponding
-\fBKEY_\fR
-value defined
-in
-\fB\fR
-and returning
-\fBKEY_CODE_YES\fR.
+to the keycode assigned to the function key,
+and returning \fBKEY_CODE_YES\fR.
 If a character (such as escape) that could be the
 beginning of a function key is received, curses sets a timer.
 If the remainder
@@ -92,6 +94,18 @@ For this
 reason, many terminals experience a delay between the time a user presses
 the escape key and the time the escape is returned to the program.
 .PP
+The keycodes returned by these functions are the same as those
+returned by \fBwgetch\fP:
+.bP
+The predefined function
+keys are listed in \fB\fR as macros with values outside the range
+of 8-bit characters.
+Their names begin with \fBKEY_\fR.
+.bP
+Other (user-defined) function keys which may be defined using \fBdefine_key\fP(3X)
+have no names, but also are expected to have values outside the range of
+8-bit characters.
+.PP
 The
 \fBunget_wch\fR
 function pushes the wide character
diff --git a/man/curs_getch.3x b/man/curs_getch.3x
index 1ef06013..642205a8 100644
--- a/man/curs_getch.3x
+++ b/man/curs_getch.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2015,2016 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            *
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getch.3x,v 1.44 2015/12/20 01:43:03 tom Exp $
+.\" $Id: curs_getch.3x,v 1.45 2016/05/15 01:05:18 tom Exp $
 .TH curs_getch 3X ""
 .na
 .hy 0
@@ -95,10 +95,17 @@ is read.
 .SS Keypad mode
 .PP
 If \fBkeypad\fR is \fBTRUE\fR, and a function key is pressed, the token for
-that function key is returned instead of the raw characters.
-Possible function
-keys are defined in \fB\fR as macros with values outside the range
-of 8-bit characters whose names begin with \fBKEY_\fR.
+that function key is returned instead of the raw characters:
+.bP
+The predefined function
+keys are listed in \fB\fR as macros with values outside the range
+of 8-bit characters.
+Their names begin with \fBKEY_\fR.
+.bP
+Other (user-defined) function keys which may be defined using \fBdefine_key\fP(3X)
+have no names, but also are expected to have values outside the range of
+8-bit characters.
+.PP
 Thus, a variable
 intended to hold the return value of a function key must be of short size or
 larger.
diff --git a/misc/terminfo.src b/misc/terminfo.src
index 1e28783e..48085426 100644
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
@@ -6,8 +6,8 @@
 # Report bugs and new terminal descriptions to
 #	bug-ncurses@gnu.org
 #
-#	$Revision: 1.562 $
-#	$Date: 2016/04/23 10:59:12 $
+#	$Revision: 1.563 $
+#	$Date: 2016/05/15 00:30:28 $
 #
 # The original header is preserved below for reference.  It is noted that there
 # is a "newer" version which differs in some cosmetic details (but actually
@@ -1681,13 +1681,17 @@ linux2.2|linux 2.2.x console,
 	cvvis=\E[?25h\E[?8c, use=linux-c-nc,
 
 # Linux 2.6.x has a fix for SI/SO to work with UTF-8 encoding added here:
-#	http://lkml.indiana.edu/hypermail/linux/kernel/0602.2/0868.html
-# Using SI/SO has the drawback that it confuses screen.  SCS would work.
-# However, SCS is buggy (see comment in Debian #515609) -TD
-# Further, this breaks longstanding workarounds for Linux console's line
-# drawing (see Debian 665959) -TD
+#	http://lkml.iu.edu/hypermail/linux/kernel/0602.2/0738.html
+# Although the kernel has mappings for these, they were not in the default
+# font (tested with Debian and Fedora):
+#	'`' diamond
+#	'~' scan line 1
+#	'p' scan line 3
+#	'r' scan line 7
+#	'_' scan line 9
 linux2.6|linux 2.6.x console,
-	rmacs=^O,
+	acsc=++\,\,--..00__``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}c~~,
+	enacs=\E(B\E)0, rmacs=^O,
 	sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p6%t;1%;m%?%p9%t\016%e\017%;,
 	sgr0=\E[m\017, smacs=^N, use=linux2.2,
 
@@ -1698,7 +1702,7 @@ linux3.0|linux 3.0 kernels,
 
 # This is Linux console for ncurses.
 linux|linux console,
-	use=linux2.2,
+	use=linux3.0,
 
 # Subject: linux 2.6.26 vt back_color_erase
 # Changes to the Linux console driver broke bce model as reported in
@@ -23828,4 +23832,8 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 #	+ add 'oc' capability to xterm+256color, allowing palette reset for
 #	  xterm -TD
 #
+# 2016-05-14
+#	+ modify linux2.6 entry to improve line-drawing -TD
+#	+ make linux3.0 entry the default linux entry (Debian #823658) -TD
+#
 ######## SHANTIH!  SHANTIH!  SHANTIH!
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index fdf73ef3..3c0196b3 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20160507) unstable; urgency=low
+ncurses6 (6.0+20160514) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Sat, 07 May 2016 13:04:36 -0400
+ -- Thomas E. Dickey   Sat, 14 May 2016 12:50:48 -0400
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index fdf73ef3..3c0196b3 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20160507) unstable; urgency=low
+ncurses6 (6.0+20160514) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Sat, 07 May 2016 13:04:36 -0400
+ -- Thomas E. Dickey   Sat, 14 May 2016 12:50:48 -0400
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 27b3ebb0..a4601885 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20160507) unstable; urgency=low
+ncurses6 (6.0+20160514) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Sat, 07 May 2016 13:04:36 -0400
+ -- Thomas E. Dickey   Sat, 14 May 2016 12:50:48 -0400
 
 ncurses6 (5.9-20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 4217db72..d48621c4 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.156 2016/05/07 17:04:36 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.158 2016/05/14 16:50:48 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "0"
 !define VERSION_YYYY  "2016"
-!define VERSION_MMDD  "0507"
+!define VERSION_MMDD  "0514"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 0dca7c92..8af364d3 100644
--- 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.0
-Release: 20160507
+Release: 20160514
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/package/ncurses.spec b/package/ncurses.spec
index f18ff219..4c377e4c 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.0
-Release: 20160507
+Release: 20160514
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
-- 
2.45.0