ncurses 6.1 - patch 20190413
authorThomas E. Dickey <dickey@invisible-island.net>
Sun, 14 Apr 2019 01:30:08 +0000 (01:30 +0000)
committerThomas E. Dickey <dickey@invisible-island.net>
Sun, 14 Apr 2019 01:30:08 +0000 (01:30 +0000)
+ check for TABSIZE variable in test/configure script.
+ used test/test_arrays.c to improve Caps.aix1 and Caps.hpux11
+ corrected filtering of comments in MKparametrized.sh
+ reduce duplication across Caps* files by moving some parts which do
  not depend on order into Caps-ncurses.

26 files changed:
NEWS
VERSION
dist.mk
include/Caps
include/Caps-ncurses
include/Caps.aix4
include/Caps.hpux11
include/Caps.keys
include/Caps.osf1r5
include/Caps.uwin
include/MKparametrized.sh
include/MKterm.h.awk.in
include/ncurses_defs
man/curs_sp_funcs.3x
ncurses/tty/lib_vidattr.c
ncurses/widechar/lib_vid_attr.c
package/debian-mingw/changelog
package/debian-mingw64/changelog
package/debian/changelog
package/mingw-ncurses.nsi
package/mingw-ncurses.spec
package/ncurses.spec
package/ncursest.spec
test/configure
test/configure.in
test/test.priv.h

diff --git a/NEWS b/NEWS
index adc521769e55b3ae3195b1e8b591dd0a155aa9df..95276710ea3e8a9b58dd6c2cdf78ff315946748e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -25,7 +25,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3304 2019/04/07 00:05:35 tom Exp $
+-- $Id: NEWS,v 1.3308 2019/04/13 22:55:07 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -45,6 +45,13 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20190413
+       + check for TABSIZE variable in test/configure script.
+       + used test/test_arrays.c to improve Caps.aix1 and Caps.hpux11
+       + corrected filtering of comments in MKparametrized.sh
+       + reduce duplication across Caps* files by moving some parts which do
+         not depend on order into Caps-ncurses.
+
 20190406
        + modify MKcaptab.sh, MKkey_defs.sh, and MKhashsize.sh to handle
          split-up Caps-files.
diff --git a/VERSION b/VERSION
index 80efeb0868bc0cc9de6b26ac56b38a3567bd23c0..090e7739cd407df931351acfb6dd5007985e9457 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10 6.1     20190406
+5:0:10 6.1     20190413
diff --git a/dist.mk b/dist.mk
index 943b799b7728c5e0720279c790e19042af206ce0..18c454ad74e3e0ea3b35835f827065fb06f6e236 100644 (file)
--- 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.1277 2019/04/06 10:42:54 tom Exp $
+# $Id: dist.mk,v 1.1278 2019/04/13 15:23:45 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 = 1
-NCURSES_PATCH = 20190406
+NCURSES_PATCH = 20190413
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
index dfc6a39772df12f1942793cb843d81087a09eaa6..5fe57deb9bd8d8e5cedb321e50037e9e2e014e49 100644 (file)
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2016,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 "Software"), #
@@ -29,7 +29,7 @@
 # Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995
 #    and: Eric S. Raymond <esr@snark.thyrsus.com>
 #
-# $Id: Caps,v 1.40 2016/08/13 17:45:50 tom Exp $
+# $Id: Caps,v 1.42 2019/04/13 19:54:05 tom Exp $
 #
 # This is the master termcap/terminfo capability table.
 #
@@ -958,303 +958,9 @@ acs_plus                  OTGC    str     GC      -               -       -----   single intersection
 #
 # TERMINFO EXTENSION CAPABILITIES
 #
-# This section is almost all comments.  What it's mainly for is to describe
-# what capabilities need to be squeezed out to get down to the XSI Curses
-# standard set.  They are flagged with K.
-#
-# HP extensions
-#
-# These extensions follow ptr_non (replacing everything after it) in HP
-# terminfo files.  Except for memory_lock and memory_unlock, they are
-# functionally identical to SVr4 extensions, but they make the binary format
-# different.  Grrr....
+# (see Caps-ncurses for the complete set of comments)
 #
 memory_lock                    meml    str     ml      -               -       ----K   lock memory above cursor
 memory_unlock                  memu    str     mu      -               -       ----K   unlock memory
-#plab_norm                     pln     str     pn      -               -       -----   program label #1 to show string #2
-#label_on                      smln    str     LO      -               -       -----   turn on soft labels
-#label_off                     rmln    str     LF      -               -       -----   turn off soft labels
-#key_f11                       kf11    str     F1      -               -       -----   F11 function key
-#key_f12                       kf12    str     F2      -               -       -----   F12 function key
-#key_f13                       kf13    str     F3      -               -       -----   F13 function key
-#key_f14                       kf14    str     F4      -               -       -----   F14 function key
-#key_f15                       kf15    str     F5      -               -       -----   F15 function key
-#key_f16                       kf16    str     F6      -               -       -----   F16 function key
-#key_f17                       kf17    str     F7      -               -       -----   F17 function key
-#key_f18                       kf18    str     F8      -               -       -----   F18 function key
-#key_f19                       kf19    str     F9      -               -       -----   F19 function key
-#key_f20                       kf20    str     FA      -               -       -----   F20 function key
-#key_f21                       kf21    str     FB      -               -       -----   F21 function key
-#key_f22                       kf22    str     FC      -               -       -----   F22 function key
-#key_f23                       kf23    str     FD      -               -       -----   F23 function key
-#key_f24                       kf24    str     FE      -               -       -----   F24 function key
-#key_f25                       kf25    str     FF      -               -       -----   F25 function key
-#key_f26                       kf26    str     FG      -               -       -----   F26 function key
-#key_f27                       kf27    str     FH      -               -       -----   F27 function key
-#key_f28                       kf28    str     FI      -               -       -----   F28 function key
-#key_f29                       kf29    str     FJ      -               -       -----   F29 function key
-#key_f30                       kf30    str     FK      -               -       -----   F30 function key
-#key_f31                       kf31    str     FL      -               -       -----   F31 function key
-#key_f32                       kf32    str     FM      -               -       -----   F32 function key
-#key_f33                       kf33    str     FN      -               -       -----   F33 function key
-#key_f34                       kf34    str     FO      -               -       -----   F34 function key
-#key_f35                       kf35    str     FP      -               -       -----   F35 function key
-#key_f36                       kf36    str     FQ      -               -       -----   F36 function key
-#key_f37                       kf37    str     FR      -               -       -----   F37 function key
-#key_f38                       kf38    str     FS      -               -       -----   F38 function key
-#key_f39                       kf39    str     FT      -               -       -----   F39 function key
-#key_f40                       kf40    str     FU      -               -       -----   F40 function key
-#key_f41                       kf41    str     FV      -               -       -----   F41 function key
-#key_f42                       kf42    str     FW      -               -       -----   F42 function key
-#key_f43                       kf43    str     FX      -               -       -----   F43 function key
-#key_f44                       kf44    str     FY      -               -       -----   F44 function key
-#key_f45                       kf45    str     FZ      -               -       -----   F45 function key
-#key_f46                       kf46    str     Fa      -               -       -----   F46 function key
-#key_f47                       kf47    str     Fb      -               -       -----   F47 function key
-#key_f48                       kf48    str     Fc      -               -       -----   F48 function key
-#key_f49                       kf49    str     Fd      -               -       -----   F49 function key
-#key_f50                       kf50    str     Fe      -               -       -----   F50 function key
-#key_f51                       kf51    str     Ff      -               -       -----   F51 function key
-#key_f52                       kf52    str     Fg      -               -       -----   F52 function key
-#key_f53                       kf53    str     Fh      -               -       -----   F53 function key
-#key_f54                       kf54    str     Fi      -               -       -----   F54 function key
-#key_f55                       kf55    str     Fj      -               -       -----   F55 function key
-#key_f56                       kf56    str     Fk      -               -       -----   F56 function key
-#key_f57                       kf57    str     Fl      -               -       -----   F57 function key
-#key_f58                       kf58    str     Fm      -               -       -----   F58 function key
-#key_f59                       kf59    str     Fn      -               -       -----   F59 function key
-#key_f60                       kf60    str     Fo      -               -       -----   F60 function key
-#key_f61                       kf61    str     Fp      -               -       -----   F61 function key
-#key_f62                       kf62    str     Fq      -               -       -----   F62 function key
-#key_f63                       kf63    str     Fr      -               -       -----   F63 function key
-#
-# IBM extensions
-#
-# These extensions follow ptr_non (replacing everything after it) in IBM
-# terminfo files.
-#
-# The places in the box[12] capabilities correspond to acsc characters, here is
-# the mapping:
-#
-#      box1[0]  = ACS_ULCORNER
-#      box1[1]  = ACS_HLINE
-#      box1[2]  = ACS_URCORNER
-#      box1[3]  = ACS_VLINE
-#      box1[4]  = ACS_LRCORNER
-#      box1[5]  = ACS_LLCORNER
-#      box1[6]  = ACS_TTEE
-#      box1[7]  = ACS_RTEE
-#      box1[8]  = ACS_BTEE
-#      box1[9]  = ACS_LTEE
-#      box1[10] = ACS_PLUS
-#
-# The box2 characters are the double-line versions of these forms graphics.
-#
 box_chars_1                    box1    str     bx      -               -       ----K   box characters primary set
-#box_chars_2                   box2    str     by      -               -       ----K   box characters secondary set
-#box_attr_1                    batt1   str     Bx      -               -       ----K   attributes for box1
-#box_attr_2                    batt2   str     By      -               -       ----K   attributes for box2
-#color_bg_0                    colb0   str     d0      -               -       ----K   background color 0
-#color_bg_1                    colb1   str     d1      -               -       ----K   background color 1
-#color_bg_2                    colb2   str     d2      -               -       ----K   background color 2
-#color_bg_3                    colb3   str     d3      -               -       ----K   background color 3
-#color_bg_4                    colb4   str     d4      -               -       ----K   background color 4
-#color_bg_5                    colb5   str     d5      -               -       ----K   background color 5
-#color_bg_6                    colb6   str     d6      -               -       ----K   background color 6
-#color_bg_7                    colb7   str     d7      -               -       ----K   background color 7
-#color_fg_0                    colf0   str     c0      -               -       ----K   foreground color 0
-#color_fg_1                    colf1   str     c1      -               -       ----K   foreground color 1
-#color_fg_2                    colf2   str     c2      -               -       ----K   foreground color 2
-#color_fg_3                    colf3   str     c3      -               -       ----K   foreground color 3
-#color_fg_4                    colf4   str     c4      -               -       ----K   foreground color 4
-#color_fg_5                    colf5   str     c5      -               -       ----K   foreground color 5
-#color_fg_6                    colf6   str     c6      -               -       ----K   foreground color 6
-#color_fg_7                    colf7   str     c7      -               -       ----K   foreground color 7
-#font_0                                font0   str     f0      -               -       -----   select font 0
-#font_1                                font1   str     f1      -               -       -----   select font 1
-#font_2                                font2   str     f2      -               -       -----   select font 2
-#font_3                                font3   str     f3      -               -       -----   select font 3
-#font_4                                font4   str     f4      -               -       ----K   select font 4
-#font_5                                font5   str     f5      -               -       ----K   select font 5
-#font_6                                font6   str     f6      -               -       ----K   select font 6
-#font_7                                font7   str     f7      -               -       ----K   select font 7
-#key_back_tab                  kbtab   str     k0      -               -       -----   backtab key
-#key_do                                kdo     str     ki      -               -       ----K   do request key
-#key_command                   kcmd    str     kd      -               -       ----K   command-request key
-#key_command_pane              kcpn    str     kW      -               -       ----K   command-pane key
-#key_end                       kend    str     kw      -               -       -----   end key
-#key_help                      khlp    str     kq      -               -       -----   help key
-#key_newline                   knl     str     nl      -               -       ----K   newline key
-#key_next_pane                 knpn    str     kv      -               -       ----K   next-pane key
-#key_prev_cmd                  kppn    str     kp      -               -       ----K   previous-command key
-#key_prev_pane                 kppn    str     kV      -               -       ----K   previous-pane key
-#key_quit                      kquit   str     kQ      -               -       ----K   quit key
-#key_select                    ksel    str     kU      -               -       -----   select key
-#key_scroll_left               kscl    str     kz      -               -       ----K   scroll left
-#key_scroll_right              kscr    str     kZ      -               -       ----K   scroll right
-#key_tab                       ktab    str     ko      -               -       ----K   tab key
-#key_smap_in1                  kmpf1   str     Kv      -               -       ----K   special mapped key 1 input
-#key_smap_out1                 kmpt1   str     KV      -               -       ----K   special mapped key 1 output
-#key_smap_in2                  kmpf2   str     Kw      -               -       ----K   special mapped key 2 input
-#key_smap_out2                 kmpt2   str     KW      -               -       ----K   special mapped key 2 output
-#key_smap_in3                  kmpf3   str     Kx      -               -       ----K   special mapped key 3 input
-#key_smap_out3                 kmpt3   str     KX      -               -       ----K   special mapped key 3 output
-#key_smap_in4                  kmpf4   str     Ky      -               -       ----K   special mapped key 4 input
-#key_smap_out4                 kmpt4   str     KY      -               -       ----K   special mapped key 4 output
-#key_smap_in5                  kmpf5   str     Kz      -               -       ----K   special mapped key 5 input
-#key_smap_out5                 kmpt5   str     KZ      -               -       ----K   special mapped key 5 output
-#appl_defined_str              apstr   str     za      -               -       ----K   application-defined string
-# The key_smap_in[6789] and key_smap_out[6789] capabilities aren't described in
-# the IBM manual pages, so the cap name strings are guesses.  The terminfo
-# names are almost certainly right, the termcap ones almost certainly wrong.
-#key_smap_in6                  kmpf6   str     k!      -               -       ----K   special mapped key 6 input
-#key_smap_out6                 kmpt6   str     K@      -               -       ----K   special mapped key 6 output
-#key_smap_in7                  kmpf7   str     k#      -               -       ----K   special mapped key 7 input
-#key_smap_out7                 kmpt7   str     K$      -               -       ----K   special mapped key 7 output
-#key_smap_in8                  kmpf8   str     k%      -               -       ----K   special mapped key 8 input
-#key_smap_out8                 kmpt8   str     K^      -               -       ----K   special mapped key 8 output
-#key_smap_in9                  kmpf9   str     k&      -               -       ----K   special mapped key 9 input
-#key_smap_out9                 kmpt9   str     K*      -               -       ----K   special mapped key 9 output
-# Undocumented capabilities end here
-#key_sf1                       ksf1    str     S1      -               -       ----K   special function key 1
-#key_sf2                       ksf2    str     S2      -               -       ----K   special function key 2
-#key_sf3                       ksf3    str     S3      -               -       ----K   special function key 3
-#key_sf4                       ksf4    str     S4      -               -       ----K   special function key 4
-#key_sf5                       ksf5    str     S5      -               -       ----K   special function key 5
-#key_sf6                       ksf6    str     S6      -               -       ----K   special function key 6
-#key_sf7                       ksf7    str     S7      -               -       ----K   special function key 7
-#key_sf8                       ksf8    str     S8      -               -       ----K   special function key 8
-#key_sf9                       ksf9    str     S9      -               -       ----K   special function key 9
-#key_sf10                      ksf10   str     SA      -               -       ----K   special function key 10
-# AIX version 3 documents different codes for F11, F12 and does not mention
-# F13-F64.  AIX version 4 uses the same naming for F0-F63 as above.
-#key_f11                       kf11    str     k<      -               -       -----   function key 11
-#key_f12                       kf12    str     k>      -               -       -----   function key 12
-# Undocumented capabilities end here.
-#key_action                    kact    str     kJ      -               -       ----K   sent by action key
-# The IBM docs say these capabilities are for table-drawing, and are
-# valid only for aixterm descriptions.
-#enter_topline_mode            topl    str     tp      -               -       ----K   start top-line mode
-#enter_bottom_mode             btml    str     bm      -               -       ----K   start bottom-line mode
-#enter_rvert_mode              rvert   str     rv      -               -       ----K   start right-vertical mode
-#enter_lvert_mode              lvert   str     lv      -               -       ----K   start left-vertical mode
-#
-#############################################################################
-#
-# ALIAS DECLARATIONS
-#
-# Here we set up aliases for translating extensions into standard terminfo.
-#
-#---------------------------------- Termcap aliases -------------------------
-#
-# BSD aliases:
-#
-# This is a common error in many termcap files.  We'll get notified during
-# translation when this (or any other alias) fires.
-#
-capalias       sb      sr      BSD     scroll text down
-#
-# AT&T extensions:
-#
-# The old AT&T 5410, 5420, 5425, pc6300plus, 610, and s4 entries used a set of
-# nonstandard capabilities.  Its signature is the KM capability, used to name
-# some sort of keymap file.  EE, BO, CI, CV, XS, DS, FL and FE are in this
-# set.  Comments in the original, and a little cross-checking with other AT&T
-# documentation, seem to establish the following mappings:
-#
-capalias       BO      mr      AT&T    enter_reverse_mode
-capalias       CI      vi      AT&T    cursor_invisible
-capalias       CV      ve      AT&T    cursor_normal
-capalias       DS      mh      AT&T    enter_dim_mode
-#capalias      EE      me      AT&T    exit_attribute_mode
-capalias       FE      LF      AT&T    label_on
-capalias       FL      LO      AT&T    label_off
-capalias       XS      mk      AT&T    enter_secure_mode
-#
-# We comment out EE because the conflicting XENIX EE is more common in
-# old entries.
-#
-# XENIX extensions:
-#
-# These are the ones we know how to translate directly:
-#
-capalias       EE      mh      XENIX   exit_attribute_mode
-capalias       GE      ae      XENIX   exit_alt_charset_mode
-capalias       GS      as      XENIX   enter_alt_charset_mode
-capalias       CF      vi      XENIX   cursor_invis
-capalias       CO      ve      XENIX   cursor_normal
-capalias       EN      @7      XENIX   key_end
-capalias       HM      kh      XENIX   key_home
-capalias       LD      kL      XENIX   key_dl
-capalias       PD      kN      XENIX   key_npage
-capalias       PN      po      XENIX   prtr_off
-capalias       PS      pf      XENIX   prtr_on
-capalias       PU      kP      XENIX   key_ppage
-capalias       RT      @8      XENIX   kent
-capalias       UP      ku      XENIX   kcuu1
-capalias       G6      IGNORE  XENIX   double-ACS_ULCORNER
-capalias       G7      IGNORE  XENIX   double-ACS_LLCORNER
-capalias       G5      IGNORE  XENIX   double-ACS_URCORNER
-capalias       G8      IGNORE  XENIX   double-ACS_LRCORNER
-capalias       Gr      IGNORE  XENIX   double-ACS_LTEE
-capalias       Gr      IGNORE  XENIX   double-ACS_RTEE
-capalias       Gu      IGNORE  XENIX   double-ACS_BTEE
-capalias       Gd      IGNORE  XENIX   double ACS_TTEE
-capalias       Gh      IGNORE  XENIX   double-ACS_HLINE
-capalias       Gv      IGNORE  XENIX   double-ACS_VLINE
-capalias       Gc      IGNORE  XENIX   double-ACS_PLUS
-capalias       GG      IGNORE  XENIX   acs-glitch
-#
-# IBM extensions:
-#
-capalias       kq      %1      IBM     key_help
-#
-# Iris extensions:
-#
-capalias       HS      mh      IRIS    enter_dim_mode
-#
-# Tektronix extensions:
-#
-capalias       KA      k;      Tek     key_f10
-capalias       KB      F1      Tek     key_f11
-capalias       KC      F2      Tek     key_f12
-capalias       KD      F3      Tek     key_f13
-capalias       KE      F4      Tek     key_f14
-capalias       KF      F5      Tek     key_f15
-capalias       BC      Sb      Tek     set_background
-capalias       FC      Sf      Tek     set_foreground
-#
-# There are also the following:
-#
-#      XENIX   XENIX variable name     name clash with terminfo?
-#      -----   -------------------     -------------------------
-#      CL      key_char_left
-#      CR      key_char_right
-#      CW      key_change_window
-#      HP      ??
-#      LF      key_linefeed            label_off
-#      NU      key_next_unlocked_cell
-#      PL      ??
-#      PR      ??
-#      RC      key_recalc              remove_clock
-#      RF      key_toggle_ref          req_for_input
-#      WL      key_word_left
-#      WR      key_word_right
-#
-# If you know what any of the question-marked ones mean, please tell us.
-#
-#--------------------------------- Terminfo aliases ------------------------
-#
-# IBM extensions:
-#
-infoalias      font0   s0ds    IBM     set0_des_seq
-infoalias      font1   s1ds    IBM     set1_des_seq
-infoalias      font2   s2ds    IBM     set2_des_seq
-infoalias      font3   s3ds    IBM     set3_des_seq
-infoalias      kbtab   kcbt    IBM     key_backtab
-infoalias      ksel    kslt    IBM     key_select
-#
-# Some others are identical to SVr4/XPG4 capabilities, in particular:
-# kcmd, kend, khlp, and kf11...kf63.
-#
 #############################################################################
