mirror/ncurses
1
0
Fork 0
mirror of https://github.com/ThomasDickey/ncurses-snapshots.git synced 2026-01-26 19:09:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

snapshot of project "ncurses", label v5_6_20070224

Browse Source
This commit is contained in:
Thomas E. Dickey 2007-02-25 00:45:56 -05:00
parent e08f2e2b43
commit 778f60e8df
22 changed files with 1190 additions and 1153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
NEWS
View File

@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
-- $Id: NEWS,v 1.1087 2007/02/17 22:19:25 tom Exp $
-- $Id: NEWS,v 1.1092 2007/02/25 00:45:56 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@ -45,6 +45,20 @@ 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.
20070224
+ change internal return codes of _nc_wgetch() to check for cases
where KEY_CODE_YES should be returned, e.g., if a KEY_RESIZE was
ungetch'd, and read by wget_wch().
+ fix static-library build broken in 20070217 changes to remove "-ldl"
(report by Miroslav Lichvar).
+ change makefile/scripts for cygwin to allow building termlib.
+ use Form_Hook in manpages to match form.h
+ use Menu_Hook in manpages, as well as a few places in menu.h
+ correct form- and menu-manpages to use specific Field_Options,
Menu_Options and Item_Options types.
+ correct prototype for _tracechar() in manpage (cf: 20011229).
+ correct prototype for wunctrl() in manpage.
20070217
+ fixes for $(TICS_LIST) in ncurses/Makefile (report by Miroslav
Lichvar).
@ -1627,7 +1641,8 @@ it is not possible to add this information.
20031108
+ add DJGPP to special case of DOS-style drive letters potentially
appearing in TERMCAP environment variable.
+ fix some spelling in comments (reports by jmc, Jonathon Gray).
+ fix some spelling in comments (reports by Jason McIntyre, Jonathon
Gray).
+ update config.guess, config.sub
20031101
@ -1917,7 +1932,7 @@ it is not possible to add this information.
"--srcdir" work (report by Warren L Dodge).
+ correct missing definition of $(CC) in Ada95/gen/Makefile.in
(reported by Warren L Dodge <warrend@mdhost.cse.tek.com>).
+ fix typos and whitespace in manpages (patch by jmc
+ fix typos and whitespace in manpages (patch by Jason McIntyre
<jmc@prioris.mini.pw.edu.pl>).
20030503

43
aclocal.m4 vendored
View File

@ -28,7 +28,7 @@ dnl***************************************************************************
dnl
dnl Author: Thomas E. Dickey 1995-on
dnl
dnl $Id: aclocal.m4,v 1.420 2007/02/17 21:50:10 tom Exp $
dnl $Id: aclocal.m4,v 1.425 2007/02/24 23:59:46 tom Exp $
dnl Macros used in NCURSES auto-configuration script.
dnl
dnl These macros are maintained separately from NCURSES. The copyright on
@ -1774,11 +1774,11 @@ ifelse($1,,,[$1=$LIB_PREFIX])
AC_SUBST(LIB_PREFIX)
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_LIB_RULES version: 46 updated: 2007/02/17 16:49:32
dnl CF_LIB_RULES version: 49 updated: 2007/02/24 17:12:45
dnl ------------
dnl Append definitions and rules for the given models to the subdirectory
dnl Makefiles, and the recursion rule for the top-level Makefile. If the
dnl subdirectory is a library-source directory, modify the LIBRARIES list in
dnl subdirectory is a library-source directory, modify the LIBS_TO_MAKE list in
dnl the corresponding makefile to list the models that we'll generate.
dnl
dnl For shared libraries, make a list of symbolic links to construct when
@ -1797,7 +1797,6 @@ do
continue
elif test -f $srcdir/$cf_dir/modules; then
IMPORT_LIB=
SHARED_LIB=
LIBS_TO_MAKE=
for cf_item in $cf_LIST_MODELS
@ -1844,9 +1843,7 @@ do
# use autodetected ${cf_prefix} for import lib and static lib, but
# use 'cyg' prefix for shared lib.
if test $cf_cv_shlib_version = cygdll ; then
SHARED_LIB="cyg${cf_dir}\${ABI_VERSION}.dll"
IMPORT_LIB="${cf_prefix}${cf_dir}.dll.a"
LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/\${SHARED_LIB} ../lib/\${IMPORT_LIB}"
LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/cyg${cf_dir}\${ABI_VERSION}.dll"
continue
fi
fi
@ -1883,7 +1880,6 @@ do
fi
sed -e "s%@LIBS_TO_MAKE@%$LIBS_TO_MAKE%" \
-e "s%@IMPORT_LIB@%$IMPORT_LIB%" \
-e "s%@SHARED_LIB@%$SHARED_LIB%" \
$cf_dir/Makefile >$cf_dir/Makefile.out
mv $cf_dir/Makefile.out $cf_dir/Makefile
@ -1962,7 +1958,7 @@ do
prefix=$cf_prefix \
suffix=$cf_suffix \
subset=$cf_subset \
TermlibRoot=$TINFO_NAME \
TermlibRoot=$TINFO_ARG_SUFFIX \
ShlibVer=$cf_cv_shlib_version \
ShlibVerInfix=$cf_cv_shlib_version_infix \
ReLink=${cf_cv_do_relink-no} \
@ -2062,7 +2058,7 @@ uninstall.man ::
distclean ::
rm -f config.cache config.log config.status Makefile include/ncurses_cfg.h
rm -f headers.sh headers.sed
rm -f headers.sh headers.sed mk_shared_lib.sh
rm -rf \${DIRS_TO_MAKE}
CF_EOF
@ -2694,7 +2690,7 @@ AC_ARG_WITH(manpage-tbl,
AC_MSG_RESULT($MANPAGE_TBL)
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_MAN_PAGES version: 32 updated: 2006/12/24 15:18:27
dnl CF_MAN_PAGES version: 33 updated: 2007/02/24 14:42:36
dnl ------------
dnl Try to determine if the man-pages on the system are compressed, and if
dnl so, what format is used. Use this information to construct a script that
@ -2934,6 +2930,7 @@ cat >>$cf_edit_man <<CF_EOF
if test \$verb = installing ; then
echo \$verb \$cf_target
\$INSTALL_DATA \$TMP \$cf_target
test -d \$cf_subdir\${section} &&
test -n "\$aliases" && (
cd \$cf_subdir\${section} && (
cf_source=\`echo \$cf_target |sed -e 's%^.*/\([[^/]][[^/]]*/[[^/]][[^/]]*$\)%\1%'\`
@ -2975,8 +2972,11 @@ cat >>$cf_edit_man <<CF_EOF
)
)
elif test \$verb = removing ; then
echo \$verb \$cf_target
rm -f \$cf_target
test -f \$cf_target && (
echo \$verb \$cf_target
rm -f \$cf_target
)
test -d \$cf_subdir\${section} &&
test -n "\$aliases" && (
cd \$cf_subdir\${section} && (
for cf_alias in \$aliases
@ -3615,7 +3615,7 @@ define([CF_REMOVE_LIB],
$1=`echo "$2" | sed -e 's/-l$3[[ ]]//g' -e 's/-l$3[$]//'`
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_SHARED_OPTS version: 43 updated: 2007/02/17 13:35:29
dnl CF_SHARED_OPTS version: 46 updated: 2007/02/24 18:58:09
dnl --------------
dnl --------------
dnl Attempt to determine the appropriate CC/LD options for creating a shared
@ -3692,9 +3692,22 @@ AC_DEFUN([CF_SHARED_OPTS],
;;
cygwin*)
CC_SHARED_OPTS=
MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,--out-implib=../lib/${IMPORT_LIB} -Wl,--export-all-symbols -o ../lib/${SHARED_LIB}'
MK_SHARED_LIB='sh ../mk_shared_lib.sh [$]@ [$]{CC} [$]{CFLAGS}'
cf_cv_shlib_version=cygdll
cf_cv_shlib_version_infix=cygdll
cat >mk_shared_lib.sh <<-CF_EOF
#!/bin/sh
SHARED_LIB=\[$]1
IMPORT_LIB=\`echo "\[$]1" | sed -e 's/cyg/lib/' -e 's/[[0-9]]*\.dll[$]/.dll.a/'\`
shift
cat <<-EOF
Linking shared library
** SHARED_LIB \[$]SHARED_LIB
** IMPORT_LIB \[$]IMPORT_LIB
EOF
exec \[$]* -shared -Wl,--out-implib=../lib/\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o ../lib/\[$]{SHARED_LIB}
CF_EOF
chmod +x mk_shared_lib.sh
;;
darwin*)
EXTRA_CFLAGS="-no-cpp-precomp"

2059
configure vendored
View File

File diff suppressed because it is too large Load Diff

21
configure.in
View File

@ -28,14 +28,14 @@ dnl***************************************************************************
dnl
dnl Author: Thomas E. Dickey 1995-on
dnl
dnl $Id: configure.in,v 1.402 2007/02/17 22:52:40 tom Exp $
dnl $Id: configure.in,v 1.404 2007/02/24 21:18:03 tom Exp $
dnl Process this file with autoconf to produce a configure script.
dnl
dnl See http://invisible-island.net/autoconf/ for additional information.
dnl
dnl ---------------------------------------------------------------------------
AC_PREREQ(2.13.20020210)
AC_REVISION($Revision: 1.402 $)
AC_REVISION($Revision: 1.404 $)
AC_INIT(ncurses/base/lib_initscr.c)
AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
@ -1470,13 +1470,20 @@ AC_SUBST(CXX_LIB_SUFFIX)
fi
# do not want -ldl in build except as needed for -lncurses dependency
CF_REMOVE_LIB(LIBS,$LIBS,dl)
if test "$with_dlsym" = yes ; then
if test $DFT_LWR_MODEL = shared || \
test $DFT_LWR_MODEL = libtool ; then
CF_REMOVE_LIB(LIBS,$LIBS,dl)
fi
fi
### Set up low-level terminfo dependencies for makefiles.
# TICS_LIST and TINFO_LIST are needed to build libtic.so and libterm.so, but
# do not need libdl
TICS_LIST=
CF_REMOVE_LIB(TINFO_LIST,$SHLIB_LIST,dl)
if test "$with_dlsym" = yes ; then
CF_REMOVE_LIB(TINFO_LIST,$SHLIB_LIST,dl)
fi
if test "$with_ticlib" != no ; then
@ -1527,7 +1534,7 @@ if test "$with_termlib" != no ; then
fi
else
# the next lines are needed for linking libtic over libncurses
TINFO_NAME=${LIB_NAME}${DFT_ARG_SUFFIX}
TINFO_ARG_SUFFIX=${LIB_NAME}${DFT_ARG_SUFFIX}
TICS_LIST="$SHLIB_LIST -l${LIB_NAME}${DFT_ARG_SUFFIX}"
TINFO_ARGS="-L${LIB_DIR} -l${LIB_NAME}${DFT_ARG_SUFFIX}"
@ -1537,7 +1544,9 @@ AC_SUBST(TINFO_DEP_SUFFIX)
AC_SUBST(TINFO_LIB_SUFFIX)
AC_SUBST(TINFO_ARGS)
CF_REMOVE_LIB(TICS_LIST,$TICS_LIST,dl)
if test "$with_dlsym" = yes ; then
CF_REMOVE_LIB(TICS_LIST,$TICS_LIST,dl)
fi
# needed for Ada95
TINFO_ARGS2=`echo "$TINFO_ARGS" | sed -e 's,-L\.\./,-L../../,'`

4
dist.mk
View File

@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
# $Id: dist.mk,v 1.578 2007/02/17 17:24:53 tom Exp $
# $Id: dist.mk,v 1.579 2007/02/18 15:15:32 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 = 6
NCURSES_PATCH = 20070217
NCURSES_PATCH = 20070224
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)

8
form/Makefile.in
View File

@ -1,6 +1,6 @@
# $Id: Makefile.in,v 1.42 2006/10/14 20:40:36 tom Exp $
# $Id: Makefile.in,v 1.43 2007/02/24 21:57:31 tom Exp $
##############################################################################
# Copyright (c) 1998-2004,2006 Free Software Foundation, Inc. #
# Copyright (c) 1998-2006,2007 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"), #
@ -27,7 +27,7 @@
# authorization. #
##############################################################################
#
# Author: Thomas E. Dickey <dickey@clark.net> 1996,1997
# Author: Thomas E. Dickey 1996-on
#
# Makefile for form source code.
#
@ -106,8 +106,6 @@ ABI_VERSION = @cf_cv_abi_version@
RANLIB = @LIB_PREP@
IMPORT_LIB = @IMPORT_LIB@
SHARED_LIB = @SHARED_LIB@
LIBRARIES = @LIBS_TO_MAKE@
LINT = @LINT@

8
man/curs_border.3x
View File

@ -1,5 +1,5 @@
.\"***************************************************************************
.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. *
.\" *
.\" Permission is hereby granted, free of charge, to any person obtaining a *
.\" copy of this software and associated documentation files (the *
@ -26,7 +26,7 @@
.\" authorization. *
.\"***************************************************************************
.\"
.\" $Id: curs_border.3x,v 1.18 2006/02/25 21:49:19 tom Exp $
.\" $Id: curs_border.3x,v 1.19 2007/02/24 16:15:38 tom Exp $
.TH curs_border 3X ""
.na
.hy 0
@ -64,9 +64,9 @@
.br
\fBint wvline(WINDOW *win, chtype ch, int n);\fR
.br
\fBmvhline(int y, int x, chtype ch, int n);\fR
\fBint mvhline(int y, int x, chtype ch, int n);\fR
.br
\fBmvwhline(WINDOW *, int y, int x, chtype ch, int n);\fR
\fBint mvwhline(WINDOW *, int y, int x, chtype ch, int n);\fR
.br
\fBint mvvline(int y, int x, chtype ch, int n);\fR
.br

6
man/curs_terminfo.3x
View File

@ -1,5 +1,5 @@
.\"***************************************************************************
.\" Copyright (c) 1999-2005,2006 Free Software Foundation, Inc. *
.\" Copyright (c) 1999-2006,2007 Free Software Foundation, Inc. *
.\" *
.\" Permission is hereby granted, free of charge, to any person obtaining a *
.\" copy of this software and associated documentation files (the *
@ -26,7 +26,7 @@
.\" authorization. *
.\"***************************************************************************
.\"
.\" $Id: curs_terminfo.3x,v 1.25 2006/12/24 16:05:49 tom Exp $
.\" $Id: curs_terminfo.3x,v 1.26 2007/02/24 16:37:50 tom Exp $
.TH curs_terminfo 3X ""
.ds n 5
.na
@ -64,7 +64,7 @@
.br
\fBint del_curterm(TERMINAL *\fR\fIoterm\fR\fB);\fR
.br
\fBint restartterm(const char *\fR\fIterm\fR\fB, int \fR\fIfildes\fR\fB, int *\fR\fIerrret\fR\fB);\fR
\fBint restartterm(char *\fR\fIterm\fR\fB, int \fR\fIfildes\fR\fB, int *\fR\fIerrret\fR\fB);\fR
.br
\fBchar *tparm(char *\fR\fIstr\fR\fB, ...);\fR
.br

6
man/curs_trace.3x
View File

@ -1,5 +1,5 @@
.\"***************************************************************************
.\" Copyright (c) 2000-2002,2005 Free Software Foundation, Inc. *
.\" Copyright (c) 2000-2005,2007 Free Software Foundation, Inc. *
.\" *
.\" Permission is hereby granted, free of charge, to any person obtaining a *
.\" copy of this software and associated documentation files (the *
@ -26,7 +26,7 @@
.\" authorization. *
.\"***************************************************************************
.\"
.\" $Id: curs_trace.3x,v 1.7 2005/05/15 17:02:54 tom Exp $
.\" $Id: curs_trace.3x,v 1.8 2007/02/24 17:33:49 tom Exp $
.TH curs_trace 3X ""
.na
.hy 0
@ -56,7 +56,7 @@
.br
\fBchar *_nc_tracebits(void);\fR
.br
\fBchar *_tracechar(const unsigned char ch);\fR
\fBchar *_tracechar(int);\fR
.br
\fBchar *_tracechtype(chtype ch);\fR
.br

6
man/curs_util.3x
View File

@ -1,5 +1,5 @@
.\"***************************************************************************
.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. *
.\" *
.\" Permission is hereby granted, free of charge, to any person obtaining a *
.\" copy of this software and associated documentation files (the *
@ -26,7 +26,7 @@
.\" authorization. *
.\"***************************************************************************
.\"
.\" $Id: curs_util.3x,v 1.22 2006/12/24 14:55:31 tom Exp $
.\" $Id: curs_util.3x,v 1.23 2007/02/24 15:59:07 tom Exp $
.TH curs_util 3X ""
.na
.hy 0
@ -49,7 +49,7 @@
.sp
\fBchar *unctrl(chtype c);\fR
.br
\fBchar *wunctrl(cchar_t *c);\fR
\fBwchar_t *wunctrl(cchar_t *c);\fR
.br
\fBchar *keyname(int c);\fR
.br

12
man/form_field_opts.3x
View File

@ -1,6 +1,6 @@
'\" t
.\"***************************************************************************
.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. *
.\" *
.\" Permission is hereby granted, free of charge, to any person obtaining a *
.\" copy of this software and associated documentation files (the *
@ -27,20 +27,20 @@
.\" authorization. *
.\"***************************************************************************
.\"
.\" $Id: form_field_opts.3x,v 1.12 2006/11/04 17:12:00 tom Exp $
.\" $Id: form_field_opts.3x,v 1.13 2007/02/24 17:34:27 tom Exp $
.TH form_field_opts 3X ""
.SH NAME
\fBform_field_opts\fR - set and get field options
.SH SYNOPSIS
\fB#include <form.h>\fR
.br
int set_field_opts(FIELD *field, OPTIONS opts);
int set_field_opts(FIELD *field, Field_Options opts);
.br
int field_opts_on(FIELD *field, OPTIONS opts);
int field_opts_on(FIELD *field, Field_Options opts);
.br
int field_opts_off(FIELD *field, OPTIONS opts);
int field_opts_off(FIELD *field, Field_Options opts);
.br
OPTIONS field_opts(const FIELD *field);
Field_Options field_opts(const FIELD *field);
.br
.SH DESCRIPTION
The function \fBset_field_opts\fR sets all the given field's option bits (field

20
man/form_hook.3x
View File

@ -1,6 +1,6 @@
'\" t
.\"***************************************************************************
.\" Copyright (c) 1998,2006 Free Software Foundation, Inc. *
.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. *
.\" *
.\" Permission is hereby granted, free of charge, to any person obtaining a *
.\" copy of this software and associated documentation files (the *
@ -27,28 +27,28 @@
.\" authorization. *
.\"***************************************************************************
.\"
.\" $Id: form_hook.3x,v 1.8 2006/11/04 17:12:00 tom Exp $
.\" $Id: form_hook.3x,v 1.9 2007/02/24 17:34:18 tom Exp $
.TH form_hook 3X ""
.SH NAME
\fBform_hook\fR - set hooks for automatic invocation by applications
.SH SYNOPSIS
\fB#include <form.h>\fR
.br
int set_field_init(FORM *form, void (*func)(FORM *));
int set_field_init(FORM *form, Form_Hook func);
.br
void (*)(FORM *) field_init(const FORM *form);
Form_Hook field_init(const FORM *form);
.br
int set_field_term(FORM *form, void (*func)(FORM *));
int set_field_term(FORM *form, Form_Hook func);
.br
void (*)(FORM *) field_term(const FORM *form);
Form_Hook field_term(const FORM *form);
.br
int set_form_init(FORM *form, void (*func)(FORM *));
int set_form_init(FORM *form, Form_Hook func);
.br
void (*)(FORM *) form_init(const FORM *form);
Form_Hook form_init(const FORM *form);
.br
int set_form_term(FORM *form, void (*func)(FORM *));
int set_form_term(FORM *form, Form_Hook func);
.br
void (*)(FORM *) form_term(const FORM *form);
Form_Hook form_term(const FORM *form);
.br
.SH DESCRIPTION
These functions make it possible to set hook functions to be called at various

12
man/form_opts.3x
View File

@ -1,6 +1,6 @@
'\" t
.\"***************************************************************************
.\" Copyright (c) 1998,2006 Free Software Foundation, Inc. *
.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. *
.\" *
.\" Permission is hereby granted, free of charge, to any person obtaining a *
.\" copy of this software and associated documentation files (the *
@ -27,20 +27,20 @@
.\" authorization. *
.\"***************************************************************************
.\"
.\" $Id: form_opts.3x,v 1.8 2006/11/04 17:12:00 tom Exp $
.\" $Id: form_opts.3x,v 1.9 2007/02/24 17:34:36 tom Exp $
.TH form_opts 3X ""
.SH NAME
\fBform_opts\fR - set and get form options
.SH SYNOPSIS
\fB#include <form.h>\fR
.br
int set_form_opts(FORM *form, OPTIONS opts);
int set_form_opts(FORM *form, Field_Options opts);
.br
int form_opts_on(FORM *form, OPTIONS opts);
int form_opts_on(FORM *form, Field_Options opts);
.br
int form_opts_off(FORM *form, OPTIONS opts);
int form_opts_off(FORM *form, Field_Options opts);
.br
OPTIONS form_opts(const FORM *form);
Field_Options form_opts(const FORM *form);
.br
.SH DESCRIPTION
The function \fBset_form_opts\fR sets all the given form's option bits (form

20
man/menu_hook.3x
View File

@ -1,6 +1,6 @@
'\" t
.\"***************************************************************************
.\" Copyright (c) 1998,2006 Free Software Foundation, Inc. *
.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. *
.\" *
.\" Permission is hereby granted, free of charge, to any person obtaining a *
.\" copy of this software and associated documentation files (the *
@ -27,28 +27,28 @@
.\" authorization. *
.\"***************************************************************************
.\"
.\" $Id: menu_hook.3x,v 1.8 2006/11/04 17:12:00 tom Exp $
.\" $Id: menu_hook.3x,v 1.9 2007/02/24 17:34:08 tom Exp $
.TH menu_hook 3X ""
.SH NAME
\fBmenu_hook\fR - set hooks for automatic invocation by applications
.SH SYNOPSIS
\fB#include <menu.h>\fR
.br
int set_item_init(MENU *menu, void (*func)(MENU *));
int set_item_init(MENU *menu, Menu_Hook func);
.br
void (*)(MENU *) item_init(const MENU *menu);
Menu_Hook item_init(const MENU *menu);
.br
int set_item_term(MENU *menu, void (*func)(MENU *));
int set_item_term(MENU *menu, Menu_Hook func);
.br
void (*)(MENU *) item_term(const MENU *menu);
Menu_Hook item_term(const MENU *menu);
.br
int set_menu_init(MENU *menu, void (*func)(MENU *));
int set_menu_init(MENU *menu, Menu_Hook func);
.br
void (*)(MENU *) menu_init(const MENU *menu);
Menu_Hook menu_init(const MENU *menu);
.br
int set_menu_term(MENU *menu, void (*func)(MENU *));
int set_menu_term(MENU *menu, Menu_Hook func);
.br
void (*)(MENU *) menu_term(const MENU *menu);
Menu_Hook menu_term(const MENU *menu);
.br
.SH DESCRIPTION
These functions make it possible to set hook functions to be called at various

12
man/menu_opts.3x
View File

@ -1,6 +1,6 @@
'\" t
.\"***************************************************************************
.\" Copyright (c) 1998,2006 Free Software Foundation, Inc. *
.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. *
.\" *
.\" Permission is hereby granted, free of charge, to any person obtaining a *
.\" copy of this software and associated documentation files (the *
@ -27,20 +27,20 @@
.\" authorization. *
.\"***************************************************************************
.\"
.\" $Id: menu_opts.3x,v 1.9 2006/11/04 17:12:00 tom Exp $
.\" $Id: menu_opts.3x,v 1.10 2007/02/24 17:33:59 tom Exp $
.TH menu_opts 3X ""
.SH NAME
\fBmenu_opts\fR - set and get menu options
.SH SYNOPSIS
\fB#include <menu.h>\fR
.br
int set_menu_opts(MENU *menu, OPTIONS opts);
int set_menu_opts(MENU *menu, Menu_Options opts);
.br
int menu_opts_on(MENU *menu, OPTIONS opts);
int menu_opts_on(MENU *menu, Menu_Options opts);
.br
int menu_opts_off(MENU *menu, OPTIONS opts);
int menu_opts_off(MENU *menu, Menu_Options opts);
.br
OPTIONS menu_opts(const MENU *menu);
Menu_Options menu_opts(const MENU *menu);
.br
.SH DESCRIPTION
The function \fBset_menu_opts\fR sets all the given menu's option bits (menu

12
man/mitem_opts.3x
View File

@ -1,6 +1,6 @@
'\" t
.\"***************************************************************************
.\" Copyright (c) 1998,2006 Free Software Foundation, Inc. *
.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. *
.\" *
.\" Permission is hereby granted, free of charge, to any person obtaining a *
.\" copy of this software and associated documentation files (the *
@ -27,20 +27,20 @@
.\" authorization. *
.\"***************************************************************************
.\"
.\" $Id: mitem_opts.3x,v 1.8 2006/11/04 17:12:00 tom Exp $
.\" $Id: mitem_opts.3x,v 1.9 2007/02/24 17:33:32 tom Exp $
.TH mitem_opts 3X ""
.SH NAME
\fBmitem_opts\fR - set and get menu item options
.SH SYNOPSIS
\fB#include <menu.h>\fR
.br
int set_item_opts(ITEM *item, OPTIONS opts);
int set_item_opts(ITEM *item, Item_Options opts);
.br
int item_opts_on(ITEM *item, OPTIONS opts);
int item_opts_on(ITEM *item, Item_Options opts);
.br
int item_opts_off(ITEM *item, OPTIONS opts);
int item_opts_off(ITEM *item, Item_Options opts);
.br
OPTIONS item_opts(const ITEM *item);
Item_Options item_opts(const ITEM *item);
.br
.SH DESCRIPTION
The function \fBset_item_opts\fR sets all the given item's option bits (menu

8
menu/Makefile.in
View File

@ -1,6 +1,6 @@
# $Id: Makefile.in,v 1.43 2006/10/14 20:40:36 tom Exp $
# $Id: Makefile.in,v 1.44 2007/02/24 21:58:06 tom Exp $
##############################################################################
# Copyright (c) 1998-2004,2006 Free Software Foundation, Inc. #
# Copyright (c) 1998-2006,2007 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"), #
@ -27,7 +27,7 @@
# authorization. #
##############################################################################
#
# Author: Thomas E. Dickey <dickey@clark.net> 1996,1997
# Author: Thomas E. Dickey 1996-on
#
# Makefile for menu source code.
#
@ -106,8 +106,6 @@ ABI_VERSION = @cf_cv_abi_version@
RANLIB = @LIB_PREP@
IMPORT_LIB = @IMPORT_LIB@
SHARED_LIB = @SHARED_LIB@
LIBRARIES = @LIBS_TO_MAKE@
LINT = @LINT@

12
menu/menu.h
View File

@ -1,5 +1,5 @@
/****************************************************************************
* Copyright (c) 1998-2002,2003 Free Software Foundation, Inc. *
* Copyright (c) 1998-2003,2007 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 *
@ -30,7 +30,7 @@
* Author: Juergen Pfeifer, 1995,1997 *
****************************************************************************/
/* $Id: menu.h,v 1.18 2003/11/08 20:48:24 tom Exp $ */
/* $Id: menu.h,v 1.19 2007/02/24 17:32:13 tom Exp $ */
#ifndef ETI_MENU
#define ETI_MENU
@ -217,23 +217,23 @@ extern NCURSES_EXPORT(int) pos_menu_cursor (const MENU *);
extern NCURSES_EXPORT(int) post_menu (MENU *);
extern NCURSES_EXPORT(int) scale_menu (const MENU *,int *,int *);
extern NCURSES_EXPORT(int) set_current_item (MENU *menu,ITEM *item);
extern NCURSES_EXPORT(int) set_item_init (MENU *,void(*)(MENU *));
extern NCURSES_EXPORT(int) set_item_init (MENU *, Menu_Hook);
extern NCURSES_EXPORT(int) set_item_opts (ITEM *,Item_Options);
extern NCURSES_EXPORT(int) set_item_term (MENU *,void(*)(MENU *));
extern NCURSES_EXPORT(int) set_item_term (MENU *, Menu_Hook);
extern NCURSES_EXPORT(int) set_item_userptr (ITEM *, void *);
extern NCURSES_EXPORT(int) set_item_value (ITEM *,bool);
extern NCURSES_EXPORT(int) set_menu_back (MENU *,chtype);
extern NCURSES_EXPORT(int) set_menu_fore (MENU *,chtype);
extern NCURSES_EXPORT(int) set_menu_format (MENU *,int,int);
extern NCURSES_EXPORT(int) set_menu_grey (MENU *,chtype);
extern NCURSES_EXPORT(int) set_menu_init (MENU *,void(*)(MENU *));
extern NCURSES_EXPORT(int) set_menu_init (MENU *, Menu_Hook);
extern NCURSES_EXPORT(int) set_menu_items (MENU *,ITEM **);
extern NCURSES_EXPORT(int) set_menu_mark (MENU *, const char *);
extern NCURSES_EXPORT(int) set_menu_opts (MENU *,Menu_Options);
extern NCURSES_EXPORT(int) set_menu_pad (MENU *,int);
extern NCURSES_EXPORT(int) set_menu_pattern (MENU *,const char *);
extern NCURSES_EXPORT(int) set_menu_sub (MENU *,WINDOW *);
extern NCURSES_EXPORT(int) set_menu_term (MENU *,void(*)(MENU *));
extern NCURSES_EXPORT(int) set_menu_term (MENU *, Menu_Hook);
extern NCURSES_EXPORT(int) set_menu_userptr (MENU *,void *);
extern NCURSES_EXPORT(int) set_menu_win (MENU *,WINDOW *);
extern NCURSES_EXPORT(int) set_top_row (MENU *,int);

24
mk-1st.awk
View File

@ -1,4 +1,4 @@
# $Id: mk-1st.awk,v 1.73 2007/02/17 21:31:09 tom Exp $
# $Id: mk-1st.awk,v 1.75 2007/02/24 22:10:21 tom Exp $
##############################################################################
# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. #
# #
@ -164,11 +164,7 @@ function sharedlinks(directory) {
}
}
function shlib_build(directory) {
if ( ShlibVer == "cygdll" ) {
dst_libs = sprintf("%s/$(SHARED_LIB) %s/$(IMPORT_LIB)", directory, directory);
} else {
dst_libs = sprintf("%s/%s", directory, end_name);
}
dst_libs = sprintf("%s/%s", directory, end_name);
printf "%s : \\\n", dst_libs
printf "\t\t%s \\\n", directory
if (subset ~ /^base/ || subset == "ticlib" ) {
@ -193,20 +189,8 @@ function shlib_build(directory) {
sharedlinks(directory)
}
function shlib_install(directory) {
if ( ShlibVer == "cygdll" ) {
src_lib1 = sprintf("%s/$(SHARED_LIB)", "../lib");
src_lib2 = sprintf("%s/$(IMPORT_LIB)", "../lib");
src_libs = sprintf("%s %s", src_lib1, src_lib2);
dst_lib1 = sprintf("%s/$(SHARED_LIB)", directory);
dst_lib2 = sprintf("%s/$(IMPORT_LIB)", directory);
dst_libs = sprintf("%s %s", dst_lib1, dst_lib2);
} else {
src_lib1 = sprintf("../lib/%s", end_name);
src_lib2 = ""
src_libs = src_lib1
dst_lib1 = sprintf("%s/%s", directory, end_name);
dst_libs = dst_lib1;
}
src_lib1 = sprintf("../lib/%s", end_name);
dst_lib1 = sprintf("%s/%s", directory, end_name);
printf "%s : \\\n", dst_libs
printf "\t\t%s \\\n", directory
printf "\t\t%s\n", src_libs

4
ncurses/Makefile.in
View File

@ -1,4 +1,4 @@
# $Id: Makefile.in,v 1.102 2007/02/17 23:13:24 tom Exp $
# $Id: Makefile.in,v 1.103 2007/02/24 21:50:17 tom Exp $
##############################################################################
# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. #
# #
@ -129,8 +129,6 @@ ABI_VERSION = @cf_cv_abi_version@
RANLIB = @LIB_PREP@
IMPORT_LIB = @IMPORT_LIB@
SHARED_LIB = @SHARED_LIB@
LIBRARIES = @LIBS_TO_MAKE@
LINT = @LINT@

17
ncurses/base/lib_getch.c
View File

@ -41,7 +41,7 @@
#include <curses.priv.h>
MODULE_ID("$Id: lib_getch.c,v 1.76 2006/12/30 16:03:27 tom Exp $")
MODULE_ID("$Id: lib_getch.c,v 1.77 2007/02/25 00:43:54 tom Exp $")
#include <fifo_defs.h>
@ -234,15 +234,16 @@ _nc_wgetch(WINDOW *win,
T((T_CALLED("_nc_wgetch(%p)"), win));
*result = 0;
if (win == 0 || SP == 0)
if (win == 0 || SP == 0) {
returnCode(ERR);
}
if (cooked_key_in_fifo()) {
if (wgetch_should_refresh(win))
wrefresh(win);
*result = fifo_pull();
returnCode(OK);
returnCode(*result >= KEY_MIN ? KEY_CODE_YES : OK);
}
#ifdef NCURSES_WGETCH_EVENTS
if (evl && (evl->count == 0))
@ -281,12 +282,10 @@ _nc_wgetch(WINDOW *win,
/* Return it first */
if (rc == KEY_EVENT) {
*result = rc;
returnCode(OK);
}
} else
#endif
*result = fifo_pull();
returnCode(OK);
*result = fifo_pull();
returnCode(*result >= KEY_MIN ? KEY_CODE_YES : OK);
}
if (win->_use_keypad != SP->_keypad_on)
@ -318,7 +317,7 @@ _nc_wgetch(WINDOW *win,
#ifdef NCURSES_WGETCH_EVENTS
if (rc & 4) {
*result = KEY_EVENT;
returnCode(OK);
returnCode(KEY_CODE_YES);
}
#endif
if (!rc)

8
panel/Makefile.in
View File

@ -1,6 +1,6 @@
# $Id: Makefile.in,v 1.47 2006/10/14 20:40:36 tom Exp $
# $Id: Makefile.in,v 1.48 2007/02/24 21:57:08 tom Exp $
##############################################################################
# Copyright (c) 1998-2003,2006 Free Software Foundation, Inc. #
# Copyright (c) 1998-2006,2007 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"), #
@ -27,7 +27,7 @@
# authorization. #
##############################################################################
#
# Author: Thomas E. Dickey 1996-2002
# Author: Thomas E. Dickey 1996-on
#
# Makefile for panels source code.
#
@ -107,8 +107,6 @@ ABI_VERSION = @cf_cv_abi_version@
RANLIB = @LIB_PREP@
IMPORT_LIB = @IMPORT_LIB@
SHARED_LIB = @SHARED_LIB@
LIBRARIES = @LIBS_TO_MAKE@
LINT = @LINT@