From 9bb12d03d854ce72b456e525f0c560f2fa91545d Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Sun, 15 Aug 2010 00:45:51 +0000 Subject: [PATCH] ncurses 5.7 - patch 20100814 + document in manpages that "mv" functions first use wmove() to check the window pointer and whether the position lies within the window (suggested by Poul-Henning Kamp). + fixes to curs_color.3x, curs_kernel.3x and wresize.3x manpages (patch by Tim van der Molen). + modify configure script to transform library names for tic- and tinfo-libraries so that those build properly with Mac OS X shared library configuration. + modify configure script to ensure that it removes conftest.dSYM directory leftover on checks with Mac OS X. + modify configure script to cleanup after check for symbolic links. --- NEWS | 15 ++++++- aclocal.m4 | 89 +++++++++++++++++++++++++++++++----------- configure | 54 ++++++++++++------------- dist.mk | 4 +- man/curs_add_wch.3x | 6 ++- man/curs_add_wchstr.3x | 6 ++- man/curs_addch.3x | 11 +++++- man/curs_addchstr.3x | 6 ++- man/curs_addstr.3x | 6 ++- man/curs_addwstr.3x | 6 ++- man/curs_attr.3x | 6 ++- man/curs_border.3x | 6 ++- man/curs_border_set.3x | 6 ++- man/curs_color.3x | 5 +-- man/curs_delch.3x | 6 ++- man/curs_get_wch.3x | 8 +++- man/curs_get_wstr.3x | 8 +++- man/curs_getch.3x | 6 ++- man/curs_getstr.3x | 6 ++- man/curs_in_wch.3x | 6 ++- man/curs_in_wchstr.3x | 8 +++- man/curs_inch.3x | 12 ++++-- man/curs_inchstr.3x | 6 ++- man/curs_ins_wch.3x | 8 +++- man/curs_ins_wstr.3x | 8 +++- man/curs_insch.3x | 6 ++- man/curs_insstr.3x | 6 ++- man/curs_instr.3x | 6 ++- man/curs_inwstr.3x | 8 +++- man/curs_kernel.3x | 4 +- man/curs_printw.3x | 6 ++- man/curs_scanw.3x | 6 ++- man/wresize.3x | 5 ++- 33 files changed, 260 insertions(+), 95 deletions(-) diff --git a/NEWS b/NEWS index 6c3b6a0e..7eb6d1b3 100644 --- a/NEWS +++ b/NEWS @@ -25,7 +25,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: NEWS,v 1.1578 2010/08/07 20:44:25 tom Exp $ +-- $Id: NEWS,v 1.1581 2010/08/14 23:32:54 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -45,6 +45,19 @@ 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. +20100814 + + document in manpages that "mv" functions first use wmove() to check + the window pointer and whether the position lies within the window + (suggested by Poul-Henning Kamp). + + fixes to curs_color.3x, curs_kernel.3x and wresize.3x manpages (patch + by Tim van der Molen). + + modify configure script to transform library names for tic- and + tinfo-libraries so that those build properly with Mac OS X shared + library configuration. + + modify configure script to ensure that it removes conftest.dSYM + directory leftover on checks with Mac OS X. + + modify configure script to cleanup after check for symbolic links. + 20100807 + correct a typo in mk-1st.awk (patch by Gabriele Balducci) (cf: 20100724) diff --git a/aclocal.m4 b/aclocal.m4 index 9ff487b5..1fd08f08 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -28,7 +28,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1995-on dnl -dnl $Id: aclocal.m4,v 1.539 2010/08/07 18:14:46 tom Exp $ +dnl $Id: aclocal.m4,v 1.542 2010/08/14 23:37:19 tom Exp $ dnl Macros used in NCURSES auto-configuration script. dnl dnl These macros are maintained separately from NCURSES. The copyright on @@ -864,7 +864,7 @@ fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CHECK_GPM_WGETCH version: 1 updated: 2007/04/28 14:38:06 +dnl CF_CHECK_GPM_WGETCH version: 2 updated: 2010/08/14 18:25:37 dnl ------------------- dnl Check if GPM is already linked with curses. If so - and if the linkage dnl is not "weak" - warn about this because it can create problems linking @@ -898,7 +898,7 @@ CF_EOF test -z "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=no fi fi - rm -f conftest* + rm -rf conftest* LIBS="$cf_save_LIBS" fi ]) @@ -1660,7 +1660,7 @@ if test "$GCC" = yes ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GCC_WARNINGS version: 25 updated: 2010/04/24 11:03:31 +dnl CF_GCC_WARNINGS version: 26 updated: 2010/08/14 18:25:37 dnl --------------- dnl Check if the compiler supports useful warning options. There's a few that dnl we don't use, simply because they're too noisy: @@ -1764,7 +1764,7 @@ then done CFLAGS="$cf_save_CFLAGS" fi -rm -f conftest* +rm -rf conftest* AC_SUBST(EXTRA_CFLAGS) ])dnl @@ -1798,7 +1798,7 @@ fi AC_SUBST(PRAGMA_UNREF) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GNAT_TRY_LINK version: 1 updated: 2004/08/21 19:02:08 +dnl CF_GNAT_TRY_LINK version: 2 updated: 2010/08/14 18:25:37 dnl ---------------- dnl Verify that a test program compiles/links with GNAT. dnl $cf_ada_make is set to the program that compiles/links @@ -1810,7 +1810,7 @@ dnl $3 is the shell command to execute if successful dnl $4 is the shell command to execute if not successful AC_DEFUN([CF_GNAT_TRY_LINK], [ -rm -f conftest* +rm -rf conftest* cat >>conftest.ads <>conftest.ads < #include @@ -4310,7 +4353,7 @@ AC_PROG_AWK test -z "$AWK" && AC_MSG_ERROR(No awk program found) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PROG_CC_C_O version: 2 updated: 2006/12/16 15:55:46 +dnl CF_PROG_CC_C_O version: 3 updated: 2010/08/14 18:25:37 dnl -------------- dnl Analogous to AC_PROG_CC_C_O, but more useful: tests only $CC, ensures that dnl the output file can be renamed, and allows for a shell variable that can @@ -4340,7 +4383,7 @@ then else eval cf_cv_prog_$1_c_o=no fi -rm -f conftest* +rm -rf conftest* ])dnl if test $cf_cv_prog_$1_c_o = yes; then AC_MSG_RESULT([yes]) @@ -4493,7 +4536,7 @@ AC_CHECK_PROGS(LINT, tdlint lint alint splint lclint) AC_SUBST(LINT_OPTS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PROG_LN_S version: 1 updated: 2010/07/24 17:12:40 +dnl CF_PROG_LN_S version: 2 updated: 2010/08/14 18:25:37 dnl ------------ dnl Combine checks for "ln -s" and "ln -sf", updating $LN_S to include "-f" dnl option if it is supported. @@ -4509,7 +4552,7 @@ if $LN_S -f conf$$.src conf$$.dst 2>/dev/null; then else cf_prog_ln_sf=no fi - +rm -f conf$$.dst conf$$src AC_MSG_RESULT($cf_prog_ln_sf) test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f" diff --git a/configure b/configure index c6adecd0..d47dd1d2 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh # From configure.in Revision: 1.503 . # Guess values for system-dependent variables and create Makefiles. -# Generated by Autoconf 2.52.20100530. +# Generated by Autoconf 2.52.20100814. # # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. @@ -882,7 +882,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.52.20100530. Invocation command line was +generated by GNU Autoconf 2.52.20100814. Invocation command line was $ $0 $@ @@ -2081,7 +2081,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext done -rm -f conftest* +rm -rf conftest* if test -n "$ac_declaration"; then echo '#ifdef __cplusplus' >>confdefs.h echo $ac_declaration >>confdefs.h @@ -2331,7 +2331,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | else ac_cv_prog_gcc_traditional=no fi -rm -f conftest* +rm -rf conftest* if test $ac_cv_prog_gcc_traditional = no; then cat >conftest.$ac_ext <<_ACEOF @@ -2344,7 +2344,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "$ac_pattern" >/dev/null 2>&1; then ac_cv_prog_gcc_traditional=yes fi -rm -f conftest* +rm -rf conftest* fi fi @@ -2386,7 +2386,7 @@ then else eval cf_cv_prog_CC_c_o=no fi -rm -f conftest* +rm -rf conftest* fi if test $cf_cv_prog_CC_c_o = yes; then @@ -3038,7 +3038,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext done -rm -f conftest* +rm -rf conftest* if test -n "$ac_declaration"; then echo '#ifdef __cplusplus' >>confdefs.h echo $ac_declaration >>confdefs.h @@ -3402,7 +3402,7 @@ if $LN_S -f conf$$.src conf$$.dst 2>/dev/null; then else cf_prog_ln_sf=no fi - +rm -f conf$$.dst conf$$src echo "$as_me:3406: result: $cf_prog_ln_sf" >&5 echo "${ECHO_T}$cf_prog_ln_sf" >&6 @@ -5083,7 +5083,7 @@ cf_save_LIBS="$LIBS" test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown fi fi -rm -f conftest* +rm -rf conftest* LIBS="$cf_save_LIBS" fi @@ -5195,7 +5195,7 @@ CF_EOF test -z "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=no fi fi - rm -f conftest* + rm -rf conftest* LIBS="$cf_save_LIBS" fi @@ -8999,7 +8999,7 @@ cat >>confdefs.h <&5 echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_large_files+set}" = set; then @@ -9096,7 +9096,7 @@ cat >>confdefs.h <>confdefs.h <&5 | else ac_cv_header_stdc=no fi -rm -f conftest* +rm -rf conftest* fi @@ -10230,7 +10230,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | else ac_cv_header_stdc=no fi -rm -f conftest* +rm -rf conftest* fi @@ -11298,7 +11298,7 @@ echo "${as_me-configure}:11290: testing feature is broken in gcc $GCC_VERSION .. done CFLAGS="$cf_save_CFLAGS" fi -rm -f conftest* +rm -rf conftest* if test "$cf_with_cxx" = yes ; then @@ -11457,7 +11457,7 @@ echo "${ECHO_T}... no -$cf_opt" >&6 CXXFLAGS="$cf_save_CXXFLAGS" fi -rm -f conftest* +rm -rf conftest* ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -12532,7 +12532,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | else ac_cv_header_stdc=no fi -rm -f conftest* +rm -rf conftest* fi @@ -12550,7 +12550,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | else ac_cv_header_stdc=no fi -rm -f conftest* +rm -rf conftest* fi @@ -14956,7 +14956,7 @@ if test "${cf_cv_func_mkstemp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -rm -f conftest* +rm -rf conftest* if test "$cross_compiling" = yes; then echo "$as_me:14961: checking for mkstemp" >&5 echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6 @@ -16824,7 +16824,7 @@ then else eval cf_cv_prog_CXX_c_o=no fi -rm -f conftest* +rm -rf conftest* fi if test $cf_cv_prog_CXX_c_o = yes; then @@ -17981,7 +17981,7 @@ fi echo "$as_me:17981: checking if GNAT works" >&5 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 -rm -f conftest* +rm -rf conftest* cat >>conftest.ads <&5 2>&1 ) ; then else cf_cv_prog_gnat_correct=no fi -rm -f conftest* +rm -rf conftest* echo "$as_me:18009: result: $cf_cv_prog_gnat_correct" >&5 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 @@ -18021,7 +18021,7 @@ if test "${cf_cv_pragma_unreferenced+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -rm -f conftest* +rm -rf conftest* cat >>conftest.ads <&5 2>&1 ) ; then else cf_cv_pragma_unreferenced=no fi -rm -f conftest* +rm -rf conftest* fi echo "$as_me:18049: result: $cf_cv_pragma_unreferenced" >&5 @@ -19144,7 +19144,7 @@ EOF cat >>$CONFIG_STATUS <&5 << _ACEOF ## Running config.status. ## ## ----------------------- ## -This file was extended by $as_me 2.52.20100530, executed with +This file was extended by $as_me 2.52.20100814, executed with CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS CONFIG_LINKS = $CONFIG_LINKS diff --git a/dist.mk b/dist.mk index 810ef2a6..d95e0025 100644 --- 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.769 2010/08/07 15:46:03 tom Exp $ +# $Id: dist.mk,v 1.770 2010/08/14 18:03:33 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 = 20100807 +NCURSES_PATCH = 20100814 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/man/curs_add_wch.3x b/man/curs_add_wch.3x index 84092dfd..d55be634 100644 --- a/man/curs_add_wch.3x +++ b/man/curs_add_wch.3x @@ -26,7 +26,7 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: curs_add_wch.3x,v 1.7 2010/07/31 16:12:01 tom Exp $ +.\" $Id: curs_add_wch.3x,v 1.8 2010/08/14 23:29:16 tom Exp $ .TH curs_add_wch 3X "" .SH NAME \fBadd_wch\fP, @@ -102,6 +102,10 @@ by using the *\fBecho\fP* functions instead of their equivalents. .SH RETURN VALUES .PP All routines return the integer \fBERR\fR upon failure and \fBOK\fR on success. +.PP +Functions with a "mv" prefix first perform a cursor movement using +\fBwmove\fP, and return an error if the position is outside the window, +or if the window pointer is null. .SH NOTES .PP Note that diff --git a/man/curs_add_wchstr.3x b/man/curs_add_wchstr.3x index 27a86337..b256db18 100644 --- a/man/curs_add_wchstr.3x +++ b/man/curs_add_wchstr.3x @@ -26,7 +26,7 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: curs_add_wchstr.3x,v 1.7 2010/07/31 16:12:01 tom Exp $ +.\" $Id: curs_add_wchstr.3x,v 1.8 2010/08/14 23:29:16 tom Exp $ .TH curs_add_wchstr 3X "" .SH NAME \fBadd_wchstr\fR, @@ -83,6 +83,10 @@ the remaining columns are filled with the background character and rendition. All functions except \fBwadd_wchnstr\fR may be macros. .SH RETURN VALUES All routines return the integer \fBERR\fR upon failure and \fBOK\fR on success. +.PP +Functions with a "mv" prefix first perform a cursor movement using +\fBwmove\fP, and return an error if the position is outside the window, +or if the window pointer is null. .SH PORTABILITY All these entry points are described in the XSI Curses standard, Issue 4. .SH SEE ALSO diff --git a/man/curs_addch.3x b/man/curs_addch.3x index c1f69f1d..903da756 100644 --- a/man/curs_addch.3x +++ b/man/curs_addch.3x @@ -27,10 +27,13 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: curs_addch.3x,v 1.28 2010/07/31 16:12:01 tom Exp $ +.\" $Id: curs_addch.3x,v 1.29 2010/08/14 23:29:16 tom Exp $ .TH curs_addch 3X "" .SH NAME -\fBaddch\fR, \fBwaddch\fR, \fBmvaddch\fR, \fBmvwaddch\fR, +\fBaddch\fR, +\fBwaddch\fR, +\fBmvaddch\fR, +\fBmvwaddch\fR, \fBechochar\fR, \fBwechochar\fR \- add a character (with attributes) to a \fBcurses\fR window, then advance the cursor .SH SYNOPSIS @@ -134,6 +137,10 @@ All routines return the integer \fBERR\fR upon failure and \fBOK\fR on success (the SVr4 manuals specify only "an integer value other than \fBERR\fR") upon successful completion, unless otherwise noted in the preceding routine descriptions. +.PP +Functions with a "mv" prefix first perform a cursor movement using +\fBwmove\fP, and return an error if the position is outside the window, +or if the window pointer is null. .SH NOTES Note that \fBaddch\fR, \fBmvaddch\fR, \fBmvwaddch\fR, and \fBechochar\fR may be macros. diff --git a/man/curs_addchstr.3x b/man/curs_addchstr.3x index 397ccee0..41749ebd 100644 --- a/man/curs_addchstr.3x +++ b/man/curs_addchstr.3x @@ -26,7 +26,7 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: curs_addchstr.3x,v 1.13 2010/07/31 16:12:01 tom Exp $ +.\" $Id: curs_addchstr.3x,v 1.14 2010/08/14 23:29:16 tom Exp $ .TH curs_addchstr 3X "" .na .hy 0 @@ -81,6 +81,10 @@ descriptions. X/Open does not define any error conditions. This implementation returns an error if the window pointer is null. +.PP +Functions with a "mv" prefix first perform a cursor movement using +\fBwmove\fP, and return an error if the position is outside the window, +or if the window pointer is null. .SH NOTES Note that all routines except \fBwaddchnstr\fR may be macros. .SH PORTABILITY diff --git a/man/curs_addstr.3x b/man/curs_addstr.3x index 7e192a9d..d98b456c 100644 --- a/man/curs_addstr.3x +++ b/man/curs_addstr.3x @@ -26,7 +26,7 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: curs_addstr.3x,v 1.14 2010/07/31 16:12:01 tom Exp $ +.\" $Id: curs_addstr.3x,v 1.15 2010/08/14 23:29:16 tom Exp $ .TH curs_addstr 3X "" .na .hy 0 @@ -80,6 +80,10 @@ This implementation returns an error if the window pointer is null or if the string pointer is null or if the corresponding calls to \fBwaddch\fP return an error. +.PP +Functions with a "mv" prefix first perform a cursor movement using +\fBwmove\fP, and return an error if the position is outside the window, +or if the window pointer is null. .SH NOTES Note that all of these routines except \fBwaddstr\fR and \fBwaddnstr\fR may be macros. diff --git a/man/curs_addwstr.3x b/man/curs_addwstr.3x index cc299efa..81ea04b0 100644 --- a/man/curs_addwstr.3x +++ b/man/curs_addwstr.3x @@ -26,7 +26,7 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: curs_addwstr.3x,v 1.8 2010/07/31 16:12:01 tom Exp $ +.\" $Id: curs_addwstr.3x,v 1.9 2010/08/14 23:29:16 tom Exp $ .TH curs_addwstr 3X "" .na .hy 0 @@ -79,6 +79,10 @@ up to the maximum number of characters that will fit on the line, or until a terminating null is reached. .SH RETURN VALUES All routines return the integer \fBERR\fR upon failure and \fBOK\fR on success. +.PP +Functions with a "mv" prefix first perform a cursor movement using +\fBwmove\fP, and return an error if the position is outside the window, +or if the window pointer is null. .SH NOTES Note that all of these routines except \fBwaddnwstr\fR may be macros. .SH PORTABILITY diff --git a/man/curs_attr.3x b/man/curs_attr.3x index 8cf769ae..9e400186 100644 --- a/man/curs_attr.3x +++ b/man/curs_attr.3x @@ -27,7 +27,7 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: curs_attr.3x,v 1.33 2010/07/31 16:12:01 tom Exp $ +.\" $Id: curs_attr.3x,v 1.34 2010/08/14 23:30:02 tom Exp $ .TH curs_attr 3X "" .na .hy 0 @@ -257,6 +257,10 @@ is outside the range 0..COLOR_PAIRS\-1. This implementation also provides \fBgetattrs\fR for compatibility with older versions of curses. +.PP +Functions with a "mv" prefix first perform a cursor movement using +\fBwmove\fP, and return an error if the position is outside the window, +or if the window pointer is null. .SH SEE ALSO \fBcurses\fR(3X), \fBcurs_addch\fR(3X), diff --git a/man/curs_border.3x b/man/curs_border.3x index 16b98c3d..09c2f5cf 100644 --- a/man/curs_border.3x +++ b/man/curs_border.3x @@ -26,7 +26,7 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: curs_border.3x,v 1.20 2010/07/31 16:12:01 tom Exp $ +.\" $Id: curs_border.3x,v 1.21 2010/08/14 23:29:16 tom Exp $ .TH curs_border 3X "" .na .hy 0 @@ -136,6 +136,10 @@ non-negative integer if \fBimmedok\fR is set", but this appears to be an error. X/Open does not define any error conditions. This implementation returns an error if the window pointer is null. +.PP +Functions with a "mv" prefix first perform a cursor movement using +\fBwmove\fP, and return an error if the position is outside the window, +or if the window pointer is null. .SH NOTES The borders generated by these functions are \fIinside\fR borders (this is also true of SVr4 curses, though the fact is not documented). diff --git a/man/curs_border_set.3x b/man/curs_border_set.3x index d1751f24..83d41fc1 100644 --- a/man/curs_border_set.3x +++ b/man/curs_border_set.3x @@ -26,7 +26,7 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: curs_border_set.3x,v 1.7 2010/07/31 16:12:01 tom Exp $ +.\" $Id: curs_border_set.3x,v 1.8 2010/08/14 23:29:16 tom Exp $ .TH curs_border_set 3X "" .na .hy 0 @@ -195,6 +195,10 @@ Otherwise, they return \fBERR\fR. .PP Functions using a window parameter return an error if it is null. +.PP +Functions with a "mv" prefix first perform a cursor movement using +\fBwmove\fP, and return an error if the position is outside the window, +or if the window pointer is null. .SH SEE ALSO \fBncurses\fR(3X), \fBcurs_border\fR(3X), diff --git a/man/curs_color.3x b/man/curs_color.3x index a90a321b..a1107d71 100644 --- a/man/curs_color.3x +++ b/man/curs_color.3x @@ -26,7 +26,7 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: curs_color.3x,v 1.30 2010/07/31 16:12:01 tom Exp $ +.\" $Id: curs_color.3x,v 1.31 2010/08/14 23:11:23 Tim.van.der.Molen Exp $ .TH curs_color 3X "" .na .hy 0 @@ -193,8 +193,7 @@ this feature, e.g., if the \fIinitialize_color\fP capability is absent from the terminal description. .TP 5 \fBstart_color\fP -returns an error -If the color table cannot be allocated. +returns an error if the color table cannot be allocated. .RE .SH NOTES In the \fIncurses\fR implementation, there is a separate color activation flag, diff --git a/man/curs_delch.3x b/man/curs_delch.3x index fe9650c1..6f05e3eb 100644 --- a/man/curs_delch.3x +++ b/man/curs_delch.3x @@ -26,7 +26,7 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: curs_delch.3x,v 1.9 2010/07/31 16:12:01 tom Exp $ +.\" $Id: curs_delch.3x,v 1.10 2010/08/14 23:29:16 tom Exp $ .TH curs_delch 3X "" .SH NAME \fBdelch\fR, @@ -54,6 +54,10 @@ imply use of the hardware delete character feature.) All routines return the integer \fBERR\fR upon failure and an \fBOK\fR (SVr4 specifies only "an integer value other than \fBERR\fR") upon successful completion. +.PP +Functions with a "mv" prefix first perform a cursor movement using +\fBwmove\fP, and return an error if the position is outside the window, +or if the window pointer is null. .SH NOTES Note that \fBdelch\fR, \fBmvdelch\fR, and \fBmvwdelch\fR may be macros. .SH PORTABILITY diff --git a/man/curs_get_wch.3x b/man/curs_get_wch.3x index 6ecff799..fe49849a 100644 --- a/man/curs_get_wch.3x +++ b/man/curs_get_wch.3x @@ -1,5 +1,5 @@ .\"*************************************************************************** -.\" Copyright (c) 2002-2003,2006 Free Software Foundation, Inc. * +.\" Copyright (c) 2002-2006,2010 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_get_wch.3x,v 1.6 2006/02/25 21:47:06 tom Exp $ +.\" $Id: curs_get_wch.3x,v 1.7 2010/08/14 23:31:42 tom Exp $ .TH curs_get_wch 3X "" .SH NAME \fBget_wch\fR, @@ -152,6 +152,10 @@ returns \fBOK\fR. Otherwise, the function returns \fBERR\fR. +.PP +Functions with a "mv" prefix first perform a cursor movement using +\fBwmove\fP, and return an error if the position is outside the window, +or if the window pointer is null. .SH SEE ALSO \fBcurses\fR(3X), \fBcurs_getch\fR(3X), diff --git a/man/curs_get_wstr.3x b/man/curs_get_wstr.3x index 4286c78b..8bfc467a 100644 --- a/man/curs_get_wstr.3x +++ b/man/curs_get_wstr.3x @@ -1,5 +1,5 @@ .\"*************************************************************************** -.\" Copyright (c) 2002-2005,2006 Free Software Foundation, Inc. * +.\" Copyright (c) 2002-2006,2010 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_get_wstr.3x,v 1.6 2006/02/25 21:49:19 tom Exp $ +.\" $Id: curs_get_wstr.3x,v 1.7 2010/08/14 23:31:42 tom Exp $ .TH curs_get_wstr 3X "" .na .hy 0 @@ -154,6 +154,10 @@ Functions using a window parameter return an error if it is null. \fBwgetn_wstr\fP returns an error if the associated call to \fBwget_wch\fP failed. .RE +.PP +Functions with a "mv" prefix first perform a cursor movement using +\fBwmove\fP, and return an error if the position is outside the window, +or if the window pointer is null. .SH PORTABILITY These functions are described in The Single Unix Specification, Version 2. No error conditions are defined. diff --git a/man/curs_getch.3x b/man/curs_getch.3x index e8041655..e03970d0 100644 --- a/man/curs_getch.3x +++ b/man/curs_getch.3x @@ -27,7 +27,7 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: curs_getch.3x,v 1.31 2010/01/30 21:29:04 tom Exp $ +.\" $Id: curs_getch.3x,v 1.32 2010/08/14 23:29:16 tom Exp $ .TH curs_getch 3X "" .na .hy 0 @@ -245,6 +245,10 @@ returns an error if the window pointer is null, or if its timeout expires without having any data. .RE +.PP +Functions with a "mv" prefix first perform a cursor movement using +\fBwmove\fP, and return an error if the position is outside the window, +or if the window pointer is null. .SH NOTES Use of the escape key by a programmer for a single character function is discouraged, as it will cause a delay of up to one second while the diff --git a/man/curs_getstr.3x b/man/curs_getstr.3x index c3e7435c..2052412a 100644 --- a/man/curs_getstr.3x +++ b/man/curs_getstr.3x @@ -26,7 +26,7 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: curs_getstr.3x,v 1.16 2010/07/31 16:12:01 tom Exp $ +.\" $Id: curs_getstr.3x,v 1.17 2010/08/14 23:29:16 tom Exp $ .TH curs_getstr 3X "" .na .hy 0 @@ -94,6 +94,10 @@ if its timeout expires without having any data. This implementation provides an extension as well. If a SIGWINCH interrupts the function, it will return \fBKEY_RESIZE\fP rather than \fBOK\fP or \fBERR\fP. +.PP +Functions with a "mv" prefix first perform a cursor movement using +\fBwmove\fP, and return an error if the position is outside the window, +or if the window pointer is null. .SH NOTES Note that \fBgetstr\fR, \fBmvgetstr\fR, and \fBmvwgetstr\fR may be macros. .SH PORTABILITY diff --git a/man/curs_in_wch.3x b/man/curs_in_wch.3x index 6db41a96..6b3e53ef 100644 --- a/man/curs_in_wch.3x +++ b/man/curs_in_wch.3x @@ -26,7 +26,7 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: curs_in_wch.3x,v 1.3 2010/07/31 16:10:55 tom Exp $ +.\" $Id: curs_in_wch.3x,v 1.4 2010/08/14 23:29:16 tom Exp $ .TH curs_in_wch 3X "" .SH NAME \fBin_wch\fR, @@ -53,6 +53,10 @@ This implementation checks for null pointers, returns ERR in that case. Also, the \fImv\fR routines check for error moving the cursor, returning ERR in that case. Otherwise they return OK +.PP +Functions with a "mv" prefix first perform a cursor movement using +\fBwmove\fP, and return an error if the position is outside the window, +or if the window pointer is null. .SH NOTES Note that all of these routines may be macros. .SH PORTABILITY diff --git a/man/curs_in_wchstr.3x b/man/curs_in_wchstr.3x index b04a1f54..83786138 100644 --- a/man/curs_in_wchstr.3x +++ b/man/curs_in_wchstr.3x @@ -1,5 +1,5 @@ .\"*************************************************************************** -.\" Copyright (c) 2002-2005,2006 Free Software Foundation, Inc. * +.\" Copyright (c) 2002-2006,2010 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_in_wchstr.3x,v 1.6 2006/12/02 17:03:07 tom Exp $ +.\" $Id: curs_in_wchstr.3x,v 1.7 2010/08/14 23:31:42 tom Exp $ .TH curs_in_wchstr 3X "" .na .hy 0 @@ -103,6 +103,10 @@ Upon successful completion, these functions return \fBOK\fR. Otherwise, they return \fBERR\fR. +.PP +Functions with a "mv" prefix first perform a cursor movement using +\fBwmove\fP, and return an error if the position is outside the window, +or if the window pointer is null. .SH PORTABILITY The XSI Curses defines no error conditions. This implementation checks for null pointers, diff --git a/man/curs_inch.3x b/man/curs_inch.3x index 486d6d61..5faa7633 100644 --- a/man/curs_inch.3x +++ b/man/curs_inch.3x @@ -27,11 +27,13 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: curs_inch.3x,v 1.14 2010/07/31 16:11:27 tom Exp $ +.\" $Id: curs_inch.3x,v 1.16 2010/08/14 23:35:36 tom Exp $ .TH curs_inch 3X "" .SH NAME -\fBinch\fR, \fBwinch\fR, \fBmvinch\fR, \fBmvwinch\fR -\- get a character and attributes from a \fBcurses\fR window +\fBinch\fR, +\fBwinch\fR, +\fBmvinch\fR, +\fBmvwinch\fR \- get a character and attributes from a \fBcurses\fR window .SH SYNOPSIS \fB#include \fR .sp @@ -59,6 +61,10 @@ l l . \fBA_ATTRIBUTES\fR Bit-mask to extract attributes \fBA_COLOR\fR Bit-mask to extract color-pair field information .TE +.SH RETURN VALUE +Functions with a "mv" prefix first perform a cursor movement using +\fBwmove\fP, and return an error if the position is outside the window, +or if the window pointer is null. .SH NOTES Note that all of these routines may be macros. .SH PORTABILITY diff --git a/man/curs_inchstr.3x b/man/curs_inchstr.3x index daeafe25..db69cb23 100644 --- a/man/curs_inchstr.3x +++ b/man/curs_inchstr.3x @@ -26,7 +26,7 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: curs_inchstr.3x,v 1.13 2010/07/31 16:08:48 tom Exp $ +.\" $Id: curs_inchstr.3x,v 1.14 2010/08/14 23:29:16 tom Exp $ .TH curs_inchstr 3X "" .na .hy 0 @@ -78,6 +78,10 @@ No error conditions are defined. If the \fIchstr\fP parameter is null, no data is returned, and the return value is zero. +.PP +Functions with a "mv" prefix first perform a cursor movement using +\fBwmove\fP, and return an error if the position is outside the window, +or if the window pointer is null. .SH NOTES Note that all routines except \fBwinchnstr\fR may be macros. SVr4 does not document whether the result string is zero-terminated; it does not document diff --git a/man/curs_ins_wch.3x b/man/curs_ins_wch.3x index bb8a9a34..df596cc5 100644 --- a/man/curs_ins_wch.3x +++ b/man/curs_ins_wch.3x @@ -1,5 +1,5 @@ .\"*************************************************************************** -.\" Copyright (c) 2002,2006 Free Software Foundation, Inc. * +.\" Copyright (c) 2002-2006,2010 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_ins_wch.3x,v 1.3 2006/02/25 21:42:22 tom Exp $ +.\" $Id: curs_ins_wch.3x,v 1.4 2010/08/14 23:31:42 tom Exp $ .TH curs_ins_wch 3X "" .SH NAME \fBins_wch\fR, @@ -52,6 +52,10 @@ The insertion operation does not change the cursor position. .SH RETURN VALUE If successful, these functions return OK. If not, they return ERR. +.PP +Functions with a "mv" prefix first perform a cursor movement using +\fBwmove\fP, and return an error if the position is outside the window, +or if the window pointer is null. .SH ERRORS No errors are defined. .SH SEE ALSO diff --git a/man/curs_ins_wstr.3x b/man/curs_ins_wstr.3x index 0c153c4c..9eecbfbf 100644 --- a/man/curs_ins_wstr.3x +++ b/man/curs_ins_wstr.3x @@ -1,5 +1,5 @@ .\"*************************************************************************** -.\" Copyright (c) 2002,2005 Free Software Foundation, Inc. * +.\" Copyright (c) 2002-2005,2010 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_ins_wstr.3x,v 1.4 2005/05/15 17:02:54 tom Exp $ +.\" $Id: curs_ins_wstr.3x,v 1.5 2010/08/14 23:31:42 tom Exp $ .TH curs_ins_wstr 3X "" .na .hy 0 @@ -95,6 +95,10 @@ a control character. .SH RETURN VALUES Upon successful completion, these functions return OK. Otherwise, they return ERR. +.PP +Functions with a "mv" prefix first perform a cursor movement using +\fBwmove\fP, and return an error if the position is outside the window, +or if the window pointer is null. .SH SEE ALSO \fBcurses\fR(3X), \fBcurs_insstr\fR(3X), diff --git a/man/curs_insch.3x b/man/curs_insch.3x index 5b1a0b3c..bc2aeb47 100644 --- a/man/curs_insch.3x +++ b/man/curs_insch.3x @@ -26,7 +26,7 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: curs_insch.3x,v 1.11 2010/07/31 16:11:27 tom Exp $ +.\" $Id: curs_insch.3x,v 1.12 2010/08/14 23:29:16 tom Exp $ .TH curs_insch 3X "" .SH NAME \fBinsch\fR, @@ -53,6 +53,10 @@ The insertion operation does not change the cursor position. All routines that return an integer return \fBERR\fR upon failure and OK (SVr4 specifies only "an integer value other than \fBERR\fR") upon successful completion, unless otherwise noted in the preceding routine descriptions. +.PP +Functions with a "mv" prefix first perform a cursor movement using +\fBwmove\fP, and return an error if the position is outside the window, +or if the window pointer is null. .SH NOTES These routines do not necessarily imply use of a hardware insert character feature. diff --git a/man/curs_insstr.3x b/man/curs_insstr.3x index 8fca4adf..072288dc 100644 --- a/man/curs_insstr.3x +++ b/man/curs_insstr.3x @@ -26,7 +26,7 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: curs_insstr.3x,v 1.19 2010/07/31 16:11:27 tom Exp $ +.\" $Id: curs_insstr.3x,v 1.20 2010/08/14 23:29:16 tom Exp $ .TH curs_insstr 3X "" .SH NAME \fBinsstr\fR, @@ -78,6 +78,10 @@ X/Open defines no error conditions. In this implementation, if the window parameter is null or the str parameter is null, an error is returned. +.PP +Functions with a "mv" prefix first perform a cursor movement using +\fBwmove\fP, and return an error if the position is outside the window, +or if the window pointer is null. .SH NOTES Note that all but \fBwinsnstr\fR may be macros. .SH PORTABILITY diff --git a/man/curs_instr.3x b/man/curs_instr.3x index 5e79f813..ff7d7f08 100644 --- a/man/curs_instr.3x +++ b/man/curs_instr.3x @@ -26,7 +26,7 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: curs_instr.3x,v 1.14 2010/07/31 16:11:27 tom Exp $ +.\" $Id: curs_instr.3x,v 1.15 2010/08/14 23:29:16 tom Exp $ .TH curs_instr 3X "" .SH NAME \fBinstr\fR, @@ -70,6 +70,10 @@ X/Open defines no error conditions. In this implementation, if the window parameter is null or the str parameter is null, a zero is returned. +.PP +Functions with a "mv" prefix first perform a cursor movement using +\fBwmove\fP, and return an error if the position is outside the window, +or if the window pointer is null. .SH NOTES Note that all routines except \fBwinnstr\fR may be macros. .SH PORTABILITY diff --git a/man/curs_inwstr.3x b/man/curs_inwstr.3x index 990789cb..c785b09e 100644 --- a/man/curs_inwstr.3x +++ b/man/curs_inwstr.3x @@ -1,5 +1,5 @@ .\"*************************************************************************** -.\" Copyright (c) 2002-2005,2006 Free Software Foundation, Inc. * +.\" Copyright (c) 2002-2006,2010 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_inwstr.3x,v 1.5 2006/02/25 21:20:20 tom Exp $ +.\" $Id: curs_inwstr.3x,v 1.6 2010/08/14 23:31:42 tom Exp $ .TH curs_inwstr 3X "" .SH NAME \fBinwstr\fR, @@ -81,6 +81,10 @@ routines return \fBOK\fR, and the *\fBinnwstr\fR routines return the number of characters read into the string. +.PP +Functions with a "mv" prefix first perform a cursor movement using +\fBwmove\fP, and return an error if the position is outside the window, +or if the window pointer is null. .SH SEE ALSO \fBcurses\fR(3X), \fBcurs_instr\fR(3X), diff --git a/man/curs_kernel.3x b/man/curs_kernel.3x index 105f76a0..9d378e20 100644 --- a/man/curs_kernel.3x +++ b/man/curs_kernel.3x @@ -26,7 +26,7 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: curs_kernel.3x,v 1.16 2010/07/31 16:11:27 tom Exp $ +.\" $Id: curs_kernel.3x,v 1.17 2010/08/14 23:12:36 Tim.van.der.Molen Exp $ .TH curs_kernel 3X "" .na .hy 0 @@ -127,7 +127,7 @@ routine. \fBripoffline\fR can be called up to five times before calling \fBinitscr\fR or \fBnewterm\fR. .PP -The \fBcurs_set\fR routine sets the cursor state is set to invisible, +The \fBcurs_set\fR routine sets the cursor state to invisible, normal, or very visible for \fBvisibility\fR equal to \fB0\fR, \fB1\fR, or \fB2\fR respectively. If the terminal supports the \fIvisibility\fR requested, the previous \fIcursor\fR state is diff --git a/man/curs_printw.3x b/man/curs_printw.3x index a1ec5558..ce5d39d0 100644 --- a/man/curs_printw.3x +++ b/man/curs_printw.3x @@ -26,7 +26,7 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: curs_printw.3x,v 1.18 2010/07/31 16:10:55 tom Exp $ +.\" $Id: curs_printw.3x,v 1.19 2010/08/14 23:29:16 tom Exp $ .TH curs_printw 3X "" .na .hy 0 @@ -74,6 +74,10 @@ In this implementation, an error may be returned if it cannot allocate enough memory for the buffer used to format the results. It will return an error if the window pointer is null. +.PP +Functions with a "mv" prefix first perform a cursor movement using +\fBwmove\fP, and return an error if the position is outside the window, +or if the window pointer is null. .SH PORTABILITY The XSI Curses standard, Issue 4 describes these functions. The function \fBvwprintw\fR is marked TO BE WITHDRAWN, and is to be replaced by a function diff --git a/man/curs_scanw.3x b/man/curs_scanw.3x index 97449bd5..5e9ba0bd 100644 --- a/man/curs_scanw.3x +++ b/man/curs_scanw.3x @@ -26,7 +26,7 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: curs_scanw.3x,v 1.15 2010/07/31 16:10:55 tom Exp $ +.\" $Id: curs_scanw.3x,v 1.16 2010/08/14 23:29:16 tom Exp $ .TH curs_scanw 3X "" .SH NAME \fBscanw\fR, @@ -66,6 +66,10 @@ number of fields scanned on success. Applications may use the return value from the \fBscanw\fR, \fBwscanw\fR, \fBmvscanw\fR and \fBmvwscanw\fR routines to determine the number of fields which were mapped in the call. +.PP +Functions with a "mv" prefix first perform a cursor movement using +\fBwmove\fP, and return an error if the position is outside the window, +or if the window pointer is null. .SH PORTABILITY The XSI Curses standard, Issue 4 describes these functions. The function \fBvwscanw\fR is marked TO BE WITHDRAWN, and is to be replaced by a function diff --git a/man/wresize.3x b/man/wresize.3x index 11d1f3d6..861f4bea 100644 --- a/man/wresize.3x +++ b/man/wresize.3x @@ -28,7 +28,7 @@ .\" .\" Author: Thomas E. Dickey 1996 .\" -.\" $Id: wresize.3x,v 1.11 2010/07/31 15:30:32 tom Exp $ +.\" $Id: wresize.3x,v 1.12 2010/08/14 23:12:04 Tim.van.der.Molen Exp $ .TH wresize 3X "" .SH NAME \fBwresize\fR \- resize a curses window @@ -37,7 +37,8 @@ .sp \fBint wresize(WINDOW *win, int lines, int columns);\fR .SH DESCRIPTION -The \fBwresize\fR function reallocates storage for an \fBncurses\fR +This is an extension to the curses library. +It reallocates storage for an \fBncurses\fR window to adjust its dimensions to the specified values. If either dimension is larger than the current values, the window's data is filled with blanks that have the current background rendition -- 2.44.0