index afed76ec4cc7f7ed624768206b15c68de3936792..3b0ea454a1315dc8c7d6830c825e1d2d997865cc 100644 (file)
 #
 # Author: Thomas E. Dickey
 #
-# $Id: Caps-ncurses,v 1.4 2019/03/17 01:00:12 tom Exp $
+# $Id: Caps-ncurses,v 1.6 2019/04/13 19:54:23 tom Exp $
 #
+#############################################################################
+#
+# TERMINFO EXTENSION CAPABILITIES
+#
+# This section is all comments (selected lines are copied/uncommented into
+# specific "Caps" files).  The section describes what capabilities need to be
+# squeezed out to get down to the XSI Curses standard set.  They are flagged
+# with K.
+#
+# HP extensions
+#
+# These extensions follow ptr_non (replacing everything after it) in HP
+# terminfo files.  Except for memory_lock and memory_unlock, they are
+# functionally identical to SVr4 extensions, but they make the binary format
+# different.  Grrr....
+#
+#memory_lock                   meml    str     ml      -               -       ----K   lock memory above cursor
+#memory_unlock                 memu    str     mu      -               -       ----K   unlock memory
+#plab_norm                     pln     str     pn      -               -       -----   program label #1 to show string #2
+#label_on                      smln    str     LO      -               -       -----   turn on soft labels
+#label_off                     rmln    str     LF      -               -       -----   turn off soft labels
+#key_f11                       kf11    str     F1      -               -       -----   F11 function key
+#key_f12                       kf12    str     F2      -               -       -----   F12 function key
+#key_f13                       kf13    str     F3      -               -       -----   F13 function key
+#key_f14                       kf14    str     F4      -               -       -----   F14 function key
+#key_f15                       kf15    str     F5      -               -       -----   F15 function key
+#key_f16                       kf16    str     F6      -               -       -----   F16 function key
+#key_f17                       kf17    str     F7      -               -       -----   F17 function key
+#key_f18                       kf18    str     F8      -               -       -----   F18 function key
+#key_f19                       kf19    str     F9      -               -       -----   F19 function key
+#key_f20                       kf20    str     FA      -               -       -----   F20 function key
+#key_f21                       kf21    str     FB      -               -       -----   F21 function key
+#key_f22                       kf22    str     FC      -               -       -----   F22 function key
+#key_f23                       kf23    str     FD      -               -       -----   F23 function key
+#key_f24                       kf24    str     FE      -               -       -----   F24 function key
+#key_f25                       kf25    str     FF      -               -       -----   F25 function key
+#key_f26                       kf26    str     FG      -               -       -----   F26 function key
+#key_f27                       kf27    str     FH      -               -       -----   F27 function key
+#key_f28                       kf28    str     FI      -               -       -----   F28 function key
+#key_f29                       kf29    str     FJ      -               -       -----   F29 function key
+#key_f30                       kf30    str     FK      -               -       -----   F30 function key
+#key_f31                       kf31    str     FL      -               -       -----   F31 function key
+#key_f32                       kf32    str     FM      -               -       -----   F32 function key
+#key_f33                       kf33    str     FN      -               -       -----   F33 function key
+#key_f34                       kf34    str     FO      -               -       -----   F34 function key
+#key_f35                       kf35    str     FP      -               -       -----   F35 function key
+#key_f36                       kf36    str     FQ      -               -       -----   F36 function key
+#key_f37                       kf37    str     FR      -               -       -----   F37 function key
+#key_f38                       kf38    str     FS      -               -       -----   F38 function key
+#key_f39                       kf39    str     FT      -               -       -----   F39 function key
+#key_f40                       kf40    str     FU      -               -       -----   F40 function key
+#key_f41                       kf41    str     FV      -               -       -----   F41 function key
+#key_f42                       kf42    str     FW      -               -       -----   F42 function key
+#key_f43                       kf43    str     FX      -               -       -----   F43 function key
+#key_f44                       kf44    str     FY      -               -       -----   F44 function key
+#key_f45                       kf45    str     FZ      -               -       -----   F45 function key
+#key_f46                       kf46    str     Fa      -               -       -----   F46 function key
+#key_f47                       kf47    str     Fb      -               -       -----   F47 function key
+#key_f48                       kf48    str     Fc      -               -       -----   F48 function key
+#key_f49                       kf49    str     Fd      -               -       -----   F49 function key
+#key_f50                       kf50    str     Fe      -               -       -----   F50 function key
+#key_f51                       kf51    str     Ff      -               -       -----   F51 function key
+#key_f52                       kf52    str     Fg      -               -       -----   F52 function key
+#key_f53                       kf53    str     Fh      -               -       -----   F53 function key
+#key_f54                       kf54    str     Fi      -               -       -----   F54 function key
+#key_f55                       kf55    str     Fj      -               -       -----   F55 function key
+#key_f56                       kf56    str     Fk      -               -       -----   F56 function key
+#key_f57                       kf57    str     Fl      -               -       -----   F57 function key
+#key_f58                       kf58    str     Fm      -               -       -----   F58 function key
+#key_f59                       kf59    str     Fn      -               -       -----   F59 function key
+#key_f60                       kf60    str     Fo      -               -       -----   F60 function key
+#key_f61                       kf61    str     Fp      -               -       -----   F61 function key
+#key_f62                       kf62    str     Fq      -               -       -----   F62 function key
+#key_f63                       kf63    str     Fr      -               -       -----   F63 function key
+#
+# IBM extensions
+#
+# These extensions follow ptr_non (replacing everything after it) in IBM
+# terminfo files.
+#
+# The places in the box[12] capabilities correspond to acsc characters, here is
+# the mapping:
+#
+#      box1[0]  = ACS_ULCORNER
+#      box1[1]  = ACS_HLINE
+#      box1[2]  = ACS_URCORNER
+#      box1[3]  = ACS_VLINE
+#      box1[4]  = ACS_LRCORNER
+#      box1[5]  = ACS_LLCORNER
+#      box1[6]  = ACS_TTEE
+#      box1[7]  = ACS_RTEE
+#      box1[8]  = ACS_BTEE
+#      box1[9]  = ACS_LTEE
+#      box1[10] = ACS_PLUS
+#
+# The box2 characters are the double-line versions of these forms graphics.
+#
+#box_chars_1                   box1    str     bx      -               -       ----K   box characters primary set
+#box_chars_2                   box2    str     by      -               -       ----K   box characters secondary set
+#box_attr_1                    batt1   str     Bx      -               -       ----K   attributes for box1
+#box_attr_2                    batt2   str     By      -               -       ----K   attributes for box2
+#color_bg_0                    colb0   str     d0      -               -       ----K   background color 0
+#color_bg_1                    colb1   str     d1      -               -       ----K   background color 1
+#color_bg_2                    colb2   str     d2      -               -       ----K   background color 2
+#color_bg_3                    colb3   str     d3      -               -       ----K   background color 3
+#color_bg_4                    colb4   str     d4      -               -       ----K   background color 4
+#color_bg_5                    colb5   str     d5      -               -       ----K   background color 5
+#color_bg_6                    colb6   str     d6      -               -       ----K   background color 6
+#color_bg_7                    colb7   str     d7      -               -       ----K   background color 7
+#color_fg_0                    colf0   str     c0      -               -       ----K   foreground color 0
+#color_fg_1                    colf1   str     c1      -               -       ----K   foreground color 1
+#color_fg_2                    colf2   str     c2      -               -       ----K   foreground color 2
+#color_fg_3                    colf3   str     c3      -               -       ----K   foreground color 3
+#color_fg_4                    colf4   str     c4      -               -       ----K   foreground color 4
+#color_fg_5                    colf5   str     c5      -               -       ----K   foreground color 5
+#color_fg_6                    colf6   str     c6      -               -       ----K   foreground color 6
+#color_fg_7                    colf7   str     c7      -               -       ----K   foreground color 7
+#font_0                                font0   str     f0      -               -       -----   select font 0
+#font_1                                font1   str     f1      -               -       -----   select font 1
+#font_2                                font2   str     f2      -               -       -----   select font 2
+#font_3                                font3   str     f3      -               -       -----   select font 3
+#font_4                                font4   str     f4      -               -       ----K   select font 4
+#font_5                                font5   str     f5      -               -       ----K   select font 5
+#font_6                                font6   str     f6      -               -       ----K   select font 6
+#font_7                                font7   str     f7      -               -       ----K   select font 7
+#key_back_tab                  kbtab   str     k0      -               -       -----   backtab key
+#key_do                                kdo     str     ki      -               -       ----K   do request key
+#key_command                   kcmd    str     kd      -               -       ----K   command-request key
+#key_command_pane              kcpn    str     kW      -               -       ----K   command-pane key
+#key_end                       kend    str     kw      -               -       -----   end key
+#key_help                      khlp    str     kq      -               -       -----   help key
+#key_newline                   knl     str     nl      -               -       ----K   newline key
+#key_next_pane                 knpn    str     kv      -               -       ----K   next-pane key
+#key_prev_cmd                  kppn    str     kp      -               -       ----K   previous-command key
+#key_prev_pane                 kppn    str     kV      -               -       ----K   previous-pane key
+#key_quit                      kquit   str     kQ      -               -       ----K   quit key
+#key_select                    ksel    str     kU      -               -       -----   select key
+#key_scroll_left               kscl    str     kz      -               -       ----K   scroll left
+#key_scroll_right              kscr    str     kZ      -               -       ----K   scroll right
+#key_tab                       ktab    str     ko      -               -       ----K   tab key
+#key_smap_in1                  kmpf1   str     Kv      -               -       ----K   special mapped key 1 input
+#key_smap_out1                 kmpt1   str     KV      -               -       ----K   special mapped key 1 output
+#key_smap_in2                  kmpf2   str     Kw      -               -       ----K   special mapped key 2 input
+#key_smap_out2                 kmpt2   str     KW      -               -       ----K   special mapped key 2 output
+#key_smap_in3                  kmpf3   str     Kx      -               -       ----K   special mapped key 3 input
+#key_smap_out3                 kmpt3   str     KX      -               -       ----K   special mapped key 3 output
+#key_smap_in4                  kmpf4   str     Ky      -               -       ----K   special mapped key 4 input
+#key_smap_out4                 kmpt4   str     KY      -               -       ----K   special mapped key 4 output
+#key_smap_in5                  kmpf5   str     Kz      -               -       ----K   special mapped key 5 input
+#key_smap_out5                 kmpt5   str     KZ      -               -       ----K   special mapped key 5 output
+#appl_defined_str              apstr   str     za      -               -       ----K   application-defined string
+# The key_smap_in[6789] and key_smap_out[6789] capabilities aren't described in
+# the IBM manual pages, so the cap name strings are guesses.  The terminfo
+# names are almost certainly right, the termcap ones almost certainly wrong.
+#key_smap_in6                  kmpf6   str     k!      -               -       ----K   special mapped key 6 input
+#key_smap_out6                 kmpt6   str     K@      -               -       ----K   special mapped key 6 output
+#key_smap_in7                  kmpf7   str     k#      -               -       ----K   special mapped key 7 input
+#key_smap_out7                 kmpt7   str     K$      -               -       ----K   special mapped key 7 output
+#key_smap_in8                  kmpf8   str     k%      -               -       ----K   special mapped key 8 input
+#key_smap_out8                 kmpt8   str     K^      -               -       ----K   special mapped key 8 output
+#key_smap_in9                  kmpf9   str     k&      -               -       ----K   special mapped key 9 input
+#key_smap_out9                 kmpt9   str     K*      -               -       ----K   special mapped key 9 output
+# Undocumented capabilities end here
+#key_sf1                       ksf1    str     S1      -               -       ----K   special function key 1
+#key_sf2                       ksf2    str     S2      -               -       ----K   special function key 2
+#key_sf3                       ksf3    str     S3      -               -       ----K   special function key 3
+#key_sf4                       ksf4    str     S4      -               -       ----K   special function key 4
+#key_sf5                       ksf5    str     S5      -               -       ----K   special function key 5
+#key_sf6                       ksf6    str     S6      -               -       ----K   special function key 6
+#key_sf7                       ksf7    str     S7      -               -       ----K   special function key 7
+#key_sf8                       ksf8    str     S8      -               -       ----K   special function key 8
+#key_sf9                       ksf9    str     S9      -               -       ----K   special function key 9
+#key_sf10                      ksf10   str     SA      -               -       ----K   special function key 10
+# AIX version 3 documents different codes for F11, F12 and does not mention
+# F13-F64.  AIX version 4 uses the same naming for F0-F63 as above.
+#key_f11                       kf11    str     k<      -               -       -----   function key 11
+#key_f12                       kf12    str     k>      -               -       -----   function key 12
+# Undocumented capabilities end here.
+#key_action                    kact    str     kJ      -               -       ----K   sent by action key
+# The IBM docs say these capabilities are for table-drawing, and are
+# valid only for aixterm descriptions.
+#enter_topline_mode            topl    str     tp      -               -       ----K   start top-line mode
+#enter_bottom_mode             btml    str     bm      -               -       ----K   start bottom-line mode
+#enter_rvert_mode              rvert   str     rv      -               -       ----K   start right-vertical mode
+#enter_lvert_mode              lvert   str     lv      -               -       ----K   start left-vertical mode
+#
+#############################################################################
+#
+# ALIAS DECLARATIONS
+#
+# Here we set up aliases for translating extensions into standard terminfo.
+#
+#---------------------------------- Termcap aliases -------------------------
+#
+# BSD aliases:
+#
+# This is a common error in many termcap files.  We'll get notified during
+# translation when this (or any other alias) fires.
+#
+capalias       sb      sr      BSD     scroll text down
+#
+# AT&T extensions:
+#
+# The old AT&T 5410, 5420, 5425, pc6300plus, 610, and s4 entries used a set of
+# nonstandard capabilities.  Its signature is the KM capability, used to name
+# some sort of keymap file.  EE, BO, CI, CV, XS, DS, FL and FE are in this
+# set.  Comments in the original, and a little cross-checking with other AT&T
+# documentation, seem to establish the following mappings:
+#
+capalias       BO      mr      AT&T    enter_reverse_mode
+capalias       CI      vi      AT&T    cursor_invisible
+capalias       CV      ve      AT&T    cursor_normal
+capalias       DS      mh      AT&T    enter_dim_mode
+#capalias      EE      me      AT&T    exit_attribute_mode
+capalias       FE      LF      AT&T    label_on
+capalias       FL      LO      AT&T    label_off
+capalias       XS      mk      AT&T    enter_secure_mode
+#
+# We comment out EE because the conflicting XENIX EE is more common in
+# old entries.
+#
+# XENIX extensions:
+#
+# These are the ones we know how to translate directly:
+#
+capalias       EE      mh      XENIX   exit_attribute_mode
+capalias       GE      ae      XENIX   exit_alt_charset_mode
+capalias       GS      as      XENIX   enter_alt_charset_mode
+capalias       CF      vi      XENIX   cursor_invis
+capalias       CO      ve      XENIX   cursor_normal
+capalias       EN      @7      XENIX   key_end
+capalias       HM      kh      XENIX   key_home
+capalias       LD      kL      XENIX   key_dl
+capalias       PD      kN      XENIX   key_npage
+capalias       PN      po      XENIX   prtr_off
+capalias       PS      pf      XENIX   prtr_on
+capalias       PU      kP      XENIX   key_ppage
+capalias       RT      @8      XENIX   kent
+capalias       UP      ku      XENIX   kcuu1
+capalias       G6      IGNORE  XENIX   double-ACS_ULCORNER
+capalias       G7      IGNORE  XENIX   double-ACS_LLCORNER
+capalias       G5      IGNORE  XENIX   double-ACS_URCORNER
+capalias       G8      IGNORE  XENIX   double-ACS_LRCORNER
+capalias       Gr      IGNORE  XENIX   double-ACS_LTEE
+capalias       Gr      IGNORE  XENIX   double-ACS_RTEE
+capalias       Gu      IGNORE  XENIX   double-ACS_BTEE
+capalias       Gd      IGNORE  XENIX   double ACS_TTEE
+capalias       Gh      IGNORE  XENIX   double-ACS_HLINE
+capalias       Gv      IGNORE  XENIX   double-ACS_VLINE
+capalias       Gc      IGNORE  XENIX   double-ACS_PLUS
+capalias       GG      IGNORE  XENIX   acs-glitch
+#
+# IBM extensions:
+#
+capalias       kq      %1      IBM     key_help
+#
+# Iris extensions:
+#
+capalias       HS      mh      IRIS    enter_dim_mode
+#
+# Tektronix extensions:
+#
+capalias       KA      k;      Tek     key_f10
+capalias       KB      F1      Tek     key_f11
+capalias       KC      F2      Tek     key_f12
+capalias       KD      F3      Tek     key_f13
+capalias       KE      F4      Tek     key_f14
+capalias       KF      F5      Tek     key_f15
+capalias       BC      Sb      Tek     set_background
+capalias       FC      Sf      Tek     set_foreground
+#
+# There are also the following:
+#
+#      XENIX   XENIX variable name     name clash with terminfo?
+#      -----   -------------------     -------------------------
+#      CL      key_char_left
+#      CR      key_char_right
+#      CW      key_change_window
+#      HP      ??
+#      LF      key_linefeed            label_off
+#      NU      key_next_unlocked_cell
+#      PL      ??
+#      PR      ??
+#      RC      key_recalc              remove_clock
+#      RF      key_toggle_ref          req_for_input
+#      WL      key_word_left
+#      WR      key_word_right
+#
+# If you know what any of the question-marked ones mean, please tell us.
+#
+#--------------------------------- Terminfo aliases ------------------------
+#
+# IBM extensions:
+#
+infoalias      font0   s0ds    IBM     set0_des_seq
+infoalias      font1   s1ds    IBM     set1_des_seq
+infoalias      font2   s2ds    IBM     set2_des_seq
+infoalias      font3   s3ds    IBM     set3_des_seq
+infoalias      kbtab   kcbt    IBM     key_backtab
+infoalias      ksel    kslt    IBM     key_select
+#
+# Some others are identical to SVr4/XPG4 capabilities, in particular:
+# kcmd, kend, khlp, and kf11...kf63.
+#
+#############################################################################
 # This is a table of ncurses user-definable capabilities which applications
 # developers may have used.  ncurses may use the table to check consistency of
 # types/parameters.  Applications may have defined others (such as screen's
@@ -143,3 +448,4 @@ userdef     ka2     str     -       vt220-keypad extensions
 userdef        kb1     str     -       vt220-keypad extensions
 userdef        kb3     str     -       vt220-keypad extensions
 userdef        kc2     str     -       vt220-keypad extensions
+#############################################################################
index 7f77b2183c91e8de9a59123d710e8bec83c76bf2..1f66f2f93edb77528271801a2e7f704b0cdedb0e 100644 (file)
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 2001-2015,2016 Free Software Foundation, Inc.                #
+# Copyright (c) 2001-2016,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 "Software"), #
@@ -28,7 +28,7 @@
 #
 # Author: Thomas Dickey
 #
-# $Id: Caps.aix4,v 1.11 2016/08/13 17:45:50 tom Exp $
+# $Id: Caps.aix4,v 1.14 2019/04/13 22:14:57 tom Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is designed to align with AIX 4.x's terminfo.
@@ -517,15 +517,15 @@ font_4                            font4   str     f4      -               -       ----K   select font 4
 font_5                         font5   str     f5      -               -       ----K   select font 5
 font_6                         font6   str     f6      -               -       ----K   select font 6
 font_7                         font7   str     f7      -               -       ----K   select font 7
-key_back_tab                   kbtab   str     k0      -               -       ----K   backtab key
+key_back_tab                   kbtab   str     kO      -               -       ----K   backtab key
 key_do                         kdo     str     ki      -               -       ----K   do request key
