ncurses 5.6 - patch 20081012

+ add teraterm4.59 terminfo entry, use that as primary teraterm entry, rename
  original to teraterm2.3 -TD
+ update "gnome" terminfo to 2.22.3 -TD
+ update "konsole" terminfo to 1.6.6, needs today's fix for tic -TD
+ add "aterm" terminfo -TD
+ add "linux2.6.26" terminfo -TD
+ add logic to tic for cancelling strings in user-defined capabilities,
  overlooked til now.

diff --git a/NEWS b/NEWS
index 00018ad2ed3743df669d9138aa3b70d593244d42..e56ec9358a92d51148a18db17755d69e35afdd5c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -25,7 +25,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------

--- $Id: NEWS,v 1.1309 2008/10/11 21:42:24 tom Exp $
+-- $Id: NEWS,v 1.1311 2008/10/12 23:06:21 tom Exp $

 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started


@@ -45,6 +45,16 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 

+20081012
+       + add teraterm4.59 terminfo entry, use that as primary teraterm entry, rename
+         original to teraterm2.3 -TD
+       + update "gnome" terminfo to 2.22.3 -TD
+       + update "konsole" terminfo to 1.6.6, needs today's fix for tic -TD
+       + add "aterm" terminfo -TD
+       + add "linux2.6.26" terminfo -TD
+       + add logic to tic for cancelling strings in user-defined capabilities,
+         overlooked til now.
+

 20081011
        + update html documentation.
        + add -m and -s options to test/keynames.c and test/key_names.c to test
 20081011
        + update html documentation.
        + add -m and -s options to test/keynames.c and test/key_names.c to test

diff --git a/dist.mk b/dist.mk
index 99baced977a2ddf53a1e7fb88b3a4cb508589b99..b79718eb9dbc3f309b2896b14421167c010893e2 100644 (file)
--- a/dist.mk
+++ b/dist.mk
@@ -25,7 +25,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################

-# $Id: dist.mk,v 1.666 2008/10/11 21:40:41 tom Exp $
+# $Id: dist.mk,v 1.667 2008/10/12 15:47:49 tom Exp $

 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but


@@ -37,7 +37,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 5
 NCURSES_MINOR = 6
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 5
 NCURSES_MINOR = 6

-NCURSES_PATCH = 20081011
+NCURSES_PATCH = 20081012

 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)

diff --git a/misc/terminfo.src b/misc/terminfo.src
index 3fb772e5604773a17d87f1c1f9f4b1a1ef4511c7..92a8d69c3fa58e503e7c434c6e8ae2c64e195a59 100644 (file)
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
@@ -6,8 +6,8 @@
 # Report bugs and new terminal descriptions to
 #      bug-ncurses@gnu.org
 #
 # Report bugs and new terminal descriptions to
 #      bug-ncurses@gnu.org
 #

-#      $Revision: 1.332 $
-#      $Date: 2008/08/23 17:03:36 $
+#      $Revision: 1.341 $
+#      $Date: 2008/10/12 23:03:54 $

 #
 # The original header is preserved below for reference.  It is noted that there
 # is a "newer" version which differs in some cosmetic details (but actually
 #
 # The original header is preserved below for reference.  It is noted that there
 # is a "newer" version which differs in some cosmetic details (but actually


