aboutsummaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorRong-En Fan <rafan@FreeBSD.org>2008-11-09 14:08:54 +0000
committerRong-En Fan <rafan@FreeBSD.org>2008-11-09 14:08:54 +0000
commit6181f4622a00a9de81df01cecb5fa73ffdb697bc (patch)
treec963ba08ac935d7f048b78517309fe6fc2f496e6 /misc
parentc0e48ca1322e978a8f9795a5ddb251df2479f930 (diff)
downloadsrc-6181f4622a00a9de81df01cecb5fa73ffdb697bc.tar.gz
src-6181f4622a00a9de81df01cecb5fa73ffdb697bc.zip
- Import ncurses 5.7-20081102 (5.7 release) onto vendor branchvendor/ncurses/5.7-20081102
Notes
Notes: svn path=/vendor/ncurses/dist/; revision=184798 svn path=/vendor/ncurses/5.7-20081102/; revision=184799; tag=vendor/ncurses/5.7-20081102
Diffstat (limited to 'misc')
-rwxr-xr-xmisc/ncu-indent6
-rw-r--r--misc/ncurses.supp205
-rw-r--r--misc/terminfo.src150
3 files changed, 340 insertions, 21 deletions
diff --git a/misc/ncu-indent b/misc/ncu-indent
index 1e1c7fffaeb2..862a108a3b31 100755
--- a/misc/ncu-indent
+++ b/misc/ncu-indent
@@ -1,6 +1,6 @@
#!/bin/sh
#****************************************************************************
-#* Copyright (c) 2001-2005,2006 Thomas E. Dickey *
+#* Copyright (c) 2001-2006,2008 Thomas E. Dickey *
#* *
#* Permission is hereby granted, free of charge, to any person obtaining a *
#* copy of this software and associated documentation files (the *
@@ -26,7 +26,7 @@
#* sale, use or other dealings in this Software without prior written *
#* authorization. *
#****************************************************************************/
-# $Id: ncu-indent,v 1.16 2006/02/18 17:02:22 tom Exp $
+# $Id: ncu-indent,v 1.17 2008/08/03 15:46:44 tom Exp $
NOOP=no
OPTS='
--blank-lines-after-procedures
@@ -87,6 +87,7 @@ do
rm -f "$save" "$test"
mv "$name" "$save"
sed \
+ -e '/EMPTY_MODULE(/s/)$/);/' \
-e '/MODULE_ID(/s/)$/);/' \
-e 's,\<GCC_NORETURN;,;//GCC_NORETURN;,' \
-e 's,\<GCC_PRINTFLIKE(,;//GCC_PRINTFLIKE(,' \
@@ -98,6 +99,7 @@ do
# ${INDENT_PROG-indent} --version
${INDENT_PROG-indent} -npro $OPTS "$name"
sed \
+ -e '/EMPTY_MODULE(/s/);$/)/' \
-e '/MODULE_ID(/s/);$/)/' \
-e 's,;[ ]*//GCC_NORETURN;, GCC_NORETURN;,' \
-e 's,;[ ]*//GCC_PRINTFLIKE(, GCC_PRINTFLIKE(,' \
diff --git a/misc/ncurses.supp b/misc/ncurses.supp
new file mode 100644
index 000000000000..bca582c0540f
--- /dev/null
+++ b/misc/ncurses.supp
@@ -0,0 +1,205 @@
+# $Id: ncurses.supp,v 1.7 2008/09/20 18:43:42 tom Exp $
+##############################################################################
+# Copyright (c) 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 "Software"), #
+# to deal in the Software without restriction, including without limitation #
+# the rights to use, copy, modify, merge, publish, distribute, distribute #
+# with modifications, sublicense, and/or sell copies of the Software, and to #
+# permit persons to whom the Software is furnished to do so, subject to the #
+# following conditions: #
+# #
+# The above copyright notice and this permission notice shall be included in #
+# all copies or substantial portions of the Software. #
+# #
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR #
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, #
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL #
+# THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER #
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING #
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER #
+# DEALINGS IN THE SOFTWARE. #
+# #
+# Except as contained in this notice, the name(s) of the above copyright #
+# holders shall not be used in advertising or otherwise to promote the sale, #
+# use or other dealings in this Software without prior written #
+# authorization. #
+##############################################################################
+#
+# This is a warning-suppression file for valgrind and ncurses.
+#
+# ncurses can also be configured using the --disable-leaks option, which
+# allows an application to call _nc_freeall() or _nc_free_and_exit(), to
+# free all of ncurses' "permanent" memory.
+#
+# Some of these leaks can be freed if the application does its own cleanup,
+# for example:
+# delscreen(SP);
+# del_curterm(cur_term);
+# However, few applications do this.
+
+{
+ ncurses_leak__nc_add_to_try
+ Memcheck:Leak
+ fun:*alloc
+ fun:_nc_add_to_try
+}
+
+{
+ ncurses_leak__nc_home_terminfo
+ Memcheck:Leak
+ fun:malloc
+ fun:_nc_home_terminfo
+}
+
+{
+ ncurses_leak__nc_init_wacs
+ Memcheck:Leak
+ fun:calloc
+ fun:_nc_init_wacs
+}
+
+{
+ ncurses_leak__nc_keyname
+ Memcheck:Leak
+ fun:calloc
+ fun:_nc_keyname
+}
+
+{
+ ncurses_leak__nc_keyname_2
+ Memcheck:Leak
+ fun:malloc
+ fun:strdup
+ fun:_nc_keyname
+}
+
+{
+ ncurses_leak__nc_printf_string
+ Memcheck:Leak
+ fun:malloc
+ fun:_nc_doalloc
+ fun:_nc_printf_string
+}
+
+{
+ ncurses_leak__nc_read_termtype
+ Memcheck:Leak
+ fun:*alloc
+ fun:_nc_read_termtype
+ fun:_nc_read_file_entry
+}
+
+{
+ ncurses_leak__nc_read_termtype_2
+ Memcheck:Leak
+ fun:*alloc
+ fun:_nc_doalloc
+ fun:_nc_read_termtype
+ fun:_nc_read_file_entry
+}
+
+{
+ ncurses_leak__nc_scroll_optimize
+ Memcheck:Leak
+ fun:*alloc
+ fun:_nc_hash_map
+ fun:_nc_scroll_optimize
+}
+
+{
+ ncurses_leak__nc_scroll_optimize_2
+ Memcheck:Leak
+ fun:*alloc
+ fun:_nc_doalloc
+ fun:_nc_scroll_optimize
+}
+
+{
+ ncurses_leak__nc_setupscreen
+ Memcheck:Leak
+ fun:calloc
+ fun:_nc_setupscreen
+ fun:newterm
+}
+
+{
+ ncurses_leak__nc_setupscreen_2
+ Memcheck:Leak
+ fun:calloc
+ fun:newwin
+ fun:_nc_setupscreen
+}
+
+{
+ ncurses_leak__nc_setupterm_1
+ Memcheck:Leak
+ fun:malloc
+ fun:strdup
+ fun:_nc_setupterm
+}
+
+{
+ ncurses_leak__nc_setupterm
+ Memcheck:Leak
+ fun:calloc
+ fun:_nc_setupterm
+}
+
+{
+ ncurses_leak__nc_setupscreen_3
+ Memcheck:Leak
+ fun:calloc
+ fun:_nc_makenew
+ fun:newwin
+ fun:_nc_setupscreen
+}
+
+{
+ ncurses_leak__nc_set_buffer
+ Memcheck:Leak
+ fun:malloc
+ fun:_nc_set_buffer
+}
+
+{
+ ncurses_leak__nc_tparm_analyze
+ Memcheck:Leak
+ fun:*alloc
+ fun:_nc_doalloc
+ fun:_nc_tparm_analyze
+}
+
+{
+ ncurses_leak__nc_trace_alloc
+ Memcheck:Leak
+ fun:*alloc
+ fun:_nc_doalloc
+ fun:_nc_trace_alloc
+}
+
+{
+ ncurses_leak_start_color
+ Memcheck:Leak
+ fun:calloc
+ fun:start_color
+}
+
+{
+ ncurses_leak_tparm
+ Memcheck:Leak
+ fun:realloc
+ fun:_nc_doalloc
+ fun:tparm
+}
+
+{
+ ncurses_leak_tparam_internal
+ Memcheck:Leak
+ fun:realloc
+ fun:_nc_doalloc
+ fun:get_space
+ fun:save_number
+ fun:tparam_internal
+}
diff --git a/misc/terminfo.src b/misc/terminfo.src
index 8627cece61c9..92a8d69c3fa5 100644
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
@@ -6,8 +6,8 @@
# Report bugs and new terminal descriptions to
# bug-ncurses@gnu.org
#
-# $Revision: 1.328 $
-# $Date: 2008/04/29 00:49:41 $
+# $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
@@ -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,
+# 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,
@@ -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.
-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,
@@ -2771,6 +2780,28 @@ teraterm|Tera Term Pro,
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.
#
@@ -3251,6 +3282,10 @@ xterm+256color|xterm 256-color feature,
# which support the xterm+256color feature support the associated initc
# capability. So it is cancelled in the entries which use this and/or the
# xterm+256color block.
+#
+# The default color palette for the 256- and 88-colors are different. A
+# given executable will have one palette (perhaps compiled-in). If the program
+# supports xterm's control sequence, it can be programmed using initc.
xterm+88color|xterm 88-color feature,
colors#88, pairs#7744, use=xterm+256color,
@@ -3542,8 +3577,43 @@ gnome-fc5|GNOME Terminal,
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,
- use=gnome-2007,
+ use=gnome-2008,
# palette is hardcoded...
gnome-256color|GNOME Terminal with xterm 256-colors,
@@ -3601,6 +3671,13 @@ kvt|KDE terminal,
#
# 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,
@@ -3629,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,
- 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,
@@ -3671,7 +3749,7 @@ konsole-256color|KDE console window with xterm 256-colors,
# control kf1 to kf12 \E[11;5~ to \E[24;5~ (maybe)
# control/shift kf1 to kf12 \E[11;6~ to \E[24;6~
# control/alt kf1 to kf12 \E[11;7~ to \E[24;7~
-# control/shit/alt kf1 to kf12 \E[11;8~ to \E[24;8~
+# control/shift/alt kf1 to kf12 \E[11;8~ to \E[24;8~
#
mlterm|multi lingual terminal emulator,
am, eslok, km, mc5i, mir, msgr, npc, xenl,
@@ -3687,10 +3765,11 @@ mlterm|multi lingual terminal emulator,
home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@,
ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=^J, indn=\E[%p1%dS,
is2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>,
- kbs=\177, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
- kdch1=\E[3~, kend=\EOF, kent=\EOM, kfnd=\E[1~, khome=\EOH,
- kich1=\E[2~, kmous=\E[M, knp=\E[6~, kpp=\E[5~, kslt=\E[4~,
- mc0=\E[i, nel=\EE, op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM,
+ kbs=\177, kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC,
+ kcuu1=\EOA, kdch1=\E[3~, kend=\EOF, kent=\EOM, kfnd=\E[1~,
+ khome=\EOH, kich1=\E[2~, kind=\EO1;2B, kmous=\E[M,
+ knp=\E[6~, kpp=\E[5~, kri=\EO1;2A, kslt=\E[4~, mc0=\E[i,
+ nel=\EE, op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM,
rin=\E[%p1%dT, rmacs=\E(B, rmam=\E[?7l, rmcup=\E[?1049l,
rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m,
rs2=\E7\E[r\E8\E[m\E[?7h\E[?1;3;4;6l\E[4l\E>\E[?1000l,
@@ -3706,11 +3785,14 @@ mlterm|multi lingual terminal emulator,
# (when available), it could use the extended names introduced for xterm.
mlterm+pcfkeys|fragment for PC-style fkeys,
kLFT=\EO1;2D, kNXT=\E[6;2~, kPRV=\E[5;2~, kRIT=\EO1;2C,
- kDN=\EO1;2B, kDN5=\EO1;5B, kDN6=\EO1;6B, kIC5=\E[2;5~,
- kIC6=\E[2;6~, kLFT5=\EO1;5D, kLFT6=\EO1;6D,
- kNXT5=\E[6;5~, kNXT6=\E[6;6~, kPRV5=\E[5;5~,
- kPRV6=\E[5;6~, kRIT5=\EO1;5C, kRIT6=\EO1;6C, kUP=\EO1;2A,
- kUP5=\EO1;5A, kUP6=\EO1;6A,
+ kDN=\EO1;2B, kDN3=\EO1;3B, kDN4=\EO1;4B, kDN5=\EO1;5B,
+ kDN6=\EO1;6B, kDN7=\EO1;7B, kIC5=\E[2;5~, kIC6=\E[2;6~,
+ kLFT3=\EO1;3D, kLFT4=\EO1;4D, kLFT5=\EO1;5D,
+ kLFT6=\EO1;6D, kLFT7=\EO1;7D, kNXT5=\E[6;5~,
+ kNXT6=\E[6;6~, kPRV5=\E[5;5~, kPRV6=\E[5;6~,
+ kRIT3=\EO1;3C, kRIT4=\EO1;4C, kRIT5=\EO1;5C,
+ kRIT6=\EO1;6C, kRIT7=\EO1;7C, kUP=\EO1;2A, kUP3=\EO1;3A,
+ kUP4=\EO1;4A, kUP5=\EO1;5A, kUP6=\EO1;6A, kUP7=\EO1;7A,
# From: Thomas Dickey <dickey@clark.net> 04 Oct 1997
# Updated: Oezguer Kesim <kesim@math.fu-berlin.de> 02 Nov 1997
@@ -3867,6 +3949,8 @@ rxvt-color|rxvt terminal emulator (X Window System),
use=rxvt,
rxvt-256color|rxvt 2.7.9 with xterm 256-colors,
use=xterm+256color, use=rxvt,
+rxvt-88color|rxvt 2.7.9 with xterm 88-colors,
+ use=xterm+88color, use=rxvt,
rxvt-xpm|rxvt terminal emulator (X Window System),
use=rxvt,
rxvt-cygwin|rxvt terminal emulator (X Window System) on cygwin,
@@ -3927,6 +4011,16 @@ Eterm|Eterm-color|Eterm with xterm-style color support (X Window System),
vpa=\E[%i%p1%dd, use=vt100+enq, use=rxvt+pcfkeys,
use=ecma+color,
+Eterm-256color|Eterm with xterm 256-colors,
+ use=xterm+256color, 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.
@@ -4407,6 +4501,8 @@ screen.rxvt|screen in rxvt,
screen.linux|screen in linux console,
bw,
kbs=\177, kcbt@, use=screen+fkeys, use=screen,
+screen.mlterm|screen in mlterm,
+ use=screen+fkeys, use=mlterm,
screen-w|VT 100/ANSI X3.64 virtual terminal with 132 cols,
cols#132, use=screen,
@@ -21679,6 +21775,22 @@ v3220|LANPAR Vision II model 3220/3221/3222,
# 2008-04-28
# * add screen+fkeys (prompted by Debian # 478094) -TD
#
+# 2008-06-28
+# * add screen.mlterm -TD
+# * improve mlterm and mlterm+pcfkeys -TD
+#
+# 2008-08-23
+# * 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"