-key_command                    kcmd    str     kd      -               -       ----K   command-request key
+key_command                    kcmd    str     @4      -               -       ----K   command-request key
 key_command_pane               kcpn    str     kW      -               -       ----K   command-pane key
-key_end                                kend    str     kw      KEY_END         0550    -----   end key
-key_help                       khlp    str     kq      -               -       -----   help key
-key_newline                    knl     str     nl      -               -       ----K   newline key
+key_end                                kend    str     @7      KEY_END         0550    -----   end key
+key_help                       khlp    str     %1      -               -       -----   help key
+key_newline                    knl     str     kn      -               -       ----K   newline key
 key_next_pane                  knpn    str     kv      -               -       ----K   next-pane key
-key_prev_cmd                   kppn    str     kp      -               -       ----K   previous-command key
+key_prev_cmd                   kpcmd   str     kp      -               -       ----K   previous-command key
 key_prev_pane                  kppn    str     kV      -               -       ----K   previous-pane key
 key_quit                       kquit   str     kQ      -               -       ----K   quit key
 key_select_aix                 ksel    str     kU      -               -       -----   select key
@@ -543,13 +543,13 @@ key_smap_out4                     kmpt4   str     KY      -               -       ----K   special mapped key 4 output
 key_smap_in5                   kmpf5   str     Kz      -               -       ----K   special mapped key 5 input
 key_smap_out5                  kmpt5   str     KZ      -               -       ----K   special mapped key 5 output
 appl_defined_str               apstr   str     za      -               -       ----K   application-defined string
-key_smap_in6                   kmpf6   str     kr      -               -       ----K   special mapped key 6 input
+key_smap_in6                   kmpf6   str     Kr      -               -       ----K   special mapped key 6 input
 key_smap_out6                  kmpt6   str     KR      -               -       ----K   special mapped key 6 output
-key_smap_in7                   kmpf7   str     ks      -               -       ----K   special mapped key 7 input
+key_smap_in7                   kmpf7   str     Ks      -               -       ----K   special mapped key 7 input
 key_smap_out7                  kmpt7   str     KS      -               -       ----K   special mapped key 7 output
-key_smap_in8                   kmpf8   str     kt      -               -       ----K   special mapped key 8 input
+key_smap_in8                   kmpf8   str     Kt      -               -       ----K   special mapped key 8 input
 key_smap_out8                  kmpt8   str     KT      -               -       ----K   special mapped key 8 output
-key_smap_in9                   kmpf9   str     ku      -               -       ----K   special mapped key 9 input
+key_smap_in9                   kmpf9   str     Ku      -               -       ----K   special mapped key 9 input
 key_smap_out9                  kmpt9   str     KU      -               -       ----K   special mapped key 9 output
 key_sf1                                ksf1    str     S1      -               -       ----K   special function key 1
 key_sf2                                ksf2    str     S2      -               -       ----K   special function key 2
@@ -857,13 +857,13 @@ alt_scancode_esc          scesa   str     S8      -               -       -----   Alternate escape for scancode emulatio
 #%lw25 lw6 lw2 lw20.
 #%\fBVariable  Cap-    TCap    Description\fR
 #%\fBString    name    Code\fR
-enter_horizontal_hl_mode       ehhlm   str     Xh      -               -       -----   Enter horizontal highlight mode
-enter_left_hl_mode             elhlm   str     Xl      -               -       -----   Enter left highlight mode
-enter_low_hl_mode              elohlm  str     Xo      -               -       -----   Enter low highlight mode
-enter_right_hl_mode            erhlm   str     Xr      -               -       -----   Enter right highlight mode
-enter_top_hl_mode              ethlm   str     Xt      -               -       -----   Enter top highlight mode
-enter_vertical_hl_mode         evhlm   str     Xv      -               -       -----   Enter vertical highlight mode
-set_a_attributes               sgr1    str     sA      -               -       -----   Define second set of video attributes #1-#6
+#enter_horizontal_hl_mode      ehhlm   str     Xh      -               -       -----   Enter horizontal highlight mode
+#enter_left_hl_mode            elhlm   str     Xl      -               -       -----   Enter left highlight mode
+#enter_low_hl_mode             elohlm  str     Xo      -               -       -----   Enter low highlight mode
+#enter_right_hl_mode           erhlm   str     Xr      -               -       -----   Enter right highlight mode
+#enter_top_hl_mode             ethlm   str     Xt      -               -       -----   Enter top highlight mode
+#enter_vertical_hl_mode                evhlm   str     Xv      -               -       -----   Enter vertical highlight mode
+#set_a_attributes              sgr1    str     sA      -               -       -----   Define second set of video attributes #1-#6
 set_pglen_inch                 slength str     YI      -               -       -----   Set page length to #1 hundredth of an inch (some implementations use sL for termcap).
 #%.TE
 #%.ad
@@ -1060,192 +1060,9 @@ acs_plus                        OTGC    str     GC      -               -       -----   single intersection
 #
 # TERMINFO EXTENSION CAPABILITIES
 #
-# This section is almost all comments.  What it's mainly for is to describe
-# what capabilities need to be squeezed out to get down to the XSI Curses
-# standard set.  They are flagged with K.
-#
-# HP extensions
-#
-# These extensions follow ptr_non (replacing everything after it) in HP
-# terminfo files.  Except for memory_lock and memory_unlock, they are
-# functionally identical to SVr4 extensions, but they make the binary format
-# different.  Grrr....
+# (see Caps-ncurses for the complete set of comments)
 #
 memory_lock                    meml    str     ml      -               -       ----K   lock memory above cursor
 memory_unlock                  memu    str     mu      -               -       ----K   unlock memory
-#plab_norm                     pln     str     pn      -               -       -----   program label #1 to show string #2
-#label_on                      smln    str     LO      -               -       -----   turn on soft labels
-#label_off                     rmln    str     LF      -               -       -----   turn off soft labels
-#key_f11                       kf11    str     F1      -               -       -----   F11 function key
-#key_f12                       kf12    str     F2      -               -       -----   F12 function key
-#key_f13                       kf13    str     F3      -               -       -----   F13 function key
-#key_f14                       kf14    str     F4      -               -       -----   F14 function key
-#key_f15                       kf15    str     F5      -               -       -----   F15 function key
-#key_f16                       kf16    str     F6      -               -       -----   F16 function key
-#key_f17                       kf17    str     F7      -               -       -----   F17 function key
-#key_f18                       kf18    str     F8      -               -       -----   F18 function key
-#key_f19                       kf19    str     F9      -               -       -----   F19 function key
-#key_f20                       kf20    str     FA      -               -       -----   F20 function key
-#key_f21                       kf21    str     FB      -               -       -----   F21 function key
-#key_f22                       kf22    str     FC      -               -       -----   F22 function key
-#key_f23                       kf23    str     FD      -               -       -----   F23 function key
-#key_f24                       kf24    str     FE      -               -       -----   F24 function key
-#key_f25                       kf25    str     FF      -               -       -----   F25 function key
-#key_f26                       kf26    str     FG      -               -       -----   F26 function key
-#key_f27                       kf27    str     FH      -               -       -----   F27 function key
-#key_f28                       kf28    str     FI      -               -       -----   F28 function key
-#key_f29                       kf29    str     FJ      -               -       -----   F29 function key
-#key_f30                       kf30    str     FK      -               -       -----   F30 function key
-#key_f31                       kf31    str     FL      -               -       -----   F31 function key
-#key_f32                       kf32    str     FM      -               -       -----   F32 function key
-#key_f33                       kf33    str     FN      -               -       -----   F33 function key
-#key_f34                       kf34    str     FO      -               -       -----   F34 function key
-#key_f35                       kf35    str     FP      -               -       -----   F35 function key
-#key_f36                       kf36    str     FQ      -               -       -----   F36 function key
-#key_f37                       kf37    str     FR      -               -       -----   F37 function key
-#key_f38                       kf38    str     FS      -               -       -----   F38 function key
-#key_f39                       kf39    str     FT      -               -       -----   F39 function key
-#key_f40                       kf40    str     FU      -               -       -----   F40 function key
-#key_f41                       kf41    str     FV      -               -       -----   F41 function key
-#key_f42                       kf42    str     FW      -               -       -----   F42 function key
-#key_f43                       kf43    str     FX      -               -       -----   F43 function key
-#key_f44                       kf44    str     FY      -               -       -----   F44 function key
-#key_f45                       kf45    str     FZ      -               -       -----   F45 function key
-#key_f46                       kf46    str     Fa      -               -       -----   F46 function key
-#key_f47                       kf47    str     Fb      -               -       -----   F47 function key
-#key_f48                       kf48    str     Fc      -               -       -----   F48 function key
-#key_f49                       kf49    str     Fd      -               -       -----   F49 function key
-#key_f50                       kf50    str     Fe      -               -       -----   F50 function key
-#key_f51                       kf51    str     Ff      -               -       -----   F51 function key
-#key_f52                       kf52    str     Fg      -               -       -----   F52 function key
-#key_f53                       kf53    str     Fh      -               -       -----   F53 function key
-#key_f54                       kf54    str     Fi      -               -       -----   F54 function key
-#key_f55                       kf55    str     Fj      -               -       -----   F55 function key
-#key_f56                       kf56    str     Fk      -               -       -----   F56 function key
-#key_f57                       kf57    str     Fl      -               -       -----   F57 function key
-#key_f58                       kf58    str     Fm      -               -       -----   F58 function key
-#key_f59                       kf59    str     Fn      -               -       -----   F59 function key
-#key_f60                       kf60    str     Fo      -               -       -----   F60 function key
-#key_f61                       kf61    str     Fp      -               -       -----   F61 function key
-#key_f62                       kf62    str     Fq      -               -       -----   F62 function key
-#key_f63                       kf63    str     Fr      -               -       -----   F63 function key
-#
-#############################################################################
-#
-# ALIAS DECLARATIONS
-#
-# Here we set up aliases for translating extensions into standard terminfo.
-#
-#---------------------------------- Termcap aliases -------------------------
-#
-# BSD aliases:
-#
-# This is a common error in many termcap files.  We'll get notified during
-# translation when this (or any other alias) fires.
-#
-capalias       sb      sr      BSD     scroll text down
-#
-# AT&T extensions:
-#
-# The old AT&T 5410, 5420, 5425, pc6300plus, 610, and s4 entries used a set of
-# nonstandard capabilities.  Its signature is the KM capability, used to name
-# some sort of keymap file.  EE, BO, CI, CV, XS, DS, FL and FE are in this
-# set.  Comments in the original, and a little cross-checking with other AT&T
-# documentation, seem to establish the following mappings:
-#
-capalias       BO      mr      AT&T    enter_reverse_mode
-capalias       CI      vi      AT&T    cursor_invisible
-capalias       CV      ve      AT&T    cursor_normal
-capalias       DS      mh      AT&T    enter_dim_mode
-#capalias      EE      me      AT&T    exit_attribute_mode
-capalias       FE      LF      AT&T    label_on
-capalias       FL      LO      AT&T    label_off
-capalias       XS      mk      AT&T    enter_secure_mode
-#
-# We comment out EE because the conflicting XENIX EE is more common in
-# old entries.
-#
-# XENIX extensions:
-#
-# These are the ones we know how to translate directly:
-#
-capalias       EE      mh      XENIX   exit_attribute_mode
-capalias       GE      ae      XENIX   exit_alt_charset_mode
-capalias       GS      as      XENIX   enter_alt_charset_mode
-capalias       CF      vi      XENIX   cursor_invis
-capalias       CO      ve      XENIX   cursor_normal
-capalias       EN      @7      XENIX   key_end
-capalias       HM      kh      XENIX   key_home
-capalias       LD      kL      XENIX   key_dl
-capalias       PD      kN      XENIX   key_npage
-capalias       PN      po      XENIX   prtr_off
-capalias       PS      pf      XENIX   prtr_on
-capalias       PU      kP      XENIX   key_ppage
-capalias       RT      @8      XENIX   kent
-capalias       UP      ku      XENIX   kcuu1
-capalias       G6      IGNORE  XENIX   double-ACS_ULCORNER
-capalias       G7      IGNORE  XENIX   double-ACS_LLCORNER
-capalias       G5      IGNORE  XENIX   double-ACS_URCORNER
-capalias       G8      IGNORE  XENIX   double-ACS_LRCORNER
-capalias       Gr      IGNORE  XENIX   double-ACS_LTEE
-capalias       Gr      IGNORE  XENIX   double-ACS_RTEE
-capalias       Gu      IGNORE  XENIX   double-ACS_BTEE
-capalias       Gd      IGNORE  XENIX   double ACS_TTEE
-capalias       Gh      IGNORE  XENIX   double-ACS_HLINE
-capalias       Gv      IGNORE  XENIX   double-ACS_VLINE
-capalias       Gc      IGNORE  XENIX   double-ACS_PLUS
-capalias       GG      IGNORE  XENIX   acs-glitch
-#
-# IBM extensions:
-#
-capalias       kq      %1      IBM     key_help
-#
-# Iris extensions:
-#
-capalias       HS      mh      IRIS    enter_dim_mode
-#
-# Tektronix extensions:
-#
-capalias       KA      k;      Tek     key_f10
-capalias       KB      F1      Tek     key_f11
-capalias       KC      F2      Tek     key_f12
-capalias       KD      F3      Tek     key_f13
-capalias       KE      F4      Tek     key_f14
-capalias       KF      F5      Tek     key_f15
-capalias       BC      Sb      Tek     set_background
-capalias       FC      Sf      Tek     set_foreground
-#
-# There are also the following:
-#
-#      XENIX   XENIX variable name     name clash with terminfo?
-#      -----   -------------------     -------------------------
-#      CL      key_char_left
-#      CR      key_char_right
-#      CW      key_change_window
-#      HP      ??
-#      LF      key_linefeed            label_off
-#      NU      key_next_unlocked_cell
-#      PL      ??
-#      PR      ??
-#      RC      key_recalc              remove_clock
-#      RF      key_toggle_ref          req_for_input
-#      WL      key_word_left
-#      WR      key_word_right
-#
-# If you know what any of the question-marked ones mean, please tell us.
-#
-#--------------------------------- Terminfo aliases ------------------------
-#
-# IBM extensions:
-#
-infoalias      font0   s0ds    IBM     set0_des_seq
-infoalias      font1   s1ds    IBM     set1_des_seq
-infoalias      font2   s2ds    IBM     set2_des_seq
-infoalias      font3   s3ds    IBM     set3_des_seq
-infoalias      kbtab   kcbt    IBM     key_backtab
-infoalias      ksel    kslt    IBM     key_select
-#
-# Some others are identical to SVr4/XPG4 capabilities, in particular:
-# kcmd, kend, khlp, and kf11...kf63.
 #
 #############################################################################
index e034b3f9b9a74be24716b135a12965a8fd1a7dc8..27c48d575f7c7f6fd3d8380564952826dc79349e 100644 (file)
@@ -28,7 +28,7 @@
 #
 # Author: Thomas Dickey
 #
-# $Id: Caps.hpux11,v 1.9 2019/03/03 01:11:38 tom Exp $
+# $Id: Caps.hpux11,v 1.12 2019/04/13 22:30:16 tom Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is designed to align with HPUX 11.x's terminfo.
@@ -298,7 +298,7 @@ dot_vert_spacing            spinv   num     Yb      -       -       -----   spacing of pins vertically in pins per
 dot_horz_spacing               spinh   num     Yc      -       -       -----   spacing of dots horizontally in dots per inch
 max_micro_address              maddr   num     Yd      -       -       -----   maximum value in micro_..._address
 max_micro_jump                 mjump   num     Ye      -       -       -----   maximum value in parm_..._micro
-micro_col_size                 mcs     num     Yf      -       -       -----   character step size when in micro mode
+micro_char_size                        mcs     num     Yf      -       -       -----   character step size when in micro mode
 micro_line_size                        mls     num     Yg      -       -       -----   line step size when in micro mode
 number_of_pins                 npins   num     Yh      -       -       -----   numbers of pins in print-head
 output_res_char                        orc     num     Yi      -       -       -----   horizontal resolution in units per line
@@ -755,6 +755,8 @@ alt_scancode_esc            scesa   str     S8      -               -       -----   Alternate escape for scancode emulatio
 #%they may not be binary-compatible with System V terminfo
 #%entries after SVr4.1; beware!
 #%
+#%AIX and Solaris do not provide termcap names for these; HPUX does.
+#%
 #%.na
 #%.TS H
 #%center expand;
@@ -764,19 +766,19 @@ alt_scancode_esc          scesa   str     S8      -               -       -----   Alternate escape for scancode emulatio
 #%\fBVariable  Cap-    TCap    Description\fR
 #%\fBString    name    Code\fR
 set_pglen_inch                 slength str     YI      -               -       -----   Set page length to #1 hundredth of an inch (some implementations use sL for termcap).
-enter_horizontal_hl_mode       ehhlm   str     Xh      -               -       -----   Enter horizontal highlight mode
-enter_left_hl_mode             elhlm   str     Xl      -               -       -----   Enter left highlight mode
-enter_low_hl_mode              elohlm  str     Xo      -               -       -----   Enter low highlight mode
-enter_right_hl_mode            erhlm   str     Xr      -               -       -----   Enter right highlight mode
-enter_top_hl_mode              ethlm   str     Xt      -               -       -----   Enter top highlight mode
-enter_vertical_hl_mode         evhlm   str     Xv      -               -       -----   Enter vertical highlight mode
-set_a_attributes               sgr1    str     sA      -               -       -----   Define second set of video attributes #1-#6
-exit_horizontal_hl_mode        rmhhlm  str     XH      -               -       ----K   Exit horizontal highlight mode
-exit_left_hl_mode              rmlhlm  str     XL      -               -       ----K   Exit left highlight mode
-exit_low_hl_mode               rmlohlm str     XO      -               -       ----K   Exit low highlight mode
-exit_right_hl_mode             rmrhlm  str     XR      -               -       ----K   Exit right highlight mode
-exit_top_hl_mode               rmthlm  str     XT      -               -       ----K   Exit top highlight mode
-exit_vertical_hl_mode          rmvhlm  str     XV      -               -       ----K   Exit vertical highlight mode
+enter_horizontal_hl_mode       ehhlm   str     Q1      -               -       -----   Enter horizontal highlight mode
+enter_left_hl_mode             elhlm   str     Q2      -               -       -----   Enter left highlight mode
+enter_low_hl_mode              elohlm  str     Q3      -               -       -----   Enter low highlight mode
+enter_right_hl_mode            erhlm   str     Q4      -               -       -----   Enter right highlight mode
+enter_top_hl_mode              ethlm   str     Q5      -               -       -----   Enter top highlight mode
+enter_vertical_hl_mode         evhlm   str     Q6      -               -       -----   Enter vertical highlight mode
+set_a_attributes               sgr1    str     Q7      -               -       -----   Define second set of video attributes #1-#6
+exit_horizontal_hl_mode        rmhhlm  str     Q8      -               -       ----K   Exit horizontal highlight mode
+exit_left_hl_mode              rmlhlm  str     Q9      -               -       ----K   Exit left highlight mode
+exit_low_hl_mode               rmlohlm str     Qa      -               -       ----K   Exit low highlight mode
+exit_right_hl_mode             rmrhlm  str     Qb      -               -       ----K   Exit right highlight mode
+exit_top_hl_mode               rmthlm  str     Qc      -               -       ----K   Exit top highlight mode
+exit_vertical_hl_mode          rmvhlm  str     Qd      -               -       ----K   Exit vertical highlight mode
 #%.TE
 #%.ad
 #
@@ -972,303 +974,8 @@ acs_plus                  OTGC    str     GC      -               -       -----   single intersection
 #
 # TERMINFO EXTENSION CAPABILITIES
 #
