diff options
author | Jason McIntyre <jmc@cvs.openbsd.org> | 2003-05-14 08:55:20 +0000 |
---|---|---|
committer | Jason McIntyre <jmc@cvs.openbsd.org> | 2003-05-14 08:55:20 +0000 |
commit | b943f15f307e984b61bc679f67f3655994350b0c (patch) | |
tree | 7946d220525a89be991764b6bfcd404a0b2aca68 | |
parent | 7776f84fd3b0bc8897c89b7c525c6125fc067a1b (diff) |
typos;
diffs passed on to curses people.
-rw-r--r-- | lib/libcurses/curs_pad.3 | 8 | ||||
-rw-r--r-- | lib/libcurses/curs_print.3 | 4 | ||||
-rw-r--r-- | lib/libcurses/curs_scroll.3 | 6 | ||||
-rw-r--r-- | lib/libcurses/curs_slk.3 | 12 | ||||
-rw-r--r-- | lib/libcurses/curs_window.3 | 4 | ||||
-rw-r--r-- | lib/libcurses/curses.3tbl | 16 | ||||
-rw-r--r-- | lib/libcurses/resizeterm.3 | 4 | ||||
-rw-r--r-- | lib/libcurses/term.5tbl | 18 | ||||
-rw-r--r-- | lib/libcurses/term.7 | 22 | ||||
-rw-r--r-- | lib/libcurses/termcap.3 | 4 | ||||
-rw-r--r-- | lib/libcurses/terminfo.3 | 10 |
11 files changed, 53 insertions, 55 deletions
diff --git a/lib/libcurses/curs_pad.3 b/lib/libcurses/curs_pad.3 index 63b204767fb..9544c759a33 100644 --- a/lib/libcurses/curs_pad.3 +++ b/lib/libcurses/curs_pad.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: curs_pad.3,v 1.7 2000/07/10 03:06:08 millert Exp $ +.\" $OpenBSD: curs_pad.3,v 1.8 2003/05/14 08:55:19 jmc Exp $ .\" .\"*************************************************************************** .\" Copyright (c) 1998,2000 Free Software Foundation, Inc. * @@ -55,7 +55,7 @@ structure with the given number of lines, \fInlines\fR, and columns, screen size, and is not necessarily associated with a particular part of the screen. Pads can be used when a large window is needed, and only a part of the window will be on the screen at one time. Automatic refreshes of pads -(\fIe\fR.\fIg\fR., from scrolling or echoing of input) do not occur. It is not +(e.g., from scrolling or echoing of input) do not occur. It is not legal to call \fBwrefresh\fR with a \fIpad\fR as an argument; the routines \fBprefresh\fR or \fBpnoutrefresh\fR should be called instead. Note that these routines require additional parameters to specify the part of the pad to be @@ -86,7 +86,7 @@ they were zero. The \fBpechochar\fR routine is functionally equivalent to a call to \fBaddch\fR followed by a call to \fBrefresh\fR, a call to \fBwaddch\fR followed by a call to \fBwrefresh\fR, or a call to \fBwaddch\fR followed by a call to -\fBprefresh.\fR The knowledge that only a single character is being output is +\fBprefresh\fR. The knowledge that only a single character is being output is taken into consideration and, for non-control characters, a considerable performance gain might be seen by using these routines instead of their equivalents. In the case of \fBpechochar\fR, the last location of the pad on @@ -97,7 +97,7 @@ Routines that return an integer return \fBERR\fR upon failure and \fBOK\fR completion. Routines that return pointers return \fBNULL\fR on error, and set \fBerrno\fR -to \fBENOMEM\fR. +to \fBENOMEM\fR. .SH NOTES Note that \fBpechochar\fR may be a macro. .SH PORTABILITY diff --git a/lib/libcurses/curs_print.3 b/lib/libcurses/curs_print.3 index c70a72c5946..b598ef04575 100644 --- a/lib/libcurses/curs_print.3 +++ b/lib/libcurses/curs_print.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: curs_print.3,v 1.7 1998/09/13 19:16:21 millert Exp $ +.\" $OpenBSD: curs_print.3,v 1.8 2003/05/14 08:55:19 jmc Exp $ .\" .\"*************************************************************************** .\" Copyright (c) 1998 Free Software Foundation, Inc. * @@ -48,7 +48,7 @@ keeping the rate of writes to the printer below its continuous throughput rate rule of thumb is to sleep for a second after shipping each 80-character line. .SH RETURN VALUE -The \fBmcprint\fR function returns \fBERR\fR if the write operation aborted +The \fBmcprint\fR function returns \fBERR\fR if the write operation aborted for some reason. In this case, errno will contain either an error associated with \fBwrite(2)\fR or one of the following: .TP 5 diff --git a/lib/libcurses/curs_scroll.3 b/lib/libcurses/curs_scroll.3 index 682df113616..df86d4792c9 100644 --- a/lib/libcurses/curs_scroll.3 +++ b/lib/libcurses/curs_scroll.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: curs_scroll.3,v 1.7 2000/07/10 03:06:09 millert Exp $ +.\" $OpenBSD: curs_scroll.3,v 1.8 2003/05/14 08:55:19 jmc Exp $ .\" .\"*************************************************************************** .\" Copyright (c) 1998,2000 Free Software Foundation, Inc. * @@ -59,11 +59,11 @@ These routines return \fBERR\fR upon failure, and \fBOK\fR (SVr4 only specifies .SH NOTES Note that \fBscrl\fR and \fBscroll\fR may be macros. -The SVr4 documentation says that the optimization of physically scrolling +The SVr4 documentation says that the optimization of physically scrolling immediately if the scroll region is the entire screen "is" performed, not "may be" performed. This implementation deliberately does not guarantee that this will occur, in order to leave open the possibility of smarter -optimization of multiple scroll actions on the next update. +optimization of multiple scroll actions on the next update. Neither the SVr4 nor the XSI documentation specify whether the current attribute or diff --git a/lib/libcurses/curs_slk.3 b/lib/libcurses/curs_slk.3 index 987aa9f5c33..41f21ead54a 100644 --- a/lib/libcurses/curs_slk.3 +++ b/lib/libcurses/curs_slk.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: curs_slk.3,v 1.8 2001/02/25 17:00:08 millert Exp $ +.\" $OpenBSD: curs_slk.3,v 1.9 2003/05/14 08:55:19 jmc Exp $ .\" .\"*************************************************************************** .\" Copyright (c) 1998,2000 Free Software Foundation, Inc. * @@ -79,7 +79,7 @@ The slk* functions manipulate the set of soft function-key labels that exist on many terminals. For those terminals that do not have soft labels, \fBcurses\fR takes over the bottom line of \fBstdscr\fR, reducing the size of \fBstdscr\fR and the variable \fBLINES\fR. \fBcurses\fR standardizes on eight -labels of up to eight characters each. In addition to this, the ncurses +labels of up to eight characters each. In addition to this, the ncurses implementation supports a mode where it simulates 12 labels of up to five characters each. This is most common for todays PC like enduser devices. Please note that ncurses simulates this mode by taking over up to two lines at @@ -96,10 +96,10 @@ PC like 4-4-4 mode. If \fBfmt\fR is set to \fB3\fR, it is again the PC like identify the key numbers easily. The \fBslk_set\fR routine requires \fIlabnum\fR to be a label number, -from \fB1\fR to \fB8\fR (resp. \fB12\fR); \fIlabel\fR must be the string +from \fB1\fR to \fB8\fR (resp. \fB12\fR); \fIlabel\fR must be the string to be put on the label, up to eight (resp. five) characters in length. A null string or a null pointer sets up a blank label. \fIfmt\fR is either -\fB0\fR, \fB1\fR, or \fB2\fR, indicating whether the label is to be +\fB0\fR, \fB1\fR, or \fB2\fR, indicating whether the label is to be left-justified, centered, or right-justified, respectively, within the label. @@ -111,7 +111,7 @@ The \fBslk_label\fR routine returns the current label for label number The \fBslk_clear\fR routine clears the soft labels from the screen. -The \fBslk_restore\fR routine, restores the soft labels to the screen +The \fBslk_restore\fR routine restores the soft labels to the screen after a \fBslk_clear\fR has been performed. The \fBslk_touch\fR routine forces all the soft labels to be output @@ -120,7 +120,7 @@ the next time a \fBslk_noutrefresh\fR is performed. The \fBslk_attron\fR, \fBslk_attrset\fR, \fBslk_attroff\fR and \fBslk_attr\fR routines correspond to \fBattron\fR, \fBattrset\fR, \fBattroff\fR and \fBattr_get\fR. They have an effect only if soft labels are simulated on the bottom line of -the screen. The default highlight for soft keys is A_STANDOUT (as in +the screen. The default highlight for soft keys is A_STANDOUT (as in System V curses, which does not document this fact). The \fBslk_color\fR routine corresponds to \fBcolor_set\fR. It has an effect only diff --git a/lib/libcurses/curs_window.3 b/lib/libcurses/curs_window.3 index 0c51890bee4..ac75191a5ad 100644 --- a/lib/libcurses/curs_window.3 +++ b/lib/libcurses/curs_window.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: curs_window.3,v 1.8 2000/07/10 03:06:09 millert Exp $ +.\" $OpenBSD: curs_window.3,v 1.9 2003/05/14 08:55:19 jmc Exp $ .\" .\"*************************************************************************** .\" Copyright (c) 1998,2000 Free Software Foundation, Inc. * @@ -144,7 +144,7 @@ The subwindow functions (\fIsubwin\fR, \fIderwin\fR, \fImvderwin\fR, incompletely implemented, and not well tested. The System V curses documentation is very unclear about what \fBwsyncup\fR -and \fBwsyncdown\fR actually do. It seems to imply that they are only +and \fBwsyncdown\fR actually do. It seems to imply that they are only supposed to touch exactly those lines that are affected by ancestor changes. The language here, and the behavior of the \fBcurses\fR implementation, is patterned on the XPG4 curses standard. The weaker XPG4 spec may result diff --git a/lib/libcurses/curses.3tbl b/lib/libcurses/curses.3tbl index 8ee2a5657bf..7595cd82d17 100644 --- a/lib/libcurses/curses.3tbl +++ b/lib/libcurses/curses.3tbl @@ -1,5 +1,5 @@ '\" t -.\" $OpenBSD: curses.3tbl,v 1.18 2001/01/22 18:01:33 millert Exp $ +.\" $OpenBSD: curses.3tbl,v 1.19 2003/05/14 08:55:19 jmc Exp $ .\" .\"*************************************************************************** .\" Copyright (c) 1998,1999 Free Software Foundation, Inc. * @@ -507,22 +507,22 @@ integer value other than \fBERR\fR upon successful completion, unless otherwise noted in the routine descriptions. All macros return the value of the \fBw\fR version, except \fBsetscrreg\fR, -\fBwsetscrreg\fR, \fBgetyx\fR, \fBgetbegyx\fR, \fBgetmaxyx\fR. The return +\fBwsetscrreg\fR, \fBgetyx\fR, \fBgetbegyx\fR, and \fBgetmaxyx\fR. The return values of \fBsetscrreg\fR, \fBwsetscrreg\fR, \fBgetyx\fR, \fBgetbegyx\fR, and -\fBgetmaxyx\fR are undefined (\fIi\fR.\fIe\fR., these should not be used as the +\fBgetmaxyx\fR are undefined (i.e., these should not be used as the right-hand side of assignment statements). Routines that return pointers return \fBNULL\fR on error. .SH ENVIRONMENT The following environment symbols are useful for customizing the runtime behavior of the \fBcurses\fR library. The most important -ones have been already discussed in detail. +ones have already been discussed in detail. .TP 5 BAUDRATE The debugging library checks this environment symbol when the application has redirected output to a file. The symbol's numeric value is used for the baudrate. -If no value is found \fBcurses\fR uses 9600. +If no value is found, \fBcurses\fR uses 9600. This allows testers to construct repeatable test-cases that take into account costs that depend on baudrate. .TP 5 @@ -666,7 +666,7 @@ The complete list of directories in order follows: .RS .TP 3 - -the last directory to which \fBcurses\fR wrote, if any, is searched first. +the last directory to which \fBcurses\fR wrote, if any, is searched first .TP 3 - the directory specified by the TERMINFO symbol @@ -695,7 +695,7 @@ the TERMPATH symbol. This is a list of filenames separated by colons (i.e., ":"). If the TERMPATH symbol is not set, \fBcurses\fR looks in the files /etc/termcap, /usr/share/termcap and $HOME/.termcap, in that order. -.PP +.PP The library will disregard the following variables when the application uses setuid or setgid permissions: $TERMCAP, $TERMINFO, $TERMINFO_DIRS, $TERMPATH, as well as $HOME. @@ -819,7 +819,7 @@ calls in support of wide (multibyte) characters are not yet implemented: \fBmvwins_nwstr\fP, \fBmvwins_wch\fP, \fBmvwins_wstr\fP, -\fBmvwinwchnstr\fP. +\fBmvwinwchnstr\fP, \fBmvwinwstr\fP, \fBmvwvline_set\fP, \fBpecho_wchar\fP, diff --git a/lib/libcurses/resizeterm.3 b/lib/libcurses/resizeterm.3 index 8b222d01e23..5b472cd6928 100644 --- a/lib/libcurses/resizeterm.3 +++ b/lib/libcurses/resizeterm.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: resizeterm.3,v 1.3 1998/09/13 19:16:29 millert Exp $ +.\" $OpenBSD: resizeterm.3,v 1.4 2003/05/14 08:55:19 jmc Exp $ .\" .\"*************************************************************************** .\" Copyright (c) 1998 Free Software Foundation, Inc. * @@ -60,7 +60,7 @@ without additional interaction with the application. .SH RETURN VALUE The function returns the integer \fBERR\fR upon failure and \fBOK\fR on success. It will fail if either of the dimensions less than or equal to zero, -or if an error occurs while (re)allocating memory for the windows. +or if an error occurs while (re)allocating memory for the windows. .. .SH NOTES While this function is intended to be used to support a signal handler diff --git a/lib/libcurses/term.5tbl b/lib/libcurses/term.5tbl index d82f77fc625..89f40693165 100644 --- a/lib/libcurses/term.5tbl +++ b/lib/libcurses/term.5tbl @@ -27,7 +27,7 @@ .\"*************************************************************************** .\" .\" $From: term.5,v 1.10 2000/08/13 01:56:45 tom Exp $ -.\" $OpenBSD: term.5tbl,v 1.3 2003/01/23 08:58:47 jmc Exp $ +.\" $OpenBSD: term.5tbl,v 1.4 2003/05/14 08:55:19 jmc Exp $ .TH TERM 5 .ds n 5 .ds d /usr/share/terminfo @@ -60,7 +60,7 @@ An 8 or more bit byte is assumed, but no assumptions about byte ordering or sign extension are made. .PP The compiled file is created with the -.I tic +.I tic program, and read by the routine .IR setupterm . The file is divided into six parts: @@ -88,7 +88,7 @@ The first byte contains the least significant 8 bits of the value, and the second byte contains the most significant 8 bits. (Thus, the value represented is 256*second+first.) The value \-1 is represented by the two bytes 0377, 0377; other negative -values are illegal. This value generally +values are illegal. This value generally means that the corresponding capability is missing from this terminal. Note that this format corresponds to the hardware of the \s-1VAX\s+1 and \s-1PDP\s+1-11 (that is, little-endian machines). @@ -164,12 +164,12 @@ As an example, here is a hex dump of the description for the Lear-Siegler ADM-3, a popular though rather stupid early terminal: .nf .sp -adm3a|lsi adm3a, - am, - cols#80, lines#24, - bel=^G, clear=\032$<1>, cr=^M, cub1=^H, cud1=^J, - cuf1=^L, cup=\E=%p1%{32}%+%c%p2%{32}%+%c, cuu1=^K, - home=^^, ind=^J, +adm3a|lsi adm3a, + am, + cols#80, lines#24, + bel=^G, clear=\032$<1>, cr=^M, cub1=^H, cud1=^J, + cuf1=^L, cup=\E=%p1%{32}%+%c%p2%{32}%+%c, cuu1=^K, + home=^^, ind=^J, .sp .ft CW \s-20000 1a 01 10 00 02 00 03 00 82 00 31 00 61 64 6d 33 ........ ..1.adm3 diff --git a/lib/libcurses/term.7 b/lib/libcurses/term.7 index 605169230de..e30a1e67df6 100644 --- a/lib/libcurses/term.7 +++ b/lib/libcurses/term.7 @@ -1,4 +1,4 @@ -.\" $OpenBSD: term.7,v 1.6 2003/04/14 06:51:49 jmc Exp $ +.\" $OpenBSD: term.7,v 1.7 2003/05/14 08:55:19 jmc Exp $ .\" .\"*************************************************************************** .\" Copyright (c) 1998 Free Software Foundation, Inc. * @@ -29,7 +29,7 @@ .\"*************************************************************************** .\" .\" $From: term.7,v 1.12 2000/08/13 01:56:42 tom Exp $ -.\" $OpenBSD: term.7,v 1.6 2003/04/14 06:51:49 jmc Exp $ +.\" $OpenBSD: term.7,v 1.7 2003/05/14 08:55:19 jmc Exp $ .TH TERM 7 .ds n 5 .ds d /usr/share/terminfo @@ -99,7 +99,7 @@ terminals that also explains how to parse them: First, choose a root name. The root will consist of a lower-case letter followed by up to seven lower-case letters or digits. You need to avoid using punctuation characters in root names, because they are used and interpreted as -filenames and shell meta-characters (such as !, $, *, ? etc.) embedded in them +filenames, and shell meta-characters (such as !, $, *, ?, etc.) embedded in them may cause odd and unhelpful behavior. The slash (/), or any other character that may be interpreted by anyone's file system (\e, $, [, ]), is especially dangerous (terminfo is platform-independent, and choosing names with special @@ -139,29 +139,29 @@ with another that has this suffix and uses magic cookies to support multiple attributes. .TP 5 -am -Enable auto-margin (right-margin wraparound) +Enable auto-margin (right-margin wraparound). .TP 5 -m -Mono mode - suppress color support +Mono mode - suppress color support. .TP 5 -na No arrow keys - termcap ignores arrow keys which are actually there on the terminal, so the user can use the arrow keys locally. .TP 5 -nam -No auto-margin - suppress am capability +No auto-margin - suppress am capability. .TP 5 -nl -No labels - suppress soft labels +No labels - suppress soft labels. .TP 5 -nsl -No status line - suppress status line +No status line - suppress status line. .TP 5 -pp Has a printer port which is used. .TP 5 -rv -Terminal in reverse video mode (black on white) +Terminal in reverse video mode (black on white). .TP 5 -s Enable status line. @@ -193,10 +193,10 @@ should be unique within the first 14 characters. compiled terminal capability database .TP 5 /etc/inittab -tty line initialization (AT&T-like UNIXes). +tty line initialization (AT&T-like UNIXes) .TP 5 /etc/ttys -tty line initialization (BSD-like UNIXes). +tty line initialization (BSD-like UNIXes) .SH "SEE ALSO" \fBcurses\fR(3), \fBterminfo\fR(\*n), \fBterm\fR(\*n). .\"# diff --git a/lib/libcurses/termcap.3 b/lib/libcurses/termcap.3 index a0328ee5245..294515b5bb0 100644 --- a/lib/libcurses/termcap.3 +++ b/lib/libcurses/termcap.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: termcap.3,v 1.6 2001/01/22 18:01:35 millert Exp $ +.\" $OpenBSD: termcap.3,v 1.7 2003/05/14 08:55:19 jmc Exp $ .\" .\"*************************************************************************** .\" Copyright (c) 1998,2000 Free Software Foundation, Inc. * @@ -88,7 +88,7 @@ Only the first two characters of the \fBid\fR parameter of The \fBtgoto\fR routine instantiates the parameters into the given capability. The output from this routine is to be passed to \fBtputs\fR. -The \fBtputs\fR routine is described on the \fBterminfo\fR(3) manual +The \fBtputs\fR routine is described in the \fBterminfo\fR(3) manual page. It can retrieve capabilities by either termcap or terminfo name. .SH RETURN VALUE diff --git a/lib/libcurses/terminfo.3 b/lib/libcurses/terminfo.3 index 06afcd61c55..6abb958638a 100644 --- a/lib/libcurses/terminfo.3 +++ b/lib/libcurses/terminfo.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: terminfo.3,v 1.8 2001/01/22 18:01:35 millert Exp $ +.\" $OpenBSD: terminfo.3,v 1.9 2003/05/14 08:55:19 jmc Exp $ .\" .\"*************************************************************************** .\" Copyright (c) 1999,2000 Free Software Foundation, Inc. * @@ -108,10 +108,8 @@ with \fBtputs\fR or \fBputp\fR. Call the \fBreset_shell_mode\fR to restore the tty modes before exiting [see \fBcurs_kernel\fR(3)]. Programs which use cursor addressing should output \fBenter_ca_mode\fR upon startup and should output \fBexit_ca_mode\fR before exiting. Programs desiring shell escapes -should call - -\fBreset_shell_mode\fR and output \fBexit_ca_mode\fR before the shell -is called and should output \fBenter_ca_mode\fR and call +should call \fBreset_shell_mode\fR and output \fBexit_ca_mode\fR before the +shell is called and should output \fBenter_ca_mode\fR and call \fBreset_prog_mode\fR after returning from the shell. The \fBsetupterm\fR routine reads in the \fBterminfo\fR database, @@ -264,7 +262,7 @@ XSI notes that after calling \fBmvcur\fR, the curses state may not match the actual terminal state, and that an application should touch and refresh the window before resuming normal curses calls. Both ncurses and System V Release 4 curses implement \fBmvcur\fR using -the SCREEN data allocated in either \fBinitscr\fR or \fBnewterm\fR. +the SCREEN data allocated in either \fBinitscr\fR or \fBnewterm\fR. So though it is documented as a terminfo function, \fBmvcur\fR is really a curses function which is not well specified. .SH SEE ALSO |