@@ -761,6 +761,15 @@ linux|linux console,
        civis=\E[?25l\E[?1c, cnorm=\E[?25h\E[?0c,
        cvvis=\E[?25h\E[?8c, use=linux-c-nc,
 
        civis=\E[?25l\E[?1c, cnorm=\E[?25h\E[?0c,
        cvvis=\E[?25h\E[?8c, use=linux-c-nc,
 

+# Subject: linux 2.6.26 vt back_color_erase
+# Changes to the Linux console driver broke bce model as reported in
+#      https://bugzilla.novell.com/show_bug.cgi?id=418613
+# apparently from
+#      http://lkml.org/lkml/2008/4/26/305
+#      http://groups.google.com/group/fa.linux.kernel/browse_thread/thread/87f98338f0d636bb/aa96e8b86cee0d1e?lnk=st&q=#aa96e8b86cee0d1e
+linux2.6.26|linux console w/o bce,
+       bce@, use=linux,
+

 # See the note on ICH/ICH1 VERSUS RMIR/SMIR near the end of file
 linux-nic|linux with ich/ich1 suppressed for non-curses programs,
        ich@, ich1@, use=linux,
 # See the note on ICH/ICH1 VERSUS RMIR/SMIR near the end of file
 linux-nic|linux with ich/ich1 suppressed for non-curses programs,
        ich@, ich1@, use=linux,


@@ -2751,7 +2760,7 @@ putty-vt100|VT100+ keyboard layout,
 # retrieving the window title, and for setting the window size (i.e., using
 # "resize -s"), though it does not pass SIGWINCH to the application if the
 # user resizes the window with the mouse.
 # retrieving the window title, and for setting the window size (i.e., using
 # "resize -s"), though it does not pass SIGWINCH to the application if the
 # user resizes the window with the mouse.

-teraterm|Tera Term Pro,
+teraterm2.3|Tera Term Pro,

        km, xon@,
        ncv#43, vt@,
        acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260i\316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330}\234~\376,
        km, xon@,
        ncv#43, vt@,
        acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260i\316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330}\234~\376,


@@ -2771,6 +2780,28 @@ teraterm|Tera Term Pro,
        smul=\E[4m, vpa=\E[%i%p1%dd, use=vt100+enq,
        use=klone+color, use=vt100,
 
        smul=\E[4m, vpa=\E[%i%p1%dd, use=vt100+enq,
        use=klone+color, use=vt100,
 

+# Version 4.59 has regular vt100 line-drawing (so it is no longer necessary
+# to choose a Windows OEM font).
+#
+# Testing with tack:
+#      - it does not have xenl (suppress that)
+#      - underline seems to work with color (modify ncv).
+# Testing with vttest:
+#      - wrapping differs from vt100 (menu 1).
+#      - it recognizes xterm's X10 and normal mouse tracking, but none of the
+#        other flavors.
+#      - it recognizes the dtterm window controls for reporting size in
+#        characters and pixels.
+#      - it passes SIGWINCH.
+teraterm4.59|Tera Term Pro,
+       bce, xenl@,
+       ncv#41,
+       acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+       kmous=\E[M, use=teraterm2.3,
+
+teraterm|Tera Term,
+       use=teraterm4.59,
+

 # Tested with WinNT 4.0, the telnet application assumes the screensize is
 # 25x80.  This entry uses the 'Terminal' font, to get line-drawing characters.
 #
 # Tested with WinNT 4.0, the telnet application assumes the screensize is
 # 25x80.  This entry uses the 'Terminal' font, to get line-drawing characters.
 #


@@ -3546,8 +3577,43 @@ gnome-fc5|GNOME Terminal,
 gnome-2007|GNOME Terminal snapshot 2.18.1,
        use=xterm+pcc2, use=gnome-fc5,
 
 gnome-2007|GNOME Terminal snapshot 2.18.1,
        use=xterm+pcc2, use=gnome-fc5,
 

+# GNOME Terminal 2.22.3 (2008 snapshot)
+#
+# In vttest, it claims to be a vt220 with national replacement character-sets,
+# but aside from the identifier string, implements only a small fraction of
+# vt220's behavior, which will make it less usable on a VMS system (unclear
+# what the intent of the developer is, since the NRC feature exposed in vttest
+# by this change does not work).
+gnome-2008|GNOME Terminal snapshot 2.22.3,
+       use=gnome+pcfkeys, use=gnome-2007,
+
+# GNOME terminal may automatically use the contents of the "xterm" terminfo to
+# supply key information which is not built into the program.  With 2.22.3,
+# this list is built into the program (which addresses the inadvertant use of
+# random terminfo data, though using a set of values which does not correspond
+# to any that xterm produces - still not solving the problem that GNOME
+# terminal hardcodes the $TERM variable as "xterm").
+#
+#      terminfo        modifier        code    keys
+#      kf13-kf24       shift           2       F1 to F12
+#      kf25-kf36       control         5       F1 to F12
+#      kf37-kf48       shift/control   6       F1 to F12
+#      kf49-kf60       alt             3       F1 to F12
+#      kf61-kf63       shift-alt       4       F1 to F3
+#
+# The parameters with \EO (SS3) are technically an error, since SS3 should have
+# no parameters.  This appears to be rote copying based on xterm+pcc0.
+gnome+pcfkeys|gnome variation on xterm+pcfkeys,
+       kf1=\EOP, kf13=\EO1;2P, kf14=\EO1;2Q, kf15=\EO1;2R,
+       kf16=\EO1;2S, kf2=\EOQ, kf25=\EO1;5P, kf26=\EO1;5Q,
+       kf27=\EO1;5R, kf28=\EO1;5S, kf3=\EOR, kf37=\EO1;6P,
+       kf38=\EO1;6Q, kf39=\EO1;6R, kf4=\EOS, kf40=\EO1;6S,
+       kf49=\EO1;3P, kf50=\EO1;3Q, kf51=\EO1;3R, kf52=\EO1;3S,
+       kf61=\EO1;4P, kf62=\EO1;4Q, kf63=\EO1;4R,
+       use=xterm+pcfkeys,
+

 gnome|GNOME Terminal,
 gnome|GNOME Terminal,

-       use=gnome-2007,
+       use=gnome-2008,

 
 # palette is hardcoded...
 gnome-256color|GNOME Terminal with xterm 256-colors,
 
 # palette is hardcoded...
 gnome-256color|GNOME Terminal with xterm 256-colors,


@@ -3605,6 +3671,13 @@ kvt|KDE terminal,
 #
 # Updated for konsole 1.6.4:
 #    add konsole-solaris
 #
 # Updated for konsole 1.6.4:
 #    add konsole-solaris

+#
+# Updated for konsole 1.6.6:
+#    add control-key modifiers for function-keys, etc.
+#
+# vttest menu 1 shows that both konsole and gnome terminal do wrapping
+# different from xterm (and vt100's).  They have the same behavior in this
+# detail, but it is unclear which copies the other.

 konsole-base|KDE console window,
        bce, km@, npc,
        bel@, blink=\E[5m, civis=\E[?25l, cnorm=\E[?25h,
 konsole-base|KDE console window,
        bce, km@, npc,
        bel@, blink=\E[5m, civis=\E[?25l, cnorm=\E[?25h,


@@ -3633,11 +3706,12 @@ konsole-xf3x|KDE console window with keyboard for XFree86 3.x xterm,
 # The value for kbs reflects local customization rather than the settings used
 # for XFree86 xterm.
 konsole-xf4x|KDE console window with keyboard for XFree86 4.x xterm,
 # The value for kbs reflects local customization rather than the settings used
 # for XFree86 xterm.
 konsole-xf4x|KDE console window with keyboard for XFree86 4.x xterm,

-       kend=\EOF, kf1=\EOP, kf13=\EO2P, kf14=\EO2Q, kf15=\EO2R,
-       kf16=\EO2S, kf17=\E[15;2~, kf18=\E[17;2~, kf19=\E[18;2~,
-       kf2=\EOQ, kf20=\E[19;2~, kf21=\E[20;2~, kf22=\E[21;2~,
-       kf23=\E[23;2~, kf24=\E[24;2~, kf3=\EOR, kf4=\EOS,
-       khome=\EOH, use=konsole-vt100,
+       kend=\EOF, khome=\EOH, use=konsole+pcfkeys,
+       use=konsole-vt100,
+# Konsole does not implement shifted cursor-keys.
+konsole+pcfkeys|konsole subset of xterm+pcfkeys,
+       kLFT@, kRIT@, kcbt=\E[Z, kind@, kri@, kDN@, kUP@, use=xterm+pcc2,
+       use=xterm+pcf0,

 # KDE's "vt100" keyboard has no relationship to any terminal that DEC made, but
 # it is still useful for deriving the other entries.
 konsole-vt100|KDE console window with vt100 (sic) keyboard,
 # KDE's "vt100" keyboard has no relationship to any terminal that DEC made, but
 # it is still useful for deriving the other entries.
 konsole-vt100|KDE console window with vt100 (sic) keyboard,


@@ -3943,6 +4017,10 @@ Eterm-256color|Eterm with xterm 256-colors,
 Eterm-88color|Eterm with 88 colors,
        use=xterm+88color, use=Eterm,
 
 Eterm-88color|Eterm with 88 colors,
        use=xterm+88color, use=Eterm,
 

+# Based on rxvt 2.4.8, it has a few differences in key bindings
+aterm|AfterStep terminal,
+       kbs=\177, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, use=rxvt,
+

 # xiterm  0.5-5.2
 # This is not based on xterm's source...
 # vttest shows several problems with keyboard, cursor-movements.
 # xiterm  0.5-5.2
 # This is not based on xterm's source...
 # vttest shows several problems with keyboard, cursor-movements.


@@ -21705,6 +21783,14 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 #      * add Eterm-256color, Eterm-88color -TD
 #      * add rxvt-88color -TD
 #
 #      * add Eterm-256color, Eterm-88color -TD
 #      * add rxvt-88color -TD
 #

+# 2008-10-12
+#      * add teraterm4.59 entry, use that as primary teraterm entry, rename
+#        original to teraterm2.3 -TD
+#      * update "gnome" to 2.22.3 -TD
+#      * update "konsole" to 1.6.6 -TD
+#      * add "aterm" -TD
+#      * add "linux2.6.26" -TD
+#

 # The following sets edit modes for GNU EMACS.
 # Local Variables:
 # fill-prefix:"\t"
 # The following sets edit modes for GNU EMACS.
 # Local Variables:
 # fill-prefix:"\t"

diff --git a/ncurses/tinfo/alloc_ttype.c b/ncurses/tinfo/alloc_ttype.c
index 9f31ed3ffab75b6712727847b9058534df257c84..b2b06d1b79ce7a347860dc6c93bb1121c73b103e 100644 (file)
--- a/ncurses/tinfo/alloc_ttype.c
+++ b/ncurses/tinfo/alloc_ttype.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1999-2003,2006 Free Software Foundation, Inc.              *
+ * Copyright (c) 1999-2006,2008 Free Software Foundation, Inc.              *

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


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

-MODULE_ID("$Id: alloc_ttype.c,v 1.16 2006/07/08 19:18:38 tom Exp $")
+MODULE_ID("$Id: alloc_ttype.c,v 1.17 2008/10/12 16:12:00 tom Exp $")

 
 #if NCURSES_XNAMES
 /*
 
 #if NCURSES_XNAMES
 /*


@@ -365,6 +365,17 @@ adjust_cancels(TERMTYPE *to, TERMTYPE *from)
                } else {
                    j++;
                }
                } else {
                    j++;
                }

+           } else if ((k = _nc_find_ext_name(from, to->ext_Names[j],
+                                             STRING)) >= 0) {
+               if (_nc_del_ext_name(to, name, NUMBER)
+                   || _nc_del_ext_name(to, name, BOOLEAN)) {
+                   k = _nc_ins_ext_name(to, name, STRING);
+                   to->Strings[k] = CANCELLED_STRING;
+               } else {
+                   j++;
+               }
+           } else {
+               j++;

            }
        } else {
            j++;
            }
        } else {
            j++;