-# This section is almost all comments.  What it's mainly for is to describe
-# what capabilities need to be squeezed out to get down to the XSI Curses
-# standard set.  They are flagged with K.
-#
-# HP extensions
-#
-# These extensions follow ptr_non (replacing everything after it) in HP
-# terminfo files.  Except for memory_lock and memory_unlock, they are
-# functionally identical to SVr4 extensions, but they make the binary format
-# different.  Grrr....
-#
-#memory_lock                   meml    str     ml      -               -       ----K   memory lock above
-#memory_unlock                 memu    str     mu      -               -       ----K   memory unlock
-#plab_norm                     pln     str     pn      -               -       -----   program label #1 to show string #2
-#label_on                      smln    str     LO      -               -       -----   turn on soft labels
-#label_off                     rmln    str     LF      -               -       -----   turn off soft labels
-#key_f11                       kf11    str     F1      -               -       -----   F11 function key
-#key_f12                       kf12    str     F2      -               -       -----   F12 function key
-#key_f13                       kf13    str     F3      -               -       -----   F13 function key
-#key_f14                       kf14    str     F4      -               -       -----   F14 function key
-#key_f15                       kf15    str     F5      -               -       -----   F15 function key
-#key_f16                       kf16    str     F6      -               -       -----   F16 function key
-#key_f17                       kf17    str     F7      -               -       -----   F17 function key
-#key_f18                       kf18    str     F8      -               -       -----   F18 function key
-#key_f19                       kf19    str     F9      -               -       -----   F19 function key
-#key_f20                       kf20    str     FA      -               -       -----   F20 function key
-#key_f21                       kf21    str     FB      -               -       -----   F21 function key
-#key_f22                       kf22    str     FC      -               -       -----   F22 function key
-#key_f23                       kf23    str     FD      -               -       -----   F23 function key
-#key_f24                       kf24    str     FE      -               -       -----   F24 function key
-#key_f25                       kf25    str     FF      -               -       -----   F25 function key
-#key_f26                       kf26    str     FG      -               -       -----   F26 function key
-#key_f27                       kf27    str     FH      -               -       -----   F27 function key
-#key_f28                       kf28    str     FI      -               -       -----   F28 function key
-#key_f29                       kf29    str     FJ      -               -       -----   F29 function key
-#key_f30                       kf30    str     FK      -               -       -----   F30 function key
-#key_f31                       kf31    str     FL      -               -       -----   F31 function key
-#key_f32                       kf32    str     FM      -               -       -----   F32 function key
-#key_f33                       kf33    str     FN      -               -       -----   F33 function key
-#key_f34                       kf34    str     FO      -               -       -----   F34 function key
-#key_f35                       kf35    str     FP      -               -       -----   F35 function key
-#key_f36                       kf36    str     FQ      -               -       -----   F36 function key
-#key_f37                       kf37    str     FR      -               -       -----   F37 function key
-#key_f38                       kf38    str     FS      -               -       -----   F38 function key
-#key_f39                       kf39    str     FT      -               -       -----   F39 function key
-#key_f40                       kf40    str     FU      -               -       -----   F40 function key
-#key_f41                       kf41    str     FV      -               -       -----   F41 function key
-#key_f42                       kf42    str     FW      -               -       -----   F42 function key
-#key_f43                       kf43    str     FX      -               -       -----   F43 function key
-#key_f44                       kf44    str     FY      -               -       -----   F44 function key
-#key_f45                       kf45    str     FZ      -               -       -----   F45 function key
-#key_f46                       kf46    str     Fa      -               -       -----   F46 function key
-#key_f47                       kf47    str     Fb      -               -       -----   F47 function key
-#key_f48                       kf48    str     Fc      -               -       -----   F48 function key
-#key_f49                       kf49    str     Fd      -               -       -----   F49 function key
-#key_f50                       kf50    str     Fe      -               -       -----   F50 function key
-#key_f51                       kf51    str     Ff      -               -       -----   F51 function key
-#key_f52                       kf52    str     Fg      -               -       -----   F52 function key
-#key_f53                       kf53    str     Fh      -               -       -----   F53 function key
-#key_f54                       kf54    str     Fi      -               -       -----   F54 function key
-#key_f55                       kf55    str     Fj      -               -       -----   F55 function key
-#key_f56                       kf56    str     Fk      -               -       -----   F56 function key
-#key_f57                       kf57    str     Fl      -               -       -----   F57 function key
-#key_f58                       kf58    str     Fm      -               -       -----   F58 function key
-#key_f59                       kf59    str     Fn      -               -       -----   F59 function key
-#key_f60                       kf60    str     Fo      -               -       -----   F60 function key
-#key_f61                       kf61    str     Fp      -               -       -----   F61 function key
-#key_f62                       kf62    str     Fq      -               -       -----   F62 function key
-#key_f63                       kf63    str     Fr      -               -       -----   F63 function key
-#
-# IBM extensions
-#
-# These extensions follow ptr_non (replacing everything after it) in IBM
-# terminfo files.
-#
-# The places in the box[12] capabilities correspond to acsc characters, here is
-# the mapping:
-#
-#      box1[0]  = ACS_ULCORNER
-#      box1[1]  = ACS_HLINE
-#      box1[2]  = ACS_URCORNER
-#      box1[3]  = ACS_VLINE
-#      box1[4]  = ACS_LRCORNER
-#      box1[5]  = ACS_LLCORNER
-#      box1[6]  = ACS_TTEE
-#      box1[7]  = ACS_RTEE
-#      box1[8]  = ACS_BTEE
-#      box1[9]  = ACS_LTEE
-#      box1[10] = ACS_PLUS
-#
-# The box2 characters are the double-line versions of these forms graphics.
+# (see Caps-ncurses for the complete set of comments)
 #
 box_chars_1                    box1    str     bx      -               -       ----K   box characters primary set
-#box_chars_2                   box2    str     by      -               -       ----K   box characters secondary set
-#box_attr_1                    batt1   str     Bx      -               -       ----K   attributes for box1
-#box_attr_2                    batt2   str     By      -               -       ----K   attributes for box2
-#color_bg_0                    colb0   str     d0      -               -       ----K   background color 0
-#color_bg_1                    colb1   str     d1      -               -       ----K   background color 1
-#color_bg_2                    colb2   str     d2      -               -       ----K   background color 2
-#color_bg_3                    colb3   str     d3      -               -       ----K   background color 3
-#color_bg_4                    colb4   str     d4      -               -       ----K   background color 4
-#color_bg_5                    colb5   str     d5      -               -       ----K   background color 5
-#color_bg_6                    colb6   str     d6      -               -       ----K   background color 6
-#color_bg_7                    colb7   str     d7      -               -       ----K   background color 7
-#color_fg_0                    colf0   str     c0      -               -       ----K   foreground color 0
-#color_fg_1                    colf1   str     c1      -               -       ----K   foreground color 1
-#color_fg_2                    colf2   str     c2      -               -       ----K   foreground color 2
-#color_fg_3                    colf3   str     c3      -               -       ----K   foreground color 3
-#color_fg_4                    colf4   str     c4      -               -       ----K   foreground color 4
-#color_fg_5                    colf5   str     c5      -               -       ----K   foreground color 5
-#color_fg_6                    colf6   str     c6      -               -       ----K   foreground color 6
-#color_fg_7                    colf7   str     c7      -               -       ----K   foreground color 7
-#font_0                                font0   str     f0      -               -       -----   select font 0
-#font_1                                font1   str     f1      -               -       -----   select font 1
-#font_2                                font2   str     f2      -               -       -----   select font 2
-#font_3                                font3   str     f3      -               -       -----   select font 3
-#font_4                                font4   str     f4      -               -       ----K   select font 4
-#font_5                                font5   str     f5      -               -       ----K   select font 5
-#font_6                                font6   str     f6      -               -       ----K   select font 6
-#font_7                                font7   str     f7      -               -       ----K   select font 7
-#key_back_tab                  kbtab   str     k0      -               -       -----   backtab key
-#key_do                                kdo     str     ki      -               -       ----K   do request key
-#key_command                   kcmd    str     kd      -               -       ----K   command-request key
-#key_command_pane              kcpn    str     kW      -               -       ----K   command-pane key
-#key_end                       kend    str     kw      -               -       -----   end key
-#key_help                      khlp    str     kq      -               -       -----   help key
-#key_newline                   knl     str     nl      -               -       ----K   newline key
-#key_next_pane                 knpn    str     kv      -               -       ----K   next-pane key
-#key_prev_cmd                  kppn    str     kp      -               -       ----K   previous-command key
-#key_prev_pane                 kppn    str     kV      -               -       ----K   previous-pane key
-#key_quit                      kquit   str     kQ      -               -       ----K   quit key
-#key_select                    ksel    str     kU      -               -       -----   select key
-#key_scroll_left               kscl    str     kz      -               -       ----K   scroll left
-#key_scroll_right              kscr    str     kZ      -               -       ----K   scroll right
-#key_tab                       ktab    str     ko      -               -       ----K   tab key
-#key_smap_in1                  kmpf1   str     Kv      -               -       ----K   special mapped key 1 input
-#key_smap_out1                 kmpt1   str     KV      -               -       ----K   special mapped key 1 output
-#key_smap_in2                  kmpf2   str     Kw      -               -       ----K   special mapped key 2 input
-#key_smap_out2                 kmpt2   str     KW      -               -       ----K   special mapped key 2 output
-#key_smap_in3                  kmpf3   str     Kx      -               -       ----K   special mapped key 3 input
-#key_smap_out3                 kmpt3   str     KX      -               -       ----K   special mapped key 3 output
-#key_smap_in4                  kmpf4   str     Ky      -               -       ----K   special mapped key 4 input
-#key_smap_out4                 kmpt4   str     KY      -               -       ----K   special mapped key 4 output
-#key_smap_in5                  kmpf5   str     Kz      -               -       ----K   special mapped key 5 input
-#key_smap_out5                 kmpt5   str     KZ      -               -       ----K   special mapped key 5 output
-#appl_defined_str              apstr   str     za      -               -       ----K   application-defined string
-# The key_smap_in[6789] and key_smap_out[6789] capabilities aren't described in
-# the IBM manual pages, so the cap name strings are guesses.  The terminfo
-# names are almost certainly right, the termcap ones almost certainly wrong.
-#key_smap_in6                  kmpf6   str     k!      -               -       ----K   special mapped key 6 input
-#key_smap_out6                 kmpt6   str     K@      -               -       ----K   special mapped key 6 output
-#key_smap_in7                  kmpf7   str     k#      -               -       ----K   special mapped key 7 input
-#key_smap_out7                 kmpt7   str     K$      -               -       ----K   special mapped key 7 output
-#key_smap_in8                  kmpf8   str     k%      -               -       ----K   special mapped key 8 input
-#key_smap_out8                 kmpt8   str     K^      -               -       ----K   special mapped key 8 output
-#key_smap_in9                  kmpf9   str     k&      -               -       ----K   special mapped key 9 input
-#key_smap_out9                 kmpt9   str     K*      -               -       ----K   special mapped key 9 output
-# Undocumented capabilities end here
-#key_sf1                       ksf1    str     S1      -               -       ----K   special function key 1
-#key_sf2                       ksf2    str     S2      -               -       ----K   special function key 2
-#key_sf3                       ksf3    str     S3      -               -       ----K   special function key 3
-#key_sf4                       ksf4    str     S4      -               -       ----K   special function key 4
-#key_sf5                       ksf5    str     S5      -               -       ----K   special function key 5
-#key_sf6                       ksf6    str     S6      -               -       ----K   special function key 6
-#key_sf7                       ksf7    str     S7      -               -       ----K   special function key 7
-#key_sf8                       ksf8    str     S8      -               -       ----K   special function key 8
-#key_sf9                       ksf9    str     S9      -               -       ----K   special function key 9
-#key_sf10                      ksf10   str     SA      -               -       ----K   special function key 10
-# AIX version 3 documents different codes for F11, F12 and does not mention
-# F13-F64.  AIX version 4 uses the same naming for F0-F63 as above.
-#key_f11                       kf11    str     k<      -               -       -----   function key 11
-#key_f12                       kf12    str     k>      -               -       -----   function key 12
-# Undocumented capabilities end here.
-#key_action                    kact    str     kJ      -               -       ----K   sent by action key
-# The IBM docs say these capabilities are for table-drawing, and are
-# valid only for aixterm descriptions.
-#enter_topline_mode            topl    str     tp      -               -       ----K   start top-line mode
-#enter_bottom_mode             btml    str     bm      -               -       ----K   start bottom-line mode
-#enter_rvert_mode              rvert   str     rv      -               -       ----K   start right-vertical mode
-#enter_lvert_mode              lvert   str     lv      -               -       ----K   start left-vertical mode
-#
-#############################################################################
-#
-# ALIAS DECLARATIONS
-#
-# Here we set up aliases for translating extensions into standard terminfo.
-#
-#---------------------------------- Termcap aliases -------------------------
-#
-# BSD aliases:
-#
-# This is a common error in many termcap files.  We'll get notified during
-# translation when this (or any other alias) fires.
-#
-capalias       sb      sr      BSD     scroll text down
-#
-# AT&T extensions:
-#
-# The old AT&T 5410, 5420, 5425, pc6300plus, 610, and s4 entries used a set of
-# nonstandard capabilities.  Its signature is the KM capability, used to name
-# some sort of keymap file.  EE, BO, CI, CV, XS, DS, FL and FE are in this
-# set.  Comments in the original, and a little cross-checking with other AT&T
-# documentation, seem to establish the following mappings:
-#
-capalias       BO      mr      AT&T    enter_reverse_mode
-capalias       CI      vi      AT&T    cursor_invisible
-capalias       CV      ve      AT&T    cursor_normal
-capalias       DS      mh      AT&T    enter_dim_mode
-#capalias      EE      me      AT&T    exit_attribute_mode
-capalias       FE      LF      AT&T    label_on
-capalias       FL      LO      AT&T    label_off
-capalias       XS      mk      AT&T    enter_secure_mode
-#
-# We comment out EE because the conflicting XENIX EE is more common in
-# old entries.
-#
-# XENIX extensions:
-#
-# These are the ones we know how to translate directly:
-#
-capalias       EE      mh      XENIX   exit_attribute_mode
-capalias       GE      ae      XENIX   exit_alt_charset_mode
-capalias       GS      as      XENIX   enter_alt_charset_mode
-capalias       CF      vi      XENIX   cursor_invis
-capalias       CO      ve      XENIX   cursor_normal
-capalias       EN      @7      XENIX   key_end
-capalias       HM      kh      XENIX   key_home
-capalias       LD      kL      XENIX   key_dl
-capalias       PD      kN      XENIX   key_npage
-capalias       PN      po      XENIX   prtr_off
-capalias       PS      pf      XENIX   prtr_on
-capalias       PU      kP      XENIX   key_ppage
-capalias       RT      @8      XENIX   kent
-capalias       UP      ku      XENIX   kcuu1
-capalias       G6      IGNORE  XENIX   double-ACS_ULCORNER
-capalias       G7      IGNORE  XENIX   double-ACS_LLCORNER
-capalias       G5      IGNORE  XENIX   double-ACS_URCORNER
-capalias       G8      IGNORE  XENIX   double-ACS_LRCORNER
-capalias       Gr      IGNORE  XENIX   double-ACS_LTEE
-capalias       Gr      IGNORE  XENIX   double-ACS_RTEE
-capalias       Gu      IGNORE  XENIX   double-ACS_BTEE
-capalias       Gd      IGNORE  XENIX   double ACS_TTEE
-capalias       Gh      IGNORE  XENIX   double-ACS_HLINE
-capalias       Gv      IGNORE  XENIX   double-ACS_VLINE
-capalias       Gc      IGNORE  XENIX   double-ACS_PLUS
-capalias       GG      IGNORE  XENIX   acs-glitch
-#
-# IBM extensions:
-#
-capalias       kq      %1      IBM     key_help
-#
-# Iris extensions:
-#
-capalias       HS      mh      IRIS    enter_dim_mode
-#
-# Tektronix extensions:
-#
-capalias       KA      k;      Tek     key_f10
-capalias       KB      F1      Tek     key_f11
-capalias       KC      F2      Tek     key_f12
-capalias       KD      F3      Tek     key_f13
-capalias       KE      F4      Tek     key_f14
-capalias       KF      F5      Tek     key_f15
-capalias       BC      Sb      Tek     set_background
-capalias       FC      Sf      Tek     set_foreground
-#
-# There are also the following:
-#
-#      XENIX   XENIX variable name     name clash with terminfo?
-#      -----   -------------------     -------------------------
-#      CL      key_char_left
-#      CR      key_char_right
-#      CW      key_change_window
-#      HP      ??
-#      LF      key_linefeed            label_off
-#      NU      key_next_unlocked_cell
-#      PL      ??
-#      PR      ??
-#      RC      key_recalc              remove_clock
-#      RF      key_toggle_ref          req_for_input
-#      WL      key_word_left
-#      WR      key_word_right
-#
-# If you know what any of the question-marked ones mean, please tell us.
-#
-#--------------------------------- Terminfo aliases ------------------------
-#
-# IBM extensions:
-#
-infoalias      font0   s0ds    IBM     set0_des_seq
-infoalias      font1   s1ds    IBM     set1_des_seq
-infoalias      font2   s2ds    IBM     set2_des_seq
-infoalias      font3   s3ds    IBM     set3_des_seq
-infoalias      kbtab   kcbt    IBM     key_backtab
-infoalias      ksel    kslt    IBM     key_select
-#
-# Some others are identical to SVr4/XPG4 capabilities, in particular:
-# kcmd, kend, khlp, and kf11...kf63.
 #
 #############################################################################
index 05a16f7b0b31a811ad31c12350c3575de73d68bd..c3532d8993fc2daa6b04efc25cae0e43d8c2d6fe 100644 (file)
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 2001-2015,2016 Free Software Foundation, Inc.                #
+# Copyright (c) 2001-2016,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 "Software"), #
@@ -29,7 +29,7 @@
 # Author: Thomas Dickey
 #    and: Ilya Zakharevich
 #
-# $Id: Caps.keys,v 1.9 2016/08/13 17:45:50 tom Exp $
+# $Id: Caps.keys,v 1.11 2019/04/13 19:57:03 tom Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is illustrates an experimental extension to describe alt-, shift- and
@@ -1048,303 +1048,10 @@ acs_plus                       OTGC    str     GC      -               -       -----   single intersection
 #
 # TERMINFO EXTENSION CAPABILITIES
 #
-# This section is almost all comments.  What it's mainly for is to describe
-# what capabilities need to be squeezed out to get down to the XSI Curses
-# standard set.  They are flagged with K.
-#
-# HP extensions
-#
-# These extensions follow ptr_non (replacing everything after it) in HP
-# terminfo files.  Except for memory_lock and memory_unlock, they are
-# functionally identical to SVr4 extensions, but they make the binary format
-# different.  Grrr....
+# (see Caps-ncurses for the complete set of comments)
 #
 memory_lock                    meml    str     ml      -               -       ----K   lock memory above cursor
 memory_unlock                  memu    str     mu      -               -       ----K   unlock memory
