mirror of
https://github.com/Aigor44/ncursesw-morphos.git
synced 2025-01-30 15:19:27 +08:00
ncurses 5.7 - patch 20101009
+ correct comparison used for setting 16-colors in linux-16color entry (Novell #644831) -TD + improve linux-16color entry, using "dim" for color-8 which makes it gray rather than black like color-0 -TD + drop misc/ncu-indent and misc/jpf-indent; they are provided by an external package "cindent".
This commit is contained in:
Thomas E. Dickey
parent
cef50b3afc
commit
f7340994c9
2
MANIFEST
2
MANIFEST
@ -730,12 +730,10 @@
|
||||
./misc/form.ref
|
||||
./misc/gen-pkgconfig.in
|
||||
./misc/gen_edit.sh
|
||||
./misc/jpf-indent
|
||||
./misc/makedef.cmd
|
||||
./misc/makellib
|
||||
./misc/menu.def
|
||||
./misc/menu.ref
|
||||
./misc/ncu-indent
|
||||
./misc/ncurses-config.in
|
||||
./misc/ncurses.def
|
||||
./misc/ncurses.ref
|
||||
|
||||
10
NEWS
10
NEWS
@ -25,7 +25,7 @@
|
||||
-- sale, use or other dealings in this Software without prior written --
|
||||
-- authorization. --
|
||||
-------------------------------------------------------------------------------
|
||||
-- $Id: NEWS,v 1.1597 2010/10/02 23:50:33 tom Exp $
|
||||
-- $Id: NEWS,v 1.1599 2010/10/09 20:20:06 tom Exp $
|
||||
-------------------------------------------------------------------------------
|
||||
|
||||
This is a log of changes that ncurses has gone through since Zeyd started
|
||||
@ -45,6 +45,14 @@ 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.
|
||||
|
||||
20101009
|
||||
+ correct comparison used for setting 16-colors in linux-16color
|
||||
entry (Novell #644831) -TD
|
||||
+ improve linux-16color entry, using "dim" for color-8 which makes it
|
||||
gray rather than black like color-0 -TD
|
||||
+ drop misc/ncu-indent and misc/jpf-indent; they are provided by an
|
||||
external package "cindent".
|
||||
|
||||
20101002
|
||||
+ improve linkages in html manpages, adding references to the newer
|
||||
pages, e.g., *_variables, curs_sp_funcs, curs_threads.
|
||||
|
||||
4
dist.mk
4
dist.mk
@ -25,7 +25,7 @@
|
||||
# use or other dealings in this Software without prior written #
|
||||
# authorization. #
|
||||
##############################################################################
|
||||
# $Id: dist.mk,v 1.776 2010/10/02 16:26:29 tom Exp $
|
||||
# $Id: dist.mk,v 1.777 2010/10/09 16:57:52 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 = 5
|
||||
NCURSES_MINOR = 7
|
||||
NCURSES_PATCH = 20101002
|
||||
NCURSES_PATCH = 20101009
|
||||
|
||||
# We don't append the patch to the version, since this only applies to releases
|
||||
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
|
||||
|
||||
119
misc/jpf-indent
119
misc/jpf-indent
@ -1,119 +0,0 @@
|
||||
#!/bin/sh
|
||||
#****************************************************************************
|
||||
#* Copyright (c) 2004-2005,2006 Thomas E. Dickey *
|
||||
#* *
|
||||
#* 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. *
|
||||
#****************************************************************************/
|
||||
# $Id: jpf-indent,v 1.6 2006/02/18 17:07:15 tom Exp $
|
||||
# indent ncurses source written by Juergen Pfeifer
|
||||
NOOP=no
|
||||
OPTS='
|
||||
-npro
|
||||
--blank-lines-after-declarations
|
||||
--blank-lines-after-procedures
|
||||
--brace-indent2
|
||||
--braces-after-if-line
|
||||
--continue-at-parentheses
|
||||
--indent-level2
|
||||
--line-length80
|
||||
--no-space-after-casts
|
||||
--no-space-after-function-call-names
|
||||
--parameter-indentation4
|
||||
--swallow-optional-blank-lines
|
||||
--tab-size8
|
||||
|
||||
-T FIELD
|
||||
-T FIELDTYPE
|
||||
-T FIELD_CELL
|
||||
-T FORM
|
||||
-T NCURSES_INLINE
|
||||
-T RegExp_Arg
|
||||
-T TypeArgument
|
||||
-T WINDOW
|
||||
-T attr_t
|
||||
-T bool
|
||||
-T cchar_t
|
||||
-T chtype
|
||||
-T enumARG
|
||||
-T va_list
|
||||
-T wchar_t
|
||||
'
|
||||
for name in $*
|
||||
do
|
||||
case $name in
|
||||
-v|-n)
|
||||
NOOP=yes
|
||||
OPTS="$OPTS -v"
|
||||
;;
|
||||
-*)
|
||||
OPTS="$OPTS $name"
|
||||
;;
|
||||
*.[ch])
|
||||
save="${name}".a$$
|
||||
test="${name}".b$$
|
||||
rm -f "$save" "$test"
|
||||
mv "$name" "$save"
|
||||
sed \
|
||||
-e '/MODULE_ID(/s/)$/);/' \
|
||||
-e 's,\<GCC_NORETURN;,;//GCC_NORETURN;,' \
|
||||
-e 's,\<GCC_PRINTFLIKE(,;//GCC_PRINTFLIKE(,' \
|
||||
-e 's,\<GCC_SCANFLIKE(,;//GCC_SCANFLIKE(,' \
|
||||
-e 's,\(\<NCURSES_EXPORT_VAR\>\),//\1,' \
|
||||
"$save" >"$test"
|
||||
cp "$test" "$name"
|
||||
chmod u+w "$name"
|
||||
# ${INDENT_PROG-indent} --version
|
||||
${INDENT_PROG-indent} -npro $OPTS "$name"
|
||||
sed \
|
||||
-e '/MODULE_ID(/s/);$/)/' \
|
||||
-e 's,;[ ]*//GCC_NORETURN;, GCC_NORETURN;,' \
|
||||
-e 's,;[ ]*//GCC_PRINTFLIKE(, GCC_PRINTFLIKE(,' \
|
||||
-e 's,;[ ]*//GCC_SCANFLIKE(, GCC_SCANFLIKE(,' \
|
||||
-e 's,//\(\<NCURSES_EXPORT_VAR\>\),\1,' \
|
||||
"$name" >"$test"
|
||||
mv "$test" "$name"
|
||||
rm -f "${name}~"
|
||||
if test $NOOP = yes ; then
|
||||
if (cmp -s "$name" "$save" ) then
|
||||
echo "** no change: $name"
|
||||
else
|
||||
diff -u "$save" "$name"
|
||||
fi
|
||||
rm -f "$name"
|
||||
mv "$save" "$name"
|
||||
elif ( cmp -s "$name" "$save" ) ; then
|
||||
echo "** unchanged $name"
|
||||
rm -f "${name}"
|
||||
mv "$save" "$name"
|
||||
else
|
||||
echo "** updated $name"
|
||||
rm -f "$save"
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
echo "** ignored: $name"
|
||||
;;
|
||||
esac
|
||||
done
|
||||
138
misc/ncu-indent
138
misc/ncu-indent
@ -1,138 +0,0 @@
|
||||
#!/bin/sh
|
||||
#****************************************************************************
|
||||
#* Copyright (c) 2001-2009,2010 Thomas E. Dickey *
|
||||
#* *
|
||||
#* 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. *
|
||||
#****************************************************************************/
|
||||
# $Id: ncu-indent,v 1.21 2010/07/24 11:25:18 tom Exp $
|
||||
NOOP=no
|
||||
OPTS='
|
||||
--blank-lines-after-procedures
|
||||
--braces-on-if-line
|
||||
--continuation-indentation0
|
||||
--continue-at-parentheses
|
||||
--cuddle-else
|
||||
--indent-level4
|
||||
--leave-preprocessor-space
|
||||
--no-blank-lines-after-commas
|
||||
--no-blank-lines-after-declarations
|
||||
--no-space-after-function-call-names
|
||||
--procnames-start-lines
|
||||
--space-special-semicolon
|
||||
--swallow-optional-blank-lines
|
||||
--tab-size8
|
||||
|
||||
-T NCURSES_SP_ARGx
|
||||
-T NCURSES_SP_DCLx
|
||||
-T NCURSES_EXPORT_VAR
|
||||
-T NCURSES_INLINE
|
||||
-T SCREEN
|
||||
-T TERMTYPE
|
||||
-T attr_t
|
||||
-T cchar_t
|
||||
-T chtype
|
||||
-T inline
|
||||
-T wchar_t
|
||||
-T wint_t
|
||||
|
||||
-T BUFFER
|
||||
-T CHARTYPE
|
||||
-T FILE
|
||||
-T GCC_NORETURN
|
||||
-T LINE
|
||||
-T MARK
|
||||
-T RETSIGTYPE
|
||||
-T TBUFF
|
||||
-T WINDOW
|
||||
-T size_t
|
||||
-T va_list
|
||||
|
||||
-T Cardinal
|
||||
-T Widget
|
||||
-T XtPointer
|
||||
'
|
||||
for name in $*
|
||||
do
|
||||
case $name in
|
||||
-v|-n)
|
||||
NOOP=yes
|
||||
OPTS="$OPTS -v"
|
||||
;;
|
||||
-*)
|
||||
OPTS="$OPTS $name"
|
||||
;;
|
||||
*.[ch]|*.cc|*.cpp)
|
||||
save="${name}".a$$
|
||||
test="${name}".b$$
|
||||
rm -f "$save" "$test"
|
||||
mv "$name" "$save"
|
||||
sed \
|
||||
-e '/EMPTY_MODULE(/s/)$/);/' \
|
||||
-e 's,\(MODULEID(\),//\1,' \
|
||||
-e '/MODULE_ID(/s/)$/);/' \
|
||||
-e 's,\<GCC_NORETURN\(.*\);,;//GCC_NORETURN\1,' \
|
||||
-e 's,\<GCC_PRINTFLIKE(\(.*\);,;//GCC_PRINTFLIKE(\1,' \
|
||||
-e 's,\<GCC_SCANFLIKE(\(.*\);,;//GCC_SCANFLIKE(\1,' \
|
||||
-e 's,\(\<NCURSES_EXPORT_VAR\>.*;\),//\1,' \
|
||||
"$save" >"$test"
|
||||
cp "$test" "$name"
|
||||
chmod u+w "$name"
|
||||
# ${INDENT_PROG-indent} --version
|
||||
${INDENT_PROG-indent} -npro $OPTS "$name"
|
||||
sed \
|
||||
-e '/EMPTY_MODULE(/s/);$/)/' \
|
||||
-e 's,//\(MODULEID(\),\1,' \
|
||||
-e '/MODULE_ID(/s/);$/)/' \
|
||||
-e 's,;[ ]*//GCC_NORETURN\(.*\);, GCC_NORETURN\1;,' \
|
||||
-e 's,;[ ]*//GCC_PRINTFLIKE(\(.*\);, GCC_PRINTFLIKE(\1;,' \
|
||||
-e 's,;[ ]*//GCC_SCANFLIKE(\(.*\);, GCC_SCANFLIKE(\1;,' \
|
||||
-e 's,;[ ]*//\(.*\), \1;,' \
|
||||
-e 's,[ ][ ]*\<GCC_, GCC_,g' \
|
||||
-e 's,//\(\<NCURSES_EXPORT_VAR\>[ ]*\),\1,' \
|
||||
"$name" >"$test"
|
||||
mv "$test" "$name"
|
||||
rm -f "${name}~"
|
||||
if test $NOOP = yes ; then
|
||||
if (cmp -s "$name" "$save" ) then
|
||||
echo "** no change: $name"
|
||||
else
|
||||
diff -u "$save" "$name"
|
||||
fi
|
||||
rm -f "$name"
|
||||
mv "$save" "$name"
|
||||
elif ( cmp -s "$name" "$save" ) ; then
|
||||
echo "** unchanged $name"
|
||||
rm -f "${name}"
|
||||
mv "$save" "$name"
|
||||
else
|
||||
echo "** updated $name"
|
||||
rm -f "$save"
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
echo "** ignored: $name"
|
||||
;;
|
||||
esac
|
||||
done
|
||||
@ -6,8 +6,8 @@
|
||||
# Report bugs and new terminal descriptions to
|
||||
# bug-ncurses@gnu.org
|
||||
#
|
||||
# $Revision: 1.373 $
|
||||
# $Date: 2010/10/02 22:44:14 $
|
||||
# $Revision: 1.375 $
|
||||
# $Date: 2010/10/09 19:13:51 $
|
||||
#
|
||||
# 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
|
||||
@ -999,8 +999,8 @@ kon|kon2|jfbterm|Kanji ON Linux console,
|
||||
# foreground colors and blink for bright background colors.
|
||||
linux-16color|linux console with 16 colors,
|
||||
colors#16, ncv#54, pairs#256,
|
||||
setab=\E[4%p1%{7}%m%d%?%p1%{7}%>%t;5%e;25%;m,
|
||||
setaf=\E[3%p1%{7}%m%d%?%p1%{7}%>%t;1%e;21%;m,
|
||||
setab=\E[4%p1%{8}%m%d%?%p1%{8}%>%t;5%e%p1%{8}%=%t;2%e;25%;m,
|
||||
setaf=\E[3%p1%{8}%m%d%?%p1%{8}%>%t;1%e%p1%{8}%=%t;2%e;21%;m,
|
||||
use=linux,
|
||||
|
||||
# bterm (bogl 0.1.18)
|
||||
@ -22301,6 +22301,12 @@ v3220|LANPAR Vision II model 3220/3221/3222,
|
||||
# ANSI -TD
|
||||
# * add parameterized cursor-controls to linux-basic (report by Dae) -TD
|
||||
#
|
||||
# 2010-10-09
|
||||
# * correct comparison used for setting 16-colors in linux-16color
|
||||
# entry (Novell #644831) -TD
|
||||
# * improve linux-16color entry, using "dim" for color-8 which makes it
|
||||
# gray rather than black like color-0 -TD
|
||||
#
|
||||
# The following sets edit modes for GNU EMACS.
|
||||
# Local Variables:
|
||||
# fill-prefix:"\t"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user