-#plab_norm                     pln     str     pn      -               -       -----   program label #1 to show string #2
-#label_on                      smln    str     LO      -               -       -----   turn on soft labels
-#label_off                     rmln    str     LF      -               -       -----   turn off soft labels
-#key_f11                       kf11    str     F1      -               -       -----   F11 function key
-#key_f12                       kf12    str     F2      -               -       -----   F12 function key
-#key_f13                       kf13    str     F3      -               -       -----   F13 function key
-#key_f14                       kf14    str     F4      -               -       -----   F14 function key
-#key_f15                       kf15    str     F5      -               -       -----   F15 function key
-#key_f16                       kf16    str     F6      -               -       -----   F16 function key
-#key_f17                       kf17    str     F7      -               -       -----   F17 function key
-#key_f18                       kf18    str     F8      -               -       -----   F18 function key
-#key_f19                       kf19    str     F9      -               -       -----   F19 function key
-#key_f20                       kf20    str     FA      -               -       -----   F20 function key
-#key_f21                       kf21    str     FB      -               -       -----   F21 function key
-#key_f22                       kf22    str     FC      -               -       -----   F22 function key
-#key_f23                       kf23    str     FD      -               -       -----   F23 function key
-#key_f24                       kf24    str     FE      -               -       -----   F24 function key
-#key_f25                       kf25    str     FF      -               -       -----   F25 function key
-#key_f26                       kf26    str     FG      -               -       -----   F26 function key
-#key_f27                       kf27    str     FH      -               -       -----   F27 function key
-#key_f28                       kf28    str     FI      -               -       -----   F28 function key
-#key_f29                       kf29    str     FJ      -               -       -----   F29 function key
-#key_f30                       kf30    str     FK      -               -       -----   F30 function key
-#key_f31                       kf31    str     FL      -               -       -----   F31 function key
-#key_f32                       kf32    str     FM      -               -       -----   F32 function key
-#key_f33                       kf33    str     FN      -               -       -----   F33 function key
-#key_f34                       kf34    str     FO      -               -       -----   F34 function key
-#key_f35                       kf35    str     FP      -               -       -----   F35 function key
-#key_f36                       kf36    str     FQ      -               -       -----   F36 function key
-#key_f37                       kf37    str     FR      -               -       -----   F37 function key
-#key_f38                       kf38    str     FS      -               -       -----   F38 function key
-#key_f39                       kf39    str     FT      -               -       -----   F39 function key
-#key_f40                       kf40    str     FU      -               -       -----   F40 function key
-#key_f41                       kf41    str     FV      -               -       -----   F41 function key
-#key_f42                       kf42    str     FW      -               -       -----   F42 function key
-#key_f43                       kf43    str     FX      -               -       -----   F43 function key
-#key_f44                       kf44    str     FY      -               -       -----   F44 function key
-#key_f45                       kf45    str     FZ      -               -       -----   F45 function key
-#key_f46                       kf46    str     Fa      -               -       -----   F46 function key
-#key_f47                       kf47    str     Fb      -               -       -----   F47 function key
-#key_f48                       kf48    str     Fc      -               -       -----   F48 function key
-#key_f49                       kf49    str     Fd      -               -       -----   F49 function key
-#key_f50                       kf50    str     Fe      -               -       -----   F50 function key
-#key_f51                       kf51    str     Ff      -               -       -----   F51 function key
-#key_f52                       kf52    str     Fg      -               -       -----   F52 function key
-#key_f53                       kf53    str     Fh      -               -       -----   F53 function key
-#key_f54                       kf54    str     Fi      -               -       -----   F54 function key
-#key_f55                       kf55    str     Fj      -               -       -----   F55 function key
-#key_f56                       kf56    str     Fk      -               -       -----   F56 function key
-#key_f57                       kf57    str     Fl      -               -       -----   F57 function key
-#key_f58                       kf58    str     Fm      -               -       -----   F58 function key
-#key_f59                       kf59    str     Fn      -               -       -----   F59 function key
-#key_f60                       kf60    str     Fo      -               -       -----   F60 function key
-#key_f61                       kf61    str     Fp      -               -       -----   F61 function key
-#key_f62                       kf62    str     Fq      -               -       -----   F62 function key
-#key_f63                       kf63    str     Fr      -               -       -----   F63 function key
-#
-# IBM extensions
-#
-# These extensions follow ptr_non (replacing everything after it) in IBM
-# terminfo files.
-#
-# The places in the box[12] capabilities correspond to acsc characters, here is
-# the mapping:
-#
-#      box1[0]  = ACS_ULCORNER
-#      box1[1]  = ACS_HLINE
-#      box1[2]  = ACS_URCORNER
-#      box1[3]  = ACS_VLINE
-#      box1[4]  = ACS_LRCORNER
-#      box1[5]  = ACS_LLCORNER
-#      box1[6]  = ACS_TTEE
-#      box1[7]  = ACS_RTEE
-#      box1[8]  = ACS_BTEE
-#      box1[9]  = ACS_LTEE
-#      box1[10] = ACS_PLUS
-#
-# The box2 characters are the double-line versions of these forms graphics.
-#
 box_chars_1                    box1    str     bx      -               -       ----K   box characters primary set
-#box_chars_2                   box2    str     by      -               -       ----K   box characters secondary set
-#box_attr_1                    batt1   str     Bx      -               -       ----K   attributes for box1
-#box_attr_2                    batt2   str     By      -               -       ----K   attributes for box2
-#color_bg_0                    colb0   str     d0      -               -       ----K   background color 0
-#color_bg_1                    colb1   str     d1      -               -       ----K   background color 1
-#color_bg_2                    colb2   str     d2      -               -       ----K   background color 2
-#color_bg_3                    colb3   str     d3      -               -       ----K   background color 3
-#color_bg_4                    colb4   str     d4      -               -       ----K   background color 4
-#color_bg_5                    colb5   str     d5      -               -       ----K   background color 5
-#color_bg_6                    colb6   str     d6      -               -       ----K   background color 6
-#color_bg_7                    colb7   str     d7      -               -       ----K   background color 7
-#color_fg_0                    colf0   str     c0      -               -       ----K   foreground color 0
-#color_fg_1                    colf1   str     c1      -               -       ----K   foreground color 1
-#color_fg_2                    colf2   str     c2      -               -       ----K   foreground color 2
-#color_fg_3                    colf3   str     c3      -               -       ----K   foreground color 3
-#color_fg_4                    colf4   str     c4      -               -       ----K   foreground color 4
-#color_fg_5                    colf5   str     c5      -               -       ----K   foreground color 5
-#color_fg_6                    colf6   str     c6      -               -       ----K   foreground color 6
-#color_fg_7                    colf7   str     c7      -               -       ----K   foreground color 7
-#font_0                                font0   str     f0      -               -       -----   select font 0
-#font_1                                font1   str     f1      -               -       -----   select font 1
-#font_2                                font2   str     f2      -               -       -----   select font 2
-#font_3                                font3   str     f3      -               -       -----   select font 3
-#font_4                                font4   str     f4      -               -       ----K   select font 4
-#font_5                                font5   str     f5      -               -       ----K   select font 5
-#font_6                                font6   str     f6      -               -       ----K   select font 6
-#font_7                                font7   str     f7      -               -       ----K   select font 7
-#key_back_tab                  kbtab   str     k0      -               -       -----   backtab key
-#key_do                                kdo     str     ki      -               -       ----K   do request key
-#key_command                   kcmd    str     kd      -               -       ----K   command-request key
-#key_command_pane              kcpn    str     kW      -               -       ----K   command-pane key
-#key_end                       kend    str     kw      -               -       -----   end key
-#key_help                      khlp    str     kq      -               -       -----   help key
-#key_newline                   knl     str     nl      -               -       ----K   newline key
-#key_next_pane                 knpn    str     kv      -               -       ----K   next-pane key
-#key_prev_cmd                  kppn    str     kp      -               -       ----K   previous-command key
-#key_prev_pane                 kppn    str     kV      -               -       ----K   previous-pane key
-#key_quit                      kquit   str     kQ      -               -       ----K   quit key
-#key_select                    ksel    str     kU      -               -       -----   select key
-#key_scroll_left               kscl    str     kz      -               -       ----K   scroll left
-#key_scroll_right              kscr    str     kZ      -               -       ----K   scroll right
-#key_tab                       ktab    str     ko      -               -       ----K   tab key
-#key_smap_in1                  kmpf1   str     Kv      -               -       ----K   special mapped key 1 input
-#key_smap_out1                 kmpt1   str     KV      -               -       ----K   special mapped key 1 output
-#key_smap_in2                  kmpf2   str     Kw      -               -       ----K   special mapped key 2 input
-#key_smap_out2                 kmpt2   str     KW      -               -       ----K   special mapped key 2 output
-#key_smap_in3                  kmpf3   str     Kx      -               -       ----K   special mapped key 3 input
-#key_smap_out3                 kmpt3   str     KX      -               -       ----K   special mapped key 3 output
-#key_smap_in4                  kmpf4   str     Ky      -               -       ----K   special mapped key 4 input
-#key_smap_out4                 kmpt4   str     KY      -               -       ----K   special mapped key 4 output
-#key_smap_in5                  kmpf5   str     Kz      -               -       ----K   special mapped key 5 input
-#key_smap_out5                 kmpt5   str     KZ      -               -       ----K   special mapped key 5 output
-#appl_defined_str              apstr   str     za      -               -       ----K   application-defined string
-# The key_smap_in[6789] and key_smap_out[6789] capabilities aren't described in
-# the IBM manual pages, so the cap name strings are guesses.  The terminfo
-# names are almost certainly right, the termcap ones almost certainly wrong.
-#key_smap_in6                  kmpf6   str     k!      -               -       ----K   special mapped key 6 input
-#key_smap_out6                 kmpt6   str     K@      -               -       ----K   special mapped key 6 output
-#key_smap_in7                  kmpf7   str     k#      -               -       ----K   special mapped key 7 input
-#key_smap_out7                 kmpt7   str     K$      -               -       ----K   special mapped key 7 output
-#key_smap_in8                  kmpf8   str     k%      -               -       ----K   special mapped key 8 input
-#key_smap_out8                 kmpt8   str     K^      -               -       ----K   special mapped key 8 output
-#key_smap_in9                  kmpf9   str     k&      -               -       ----K   special mapped key 9 input
-#key_smap_out9                 kmpt9   str     K*      -               -       ----K   special mapped key 9 output
-# Undocumented capabilities end here
-#key_sf1                       ksf1    str     S1      -               -       ----K   special function key 1
-#key_sf2                       ksf2    str     S2      -               -       ----K   special function key 2
-#key_sf3                       ksf3    str     S3      -               -       ----K   special function key 3
-#key_sf4                       ksf4    str     S4      -               -       ----K   special function key 4
-#key_sf5                       ksf5    str     S5      -               -       ----K   special function key 5
-#key_sf6                       ksf6    str     S6      -               -       ----K   special function key 6
-#key_sf7                       ksf7    str     S7      -               -       ----K   special function key 7
-#key_sf8                       ksf8    str     S8      -               -       ----K   special function key 8
-#key_sf9                       ksf9    str     S9      -               -       ----K   special function key 9
-#key_sf10                      ksf10   str     SA      -               -       ----K   special function key 10
-# AIX version 3 documents different codes for F11, F12 and does not mention
-# F13-F64.  AIX version 4 uses the same naming for F0-F63 as above.
-#key_f11                       kf11    str     k<      -               -       -----   function key 11
-#key_f12                       kf12    str     k>      -               -       -----   function key 12
-# Undocumented capabilities end here.
-#key_action                    kact    str     kJ      -               -       ----K   sent by action key
-# The IBM docs say these capabilities are for table-drawing, and are
-# valid only for aixterm descriptions.
-#enter_topline_mode            topl    str     tp      -               -       ----K   start top-line mode
-#enter_bottom_mode             btml    str     bm      -               -       ----K   start bottom-line mode
-#enter_rvert_mode              rvert   str     rv      -               -       ----K   start right-vertical mode
-#enter_lvert_mode              lvert   str     lv      -               -       ----K   start left-vertical mode
-#
-#############################################################################
-#
-# ALIAS DECLARATIONS
-#
-# Here we set up aliases for translating extensions into standard terminfo.
-#
-#---------------------------------- Termcap aliases -------------------------
-#
-# BSD aliases:
-#
-# This is a common error in many termcap files.  We'll get notified during
-# translation when this (or any other alias) fires.
-#
-capalias       sb      sr      BSD     scroll text down
-#
-# AT&T extensions:
-#
-# The old AT&T 5410, 5420, 5425, pc6300plus, 610, and s4 entries used a set of
-# nonstandard capabilities.  Its signature is the KM capability, used to name
-# some sort of keymap file.  EE, BO, CI, CV, XS, DS, FL and FE are in this
-# set.  Comments in the original, and a little cross-checking with other AT&T
-# documentation, seem to establish the following mappings:
-#
-capalias       BO      mr      AT&T    enter_reverse_mode
-capalias       CI      vi      AT&T    cursor_invisible
-capalias       CV      ve      AT&T    cursor_normal
-capalias       DS      mh      AT&T    enter_dim_mode
-#capalias      EE      me      AT&T    exit_attribute_mode
-capalias       FE      LF      AT&T    label_on
-capalias       FL      LO      AT&T    label_off
-capalias       XS      mk      AT&T    enter_secure_mode
-#
-# We comment out EE because the conflicting XENIX EE is more common in
-# old entries.
-#
-# XENIX extensions:
-#
-# These are the ones we know how to translate directly:
-#
-capalias       EE      mh      XENIX   exit_attribute_mode
-capalias       GE      ae      XENIX   exit_alt_charset_mode
-capalias       GS      as      XENIX   enter_alt_charset_mode
-capalias       CF      vi      XENIX   cursor_invis
-capalias       CO      ve      XENIX   cursor_normal
-capalias       EN      @7      XENIX   key_end
-capalias       HM      kh      XENIX   key_home
-capalias       LD      kL      XENIX   key_dl
-capalias       PD      kN      XENIX   key_npage
-capalias       PN      po      XENIX   prtr_off
-capalias       PS      pf      XENIX   prtr_on
-capalias       PU      kP      XENIX   key_ppage
-capalias       RT      @8      XENIX   kent
-capalias       UP      ku      XENIX   kcuu1
-capalias       G6      IGNORE  XENIX   double-ACS_ULCORNER
-capalias       G7      IGNORE  XENIX   double-ACS_LLCORNER
-capalias       G5      IGNORE  XENIX   double-ACS_URCORNER
-capalias       G8      IGNORE  XENIX   double-ACS_LRCORNER
-capalias       Gr      IGNORE  XENIX   double-ACS_LTEE
-capalias       Gr      IGNORE  XENIX   double-ACS_RTEE
-capalias       Gu      IGNORE  XENIX   double-ACS_BTEE
-capalias       Gd      IGNORE  XENIX   double ACS_TTEE
-capalias       Gh      IGNORE  XENIX   double-ACS_HLINE
-capalias       Gv      IGNORE  XENIX   double-ACS_VLINE
-capalias       Gc      IGNORE  XENIX   double-ACS_PLUS
-capalias       GG      IGNORE  XENIX   acs-glitch
-#
-# IBM extensions:
-#
-capalias       kq      %1      IBM     key_help
-#
-# Iris extensions:
-#
-capalias       HS      mh      IRIS    enter_dim_mode
-#
-# Tektronix extensions:
-#
-capalias       KA      k;      Tek     key_f10
-capalias       KB      F1      Tek     key_f11
-capalias       KC      F2      Tek     key_f12
-capalias       KD      F3      Tek     key_f13
-capalias       KE      F4      Tek     key_f14
-capalias       KF      F5      Tek     key_f15
-capalias       BC      Sb      Tek     set_background
-capalias       FC      Sf      Tek     set_foreground
-#
-# There are also the following:
-#
-#      XENIX   XENIX variable name     name clash with terminfo?
-#      -----   -------------------     -------------------------
-#      CL      key_char_left
-#      CR      key_char_right
-#      CW      key_change_window
-#      HP      ??
-#      LF      key_linefeed            label_off
-#      NU      key_next_unlocked_cell
-#      PL      ??
-#      PR      ??
-#      RC      key_recalc              remove_clock
-#      RF      key_toggle_ref          req_for_input
-#      WL      key_word_left
-#      WR      key_word_right
-#
-# If you know what any of the question-marked ones mean, please tell us.
-#
-#--------------------------------- Terminfo aliases ------------------------
-#
-# IBM extensions:
-#
-infoalias      font0   s0ds    IBM     set0_des_seq
-infoalias      font1   s1ds    IBM     set1_des_seq
-infoalias      font2   s2ds    IBM     set2_des_seq
-infoalias      font3   s3ds    IBM     set3_des_seq
-infoalias      kbtab   kcbt    IBM     key_backtab
-infoalias      ksel    kslt    IBM     key_select
-#
-# Some others are identical to SVr4/XPG4 capabilities, in particular:
-# kcmd, kend, khlp, and kf11...kf63.
 #
 #############################################################################
index a67296500734a4827cddca5920a1c36567ffda08..c3144c06bf039d1384f416a903da24322102045e 100644 (file)
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 2002-2015,2016 Free Software Foundation, Inc.                #
+# Copyright (c) 2002-2016,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 "Software"), #
@@ -28,7 +28,7 @@
 #
 # Author: Thomas Dickey
 #
-# $Id: Caps.osf1r5,v 1.8 2016/08/13 17:45:50 tom Exp $
+# $Id: Caps.osf1r5,v 1.10 2019/04/13 19:56:20 tom Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is designed to align with OSF/1 version 5 (Tru64) terminfo.
@@ -966,303 +966,9 @@ acs_plus                  OTGC    str     GC      -               -       -----   single intersection
 #
 # TERMINFO EXTENSION CAPABILITIES
 #
-# This section is almost all comments.  What it's mainly for is to describe
-# what capabilities need to be squeezed out to get down to the XSI Curses
-# standard set.  They are flagged with K.
-#
-# HP extensions
-#
-# These extensions follow ptr_non (replacing everything after it) in HP
-# terminfo files.  Except for memory_lock and memory_unlock, they are
-# functionally identical to SVr4 extensions, but they make the binary format
-# different.  Grrr....
+# (see Caps-ncurses for the complete set of comments)
 #
 memory_lock                    meml    str     ml      -               -       ----K   lock memory above cursor
 memory_unlock                  memu    str     mu      -               -       ----K   unlock memory
-#plab_norm                     pln     str     pn      -               -       -----   program label #1 to show string #2
-#label_on                      smln    str     LO      -               -       -----   turn on soft labels
-#label_off                     rmln    str     LF      -               -       -----   turn off soft labels
-#key_f11                       kf11    str     F1      -               -       -----   F11 function key
-#key_f12                       kf12    str     F2      -               -       -----   F12 function key
-#key_f13                       kf13    str     F3      -               -       -----   F13 function key
-#key_f14                       kf14    str     F4      -               -       -----   F14 function key
-#key_f15                       kf15    str     F5      -               -       -----   F15 function key
-#key_f16                       kf16    str     F6      -               -       -----   F16 function key
-#key_f17                       kf17    str     F7      -               -       -----   F17 function key
-#key_f18                       kf18    str     F8      -               -       -----   F18 function key
-#key_f19                       kf19    str     F9      -               -       -----   F19 function key
-#key_f20                       kf20    str     FA      -               -       -----   F20 function key
-#key_f21                       kf21    str     FB      -               -       -----   F21 function key
-#key_f22                       kf22    str     FC      -               -       -----   F22 function key
-#key_f23                       kf23    str     FD      -               -       -----   F23 function key
-#key_f24                       kf24    str     FE      -               -       -----   F24 function key
-#key_f25                       kf25    str     FF      -               -       -----   F25 function key
-#key_f26                       kf26    str     FG      -               -       -----   F26 function key
-#key_f27                       kf27    str     FH      -               -       -----   F27 function key
-#key_f28                       kf28    str     FI      -               -       -----   F28 function key
-#key_f29                       kf29    str     FJ      -               -       -----   F29 function key
-#key_f30                       kf30    str     FK      -               -       -----   F30 function key
-#key_f31                       kf31    str     FL      -               -       -----   F31 function key
-#key_f32                       kf32    str     FM      -               -       -----   F32 function key
-#key_f33                       kf33    str     FN      -               -       -----   F33 function key
-#key_f34                       kf34    str     FO      -               -       -----   F34 function key
-#key_f35                       kf35    str     FP      -               -       -----   F35 function key
-#key_f36                       kf36    str     FQ      -               -       -----   F36 function key
-#key_f37                       kf37    str     FR      -               -       -----   F37 function key
-#key_f38                       kf38    str     FS      -               -       -----   F38 function key
-#key_f39                       kf39    str     FT      -               -       -----   F39 function key
-#key_f40                       kf40    str     FU      -               -       -----   F40 function key
-#key_f41                       kf41    str     FV      -               -       -----   F41 function key
-#key_f42                       kf42    str     FW      -               -       -----   F42 function key
-#key_f43                       kf43    str     FX      -               -       -----   F43 function key
-#key_f44                       kf44    str     FY      -               -       -----   F44 function key
-#key_f45                       kf45    str     FZ      -               -       -----   F45 function key
-#key_f46                       kf46    str     Fa      -               -       -----   F46 function key
-#key_f47                       kf47    str     Fb      -               -       -----   F47 function key
-#key_f48                       kf48    str     Fc      -               -       -----   F48 function key
-#key_f49                       kf49    str     Fd      -               -       -----   F49 function key
-#key_f50                       kf50    str     Fe      -               -       -----   F50 function key
-#key_f51                       kf51    str     Ff      -               -       -----   F51 function key
-#key_f52                       kf52    str     Fg      -               -       -----   F52 function key
-#key_f53                       kf53    str     Fh      -               -       -----   F53 function key
-#key_f54                       kf54    str     Fi      -               -       -----   F54 function key
-#key_f55                       kf55    str     Fj      -               -       -----   F55 function key
-#key_f56                       kf56    str     Fk      -               -       -----   F56 function key
-#key_f57                       kf57    str     Fl      -               -       -----   F57 function key
-#key_f58                       kf58    str     Fm      -               -       -----   F58 function key
-#key_f59                       kf59    str     Fn      -               -       -----   F59 function key
-#key_f60                       kf60    str     Fo      -               -       -----   F60 function key
-#key_f61                       kf61    str     Fp      -               -       -----   F61 function key
-#key_f62                       kf62    str     Fq      -               -       -----   F62 function key
-#key_f63                       kf63    str     Fr      -               -       -----   F63 function key
-#
-# IBM extensions
-#
-# These extensions follow ptr_non (replacing everything after it) in IBM
-# terminfo files.
-#
-# The places in the box[12] capabilities correspond to acsc characters, here is
-# the mapping:
-#
-#      box1[0]  = ACS_ULCORNER
-#      box1[1]  = ACS_HLINE
-#      box1[2]  = ACS_URCORNER
-#      box1[3]  = ACS_VLINE
-#      box1[4]  = ACS_LRCORNER
-#      box1[5]  = ACS_LLCORNER
-#      box1[6]  = ACS_TTEE
-#      box1[7]  = ACS_RTEE
-#      box1[8]  = ACS_BTEE
-#      box1[9]  = ACS_LTEE
-#      box1[10] = ACS_PLUS
-#
-# The box2 characters are the double-line versions of these forms graphics.
-#
-#box_chars_1                   box1    str     bx      -               -       ----K   box characters primary set
-#box_chars_2                   box2    str     by      -               -       ----K   box characters secondary set
-#box_attr_1                    batt1   str     Bx      -               -       ----K   attributes for box1
-#box_attr_2                    batt2   str     By      -               -       ----K   attributes for box2
-#color_bg_0                    colb0   str     d0      -               -       ----K   background color 0
-#color_bg_1                    colb1   str     d1      -               -       ----K   background color 1
-#color_bg_2                    colb2   str     d2      -               -       ----K   background color 2
-#color_bg_3                    colb3   str     d3      -               -       ----K   background color 3
-#color_bg_4                    colb4   str     d4      -               -       ----K   background color 4
-#color_bg_5                    colb5   str     d5      -               -       ----K   background color 5
-#color_bg_6                    colb6   str     d6      -               -       ----K   background color 6
-#color_bg_7                    colb7   str     d7      -               -       ----K   background color 7
-#color_fg_0                    colf0   str     c0      -               -       ----K   foreground color 0
-#color_fg_1                    colf1   str     c1      -               -       ----K   foreground color 1
-#color_fg_2                    colf2   str     c2      -               -       ----K   foreground color 2
-#color_fg_3                    colf3   str     c3      -               -       ----K   foreground color 3
-#color_fg_4                    colf4   str     c4      -               -       ----K   foreground color 4
-#color_fg_5                    colf5   str     c5      -               -       ----K   foreground color 5
-#color_fg_6                    colf6   str     c6      -               -       ----K   foreground color 6
-#color_fg_7                    colf7   str     c7      -               -       ----K   foreground color 7
-#font_0                                font0   str     f0      -               -       -----   select font 0
-#font_1                                font1   str     f1      -               -       -----   select font 1
-#font_2                                font2   str     f2      -               -       -----   select font 2
-#font_3                                font3   str     f3      -               -       -----   select font 3
-#font_4                                font4   str     f4      -               -       ----K   select font 4
-#font_5                                font5   str     f5      -               -       ----K   select font 5
-#font_6                                font6   str     f6      -               -       ----K   select font 6
-#font_7                                font7   str     f7      -               -       ----K   select font 7
-#key_back_tab                  kbtab   str     k0      -               -       -----   backtab key
-#key_do                                kdo     str     ki      -               -       ----K   do request key
-#key_command                   kcmd    str     kd      -               -       ----K   command-request key
-#key_command_pane              kcpn    str     kW      -               -       ----K   command-pane key
-#key_end                       kend    str     kw      -               -       -----   end key
-#key_help                      khlp    str     kq      -               -       -----   help key
-#key_newline                   knl     str     nl      -               -       ----K   newline key
-#key_next_pane                 knpn    str     kv      -               -       ----K   next-pane key
-#key_prev_cmd                  kppn    str     kp      -               -       ----K   previous-command key
-#key_prev_pane                 kppn    str     kV      -               -       ----K   previous-pane key
-#key_quit                      kquit   str     kQ      -               -       ----K   quit key
-#key_select                    ksel    str     kU      -               -       -----   select key
-#key_scroll_left               kscl    str     kz      -               -       ----K   scroll left
-#key_scroll_right              kscr    str     kZ      -               -       ----K   scroll right
-#key_tab                       ktab    str     ko      -               -       ----K   tab key
-#key_smap_in1                  kmpf1   str     Kv      -               -       ----K   special mapped key 1 input
-#key_smap_out1                 kmpt1   str     KV      -               -       ----K   special mapped key 1 output
-#key_smap_in2                  kmpf2   str     Kw      -               -       ----K   special mapped key 2 input
-#key_smap_out2                 kmpt2   str     KW      -               -       ----K   special mapped key 2 output
-#key_smap_in3                  kmpf3   str     Kx      -               -       ----K   special mapped key 3 input
-#key_smap_out3                 kmpt3   str     KX      -               -       ----K   special mapped key 3 output
-#key_smap_in4                  kmpf4   str     Ky      -               -       ----K   special mapped key 4 input
-#key_smap_out4                 kmpt4   str     KY      -               -       ----K   special mapped key 4 output
-#key_smap_in5                  kmpf5   str     Kz      -               -       ----K   special mapped key 5 input
-#key_smap_out5                 kmpt5   str     KZ      -               -       ----K   special mapped key 5 output
-#appl_defined_str              apstr   str     za      -               -       ----K   application-defined string
-# The key_smap_in[6789] and key_smap_out[6789] capabilities aren't described in
-# the IBM manual pages, so the cap name strings are guesses.  The terminfo
-# names are almost certainly right, the termcap ones almost certainly wrong.
-#key_smap_in6                  kmpf6   str     k!      -               -       ----K   special mapped key 6 input
-#key_smap_out6                 kmpt6   str     K@      -               -       ----K   special mapped key 6 output
-#key_smap_in7                  kmpf7   str     k#      -               -       ----K   special mapped key 7 input
-#key_smap_out7                 kmpt7   str     K$      -               -       ----K   special mapped key 7 output
-#key_smap_in8                  kmpf8   str     k%      -               -       ----K   special mapped key 8 input
-#key_smap_out8                 kmpt8   str     K^      -               -       ----K   special mapped key 8 output
-#key_smap_in9                  kmpf9   str     k&      -               -       ----K   special mapped key 9 input
-#key_smap_out9                 kmpt9   str     K*      -               -       ----K   special mapped key 9 output
-# Undocumented capabilities end here
-#key_sf1                       ksf1    str     S1      -               -       ----K   special function key 1
-#key_sf2                       ksf2    str     S2      -               -       ----K   special function key 2
-#key_sf3                       ksf3    str     S3      -               -       ----K   special function key 3
-#key_sf4                       ksf4    str     S4      -               -       ----K   special function key 4
-#key_sf5                       ksf5    str     S5      -               -       ----K   special function key 5
-#key_sf6                       ksf6    str     S6      -               -       ----K   special function key 6
-#key_sf7                       ksf7    str     S7      -               -       ----K   special function key 7
-#key_sf8                       ksf8    str     S8      -               -       ----K   special function key 8
-#key_sf9                       ksf9    str     S9      -               -       ----K   special function key 9
-#key_sf10                      ksf10   str     SA      -               -       ----K   special function key 10
-# AIX version 3 documents different codes for F11, F12 and does not mention
-# F13-F64.  AIX version 4 uses the same naming for F0-F63 as above.
-#key_f11                       kf11    str     k<      -               -       -----   function key 11
-#key_f12                       kf12    str     k>      -               -       -----   function key 12
-# Undocumented capabilities end here.
-#key_action                    kact    str     kJ      -               -       ----K   sent by action key
-# The IBM docs say these capabilities are for table-drawing, and are
-# valid only for aixterm descriptions.
-#enter_topline_mode            topl    str     tp      -               -       ----K   start top-line mode
-#enter_bottom_mode             btml    str     bm      -               -       ----K   start bottom-line mode
-#enter_rvert_mode              rvert   str     rv      -               -       ----K   start right-vertical mode
-#enter_lvert_mode              lvert   str     lv      -               -       ----K   start left-vertical mode
-#
-#############################################################################
-#
-# ALIAS DECLARATIONS
-#
-# Here we set up aliases for translating extensions into standard terminfo.
-#
-#---------------------------------- Termcap aliases -------------------------
-#
-# BSD aliases:
-#
-# This is a common error in many termcap files.  We'll get notified during
-# translation when this (or any other alias) fires.
-#
-capalias       sb      sr      BSD     scroll text down
-#
-# AT&T extensions:
-#
-# The old AT&T 5410, 5420, 5425, pc6300plus, 610, and s4 entries used a set of
-# nonstandard capabilities.  Its signature is the KM capability, used to name
-# some sort of keymap file.  EE, BO, CI, CV, XS, DS, FL and FE are in this
-# set.  Comments in the original, and a little cross-checking with other AT&T
-# documentation, seem to establish the following mappings:
-#
-capalias       BO      mr      AT&T    enter_reverse_mode
-capalias       CI      vi      AT&T    cursor_invisible
-capalias       CV      ve      AT&T    cursor_normal
-capalias       DS      mh      AT&T    enter_dim_mode
-#capalias      EE      me      AT&T    exit_attribute_mode
-capalias       FE      LF      AT&T    label_on
-capalias       FL      LO      AT&T    label_off
-capalias       XS      mk      AT&T    enter_secure_mode
-#
-# We comment out EE because the conflicting XENIX EE is more common in
-# old entries.
-#
-# XENIX extensions:
-#
-# These are the ones we know how to translate directly:
-#
-capalias       EE      mh      XENIX   exit_attribute_mode
-capalias       GE      ae      XENIX   exit_alt_charset_mode
-capalias       GS      as      XENIX   enter_alt_charset_mode
-capalias       CF      vi      XENIX   cursor_invis
-capalias       CO      ve      XENIX   cursor_normal
-capalias       EN      @7      XENIX   key_end
-capalias       HM      kh      XENIX   key_home
-capalias       LD      kL      XENIX   key_dl
-capalias       PD      kN      XENIX   key_npage
-capalias       PN      po      XENIX   prtr_off
-capalias       PS      pf      XENIX   prtr_on
-capalias       PU      kP      XENIX   key_ppage
-capalias       RT      @8      XENIX   kent
-capalias       UP      ku      XENIX   kcuu1
-capalias       G6      IGNORE  XENIX   double-ACS_ULCORNER
-capalias       G7      IGNORE  XENIX   double-ACS_LLCORNER
-capalias       G5      IGNORE  XENIX   double-ACS_URCORNER
-capalias       G8      IGNORE  XENIX   double-ACS_LRCORNER
-capalias       Gr      IGNORE  XENIX   double-ACS_LTEE
-capalias       Gr      IGNORE  XENIX   double-ACS_RTEE
-capalias       Gu      IGNORE  XENIX   double-ACS_BTEE
-capalias       Gd      IGNORE  XENIX   double ACS_TTEE
-capalias       Gh      IGNORE  XENIX   double-ACS_HLINE
-capalias       Gv      IGNORE  XENIX   double-ACS_VLINE
-capalias       Gc      IGNORE  XENIX   double-ACS_PLUS
-capalias       GG      IGNORE  XENIX   acs-glitch
-#
-# IBM extensions:
-#
-capalias       kq      %1      IBM     key_help
-#
-# Iris extensions:
-#
-capalias       HS      mh      IRIS    enter_dim_mode
-#
-# Tektronix extensions:
-#
-capalias       KA      k;      Tek     key_f10
-capalias       KB      F1      Tek     key_f11
-capalias       KC      F2      Tek     key_f12
-capalias       KD      F3      Tek     key_f13
-capalias       KE      F4      Tek     key_f14
-capalias       KF      F5      Tek     key_f15
-capalias       BC      Sb      Tek     set_background
-capalias       FC      Sf      Tek     set_foreground
-#
-# There are also the following:
-#
-#      XENIX   XENIX variable name     name clash with terminfo?
-#      -----   -------------------     -------------------------
-#      CL      key_char_left
-#      CR      key_char_right
-#      CW      key_change_window
-#      HP      ??
-#      LF      key_linefeed            label_off
-#      NU      key_next_unlocked_cell
-#      PL      ??
-#      PR      ??
-#      RC      key_recalc              remove_clock
-#      RF      key_toggle_ref          req_for_input
-#      WL      key_word_left
-#      WR      key_word_right
-#
-# If you know what any of the question-marked ones mean, please tell us.
-#
-#--------------------------------- Terminfo aliases ------------------------
-#
-# IBM extensions:
-#
-infoalias      font0   s0ds    IBM     set0_des_seq
-infoalias      font1   s1ds    IBM     set1_des_seq
-infoalias      font2   s2ds    IBM     set2_des_seq
-infoalias      font3   s3ds    IBM     set3_des_seq
-infoalias      kbtab   kcbt    IBM     key_backtab
-infoalias      ksel    kslt    IBM     key_select
-#
-# Some others are identical to SVr4/XPG4 capabilities, in particular:
-# kcmd, kend, khlp, and kf11...kf63.
 #
 #############################################################################
index db6c3629ee7388d032fa44426b4e090858625a2b..3c1ef9413ee78f3b1f4285e7903fb65529652de2 100644 (file)
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 2001-2015,2016 Free Software Foundation, Inc.                #
+# Copyright (c) 2001-2016,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 "Software"), #
@@ -28,7 +28,7 @@
 #
 # Author: Thomas Dickey
 #
-# $Id: Caps.uwin,v 1.7 2016/08/13 17:45:50 tom Exp $
+# $Id: Caps.uwin,v 1.9 2019/04/13 19:55:29 tom Exp $
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is designed to align with U/Win's terminfo.
@@ -782,303 +782,10 @@ acs_plus                 OTGC    str     GC      -               -       -----   single intersection
 #
 # TERMINFO EXTENSION CAPABILITIES
 #
-# This section is almost all comments.  What it's mainly for is to describe
-# what capabilities need to be squeezed out to get down to the XSI Curses
-# standard set.  They are flagged with K.
-#
-# HP extensions
-#
-# These extensions follow ptr_non (replacing everything after it) in HP
-# terminfo files.  Except for memory_lock and memory_unlock, they are
-# functionally identical to SVr4 extensions, but they make the binary format
-# different.  Grrr....
+# (see Caps-ncurses for the complete set of comments)
 #
 memory_lock                    meml    str     ml      -               -       ----K   lock memory above cursor
 memory_unlock                  memu    str     mu      -               -       ----K   unlock memory
-#plab_norm                     pln     str     pn      -               -       -----   program label #1 to show string #2
-#label_on                      smln    str     LO      -               -       -----   turn on soft labels
-#label_off                     rmln    str     LF      -               -       -----   turn off soft labels
-#key_f11                       kf11    str     F1      -               -       -----   F11 function key
-#key_f12                       kf12    str     F2      -               -       -----   F12 function key
-#key_f13                       kf13    str     F3      -               -       -----   F13 function key
-#key_f14                       kf14    str     F4      -               -       -----   F14 function key
-#key_f15                       kf15    str     F5      -               -       -----   F15 function key
-#key_f16                       kf16    str     F6      -               -       -----   F16 function key
-#key_f17                       kf17    str     F7      -               -       -----   F17 function key
-#key_f18                       kf18    str     F8      -               -       -----   F18 function key
-#key_f19                       kf19    str     F9      -               -       -----   F19 function key
-#key_f20                       kf20    str     FA      -               -       -----   F20 function key
-#key_f21                       kf21    str     FB      -               -       -----   F21 function key
-#key_f22                       kf22    str     FC      -               -       -----   F22 function key
-#key_f23                       kf23    str     FD      -               -       -----   F23 function key
-#key_f24                       kf24    str     FE      -               -       -----   F24 function key
-#key_f25                       kf25    str     FF      -               -       -----   F25 function key
-#key_f26                       kf26    str     FG      -               -       -----   F26 function key
-#key_f27                       kf27    str     FH      -               -       -----   F27 function key
-#key_f28                       kf28    str     FI      -               -       -----   F28 function key
-#key_f29                       kf29    str     FJ      -               -       -----   F29 function key
-#key_f30                       kf30    str     FK      -               -       -----   F30 function key
-#key_f31                       kf31    str     FL      -               -       -----   F31 function key
-#key_f32                       kf32    str     FM      -               -       -----   F32 function key
-#key_f33                       kf33    str     FN      -               -       -----   F33 function key
-#key_f34                       kf34    str     FO      -               -       -----   F34 function key
-#key_f35                       kf35    str     FP      -               -       -----   F35 function key
-#key_f36                       kf36    str     FQ      -               -       -----   F36 function key
-#key_f37                       kf37    str     FR      -               -       -----   F37 function key
-#key_f38                       kf38    str     FS      -               -       -----   F38 function key
-#key_f39                       kf39    str     FT      -               -       -----   F39 function key
-#key_f40                       kf40    str     FU      -               -       -----   F40 function key
-#key_f41                       kf41    str     FV      -               -       -----   F41 function key
-#key_f42                       kf42    str     FW      -               -       -----   F42 function key
-#key_f43                       kf43    str     FX      -               -       -----   F43 function key
-#key_f44                       kf44    str     FY      -               -       -----   F44 function key
-#key_f45                       kf45    str     FZ      -               -       -----   F45 function key
-#key_f46                       kf46    str     Fa      -               -       -----   F46 function key
-#key_f47                       kf47    str     Fb      -               -       -----   F47 function key
-#key_f48                       kf48    str     Fc      -               -       -----   F48 function key
-#key_f49                       kf49    str     Fd      -               -       -----   F49 function key
-#key_f50                       kf50    str     Fe      -               -       -----   F50 function key
-#key_f51                       kf51    str     Ff      -               -       -----   F51 function key
-#key_f52                       kf52    str     Fg      -               -       -----   F52 function key
-#key_f53                       kf53    str     Fh      -               -       -----   F53 function key
-#key_f54                       kf54    str     Fi      -               -       -----   F54 function key
-#key_f55                       kf55    str     Fj      -               -       -----   F55 function key
-#key_f56                       kf56    str     Fk      -               -       -----   F56 function key
-#key_f57                       kf57    str     Fl      -               -       -----   F57 function key
-#key_f58                       kf58    str     Fm      -               -       -----   F58 function key
-#key_f59                       kf59    str     Fn      -               -       -----   F59 function key
-#key_f60                       kf60    str     Fo      -               -       -----   F60 function key
-#key_f61                       kf61    str     Fp      -               -       -----   F61 function key
-#key_f62                       kf62    str     Fq      -               -       -----   F62 function key
-#key_f63                       kf63    str     Fr      -               -       -----   F63 function key
-#
-# IBM extensions
-#
-# These extensions follow ptr_non (replacing everything after it) in IBM
-# terminfo files.
-#
-# The places in the box[12] capabilities correspond to acsc characters, here is
-# the mapping:
-#
-#      box1[0]  = ACS_ULCORNER
-#      box1[1]  = ACS_HLINE
-#      box1[2]  = ACS_URCORNER
-#      box1[3]  = ACS_VLINE
-#      box1[4]  = ACS_LRCORNER
-#      box1[5]  = ACS_LLCORNER
-#      box1[6]  = ACS_TTEE
-#      box1[7]  = ACS_RTEE
-#      box1[8]  = ACS_BTEE
-#      box1[9]  = ACS_LTEE
-#      box1[10] = ACS_PLUS
-#
-# The box2 characters are the double-line versions of these forms graphics.
-#
 box_chars_1                    box1    str     bx      -               -       ----K   box characters primary set
-#box_chars_2                   box2    str     by      -               -       ----K   box characters secondary set
-#box_attr_1                    batt1   str     Bx      -               -       ----K   attributes for box1
-#box_attr_2                    batt2   str     By      -               -       ----K   attributes for box2
-#color_bg_0                    colb0   str     d0      -               -       ----K   background color 0
-#color_bg_1                    colb1   str     d1      -               -       ----K   background color 1
-#color_bg_2                    colb2   str     d2      -               -       ----K   background color 2
-#color_bg_3                    colb3   str     d3      -               -       ----K   background color 3
-#color_bg_4                    colb4   str     d4      -               -       ----K   background color 4
-#color_bg_5                    colb5   str     d5      -               -       ----K   background color 5
-#color_bg_6                    colb6   str     d6      -               -       ----K   background color 6
-#color_bg_7                    colb7   str     d7      -               -       ----K   background color 7
-#color_fg_0                    colf0   str     c0      -               -       ----K   foreground color 0
-#color_fg_1                    colf1   str     c1      -               -       ----K   foreground color 1
-#color_fg_2                    colf2   str     c2      -               -       ----K   foreground color 2
-#color_fg_3                    colf3   str     c3      -               -       ----K   foreground color 3
-#color_fg_4                    colf4   str     c4      -               -       ----K   foreground color 4
-#color_fg_5                    colf5   str     c5      -               -       ----K   foreground color 5
-#color_fg_6                    colf6   str     c6      -               -       ----K   foreground color 6
-#color_fg_7                    colf7   str     c7      -               -       ----K   foreground color 7
-#font_0                                font0   str     f0      -               -       -----   select font 0
-#font_1                                font1   str     f1      -               -       -----   select font 1
-#font_2                                font2   str     f2      -               -       -----   select font 2
-#font_3                                font3   str     f3      -               -       -----   select font 3
-#font_4                                font4   str     f4      -               -       ----K   select font 4
-#font_5                                font5   str     f5      -               -       ----K   select font 5
-#font_6                                font6   str     f6      -               -       ----K   select font 6
-#font_7                                font7   str     f7      -               -       ----K   select font 7
-#key_back_tab                  kbtab   str     k0      -               -       -----   backtab key
-#key_do                                kdo     str     ki      -               -       ----K   do request key
-#key_command                   kcmd    str     kd      -               -       ----K   command-request key
-#key_command_pane              kcpn    str     kW      -               -       ----K   command-pane key
-#key_end                       kend    str     kw      -               -       -----   end key
-#key_help                      khlp    str     kq      -               -       -----   help key
-#key_newline                   knl     str     nl      -               -       ----K   newline key
-#key_next_pane                 knpn    str     kv      -               -       ----K   next-pane key
-#key_prev_cmd                  kppn    str     kp      -               -       ----K   previous-command key
-#key_prev_pane                 kppn    str     kV      -               -       ----K   previous-pane key
-#key_quit                      kquit   str     kQ      -               -       ----K   quit key
-#key_select                    ksel    str     kU      -               -       -----   select key
-#key_scroll_left               kscl    str     kz      -               -       ----K   scroll left
-#key_scroll_right              kscr    str     kZ      -               -       ----K   scroll right
-#key_tab                       ktab    str     ko      -               -       ----K   tab key
-#key_smap_in1                  kmpf1   str     Kv      -               -       ----K   special mapped key 1 input
-#key_smap_out1                 kmpt1   str     KV      -               -       ----K   special mapped key 1 output
-#key_smap_in2                  kmpf2   str     Kw      -               -       ----K   special mapped key 2 input
-#key_smap_out2                 kmpt2   str     KW      -               -       ----K   special mapped key 2 output
-#key_smap_in3                  kmpf3   str     Kx      -               -       ----K   special mapped key 3 input
-#key_smap_out3                 kmpt3   str     KX      -               -       ----K   special mapped key 3 output
-#key_smap_in4                  kmpf4   str     Ky      -               -       ----K   special mapped key 4 input
-#key_smap_out4                 kmpt4   str     KY      -               -       ----K   special mapped key 4 output
-#key_smap_in5                  kmpf5   str     Kz      -               -       ----K   special mapped key 5 input
-#key_smap_out5                 kmpt5   str     KZ      -               -       ----K   special mapped key 5 output
-#appl_defined_str              apstr   str     za      -               -       ----K   application-defined string
-# The key_smap_in[6789] and key_smap_out[6789] capabilities aren't described in
-# the IBM manual pages, so the cap name strings are guesses.  The terminfo
-# names are almost certainly right, the termcap ones almost certainly wrong.
-#key_smap_in6                  kmpf6   str     k!      -               -       ----K   special mapped key 6 input
-#key_smap_out6                 kmpt6   str     K@      -               -       ----K   special mapped key 6 output
-#key_smap_in7                  kmpf7   str     k#      -               -       ----K   special mapped key 7 input
-#key_smap_out7                 kmpt7   str     K$      -               -       ----K   special mapped key 7 output
-#key_smap_in8                  kmpf8   str     k%      -               -       ----K   special mapped key 8 input
-#key_smap_out8                 kmpt8   str     K^      -               -       ----K   special mapped key 8 output
-#key_smap_in9                  kmpf9   str     k&      -               -       ----K   special mapped key 9 input
-#key_smap_out9                 kmpt9   str     K*      -               -       ----K   special mapped key 9 output
-# Undocumented capabilities end here
-#key_sf1                       ksf1    str     S1      -               -       ----K   special function key 1
-#key_sf2                       ksf2    str     S2      -               -       ----K   special function key 2
-#key_sf3                       ksf3    str     S3      -               -       ----K   special function key 3
-#key_sf4                       ksf4    str     S4      -               -       ----K   special function key 4
-#key_sf5                       ksf5    str     S5      -               -       ----K   special function key 5
-#key_sf6                       ksf6    str     S6      -               -       ----K   special function key 6
-#key_sf7                       ksf7    str     S7      -               -       ----K   special function key 7
-#key_sf8                       ksf8    str     S8      -               -       ----K   special function key 8
-#key_sf9                       ksf9    str     S9      -               -       ----K   special function key 9
-#key_sf10                      ksf10   str     SA      -               -       ----K   special function key 10
-# AIX version 3 documents different codes for F11, F12 and does not mention
-# F13-F64.  AIX version 4 uses the same naming for F0-F63 as above.
-#key_f11                       kf11    str     k<      -               -       -----   function key 11
-#key_f12                       kf12    str     k>      -               -       -----   function key 12
-# Undocumented capabilities end here.
-#key_action                    kact    str     kJ      -               -       ----K   sent by action key
-# The IBM docs say these capabilities are for table-drawing, and are
-# valid only for aixterm descriptions.
-#enter_topline_mode            topl    str     tp      -               -       ----K   start top-line mode
-#enter_bottom_mode             btml    str     bm      -               -       ----K   start bottom-line mode
-#enter_rvert_mode              rvert   str     rv      -               -       ----K   start right-vertical mode
-#enter_lvert_mode              lvert   str     lv      -               -       ----K   start left-vertical mode
-#
-#############################################################################
-#
-# ALIAS DECLARATIONS
-#
-# Here we set up aliases for translating extensions into standard terminfo.
-#
-#---------------------------------- Termcap aliases -------------------------
-#
-# BSD aliases:
-#
-# This is a common error in many termcap files.  We'll get notified during
-# translation when this (or any other alias) fires.
-#
-capalias       sb      sr      BSD     scroll text down
-#
-# AT&T extensions:
-#
-# The old AT&T 5410, 5420, 5425, pc6300plus, 610, and s4 entries used a set of
-# nonstandard capabilities.  Its signature is the KM capability, used to name
-# some sort of keymap file.  EE, BO, CI, CV, XS, DS, FL and FE are in this
-# set.  Comments in the original, and a little cross-checking with other AT&T
-# documentation, seem to establish the following mappings:
-#
-capalias       BO      mr      AT&T    enter_reverse_mode
-capalias       CI      vi      AT&T    cursor_invisible
-capalias       CV      ve      AT&T    cursor_normal
-capalias       DS      mh      AT&T    enter_dim_mode
-#capalias      EE      me      AT&T    exit_attribute_mode
-capalias       FE      LF      AT&T    label_on
-capalias       FL      LO      AT&T    label_off
-capalias       XS      mk      AT&T    enter_secure_mode
-#
-# We comment out EE because the conflicting XENIX EE is more common in
-# old entries.
-#
-# XENIX extensions:
-#
-# These are the ones we know how to translate directly:
-#
-capalias       EE      mh      XENIX   exit_attribute_mode
-capalias       GE      ae      XENIX   exit_alt_charset_mode
-capalias       GS      as      XENIX   enter_alt_charset_mode
-capalias       CF      vi      XENIX   cursor_invis
-capalias       CO      ve      XENIX   cursor_normal
-capalias       EN      @7      XENIX   key_end
-capalias       HM      kh      XENIX   key_home
-capalias       LD      kL      XENIX   key_dl
-capalias       PD      kN      XENIX   key_npage
-capalias       PN      po      XENIX   prtr_off
-capalias       PS      pf      XENIX   prtr_on
-capalias       PU      kP      XENIX   key_ppage
-capalias       RT      @8      XENIX   kent
-capalias       UP      ku      XENIX   kcuu1
-capalias       G6      IGNORE  XENIX   double-ACS_ULCORNER
-capalias       G7      IGNORE  XENIX   double-ACS_LLCORNER
-capalias       G5      IGNORE  XENIX   double-ACS_URCORNER
-capalias       G8      IGNORE  XENIX   double-ACS_LRCORNER
-capalias       Gr      IGNORE  XENIX   double-ACS_LTEE
-capalias       Gr      IGNORE  XENIX   double-ACS_RTEE
-capalias       Gu      IGNORE  XENIX   double-ACS_BTEE
-capalias       Gd      IGNORE  XENIX   double ACS_TTEE
-capalias       Gh      IGNORE  XENIX   double-ACS_HLINE
-capalias       Gv      IGNORE  XENIX   double-ACS_VLINE
-capalias       Gc      IGNORE  XENIX   double-ACS_PLUS
-capalias       GG      IGNORE  XENIX   acs-glitch
-#
-# IBM extensions:
-#
-capalias       kq      %1      IBM     key_help
-#
-# Iris extensions:
-#
-capalias       HS      mh      IRIS    enter_dim_mode
-#
-# Tektronix extensions:
-#
-capalias       KA      k;      Tek     key_f10
-capalias       KB      F1      Tek     key_f11
-capalias       KC      F2      Tek     key_f12
-capalias       KD      F3      Tek     key_f13
-capalias       KE      F4      Tek     key_f14
-capalias       KF      F5      Tek     key_f15
-capalias       BC      Sb      Tek     set_background
-capalias       FC      Sf      Tek     set_foreground
-#
-# There are also the following:
-#
-#      XENIX   XENIX variable name     name clash with terminfo?
-#      -----   -------------------     -------------------------
-#      CL      key_char_left
-#      CR      key_char_right
-#      CW      key_change_window
-#      HP      ??
-#      LF      key_linefeed            label_off
-#      NU      key_next_unlocked_cell
-#      PL      ??
-#      PR      ??
-#      RC      key_recalc              remove_clock
-#      RF      key_toggle_ref          req_for_input
-#      WL      key_word_left
-#      WR      key_word_right
-#
-# If you know what any of the question-marked ones mean, please tell us.
-#
-#--------------------------------- Terminfo aliases ------------------------
-#
-# IBM extensions:
-#
-infoalias      font0   s0ds    IBM     set0_des_seq
-infoalias      font1   s1ds    IBM     set1_des_seq
-infoalias      font2   s2ds    IBM     set2_des_seq
-infoalias      font3   s3ds    IBM     set3_des_seq
-infoalias      kbtab   kcbt    IBM     key_backtab
-infoalias      ksel    kslt    IBM     key_select
-#
-# Some others are identical to SVr4/XPG4 capabilities, in particular:
-# kcmd, kend, khlp, and kf11...kf63.
 #
 #############################################################################
index c6908b958649089698e3d01af5fbeeb22b25fa24..4c99d00fa3956bd955d857e0f18c6f221d3ddb28 100755 (executable)
@@ -1,6 +1,6 @@
 #!/bin/sh
 ##############################################################################
-# Copyright (c) 1998-2014,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 "Software"), #
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: MKparametrized.sh,v 1.8 2017/07/22 16:32:27 tom Exp $
+# $Id: MKparametrized.sh,v 1.9 2019/04/13 20:36:24 tom Exp $
 #
 # MKparametrized.sh -- generate indirection vectors for various sort methods
 #
 # The output of this script is C source for an array specifying whether
 # termcap strings should undergo parameter and padding translation.
 #
-CAPS="${1-Caps}"
+[ $# = 0 ] && set - Caps
+
 cat <<EOF
 #ifndef PARAMETRIZED_H
 #define PARAMETRIZED_H 1
@@ -54,7 +55,14 @@ EOF
 # XENIX acs_* capabilities.  Maybe someday we'll dedicate a flag field for
 # this, that would be cleaner....
 
-${AWK-awk} <$CAPS '
+cat "$@" | ${AWK-awk} '
+
+/^#/ { next ; }
+/^capalias/ { next ; }
+/^infoalias/ { next ; }
+/^used_by/ { next ; }
+/^userdef/ { next ; }
+
 $3 != "str"            {next;}
 $1 ~ /^acs_/           {print "-1,\t/* ", $2, " */"; count++; next;}
 $1 ~ /^label_format/   {print "-1,\t/* ", $2, " */"; count++; next;}
index 2c4c6d44eb3a08b260810486d1ccba3e85ea2598..2fbe536e1c7951254fc0386b6122cdecbbaba71b 100644 (file)
@@ -59,7 +59,7 @@ BEGIN {
        print  "/*    and: Thomas E. Dickey                        1995-on                  */"
        print  "/****************************************************************************/"
        print  ""
-       print  "/* $Id: MKterm.h.awk.in,v 1.70 2019/03/02 23:23:58 tom Exp $ */"
+       print  "/* $Id: MKterm.h.awk.in,v 1.71 2019/04/13 22:34:42 tom Exp $ */"
        print  ""
        print  "/*"
        print  "**      term.h -- Definition of struct term"
@@ -163,7 +163,11 @@ $2 == "%%-STOP-HERE-%%" {
        print  "/* older synonyms for some capabilities */"
        print  "#define beehive_glitch  no_esc_ctlc"
        print  "#define teleray_glitch  dest_tabs_magic_smso"
+       print  ""
+       print  "/* HPUX-11 uses this name rather than the standard one */"
+       print  "#ifndef micro_char_size"
        print  "#define micro_char_size micro_col_size"
+       print  "#endif"
        print  ""
        print  "#ifdef __INTERNAL_CAPS_VISIBLE"
 }
index faca9ba26d14239ae19a8632214a63695d1a6ede..9d7d8e2c81d6751384e8d3b6ed14811f9cb6c225 100644 (file)
@@ -1,4 +1,4 @@
-# $Id: ncurses_defs,v 1.89 2019/03/30 21:31:18 tom Exp $
+# $Id: ncurses_defs,v 1.90 2019/04/13 22:52:57 tom Exp $
 ##############################################################################
 # Copyright (c) 2000-2018,2019 Free Software Foundation, Inc.                #
 #                                                                            #
@@ -54,6 +54,7 @@ HAVE_COLOR_CONTENT    1
 HAVE_COLOR_SET 1
 HAVE_COPYWIN   1
 HAVE_CURSCR    1
+HAVE_CURSES_DATA_TABSIZE       1
 HAVE_CURSES_DATA_TTYTYPE       1
 HAVE_DELSCREEN 1
 HAVE_DERWIN    1
index b20234ae47e108f4c8a5840147d125c87962ab15..c869f7245779ef0898a84d0e2386b51800ce2412 100644 (file)
@@ -26,7 +26,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_sp_funcs.3x,v 1.15 2019/03/24 01:45:40 tom Exp $
+.\" $Id: curs_sp_funcs.3x,v 1.16 2019/04/13 16:41:08 tom Exp $
 .TH curs_sp_funcs 3X ""
 .na
 .hy 0
@@ -36,6 +36,7 @@ curs_sp_funcs \- \fBcurses\fR screen-pointer extension
 .hy
 .SH SYNOPSIS
 \fB#include <curses.h>\fR
+\fB#include <term.h>\fR
 .nf
 .sp
 \fBint alloc_pair_sp(SCREEN*, int, int);\fR
index acad0fba2a6da68eb8c1232476e0de6a3f50454f..49e75478259795965f4b3f94b16e369bfefbedb4 100644 (file)
@@ -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            *
@@ -69,7 +69,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_vidattr.c,v 1.73 2018/03/03 22:08:12 tom Exp $")
+MODULE_ID("$Id: lib_vidattr.c,v 1.74 2019/04/13 22:40:54 tom Exp $")
 
 #define doPut(mode) \
        TPUTS_TRACE(#mode); \
@@ -315,7 +315,7 @@ NCURSES_SP_NAME(vidputs) (NCURSES_SP_DCLx
 #if USE_ITALIC
        TurnOn(A_ITALIC,        enter_italics_mode);
 #endif
-#if USE_WIDEC_SUPPORT
+#if USE_WIDEC_SUPPORT && defined(enter_horizontal_hl_mode)
        TurnOn(A_HORIZONTAL,    enter_horizontal_hl_mode);
        TurnOn(A_LEFT,          enter_left_hl_mode);
        TurnOn(A_LOW,           enter_low_hl_mode);
index d217fbcc028045f98bce2b197f5e3178c1a510f9..b0dfb6be9f82c1c3ca982596693dea6bf0214aa4 100644 (file)
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2002-2017,2018 Free Software Foundation, Inc.              *
+ * Copyright (c) 2002-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            *
@@ -36,7 +36,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_vid_attr.c,v 1.26 2018/03/03 22:03:18 tom Exp $")
+MODULE_ID("$Id: lib_vid_attr.c,v 1.27 2019/04/13 22:40:48 tom Exp $")
 
 #define doPut(mode) \
        TPUTS_TRACE(#mode); \
@@ -254,7 +254,7 @@ NCURSES_SP_NAME(vid_puts) (NCURSES_SP_DCLx
 #if USE_ITALIC
        TurnOn(A_ITALIC,        enter_italics_mode);
 #endif
-#if USE_WIDEC_SUPPORT
+#if USE_WIDEC_SUPPORT && defined(enter_horizontal_hl_mode)
        TurnOn(A_HORIZONTAL,    enter_horizontal_hl_mode);
        TurnOn(A_LEFT,          enter_left_hl_mode);
        TurnOn(A_LOW,           enter_low_hl_mode);
@@ -338,6 +338,7 @@ NCURSES_SP_NAME(term_attrs) (NCURSES_SP_DCL0)
     if (SP_PARM) {
        attrs = NCURSES_SP_NAME(termattrs) (NCURSES_SP_ARG);
 
+#if USE_WIDEC_SUPPORT && defined(enter_horizontal_hl_mode)
        /* these are only supported for wide-character mode */
        if (enter_horizontal_hl_mode)
            attrs |= WA_HORIZONTAL;
@@ -351,6 +352,7 @@ NCURSES_SP_NAME(term_attrs) (NCURSES_SP_DCL0)
            attrs |= WA_TOP;
        if (enter_vertical_hl_mode)
            attrs |= WA_VERTICAL;
+#endif
     }
 
     returnAttr(attrs);
index 6ab365bd42322a162dd7e7b2e50b87ab8a25f984..6c1b9b4c0499ca7954ae31b35e9f34c8ed00d856 100644 (file)
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190406) unstable; urgency=low
+ncurses6 (6.1+20190413) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 06 Apr 2019 06:42:54 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 13 Apr 2019 11:23:45 -0400
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
index 6ab365bd42322a162dd7e7b2e50b87ab8a25f984..6c1b9b4c0499ca7954ae31b35e9f34c8ed00d856 100644 (file)
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190406) unstable; urgency=low
+ncurses6 (6.1+20190413) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 06 Apr 2019 06:42:54 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 13 Apr 2019 11:23:45 -0400
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
index ce4e7470c00b727837149a3885554dc7fece2cfc..f35d521f6cc129f2affd85cc7df64563d989c759 100644 (file)
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190406) unstable; urgency=low
+ncurses6 (6.1+20190413) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 06 Apr 2019 06:42:54 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 13 Apr 2019 11:23:45 -0400
 
 ncurses6 (5.9-20120608) unstable; urgency=low
 
index d7b2a69755c261c5a88d5d0f9d652268934b295b..67c85bea0e2c4521006501fedc38c2ddc4eb8926 100644 (file)
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.323 2019/04/06 10:42:54 tom Exp $\r
+; $Id: mingw-ncurses.nsi,v 1.324 2019/04/13 15:23:45 tom Exp $\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_MMDD  "0406"\r
+!define VERSION_MMDD  "0413"\r
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}\r
 \r
 !define MY_ABI   "5"\r
index 941c67c9735656b39f167c1b3569017fd0dec903..c2d41c500c387b8fb6e73de2825a9f635809055b 100644 (file)
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.1
-Release: 20190406
+Release: 20190413
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
index c1259921e327d30262f8d66e5fd20109267b92ff..7e0c0bbef751bd1a99afa2005c445d6608d7615a 100644 (file)
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.1
-Release: 20190406
+Release: 20190413
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
index 1634b61dffd8aa8e7e5812d20b9be775bd301381..360834ee696f2f51020eb905e980673ca3216ea4 100644 (file)
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.1
-Release: 20190406
+Release: 20190413
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
index a606c5c44587d53e8f6f465098a4877693831c9c..943b9da322fd45dc46064eb44f68451f6bb6e590 100755 (executable)
 fi
 
 for cf_data in \
+TABSIZE \
 curscr \
 ospeed \
 boolnames \
 boolfnames \
 ttytype
 do
-echo "$as_me:19182: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:19183: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
 echo $ECHO_N "checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 19186 "configure"
+#line 19187 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -19211,16 +19212,16 @@ void *foo = &($cf_data)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19214: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19215: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19217: \$? = $ac_status" >&5
+  echo "$as_me:19218: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19220: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19221: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19223: \$? = $ac_status" >&5
+  echo "$as_me:19224: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 
@@ -19230,7 +19231,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:19233: result: $cf_result" >&5
+echo "$as_me:19234: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 if test $cf_result = yes ; then
@@ -19242,14 +19243,14 @@ cf_result=`echo "have_curses_data_$cf_data" | sed y%abcdefghijklmnopqrstuvwxyz./
 EOF
 
 else
-       echo "$as_me:19245: checking for data $cf_data in library" >&5
+       echo "$as_me:19246: checking for data $cf_data in library" >&5
 echo $ECHO_N "checking for data $cf_data in library... $ECHO_C" >&6
        # BSD linkers insist on making weak linkage, but resolve at runtime.
        if test "$cross_compiling" = yes; then
 
        # cross-compiling
        cat >conftest.$ac_ext <<_ACEOF
-#line 19252 "configure"
+#line 19253 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -19282,16 +19283,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19285: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19286: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19288: \$? = $ac_status" >&5
+  echo "$as_me:19289: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19291: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19292: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19294: \$? = $ac_status" >&5
+  echo "$as_me:19295: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -19303,7 +19304,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 19306 "configure"
+#line 19307 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -19329,15 +19330,15 @@ int main(void)
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:19332: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19333: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19335: \$? = $ac_status" >&5
+  echo "$as_me:19336: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:19337: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19338: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19340: \$? = $ac_status" >&5
+  echo "$as_me:19341: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 
@@ -19349,7 +19350,7 @@ cf_result=no
 fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
-       echo "$as_me:19352: result: $cf_result" >&5
+       echo "$as_me:19353: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
        if test $cf_result = yes ; then
 
@@ -19366,7 +19367,7 @@ done
 
 if ( test "$GCC" = yes || test "$GXX" = yes )
 then
-echo "$as_me:19369: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:19370: checking if you want to turn on gcc warnings" >&5
 echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6
 
 # Check whether --enable-warnings or --disable-warnings was given.
@@ -19383,7 +19384,7 @@ else
        with_warnings=no
 
 fi;
-echo "$as_me:19386: result: $with_warnings" >&5
+echo "$as_me:19387: result: $with_warnings" >&5
 echo "${ECHO_T}$with_warnings" >&6
 if test "$with_warnings" = "yes"
 then
@@ -19406,10 +19407,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-       { echo "$as_me:19409: checking for $CC __attribute__ directives..." >&5
+       { echo "$as_me:19410: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > conftest.$ac_ext <<EOF
-#line 19412 "${as_me:-configure}"
+#line 19413 "${as_me:-configure}"
 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"
@@ -19458,12 +19459,12 @@ EOF
                        ;;
                esac
 
-               if { (eval echo "$as_me:19461: \"$ac_compile\"") >&5
+               if { (eval echo "$as_me:19462: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19464: \$? = $ac_status" >&5
+  echo "$as_me:19465: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-                       test -n "$verbose" && echo "$as_me:19466: result: ... $cf_attribute" >&5
+                       test -n "$verbose" && echo "$as_me:19467: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
                        cat conftest.h >>confdefs.h
                        case $cf_attribute in
@@ -19527,12 +19528,12 @@ INTEL_COMPILER=no
 if test "$GCC" = yes ; then
        case $host_os in
        (linux*|gnu*)
-               echo "$as_me:19530: checking if this is really Intel C compiler" >&5
+               echo "$as_me:19531: checking if this is really Intel C compiler" >&5
 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
                cf_save_CFLAGS="$CFLAGS"
                CFLAGS="$CFLAGS -no-gcc"
                cat >conftest.$ac_ext <<_ACEOF
-#line 19535 "configure"
+#line 19536 "configure"
 #include "confdefs.h"
 
 int
@@ -19549,16 +19550,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19552: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19553: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19555: \$? = $ac_status" >&5
+  echo "$as_me:19556: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19558: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19559: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19561: \$? = $ac_status" >&5
+  echo "$as_me:19562: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -19569,7 +19570,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
                CFLAGS="$cf_save_CFLAGS"
-               echo "$as_me:19572: result: $INTEL_COMPILER" >&5
+               echo "$as_me:19573: result: $INTEL_COMPILER" >&5
 echo "${ECHO_T}$INTEL_COMPILER" >&6
                ;;
        esac
 CLANG_COMPILER=no
 
 if test "$GCC" = yes ; then
-       echo "$as_me:19581: checking if this is really Clang C compiler" >&5
+       echo "$as_me:19582: checking if this is really Clang C compiler" >&5
 echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6
        cf_save_CFLAGS="$CFLAGS"
        CFLAGS="$CFLAGS -Qunused-arguments"
        cat >conftest.$ac_ext <<_ACEOF
-#line 19586 "configure"
+#line 19587 "configure"
 #include "confdefs.h"
 
 int
@@ -19600,16 +19601,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19603: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19604: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19606: \$? = $ac_status" >&5
+  echo "$as_me:19607: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19609: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19610: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19612: \$? = $ac_status" >&5
+  echo "$as_me:19613: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   CLANG_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
@@ -19620,12 +19621,12 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
        CFLAGS="$cf_save_CFLAGS"
-       echo "$as_me:19623: result: $CLANG_COMPILER" >&5
+       echo "$as_me:19624: result: $CLANG_COMPILER" >&5
 echo "${ECHO_T}$CLANG_COMPILER" >&6
 fi
 
 cat > conftest.$ac_ext <<EOF
-#line 19628 "${as_me:-configure}"
+#line 19629 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 
@@ -19642,7 +19643,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-       { echo "$as_me:19645: checking for $CC warning options..." >&5
+       { echo "$as_me:19646: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CFLAGS="$CFLAGS"
        EXTRA_CFLAGS="-Wall"
@@ -19658,12 +19659,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
                wd981
        do
                CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-               if { (eval echo "$as_me:19661: \"$ac_compile\"") >&5
+               if { (eval echo "$as_me:19662: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19664: \$? = $ac_status" >&5
+  echo "$as_me:19665: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-                       test -n "$verbose" && echo "$as_me:19666: result: ... -$cf_opt" >&5
+                       test -n "$verbose" && echo "$as_me:19667: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
                        EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
                fi
@@ -19672,7 +19673,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 
 elif test "$GCC" = yes
 then
-       { echo "$as_me:19675: checking for $CC warning options..." >&5
+       { echo "$as_me:19676: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CFLAGS="$CFLAGS"
        EXTRA_CFLAGS=
@@ -19696,12 +19697,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
                Wundef $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas
        do
                CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-               if { (eval echo "$as_me:19699: \"$ac_compile\"") >&5
+               if { (eval echo "$as_me:19700: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19702: \$? = $ac_status" >&5
+  echo "$as_me:19703: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-                       test -n "$verbose" && echo "$as_me:19704: result: ... -$cf_opt" >&5
+                       test -n "$verbose" && echo "$as_me:19705: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
                        case $cf_opt in
                        (Wcast-qual)
@@ -19715,7 +19716,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
                                ([34].*)
                                        test -n "$verbose" && echo "    feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:19718: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:19719: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
                                        continue;;
                                esac
@@ -19725,7 +19726,7 @@ echo "${as_me:-configure}:19718: testing feature is broken in gcc $GCC_VERSION .
                                ([12].*)
                                        test -n "$verbose" && echo "    feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:19728: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:19729: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
                                        continue;;
                                esac
@@ -19741,7 +19742,7 @@ rm -rf conftest*
 fi
 fi
 
-echo "$as_me:19744: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:19745: checking if you want to use dmalloc for testing" >&5
 echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6
 
 # Check whether --with-dmalloc or --without-dmalloc was given.
@@ -19758,7 +19759,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:19761: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:19762: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case .$with_cflags in
 esac
 
 if test "$with_dmalloc" = yes ; then
-       echo "$as_me:19875: checking for dmalloc.h" >&5
+       echo "$as_me:19876: checking for dmalloc.h" >&5
 echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6
 if test "${ac_cv_header_dmalloc_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 19881 "configure"
+#line 19882 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:19885: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:19886: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:19891: \$? = $ac_status" >&5
+  echo "$as_me:19892: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -19907,11 +19908,11 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:19910: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:19911: result: $ac_cv_header_dmalloc_h" >&5
 echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6
 if test $ac_cv_header_dmalloc_h = yes; then
 
-echo "$as_me:19914: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:19915: checking for dmalloc_debug in -ldmalloc" >&5
 echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6
 if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19919,7 +19920,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 19922 "configure"
+#line 19923 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19938,16 +19939,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19941: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19942: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19944: \$? = $ac_status" >&5
+  echo "$as_me:19945: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19947: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19948: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19950: \$? = $ac_status" >&5
+  echo "$as_me:19951: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -19958,7 +19959,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19961: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:19962: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then
   cat >>confdefs.h <<EOF
@@ -19973,7 +19974,7 @@ fi
 
 fi
 
-echo "$as_me:19976: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:19977: checking if you want to use dbmalloc for testing" >&5
 echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6
 
 # Check whether --with-dbmalloc or --without-dbmalloc was given.
@@ -19990,7 +19991,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:19993: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:19994: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case .$with_cflags in
 esac
 
 if test "$with_dbmalloc" = yes ; then
-       echo "$as_me:20107: checking for dbmalloc.h" >&5
+       echo "$as_me:20108: checking for dbmalloc.h" >&5
 echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6
 if test "${ac_cv_header_dbmalloc_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 20113 "configure"
+#line 20114 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:20117: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:20118: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20123: \$? = $ac_status" >&5
+  echo "$as_me:20124: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20139,11 +20140,11 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:20142: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:20143: result: $ac_cv_header_dbmalloc_h" >&5
 echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6
 if test $ac_cv_header_dbmalloc_h = yes; then
 
-echo "$as_me:20146: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:20147: checking for debug_malloc in -ldbmalloc" >&5
 echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6
 if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20151,7 +20152,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 20154 "configure"
+#line 20155 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20170,16 +20171,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20173: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20174: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20176: \$? = $ac_status" >&5
+  echo "$as_me:20177: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20179: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20180: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20182: \$? = $ac_status" >&5
+  echo "$as_me:20183: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -20190,7 +20191,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20193: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:20194: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then
   cat >>confdefs.h <<EOF
@@ -20205,7 +20206,7 @@ fi
 
 fi
 
-echo "$as_me:20208: checking if you want to use valgrind for testing" >&5
+echo "$as_me:20209: checking if you want to use valgrind for testing" >&5
 echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
 
 # Check whether --with-valgrind or --without-valgrind was given.
@@ -20222,7 +20223,7 @@ EOF
 else
   with_valgrind=
 fi;
-echo "$as_me:20225: result: ${with_valgrind:-no}" >&5
+echo "$as_me:20226: result: ${with_valgrind:-no}" >&5
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 case .$with_cflags in
@@ -20335,7 +20336,7 @@ fi
        ;;
 esac
 
-echo "$as_me:20338: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:20339: checking if you want to perform memory-leak testing" >&5
 echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
 
 # Check whether --enable-leaks or --disable-leaks was given.
@@ -20345,7 +20346,7 @@ if test "${enable_leaks+set}" = set; then
 else
   : ${with_no_leaks:=no}
 fi;
-echo "$as_me:20348: result: $with_no_leaks" >&5
+echo "$as_me:20349: result: $with_no_leaks" >&5
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$with_no_leaks" = yes ; then
@@ -20363,7 +20364,7 @@ fi
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
-       echo "$as_me:20366: checking for an rpath option" >&5
+       echo "$as_me:20367: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
        case $cf_cv_system_name in
        (irix*)
@@ -20394,12 +20395,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
        (*)
                ;;
        esac
-       echo "$as_me:20397: result: $LD_RPATH_OPT" >&5
+       echo "$as_me:20398: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
        case "x$LD_RPATH_OPT" in
        (x-R*)
-               echo "$as_me:20402: checking if we need a space after rpath option" >&5
+               echo "$as_me:20403: checking if we need a space after rpath option" >&5
 echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
                cf_save_LIBS="$LIBS"
 
@@ -20420,7 +20421,7 @@ done
 LIBS="$cf_add_libs"
 
                cat >conftest.$ac_ext <<_ACEOF
-#line 20423 "configure"
+#line 20424 "configure"
 #include "confdefs.h"
 
 int
@@ -20432,16 +20433,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20435: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20436: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20438: \$? = $ac_status" >&5
+  echo "$as_me:20439: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20441: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20442: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20444: \$? = $ac_status" >&5
+  echo "$as_me:20445: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_rpath_space=no
 else
@@ -20451,14 +20452,14 @@ cf_rpath_space=yes
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
                LIBS="$cf_save_LIBS"
-               echo "$as_me:20454: result: $cf_rpath_space" >&5
+               echo "$as_me:20455: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
                test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
                ;;
        esac
 fi
 
-echo "$as_me:20461: checking if rpath-hack should be disabled" >&5
+echo "$as_me:20462: checking if rpath-hack should be disabled" >&5
 echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6
 
 # Check whether --enable-rpath-hack or --disable-rpath-hack was given.
@@ -20475,21 +20476,21 @@ else
        cf_disable_rpath_hack=no
 
 fi;
-echo "$as_me:20478: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:20479: result: $cf_disable_rpath_hack" >&5
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 if test "$cf_disable_rpath_hack" = no ; then
 
-echo "$as_me:20482: checking for updated LDFLAGS" >&5
+echo "$as_me:20483: checking for updated LDFLAGS" >&5
 echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
 if test -n "$LD_RPATH_OPT" ; then
-       echo "$as_me:20485: result: maybe" >&5
+       echo "$as_me:20486: result: maybe" >&5
 echo "${ECHO_T}maybe" >&6
 
        for ac_prog in ldd
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:20492: checking for $ac_word" >&5
+echo "$as_me:20493: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20504,7 +20505,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_cf_ldd_prog="$ac_prog"
-echo "$as_me:20507: found $ac_dir/$ac_word" >&5
+echo "$as_me:20508: found $ac_dir/$ac_word" >&5
 break
 done
 
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:20515: result: $cf_ldd_prog" >&5
+  echo "$as_me:20516: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:20518: result: no" >&5
+  echo "$as_me:20519: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -20529,7 +20530,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
                cf_rpath_oops=
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 20532 "configure"
+#line 20533 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -20541,16 +20542,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20544: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20545: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20547: \$? = $ac_status" >&5
+  echo "$as_me:20548: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20550: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20551: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20553: \$? = $ac_status" >&5
+  echo "$as_me:20554: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
                 cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[      ]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
@@ -20578,7 +20579,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
                                        then
                                                test -n "$verbose" && echo "    ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
 
-echo "${as_me:-configure}:20581: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:20582: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
                                                LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
                                                break
@@ -20590,11 +20591,11 @@ echo "${as_me:-configure}:20581: testing ...adding -L$cf_rpath_dir/lib to LDFLAG
 
        test -n "$verbose" && echo "    ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:20593: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:20594: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "   ...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:20597: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:20598: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -20631,7 +20632,7 @@ do
                        then
                                test -n "$verbose" && echo "    ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:20634: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:20635: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
                                EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
                        fi
@@ -20644,11 +20645,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "   ...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:20647: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:20648: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "   ...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:20651: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:20652: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -20685,7 +20686,7 @@ do
                        then
                                test -n "$verbose" && echo "    ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:20688: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:20689: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
                                EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
                        fi
@@ -20698,14 +20699,14 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "   ...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:20701: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:20702: testing ...checked LIBS $LIBS ..." 1>&5
 
        test -n "$verbose" && echo "    ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:20705: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:20706: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 else
-       echo "$as_me:20708: result: no" >&5
+       echo "$as_me:20709: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -20795,7 +20796,7 @@ DEFS=-DHAVE_CONFIG_H
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:20798: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:20799: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -20971,7 +20972,7 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:20974: error: ambiguous option: $1
+    { { echo "$as_me:20975: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -20990,7 +20991,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:20993: error: unrecognized option: $1
+  -*) { { echo "$as_me:20994: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -21040,7 +21041,7 @@ do
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
   "ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS ncurses_cfg.h:ncurses_tst.hin" ;;
-  *) { { echo "$as_me:21043: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:21044: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -21336,7 +21337,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:21339: creating $ac_file" >&5
+    { echo "$as_me:21340: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -21354,7 +21355,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:21357: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:21358: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -21367,7 +21368,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:21370: error: cannot find input file: $f" >&5
+           { { echo "$as_me:21371: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -21383,7 +21384,7 @@ cat >>$CONFIG_STATUS <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' $ac_item`
         if test -z "$ac_used"; then
-          { echo "$as_me:21386: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:21387: WARNING: datarootdir was used implicitly but not set:
 $ac_seen" >&5
 echo "$as_me: WARNING: datarootdir was used implicitly but not set:
 $ac_seen" >&2;}
@@ -21392,7 +21393,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' $ac_item`
       if test -n "$ac_seen"; then
-        { echo "$as_me:21395: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:21396: WARNING: datarootdir was used explicitly but not set:
 $ac_seen" >&5
 echo "$as_me: WARNING: datarootdir was used explicitly but not set:
 $ac_seen" >&2;}
@@ -21429,7 +21430,7 @@ s,@INSTALL@,$ac_INSTALL,;t t
             ac_init=`egrep '[  ]*'$ac_name'[   ]*=' $ac_file`
             if test -z "$ac_init"; then
               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
-              { echo "$as_me:21432: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:21433: WARNING: Variable $ac_name is used but was not set:
 $ac_seen" >&5
 echo "$as_me: WARNING: Variable $ac_name is used but was not set:
 $ac_seen" >&2;}
@@ -21440,7 +21441,7 @@ $ac_seen" >&2;}
     egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
     if test -s $tmp/out; then
       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
-      { echo "$as_me:21443: WARNING: Some variables may not be substituted:
+      { echo "$as_me:21444: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -21489,7 +21490,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:21492: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:21493: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -21500,7 +21501,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:21503: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:21504: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -21513,7 +21514,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:21516: error: cannot find input file: $f" >&5
+           { { echo "$as_me:21517: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -21571,7 +21572,7 @@ cat >>$CONFIG_STATUS <<\EOF
   rm -f $tmp/in
   if test x"$ac_file" != x-; then
     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
-      { echo "$as_me:21574: $ac_file is unchanged" >&5
+      { echo "$as_me:21575: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
index 10e175b039714f14a45a9b0d5f2dcbd31d4f956c..daba64a209b30f793b8afc51087d9fed0ed1f589 100644 (file)
@@ -28,7 +28,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1996-on
 dnl
-dnl $Id: configure.in,v 1.153 2019/03/30 20:17:23 tom Exp $
+dnl $Id: configure.in,v 1.154 2019/04/13 22:51:52 tom Exp $
 dnl This is a simple configuration-script for the ncurses test programs that
 dnl allows the test-directory to be separately configured against a reference
 dnl system (i.e., sysvr4 curses)
@@ -469,6 +469,7 @@ if test "$cf_enable_widec" = yes; then
 fi
 
 CF_CURSES_CHECK_DATA(\
+TABSIZE \
 curscr \
 ospeed \
 boolnames \
index 50ec1996411333446071686fe6562c69ea1776ef..5f6f341c1764e847c705256f0aa9115f86172598 100644 (file)
@@ -29,7 +29,7 @@
 /****************************************************************************
  *  Author: Thomas E. Dickey                    1996-on                     *
  ****************************************************************************/
-/* $Id: test.priv.h,v 1.180 2019/03/30 20:19:38 tom Exp $ */
+/* $Id: test.priv.h,v 1.181 2019/04/13 22:54:18 tom Exp $ */
 
 #ifndef __TEST_PRIV_H
 #define __TEST_PRIV_H 1
@@ -473,8 +473,16 @@ extern int optind;
 #define slk_clear()            /* nothing */
 #endif
 
+#ifndef HAVE_CURSES_DATA_TABSIZE
+#define HAVE_CURSES_DATA_TABSIZE 0
+#endif
+
 #if !NCURSES_EXT_FUNCS
+#if HAVE_CURSES_DATA_TABSIZE
 #define set_tabsize(n) TABSIZE = (n)
+#else
+#define set_tabsize(n)         /* nothing */
+#endif
 #endif
 
 #if HAVE_TPUTS_SP